You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2012/08/21 15:15:20 UTC

svn commit: r1375523 [1/5] - in /webservices/wss4j/trunk: cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/ cxf-integration/src/test/resources/integration/ ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/ ws-s...

Author: coheigea
Date: Tue Aug 21 13:15:11 2012
New Revision: 1375523

URL: http://svn.apache.org/viewvc?rev=1375523&view=rev
Log:
More package reshuffling

Added:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/WSSec.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/WSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/InboundWSSec.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/InboundWSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/OutboundWSSec.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/OutboundWSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSConfigurationException.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSConfigurationException.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSConstants.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSConstants.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSSecurityProperties.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSSecurityProperties.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSUtils.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSUtils.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/ext/WSSecurityContext.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSecurityContext.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/InboundWSSecurityContextImpl.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/InboundWSSecurityContextImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/WSSecurityContextImpl.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/WSSecurityContextImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DecryptInputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DecryptInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/DerivedKeyTokenInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DerivedKeyTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/OperationInputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/OperationInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/ReferenceListInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/ReferenceListInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SAMLTokenInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SAMLTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityContextTokenInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityContextTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityHeaderInputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityHeaderInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SignatureConfirmationInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/SignatureConfirmationInputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/TimestampInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/TimestampInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/UsernameTokenInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/UsernameTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/WSSEncryptedKeyInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSEncryptedKeyInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/WSSSignatureInputHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptEndingOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptEndingOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptedKeyOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/SAMLTokenOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SAMLTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityHeaderOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/TimestampOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/TimestampOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/UsernameTokenOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/UsernameTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureEndingOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/processor/output/WSSSignatureOutputProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/resourceResolvers/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/resourceResolvers/ResolverSameDocument.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/resourceResolvers/ResolverSameDocument.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/resourceResolvers/ResolverXPointer.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/resourceResolvers/ResolverXPointer.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/saml/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/saml/WSSSAMLKeyInfoProcessor.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/saml/WSSSAMLKeyInfoProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/HttpsSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/HttpsSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/ProcessorInfoSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ProcessorInfoSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/SAMLSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SAMLSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/SecureConversationSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecureConversationSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/SecurityTokenFactoryImpl.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenFactoryImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/SecurityTokenReference.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenReference.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/ThumbprintSHA1SecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/UsernameSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/UsernameSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/X509DataSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DataSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/X509DefaultSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DefaultSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/X509PKIPathv1SecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509PKIPathv1SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/X509SecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/securityToken/X509_V3SecurityToken.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509_V3SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/transformer/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/impl/transformer/STRTransformer.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/transformer/STRTransformer.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/DerivedKeyTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/DerivedKeyTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/EncryptedPartSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/EncryptedPartSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/HttpsTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/HttpsTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/IssuedTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/IssuedTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/KerberosTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/KerberosTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/OperationSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/OperationSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/RelTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/RelTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/RequiredElementSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/RequiredElementSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/RequiredPartSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/RequiredPartSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/SamlTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SamlTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/SecureConversationTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SecureConversationTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/SecurityContextTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SecurityContextTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/SignedPartSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SignedPartSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/SpnegoContextTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SpnegoContextTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/TimestampSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/TimestampSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/UsernameTokenSecurityEvent.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/UsernameTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/securityEvent/WSSecurityEventConstants.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/WSSecurityEventConstants.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/AbstractTestBase.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/CallbackHandlerImpl.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/CallbackHandlerImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/DerivedKeyTokenTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/DerivedKeyTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/EncDecryptionTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/EncDecryptionTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/InboundWSSecurityContextImplTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/InboundWSSecurityContextImplTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/InteroperabilityTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/OutputChainTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/OutputChainTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/PerformanceMemoryTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceMemoryTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/PerformanceTimingTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceTimingTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/ProfilingTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/ProfilingTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SecurityContextTokenTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/SecurityContextTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SignatureConfirmationTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/SignatureConfirmationTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/SignatureTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/SignatureTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/TimestampTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/TimestampTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/UsernameTokenTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/UsernameTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/VulnerabliltyVectorsTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/VulnerabliltyVectorsTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/WSS4JCallbackHandlerImpl.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/AbstractSAMLCallbackHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/AbstractSAMLCallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAML1AuthnHOKHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1AuthnHOKHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAML1CallbackHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1CallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAML2CallbackHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML2CallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAMLTokenHOKTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenHOKTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAMLTokenNegativeTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenNegativeTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAMLTokenReferenceTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenReferenceTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAMLTokenSVTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenSVTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/saml/SAMLTokenTest.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/utils/
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/utils/SOAPUtil.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/SOAPUtil.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/utils/SecretKeyCallbackHandler.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/SecretKeyCallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/utils/StAX2DOM.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/StAX2DOM.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/utils/XMLSecEventAllocator.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/XMLSecEventAllocator.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/test/utils/XmlReaderToWriter.java
      - copied, changed from r1375517, webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/XmlReaderToWriter.java
Removed:
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/WSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/InboundWSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/OutboundWSSec.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSConfigurationException.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSConstants.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSSecurityProperties.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSUtils.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/ext/WSSecurityContext.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/InboundWSSecurityContextImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/WSSecurityContextImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/BinarySecurityTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DecryptInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/DerivedKeyTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/OperationInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/ReferenceListInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SAMLTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityContextTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityHeaderInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SecurityTokenReferenceInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/SignatureConfirmationInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/TimestampInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/UsernameTokenInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSEncryptedKeyInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureInputHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/BinarySecurityTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/DerivedKeyTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptEndingOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/EncryptedKeyOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SAMLTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityContextTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SecurityHeaderOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/SignatureConfirmationOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/TimestampOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/UsernameTokenOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureEndingOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/processor/output/WSSSignatureOutputProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/resourceResolvers/ResolverSameDocument.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/resourceResolvers/ResolverXPointer.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/saml/WSSSAMLKeyInfoProcessor.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/HttpsSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ProcessorInfoSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SAMLSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecureConversationSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenFactoryImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/SecurityTokenReference.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/ThumbprintSHA1SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/UsernameSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DataSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509DefaultSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509PKIPathv1SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509SubjectKeyIdentifierSecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/securityToken/X509_V3SecurityToken.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/impl/transformer/STRTransformer.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/DerivedKeyTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/EncryptedPartSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/HttpsTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/IssuedTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/KerberosTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/OperationSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/RelTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/RequiredElementSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/RequiredPartSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SamlTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SecureConversationTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SecurityContextTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SignedPartSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/SpnegoContextTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/TimestampSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/UsernameTokenSecurityEvent.java
    webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/ws/security/stax/wss/securityEvent/WSSecurityEventConstants.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/CallbackHandlerImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/DerivedKeyTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/EncDecryptionTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/InboundWSSecurityContextImplTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/OutputChainTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceMemoryTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceTimingTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/ProfilingTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/SecurityContextTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/SignatureConfirmationTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/SignatureTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/TimestampTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/UsernameTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/VulnerabliltyVectorsTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/AbstractSAMLCallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1AuthnHOKHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1CallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML2CallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenHOKTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenNegativeTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenReferenceTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenSVTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAMLTokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/SOAPUtil.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/SecretKeyCallbackHandler.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/StAX2DOM.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/XMLSecEventAllocator.java
    webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/ws/security/stax/wss/test/utils/XmlReaderToWriter.java
Modified:
    webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityInInterceptor.java
    webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityOutInterceptor.java
    webservices/wss4j/trunk/cxf-integration/src/test/resources/integration/test-application-context.xml
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SamlTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecureConversationTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SecurityContextTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignatureProtectionAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedElementsAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SignedPartsAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/TokenProtectionAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/UsernameTokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/X509TokenAssertionState.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/AbstractPolicyTestBase.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/AlgorithmSuiteTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingIntegrationTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/AsymmetricBindingTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/ContentEncryptedElementsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/DerivedKeyTests.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedElementsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/EncryptedPartsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/HttpsTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/IssuedTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/KerberosTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/KeyValueTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/ProtectionOrderTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/RelTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/RequiredElementsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/RequiredPartsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SamlTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SecureConversationTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SecurityContextTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SignedElementsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SignedPartsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SpnegoContextTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SupportingTokensTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/SymmetricBindingTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/TokenProtectionTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingIntegrationTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/TransportBindingTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/UsernameTokenTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/VulnerabliltyVectorsTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/WSP13SpecTest.java
    webservices/wss4j/trunk/ws-security-policy-stax/src/test/java/org/apache/ws/security/policy/stax/test/X509TokenTest.java
    webservices/wss4j/trunk/ws-security-stax/src/main/resources/wss/wss-config.xml
    webservices/wss4j/trunk/ws-security-stax/src/test/resources/log4j-wss.xml

Modified: webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityInInterceptor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityInInterceptor.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityInInterceptor.java (original)
+++ webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityInInterceptor.java Tue Aug 21 13:15:11 2012
@@ -25,10 +25,10 @@ import org.apache.cxf.interceptor.Fault;
 import org.apache.cxf.interceptor.StaxInInterceptor;
 
 import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.stax.wss.WSSec;
-import org.apache.ws.security.stax.wss.ext.InboundWSSec;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
-import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
+import org.apache.ws.security.stax.WSSec;
+import org.apache.ws.security.stax.ext.InboundWSSec;
+import org.apache.ws.security.stax.ext.WSSConstants;
+import org.apache.ws.security.stax.ext.WSSSecurityProperties;
 
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;

Modified: webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityOutInterceptor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityOutInterceptor.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityOutInterceptor.java (original)
+++ webservices/wss4j/trunk/cxf-integration/src/main/java/org/swssf/cxfIntegration/interceptor/SecurityOutInterceptor.java Tue Aug 21 13:15:11 2012
@@ -31,9 +31,9 @@ import org.apache.cxf.phase.AbstractPhas
 import org.apache.cxf.phase.Phase;
 
 import org.apache.ws.security.common.ext.WSSecurityException;
-import org.apache.ws.security.stax.wss.WSSec;
-import org.apache.ws.security.stax.wss.ext.OutboundWSSec;
-import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
+import org.apache.ws.security.stax.WSSec;
+import org.apache.ws.security.stax.ext.OutboundWSSec;
+import org.apache.ws.security.stax.ext.WSSSecurityProperties;
 
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventListener;

Modified: webservices/wss4j/trunk/cxf-integration/src/test/resources/integration/test-application-context.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/cxf-integration/src/test/resources/integration/test-application-context.xml?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/cxf-integration/src/test/resources/integration/test-application-context.xml (original)
+++ webservices/wss4j/trunk/cxf-integration/src/test/resources/integration/test-application-context.xml Tue Aug 21 13:15:11 2012
@@ -28,13 +28,13 @@
     </cxf:bus>
     -->
     
-    <bean name="inSecurityProperties" class="org.apache.ws.security.stax.wss.ext.WSSSecurityProperties">
+    <bean name="inSecurityProperties" class="org.apache.ws.security.stax.ext.WSSSecurityProperties">
         <property name="callbackHandler" ref="callbackHandler"/>
         <property name="outAction">
             <list>
-                <util:constant static-field="org.apache.ws.security.stax.wss.ext.WSSConstants.TIMESTAMP"/>
-                <util:constant static-field="org.apache.ws.security.stax.wss.ext.WSSConstants.SIGNATURE"/>
-                <util:constant static-field="org.apache.ws.security.stax.wss.ext.WSSConstants.ENCRYPT"/>
+                <util:constant static-field="org.apache.ws.security.stax.ext.WSSConstants.TIMESTAMP"/>
+                <util:constant static-field="org.apache.ws.security.stax.ext.WSSConstants.SIGNATURE"/>
+                <util:constant static-field="org.apache.ws.security.stax.ext.WSSConstants.ENCRYPT"/>
             </list>
         </property>
         <!--<property name="encryptionUser" value="transmitter"/>-->
@@ -44,13 +44,13 @@
         <property name="disableSchemaValidation" value="true"/>
     </bean>
 
-    <bean name="outSecurityProperties" class="org.apache.ws.security.stax.wss.ext.WSSSecurityProperties">
+    <bean name="outSecurityProperties" class="org.apache.ws.security.stax.ext.WSSSecurityProperties">
         <property name="callbackHandler" ref="callbackHandler"/>
         <property name="outAction">
             <list>
-                <util:constant static-field="org.apache.ws.security.stax.wss.ext.WSSConstants.TIMESTAMP"/>
-                <util:constant static-field="org.apache.ws.security.stax.wss.ext.WSSConstants.SIGNATURE"/>
-                <util:constant static-field="org.apache.ws.security.stax.wss.ext.WSSConstants.ENCRYPT"/>
+                <util:constant static-field="org.apache.ws.security.stax.ext.WSSConstants.TIMESTAMP"/>
+                <util:constant static-field="org.apache.ws.security.stax.ext.WSSConstants.SIGNATURE"/>
+                <util:constant static-field="org.apache.ws.security.stax.ext.WSSConstants.ENCRYPT"/>
             </list>
         </property>
         <property name="signatureUser" value="receiver"/>
@@ -132,7 +132,7 @@
         <constructor-arg index="1" ref="outSecurityProperties"/>
     </bean>
 
-    <bean name="callbackHandler" class="org.apache.ws.security.stax.wss.test.CallbackHandlerImpl">
+    <bean name="callbackHandler" class="org.apache.ws.security.stax.test.CallbackHandlerImpl">
     </bean>
 
     <jaxws:endpoint id="greeterServiceWSS4J" implementor="#greeterServiceImpl"

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcer.java Tue Aug 21 13:15:11 2012
@@ -26,9 +26,9 @@ import org.apache.ws.security.common.ext
 import org.apache.ws.security.policy.WSSPolicyException;
 import org.apache.ws.security.policy.model.*;
 import org.apache.ws.security.policy.stax.assertionStates.*;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
-import org.apache.ws.security.stax.wss.securityEvent.OperationSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.ext.WSSConstants;
+import org.apache.ws.security.stax.securityEvent.OperationSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 import org.apache.xml.security.stax.ext.XMLSecurityException;
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyEnforcerFactory.java Tue Aug 21 13:15:11 2012
@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFac
 import org.apache.neethi.Policy;
 import org.apache.neethi.PolicyBuilder;
 import org.apache.ws.security.policy.WSSPolicyException;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
+import org.apache.ws.security.stax.ext.WSSConstants;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/PolicyInputProcessor.java Tue Aug 21 13:15:11 2012
@@ -20,14 +20,14 @@ package org.apache.ws.security.policy.st
 
 import org.apache.ws.security.common.ext.WSSecurityException;
 import org.apache.ws.security.policy.WSSPolicyException;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
-import org.apache.ws.security.stax.wss.ext.WSSSecurityProperties;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.impl.processor.input.SecurityHeaderInputProcessor;
-import org.apache.ws.security.stax.wss.securityEvent.EncryptedPartSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.RequiredElementSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.RequiredPartSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.stax.ext.WSSConstants;
+import org.apache.ws.security.stax.ext.WSSSecurityProperties;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.impl.processor.input.SecurityHeaderInputProcessor;
+import org.apache.ws.security.stax.securityEvent.EncryptedPartSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.RequiredElementSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.RequiredPartSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.SignedPartSecurityEvent;
 import org.apache.xml.security.stax.ext.*;
 import org.apache.xml.security.stax.ext.stax.XMLSecEndElement;
 import org.apache.xml.security.stax.ext.stax.XMLSecEvent;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java Tue Aug 21 13:15:11 2012
@@ -23,7 +23,7 @@ import org.apache.ws.security.policy.WSS
 import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
 import org.apache.ws.security.policy.model.AlgorithmSuite;
 import org.apache.ws.security.policy.stax.Assertable;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
+import org.apache.ws.security.stax.ext.WSSConstants;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
 import org.apache.xml.security.stax.securityEvent.AlgorithmSuiteSecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java Tue Aug 21 13:15:11 2012
@@ -28,8 +28,8 @@ import org.apache.xml.security.stax.secu
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
 import org.apache.ws.security.policy.stax.PolicyUtils;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedElementsAssertionState.java Tue Aug 21 13:15:11 2012
@@ -28,8 +28,8 @@ import org.apache.xml.security.stax.secu
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
 import org.apache.ws.security.policy.stax.PolicyUtils;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 import javax.xml.namespace.QName;
 import java.util.ArrayList;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/EncryptedPartsAssertionState.java Tue Aug 21 13:15:11 2012
@@ -26,10 +26,10 @@ import org.apache.ws.security.policy.mod
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.securityEvent.EncryptedPartSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.ext.WSSConstants;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.securityEvent.EncryptedPartSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 import javax.xml.namespace.QName;
 import java.util.LinkedList;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/HttpsTokenAssertionState.java Tue Aug 21 13:15:11 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
 import org.apache.ws.security.policy.model.HttpsToken;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.HttpsTokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.securityEvent.HttpsTokenSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 /**
  * WSP1.3, 5.4.10 HttpsToken Assertion

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IncludeTimeStampAssertionState.java Tue Aug 21 13:15:11 2012
@@ -24,7 +24,7 @@ import org.apache.ws.security.policy.mod
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 /**
  * WSP1.3, 6.2 Timestamp Property

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/IssuedTokenAssertionState.java Tue Aug 21 13:15:11 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
 import org.apache.ws.security.policy.model.IssuedToken;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.IssuedTokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.securityEvent.IssuedTokenSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 /**
  * WSP1.3, 5.4.2 IssuedToken Assertion

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KerberosTokenAssertionState.java Tue Aug 21 13:15:11 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
 import org.apache.ws.security.policy.model.KerberosToken;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.KerberosTokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.securityEvent.KerberosTokenSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 /**
  * WSP1.3, 5.4.4 KerberosToken Assertion

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/KeyValueTokenAssertionState.java Tue Aug 21 13:15:11 2012
@@ -25,7 +25,7 @@ import org.apache.ws.security.policy.mod
 import org.apache.xml.security.stax.securityEvent.KeyValueTokenSecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 /**
  * WSP1.3, 5.4.11 KeyValueToken Assertion

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/LayoutAssertionState.java Tue Aug 21 13:15:11 2012
@@ -25,7 +25,7 @@ import org.apache.ws.security.policy.mod
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java Tue Aug 21 13:15:11 2012
@@ -25,10 +25,10 @@ import org.apache.ws.security.policy.mod
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.securityEvent.SignedPartSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.ext.WSSConstants;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.securityEvent.SignedPartSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 /**
  * WSP1.3, 6.6 Entire Header and Body Signatures Property

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/ProtectionOrderAssertionState.java Tue Aug 21 13:15:11 2012
@@ -23,8 +23,8 @@ import org.apache.ws.security.policy.WSS
 import org.apache.ws.security.policy.model.AbstractSecurityAssertion;
 import org.apache.ws.security.policy.model.AbstractSymmetricAsymmetricBinding;
 import org.apache.ws.security.policy.stax.Assertable;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.securityEvent.*;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.securityEvent.*;
 import org.apache.xml.security.stax.ext.XMLSecurityConstants;
 import org.apache.xml.security.stax.securityEvent.ContentEncryptedElementSecurityEvent;
 import org.apache.xml.security.stax.securityEvent.EncryptedElementSecurityEvent;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RelTokenAssertionState.java Tue Aug 21 13:15:11 2012
@@ -24,8 +24,8 @@ import org.apache.ws.security.policy.mod
 import org.apache.ws.security.policy.model.RelToken;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.xml.security.stax.securityEvent.TokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.RelTokenSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.securityEvent.RelTokenSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 /**
  * WSP1.3, 5.4.9 RelToken Assertion

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredElementsAssertionState.java Tue Aug 21 13:15:11 2012
@@ -27,9 +27,9 @@ import org.apache.xml.security.stax.secu
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
 import org.apache.ws.security.policy.stax.PolicyUtils;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.securityEvent.RequiredElementSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.securityEvent.RequiredElementSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 import javax.xml.namespace.QName;
 import java.util.HashMap;

Modified: webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java?rev=1375523&r1=1375522&r2=1375523&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java (original)
+++ webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/ws/security/policy/stax/assertionStates/RequiredPartsAssertionState.java Tue Aug 21 13:15:11 2012
@@ -26,10 +26,10 @@ import org.apache.ws.security.policy.mod
 import org.apache.xml.security.stax.securityEvent.SecurityEvent;
 import org.apache.xml.security.stax.securityEvent.SecurityEventConstants;
 import org.apache.ws.security.policy.stax.Assertable;
-import org.apache.ws.security.stax.wss.ext.WSSConstants;
-import org.apache.ws.security.stax.wss.ext.WSSUtils;
-import org.apache.ws.security.stax.wss.securityEvent.RequiredPartSecurityEvent;
-import org.apache.ws.security.stax.wss.securityEvent.WSSecurityEventConstants;
+import org.apache.ws.security.stax.ext.WSSConstants;
+import org.apache.ws.security.stax.ext.WSSUtils;
+import org.apache.ws.security.stax.securityEvent.RequiredPartSecurityEvent;
+import org.apache.ws.security.stax.securityEvent.WSSecurityEventConstants;
 
 import javax.xml.namespace.QName;
 import java.util.*;