Refactored WS-security.
small modifications to  pull #275
Merge pull request #310 from gabhi/security_refactoring

Refactored WS-security.