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/17 17:41:05 UTC
svn commit: r1374326 [1/5] - in /webservices/wss4j/trunk:
cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/
cxf-integration/src/test/resources/integration/ policy/
streaming-ws-security/src/test/java/org/apache/ws/security/stax/w...
Author: coheigea
Date: Fri Aug 17 15:40:59 2012
New Revision: 1374326
URL: http://svn.apache.org/viewvc?rev=1374326&view=rev
Log:
DOM code now shares common Crypto code
Added:
webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/WSS4JCallbackHandlerImpl.java
- copied, changed from r1374230, webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java
webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/
webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties
- copied, changed from r1374230, webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/errors.properties
Removed:
webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/components/crypto/errors.properties
webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/conversation/errors.properties
webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/errors.properties
webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/saml/saml.properties
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSPasswordCallback.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSecurityException.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/CertificateStore.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/CredentialException.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/Crypto.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/CryptoBase.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/CryptoFactory.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/CryptoType.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/DERDecoder.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/Merlin.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/MerlinDevice.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/X509NameTokenizer.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/components/crypto/X509SubjectPublicKeyInfo.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/Loader.java
webservices/wss4j/trunk/wss4j-dom/src/main/resources/org/apache/ws/security/components/crypto/errors.properties
webservices/wss4j/trunk/wss4j-dom/src/main/resources/org/apache/ws/security/errors.properties
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/SKITest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/X509NameTokenizerTest.java
Modified:
webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/CXFIntegrationTest.java
webservices/wss4j/trunk/cxf-integration/src/test/resources/integration/test-application-context.xml
webservices/wss4j/trunk/policy/rampart-project.patch
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/DerivedKeyTokenTest.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceMemoryTest.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceTimingTest.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SecurityContextTokenTest.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1AuthnHOKHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1CallbackHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML2CallbackHandler.java
webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/utils/SecretKeyCallbackHandler.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Crypto.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSPasswordCallback.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSSecurityException.java
webservices/wss4j/trunk/wss4j-dom/pom.xml
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSDocInfo.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSConfig.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSecurityEngine.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/Action.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/EncryptionAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenUnsignedAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureConfirmationAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/TimestampAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenSignedAction.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/RequestData.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/WSHandler.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/CallbackLookup.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/DOMCallbackLookup.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecDKEncrypt.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecDKSign.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecDerivedKeyBase.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecEncrypt.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecEncryptedKey.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecHeader.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecSAMLToken.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecSecurityContextToken.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecSignature.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecSignatureBase.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/WSSecUsernameToken.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/BinarySecurity.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/DOMX509Data.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/DerivedKeyToken.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/KerberosSecurity.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/PKIPathSecurity.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/Reference.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/SecurityContextToken.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/SecurityTokenReference.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/SignatureConfirmation.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/Timestamp.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/UsernameToken.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/message/token/X509Security.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/DerivedKeyTokenProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/EncryptedDataProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/EncryptedKeyProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/Processor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/ReferenceListProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SecurityContextTokenProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SignatureConfirmationProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/TimestampProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/processor/X509Util.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuer.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerFactory.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLIssuerImpl.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/SAMLUtil.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/WSSecSignatureSAML.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/AssertionWrapper.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/OpenSAMLUtil.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML1ComponentBuilder.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/saml/ext/builder/SAML2ComponentBuilder.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/spnego/SpnegoTokenContext.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/BSPEnforcer.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/DerivedKeyTokenSTRParser.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/EncryptedKeySTRParser.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/STRParser.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SecurityTokenRefSTRParser.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/str/SignatureSTRParser.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/transform/STRTransformUtil.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/Base64.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/util/WSSecurityUtil.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/JAASUsernameTokenValidator.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/KerberosTokenValidator.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/NoOpValidator.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SamlAssertionValidator.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/SignatureTrustValidator.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/TimestampValidator.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/UsernameTokenValidator.java
webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/validate/Validator.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomAction.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomCrypto.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomProcessor.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/CustomSamlAssertionValidator.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/EncodedPasswordCallbackHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/KeystoreCallbackHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1AuthnHOKHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML1CallbackHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SAML2CallbackHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/SecretKeyCallbackHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/common/UsernamePasswordCallbackHandler.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CertificateStoreTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoProviderTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/components/crypto/CryptoTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/CustomActionProcessorTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureConfirmationTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/SignatureUTAliasTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/handler/WSHandlerGetPasswordTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/CertErrorTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/DerivedKeyTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptedDataInHeaderTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionCRLTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionGCMTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionPartsTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/EncryptionTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ModifiedRequestTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/NoSoapPrefixSignatureTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/PasswordTypeTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/ReplayTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/RequireSignedEncryptedDataElementsTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SKISignatureTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/STRSignatureTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SecurityContextTokenTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCRLTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertConstraintsTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureCertTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureEncryptionTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureKeyValueTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignaturePartsTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignatureTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SignedBSTTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/SymmetricSignatureTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/TimestampTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTDerivedKeyTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UTSignatureTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/UsernameTokenTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BSTKerberosTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/BinarySecurityTokenTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/KerberosTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/ReferenceTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/SecurityTokenReferenceTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/message/token/WCFUsernameTokenTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/misc/FaultCodeTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/misc/PrincipalTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/misc/SecurityHeaderTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/processor/EncryptedKeyDataRefTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/processor/ReferenceListDataRefTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlConditionsTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlNegativeTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlReferenceTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenDerivedTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenHOKTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenSVTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SamlTokenTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/SignedSamlTokenHOKTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/saml/ext/AssertionSigningTest.java
webservices/wss4j/trunk/wss4j-dom/src/test/java/org/apache/ws/security/validate/ValidatorTest.java
Modified: webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/CXFIntegrationTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/CXFIntegrationTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/CXFIntegrationTest.java (original)
+++ webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/CXFIntegrationTest.java Fri Aug 17 15:40:59 2012
@@ -27,7 +27,6 @@ import org.apache.hello_world_soap_http.
import org.apache.hello_world_soap_http.SOAPService;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.springframework.context.support.ClassPathXmlApplicationContext;
-import org.apache.ws.security.stax.wss.test.WSS4JCallbackHandlerImpl;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
Copied: webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/WSS4JCallbackHandlerImpl.java (from r1374230, webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/WSS4JCallbackHandlerImpl.java?p2=webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/WSS4JCallbackHandlerImpl.java&p1=webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java&r1=1374230&r2=1374326&rev=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java (original)
+++ webservices/wss4j/trunk/cxf-integration/src/test/java/org/swssf/cxfIntegration/test/integration/WSS4JCallbackHandlerImpl.java Fri Aug 17 15:40:59 2012
@@ -16,12 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ws.security.stax.wss.test;
-
-import org.apache.ws.security.WSPasswordCallback;
+package org.swssf.cxfIntegration.test.integration;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.WSPasswordCallback;
+
import java.io.IOException;
/**
@@ -40,7 +41,7 @@ public class WSS4JCallbackHandlerImpl im
}
public void handle(javax.security.auth.callback.Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- org.apache.ws.security.WSPasswordCallback pc = (org.apache.ws.security.WSPasswordCallback) callbacks[0];
+ WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
// if (pc.getUsage() == org.apache.ws.security.WSPasswordCallback.DECRYPT || pc.getUsage() == org.apache.ws.security.WSPasswordCallback.SIGNATURE) {
pc.setPassword("default");
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=1374326&r1=1374325&r2=1374326&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 Fri Aug 17 15:40:59 2012
@@ -172,7 +172,7 @@
</property>
</bean>
- <bean name="passwordCallbackHandlerWSS4J" class="org.apache.ws.security.stax.wss.test.WSS4JCallbackHandlerImpl">
+ <bean name="passwordCallbackHandlerWSS4J" class="org.swssf.cxfIntegration.test.integration.WSS4JCallbackHandlerImpl">
</bean>
<httpj:engine-factory bus="cxf">
Modified: webservices/wss4j/trunk/policy/rampart-project.patch
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/rampart-project.patch?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/rampart-project.patch (original)
+++ webservices/wss4j/trunk/policy/rampart-project.patch Fri Aug 17 15:40:59 2012
@@ -162,7 +162,7 @@ Index: modules/rampart-core/src/main/jav
+import org.apache.ws.secpolicy.model.*;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
- import org.apache.ws.security.WSSecurityException;
+ import WSSecurityException;
@@ -45,8 +45,10 @@
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -1040,7 +1040,7 @@ Index: modules/rampart-core/src/main/jav
+import org.apache.ws.secpolicy.model.*;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
- import org.apache.ws.security.WSSecurityException;
+ import WSSecurityException;
@@ -52,6 +44,7 @@
import java.util.ArrayList;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/AbstractTestBase.java Fri Aug 17 15:40:59 2012
@@ -178,14 +178,14 @@ public abstract class AbstractTestBase {
return baos;
}
- protected Document doOutboundSecurityWithWSS4J(InputStream sourceDocument, String action, Properties properties) throws org.apache.ws.security.WSSecurityException {
+ protected Document doOutboundSecurityWithWSS4J(InputStream sourceDocument, String action, Properties properties) throws WSSecurityException {
Map<String, Object> context = doOutboundSecurityWithWSS4J_1(sourceDocument, action, properties);
return (Document) context.get(SECURED_DOCUMENT);
}
protected Map<String, Object> doOutboundSecurityWithWSS4J_1(
InputStream sourceDocument, String action, final Properties properties
- ) throws org.apache.ws.security.WSSecurityException {
+ ) throws WSSecurityException {
CustomWSS4JHandler wss4JHandler = new CustomWSS4JHandler();
final Map<String, Object> messageContext = getMessageContext(sourceDocument);
messageContext.put(WSHandlerConstants.ACTION, action);
@@ -385,7 +385,7 @@ public abstract class AbstractTestBase {
* Handles incoming web service requests and outgoing responses
*/
public boolean doSender(Map<String, Object> mc, RequestData reqData, boolean isRequest)
- throws org.apache.ws.security.WSSecurityException {
+ throws WSSecurityException {
reqData.getSignatureParts().clear();
reqData.getEncryptParts().clear();
@@ -394,7 +394,7 @@ public abstract class AbstractTestBase {
*/
String action = (String) mc.get(WSHandlerConstants.ACTION);
if (action == null) {
- throw new org.apache.ws.security.WSSecurityException("WSS4JHandler: No action defined");
+ throw new WSSecurityException("WSS4JHandler: No action defined");
}
List<Integer> actions = new ArrayList<Integer>();
int doAction = WSSecurityUtil.decodeAction(action, actions);
@@ -422,7 +422,7 @@ public abstract class AbstractTestBase {
* We need a username - if none throw a WSSecurityException. For encryption
* there is a specific parameter to get a username.
*/
- throw new org.apache.ws.security.WSSecurityException(
+ throw new WSSecurityException(
"WSS4JHandler: Empty username for specified action"
);
}
@@ -438,7 +438,7 @@ public abstract class AbstractTestBase {
*/
Document doc = (Document) mc.get(SECURED_DOCUMENT);
if (doc == null) {
- throw new org.apache.ws.security.WSSecurityException(
+ throw new WSSecurityException(
"WSS4JHandler: cannot get SOAP envlope from message"
);
}
@@ -455,10 +455,10 @@ public abstract class AbstractTestBase {
@SuppressWarnings("unchecked")
public boolean doReceiver(Map<String, Object> mc, RequestData reqData, boolean isRequest)
- throws org.apache.ws.security.WSSecurityException {
+ throws WSSecurityException {
String action = (String) mc.get(WSHandlerConstants.ACTION);
if (action == null) {
- throw new org.apache.ws.security.WSSecurityException("WSS4JHandler: No action defined");
+ throw new WSSecurityException("WSS4JHandler: No action defined");
}
List<Integer> actions = new ArrayList<Integer>();
int doAction = WSSecurityUtil.decodeAction(action, actions);
@@ -496,11 +496,11 @@ public abstract class AbstractTestBase {
List<WSSecurityEngineResult> wsResult = null;
try {
wsResult = secEngine.processSecurityHeader(elem, reqData);
- } catch (org.apache.ws.security.WSSecurityException ex) {
+ } catch (WSSecurityException ex) {
if (doDebug) {
log.debug(ex.getMessage(), ex);
}
- throw new org.apache.ws.security.WSSecurityException(
+ throw new WSSecurityException(
"WSS4JHandler: security processing failed", ex
);
}
@@ -509,7 +509,7 @@ public abstract class AbstractTestBase {
if (doAction == WSConstants.NO_SECURITY) {
return true;
} else {
- throw new org.apache.ws.security.WSSecurityException(
+ throw new WSSecurityException(
"WSS4JHandler: Request does not contain required Security header"
);
}
@@ -526,7 +526,7 @@ public abstract class AbstractTestBase {
* now check the security actions: do they match, in right order?
*/
if (!checkReceiverResults(wsResult, actions)) {
- throw new org.apache.ws.security.WSSecurityException(
+ throw new WSSecurityException(
"WSS4JHandler: security processing failed (actions mismatch)"
);
}
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/DerivedKeyTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/DerivedKeyTokenTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/DerivedKeyTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/DerivedKeyTokenTest.java Fri Aug 17 15:40:59 2012
@@ -20,9 +20,9 @@ package org.apache.ws.security.stax.wss.
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.conversation.ConversationConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.*;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/InteroperabilityTest.java Fri Aug 17 15:40:59 2012
@@ -966,7 +966,7 @@ public class InteroperabilityTest extend
try {
doInboundSecurityWithWSS4J_1(documentBuilderFactory.newDocumentBuilder().parse(new ByteArrayInputStream(baos.toByteArray())), action, properties, false);
Assert.fail("Expected WSSecurityException");
- } catch (org.apache.ws.security.WSSecurityException e) {
+ } catch (WSSecurityException e) {
Assert.assertEquals(e.getMessage(), "WSS4JHandler: Request does not contain required Security header");
}
}
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceMemoryTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceMemoryTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceMemoryTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceMemoryTest.java Fri Aug 17 15:40:59 2012
@@ -18,6 +18,7 @@
*/
package org.apache.ws.security.stax.wss.test;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.ws.security.stax.wss.WSSec;
@@ -324,7 +325,7 @@ public class PerformanceMemoryTest exten
xmlStreamReader.close();
}
- private void doDOMSecurityOutbound(File input, File output) throws org.apache.ws.security.WSSecurityException, FileNotFoundException, TransformerException {
+ private void doDOMSecurityOutbound(File input, File output) throws WSSecurityException, FileNotFoundException, TransformerException {
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#aes256-cbc");
properties.setProperty(WSHandlerConstants.ENC_KEY_TRANSPORT, "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceTimingTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceTimingTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceTimingTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/PerformanceTimingTest.java Fri Aug 17 15:40:59 2012
@@ -18,6 +18,7 @@
*/
package org.apache.ws.security.stax.wss.test;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.xml.security.stax.securityEvent.SecurityEvent;
import org.apache.ws.security.stax.wss.WSSec;
@@ -243,7 +244,7 @@ public class PerformanceTimingTest exten
xmlStreamReader.close();
}
- private void doDOMSecurityOutbound(File input, File output) throws org.apache.ws.security.WSSecurityException, FileNotFoundException, TransformerException {
+ private void doDOMSecurityOutbound(File input, File output) throws WSSecurityException, FileNotFoundException, TransformerException {
Properties properties = new Properties();
properties.setProperty(WSHandlerConstants.ENC_SYM_ALGO, "http://www.w3.org/2001/04/xmlenc#aes256-cbc");
properties.setProperty(WSHandlerConstants.ENC_KEY_TRANSPORT, "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p");
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SecurityContextTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SecurityContextTokenTest.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SecurityContextTokenTest.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/SecurityContextTokenTest.java Fri Aug 17 15:40:59 2012
@@ -20,8 +20,8 @@ package org.apache.ws.security.stax.wss.
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
import org.apache.ws.security.conversation.ConversationConstants;
import org.apache.ws.security.handler.WSHandlerConstants;
import org.apache.ws.security.message.*;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/WSS4JCallbackHandlerImpl.java Fri Aug 17 15:40:59 2012
@@ -18,10 +18,11 @@
*/
package org.apache.ws.security.stax.wss.test;
-import org.apache.ws.security.WSPasswordCallback;
-
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
+
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+
import java.io.IOException;
/**
@@ -40,7 +41,7 @@ public class WSS4JCallbackHandlerImpl im
}
public void handle(javax.security.auth.callback.Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- org.apache.ws.security.WSPasswordCallback pc = (org.apache.ws.security.WSPasswordCallback) callbacks[0];
+ WSPasswordCallback pc = (WSPasswordCallback) callbacks[0];
// if (pc.getUsage() == org.apache.ws.security.WSPasswordCallback.DECRYPT || pc.getUsage() == org.apache.ws.security.WSPasswordCallback.SIGNATURE) {
pc.setPassword("default");
@@ -48,7 +49,7 @@ public class WSS4JCallbackHandlerImpl im
throw new UnsupportedCallbackException(pc, "Unrecognized CallbackHandlerImpl");
}
*/
- if (pc.getUsage() == WSPasswordCallback.SECURITY_CONTEXT_TOKEN) {
+ if (pc.getUsage() == WSPasswordCallback.Usage.SECURITY_CONTEXT_TOKEN) {
pc.setKey(secret);
}
}
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1AuthnHOKHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1AuthnHOKHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1AuthnHOKHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1AuthnHOKHandler.java Fri Aug 17 15:40:59 2012
@@ -19,10 +19,10 @@
package org.apache.ws.security.stax.wss.test.saml;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.saml.ext.SAMLCallback;
import org.apache.ws.security.saml.ext.bean.AuthenticationStatementBean;
import org.apache.ws.security.saml.ext.bean.KeyInfoBean;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1CallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1CallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1CallbackHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML1CallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,9 +19,9 @@
package org.apache.ws.security.stax.wss.test.saml;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.saml.ext.SAMLCallback;
import org.apache.ws.security.saml.ext.bean.KeyInfoBean;
import org.apache.ws.security.saml.ext.bean.SubjectBean;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML2CallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML2CallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML2CallbackHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/saml/SAML2CallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,9 +19,9 @@
package org.apache.ws.security.stax.wss.test.saml;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.CryptoType;
import org.apache.ws.security.saml.ext.SAMLCallback;
import org.apache.ws.security.saml.ext.bean.KeyInfoBean;
import org.apache.ws.security.saml.ext.bean.SubjectBean;
Modified: webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/utils/SecretKeyCallbackHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/utils/SecretKeyCallbackHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/utils/SecretKeyCallbackHandler.java (original)
+++ webservices/wss4j/trunk/streaming-ws-security/src/test/java/org/apache/ws/security/stax/wss/test/utils/SecretKeyCallbackHandler.java Fri Aug 17 15:40:59 2012
@@ -19,8 +19,8 @@
package org.apache.ws.security.stax.wss.test.utils;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.util.Base64;
import org.apache.ws.security.util.WSSecurityUtil;
@@ -44,16 +44,14 @@ public class SecretKeyCallbackHandler im
for (int i = 0; i < callbacks.length; i++) {
if (callbacks[i] instanceof WSPasswordCallback) {
WSPasswordCallback pc = (WSPasswordCallback) callbacks[i];
- switch (pc.getUsage()) {
- case WSPasswordCallback.SECRET_KEY:
- case WSPasswordCallback.SECURITY_CONTEXT_TOKEN: {
- byte[] secret = this.secrets.get(pc.getIdentifier());
- if (secret == null) {
- secret = outboundSecret;
- }
- pc.setKey(secret);
- break;
+ if ((pc.getUsage() == WSPasswordCallback.Usage.SECRET_KEY)
+ || (pc.getUsage() == WSPasswordCallback.Usage.SECURITY_CONTEXT_TOKEN)) {
+ byte[] secret = this.secrets.get(pc.getIdentifier());
+ if (secret == null) {
+ secret = outboundSecret;
}
+ pc.setKey(secret);
+ break;
}
} else {
throw new UnsupportedCallbackException(callbacks[i], "Unrecognized Callback");
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Crypto.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Crypto.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Crypto.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Crypto.java Fri Aug 17 15:40:59 2012
@@ -80,7 +80,7 @@ public interface Crypto {
*
* @return Returns a <code>CertificateFactory</code> to construct
* X509 certificates
- * @throws org.apache.ws.security.WSSecurityException
+ * @throws WSSecurityException
*/
CertificateFactory getCertificateFactory() throws WSSecurityException;
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/CryptoBase.java Fri Aug 17 15:40:59 2012
@@ -136,7 +136,7 @@ public abstract class CryptoBase impleme
*
* @return Returns a <code>CertificateFactory</code> to construct
* X509 certificates
- * @throws org.apache.ws.security.WSSecurityException
+ * @throws WSSecurityException
*/
public CertificateFactory getCertificateFactory() throws WSSecurityException {
String provider = getCryptoProvider();
@@ -179,7 +179,7 @@ public abstract class CryptoBase impleme
*
* @param in The <code>InputStream</code> containing the X509Certificate
* @return An X509 certificate
- * @throws org.apache.ws.security.WSSecurityException
+ * @throws WSSecurityException
*/
public X509Certificate loadCertificate(InputStream in) throws WSSecurityException {
try {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/crypto/Merlin.java Fri Aug 17 15:40:59 2012
@@ -477,7 +477,7 @@ public class Merlin extends CryptoBase {
*
* @return Returns a <code>CertificateFactory</code> to construct
* X509 certificates
- * @throws org.apache.ws.security.WSSecurityException
+ * @throws WSSecurityException
*/
@Override
public CertificateFactory getCertificateFactory() throws WSSecurityException {
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSPasswordCallback.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSPasswordCallback.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSPasswordCallback.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSPasswordCallback.java Fri Aug 17 15:40:59 2012
@@ -87,7 +87,7 @@ public class WSPasswordCallback implemen
private Usage usage;
private String type;
private Element customToken;
-
+
/**
* Constructor.
*
@@ -97,7 +97,7 @@ public class WSPasswordCallback implemen
public WSPasswordCallback(String id, Usage usage) {
this(id, null, null, usage);
}
-
+
/**
* Constructor.
*
@@ -110,7 +110,7 @@ public class WSPasswordCallback implemen
this.type = type;
this.usage = usage;
}
-
+
/**
* Get the identifier.
* <p/>
@@ -120,25 +120,9 @@ public class WSPasswordCallback implemen
public String getIdentifier() {
return identifier;
}
-
- /**
- * Get the identifier.
- * <p/>
- *
- * @return The identifier
- * @deprecated use getIdentifier() instead
- */
- public String getIdentifer() {
- return getIdentifier();
- }
-
+
/**
- * Extended callback interface allows for setting the username as well.
- * Callback functions can change the identifier, this is intended in the usernametoken scenario
- * where the usernametoken denotes the identity, but a fixed identity for signing is used
- * The initial value is that from the configuration file. If this method is not called, the
- * configured identity is used.
- *
+ * Set the identifier
* @param ident The identity.
*/
public void setIdentifier(String ident) {
@@ -194,31 +178,28 @@ public class WSPasswordCallback implemen
public Usage getUsage() {
return usage;
}
-
+
/**
- * The password type is only relevant for usage <code>USERNAME_TOKEN</code>
- * and <code>USERNAME_TOKEN_UNKNOWN</code>.
- *
- * @return Returns the passwordType.
+ * @return Returns the type.
*/
- public String getPasswordType() {
+ public String getType() {
return type;
}
/**
- * The key type is only relevant for usage <code>ENCRYPTED_KEY_TOKEN</code>
- *
- * @return Returns the type.
+ *
+ * @return the custom token
*/
- public String getKeyType() {
- return type;
- }
-
public Element getCustomToken() {
return customToken;
}
+ /**
+ * Set the custom token
+ * @param customToken
+ */
public void setCustomToken(Element customToken) {
this.customToken = customToken;
}
+
}
\ No newline at end of file
Modified: webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSSecurityException.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSSecurityException.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSSecurityException.java (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/ws/security/common/ext/WSSecurityException.java Fri Aug 17 15:40:59 2012
@@ -93,7 +93,9 @@ public class WSSecurityException extends
FAILED_SIGNATURE,
}
+ private static final ResourceBundle xmlsecResources;
private static final ResourceBundle resources;
+
/*
* This is an Integer -> QName map. Its function is to map the integer error codes
* given above to the QName fault codes as defined in the SOAP Message Security 1.1
@@ -105,7 +107,8 @@ public class WSSecurityException extends
static {
try {
- resources = ResourceBundle.getBundle("messages.errors");
+ xmlsecResources = ResourceBundle.getBundle("messages.errors");
+ resources = ResourceBundle.getBundle("messages.wss4j_errors");
} catch (MissingResourceException e) {
throw new RuntimeException(e.getMessage(), e);
}
@@ -275,8 +278,13 @@ public class WSSecurityException extends
*/
private static String getMessage(ErrorCode errorCode, String msgId, Object... arguments) {
String msg = null;
+ String errorCodeString = String.valueOf(errorCode.ordinal());
try {
- msg = resources.getString(String.valueOf(errorCode.ordinal()));
+ if (resources.containsKey(errorCodeString)) {
+ msg = resources.getString(errorCodeString);
+ } else {
+ msg = xmlsecResources.getString(errorCodeString);
+ }
if (msgId != null) {
return msg += (" (" + MessageFormat.format(resources.getString(msgId), arguments) + ")");
}
@@ -285,4 +293,5 @@ public class WSSecurityException extends
}
return msg;
}
+
}
\ No newline at end of file
Copied: webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties (from r1374230, webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/errors.properties)
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties?p2=webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties&p1=webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/errors.properties&r1=1374230&r2=1374326&rev=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-common/src/main/resources/org/apache/ws/security/errors.properties (original)
+++ webservices/wss4j/trunk/ws-security-common/src/main/resources/messages/wss4j_errors.properties Fri Aug 17 15:40:59 2012
@@ -1,106 +1,109 @@
-## defines error code - str message mapping
-0 = General security error
-1 = An unsupported token was provided
-2 = An unsupported signature or encryption algorithm was used
-3 = An error was discovered processing the <wsse:Security> header
-4 = An invalid security token was provided
-5 = The security token could not be authenticated or authorized
-6 = The signature or decryption was invalid
-7 = Referenced security token could not be retrieved
-8 = The message has expired
-9 = Cannot encrypt data
-10 = Signature creation failed
-
-## detailed error msgs
-noToken = Reference \"{0}\"
-noReference = <Reference> token could not be retrieved
-badReferenceURI = Reference URI is null
-noSecurityTokenReference = The SecurityTokenReference was required but not found
-badSecurityTokenReference = A bad SecurityTokenReference was specified
-noEncodingType = No EncodingType attribute was specified
-badEncodingType = A bad EncodingType attribute was specified \"{0}\"
badAttribute = A bad attribute was specified \"{0}\"
-unhandledToken = Security token supported but currently not handled \"{0}\"
-unsupportedBinaryTokenType = Token type \"{0}\"
-invalidConstructor = Token impl. class \"{0}\" does not provide appropriate constructor
-invalidValueType = Bad ValueType \"{0}\"
-invalidTokenType = Bad TokenType \"{0}\"
-unsupportedKeyInfo = Unsupported KeyInfo type
-invalidX509Data = Unexpected number of X509Data: {0}
-unknownSignatureAlgorithm = An unknown signature algorithm was specified: {0}
-noUserCertsFound = No certificates for user {0} were found for {1}
-noCertsFound = No certificates were found for {0}
-noPrivateKey = The private key for the supplied alias does not exist in the keystore
-invalidCertData = Unexpected number of certificates: {0}
-noSKIHandling = Error during processing of SKI data: {0}
-invalidDataRef = Cannot handle multiple data references
-invalidEmbeddedRef = The embedded Reference is invalid
-noEncryptedData = Referenced encrypted data could not be retrieved. Reference \"{0}\"
+badC14nAlgo = A bad canonicalization algorithm was specified
badElement = Bad element, expected \"{0}\" while got \"{1}\"
+badEncAlgo=xenc:EncryptionMethod/@Algorithm is not supported: {0}
+badEncodingType = A bad EncodingType attribute was specified \"{0}\"
+badReferenceURI = Reference URI is null
+badSecurityTokenReference = A bad SecurityTokenReference was specified
+badTokenType00 = Bad UsernameToken Type
+badTokenType01 = Bad UsernameToken Values
badUsernameToken = An error happened processing a Username Token \"{0}\"
-badC14nAlgo = A bad canonicalization algorithm was specified
-failedAuthentication = User ({0}) not authenticated
-missingUsernameToken = UsernameToken is missing
-missingSecurityHeader = Security header is missing
-missingUsername = Username is missing
-missingPassword = Password is missing
-missingPasswordType = Password attribute type is missing
-missingNonce = Nonce is missing
-missingCreated = Created time is missing
-noSecProvider = Specified security provider not available
-parseError = Cannot parse/decode the certificate data
+certpath=Error during certificate path validation: {0}
+dataRef=WSSecurityEngine: DataReference - referenced data not found
+decoding.divisible.four = It should be divisible by four
+decoding.general = Error while decoding
+decryptionCryptoClassWrong = DecryptionCryptoClass must be a sub-class of CryptoBase
+decryptionCryptoFailure = DecryptionCrypto instantiation failed
+decryptionKeyStoreNotSet = Decryption KeyStore is not set
+duplicateError = Multiple security tokens with the same Id have been detected
encodeError = Cannot encode the certificate data
+encryptionCryptoClassWrong = EncryptionCryptoClass must be a sub-class of CryptoBase
+encryptionCryptoFailure = EncryptionCrypto instantiation failed
+encryptionKeyMissing = The encryption key or cert is missing
+encryptionKeyStoreNotSet = Encryption KeyStore is not set
+error00 = Failed to load credentials.
+failedAuthentication = User ({0}) not authenticated
+invalidCertData = Unexpected number of certificates: {0}
invalidCertForSKI = An X509 certificate with version 3 must be used for SKI. The presented cert has version: {0}
-unsupportedCertType = Certificate type not supported by security provider
invalidCert = The provided certificate is invalid
-noXMLSig = Cannot setup signature data structure
-noSKIHandling = Problem with SKI information: {0}
+invalidConstructor = Token impl. class \"{0}\" does not provide appropriate constructor
+invalidData=Invalid data: {0}
+invalidDataRef = Cannot handle multiple data references
+invalidEmbeddedRef = The embedded Reference is invalid
+invalidKeySize=Invalid keysize
+invalidSAMLsecurity=SAML token security failure
+invalidSAMLToken = Invalid SAML assertion : {0}
+invalidTimestamp=WSSecurityEngine: Invalid timestamp: {0}
+invalidTokenType = Bad TokenType \"{0}\"
+invalidValueType = Bad ValueType \"{0}\"
+invalidX509Data = Unexpected number of X509Data: {0}
+ioError00 = Failed to load credentials.
+kerberosLoginError=An error occurred in trying to obtain a TGT: {0}
+kerberosServiceTicketError=An error occurred in trying to obtain a service ticket
+kerberosTicketValidationError=An error occurred in trying to validate a ticket
keystore = Cannot access/read keystore data
-noCert = No certificate provided
-duplicateError = Multiple security tokens with the same Id have been detected
-##
-noSigCryptoFile=WSSecurityEngine: No crypto property file supplied to verify signature
-noDecCryptoFile=WSSecurityEngine: No crypto property file supplied for decryption
+missingCreated = Created time is missing
+missingNonce = Nonce is missing
+missingPassword = Password is missing
+missingPasswordType =Password attribute type is missing
+missingSecurityHeader = Security header is missing
+missingSecurityProperties = SecurityProperties must not be null!
+missingUsernameToken = UsernameToken is missing
+missingUsername = Username is missing
noCallback=WSSecurityEngine: No password callback supplied
+noCert = No certificate provided
+noCertsFound = No certificates were found for {0}
+noCipher=WSSecurityEngine: EncryptedKey does not contain xenc:CipherData/xenc:CipherValue
noCredential=WSSecurityEngine: No Credential was supplied to the Validator
-noPassword=WSSecurityEngine: Callback supplied no password for: {0}
-noKey=WSSecurityEngine: Callback supplied no key for: {0}
-badEncAlgo=xenc:EncryptionMethod/@Algorithm is not supported: {0}
+noDecCryptoFile=WSSecurityEngine: No crypto property file supplied for decryption
noEncAlgo=WSSecurityEngine: xenc:EncryptedKey does not contain xenc:EncryptionMethod/@Algorithm
-unsupportedKeyTransp=unsupported key transport encryption algorithm: {0}
-noCipher=WSSecurityEngine: EncryptedKey does not contain xenc:CipherData/xenc:CipherValue
-noKeyinfo=WSSecurityEngine: EncryptedKey does not contain ds:KeyInfo
+noEncElement=WSEncryptBody/WSSignEnvelope: Element to encrypt/sign not found: {0}
noEncKey=WSSecurityEngine: EncryptedData does not contain xenc:EncryptedKey
-noSecTokRef=WSSecurityEngine: EncryptedKey does not contain ds:KeyInfo/wsse:SecurityTokenReference
-unsupportedKeyId=Unsupported key identification: {0}
-dataRef=WSSecurityEngine: DataReference - referenced data not found
+noEncodingType = No EncodingType attribute was specified
+noEncryptedData = Referenced encrypted data could not be retrieved. Reference \"{0}\"
+noEncryptionUser = Encryption user is not set
+noKeyinfo=WSSecurityEngine: EncryptedKey does not contain ds:KeyInfo
+noKeyInSAMLToken=Provided SAML token does not contain a suitable key
noKeyname=WSSecurityEngine: ds:KeyName does not contain a key name
-noEncElement=WSEncryptBody/WSSignEnvelope: Element to encrypt/sign not found: {0}
-certpath=Error during certificate path validation: {0}
-invalidTimestamp=WSSecurityEngine: Invalid timestamp {0}
noKeySupplied=WSEncryptBody: No symmetrical encryption key supplied
-#
+noKey=WSSecurityEngine: Callback supplied no key for: {0}
+noOutputAction = No outgoing actions specified
+noPassword=WSSecurityEngine: Callback supplied no password for: {0}
+noPrivateKey = The private key for the supplied alias does not exist in the keystore
+noReference = <Reference> token could not be retrieved
+noReference = <Reference> token could not be retrieved
noSAMLdoc=Cannot convert SAML to DOM document
-invalidSAMLsecurity=SAML token security failure
-invalidSAMLToken = Invalid SAML assertion : {0}
-invalidData=Invalid data: {0}
-noKeyInSAMLToken=Provided SAML token does not contain a suitable key
-#
-decoding.divisible.four = It should be divisible by four
-decoding.general = Error while decoding
-
-unknownAction=Unknown Action {0}
-unableToLoadClass=Unable to load class {0}
-resourceNotFound = Cannot load the resource {0}
-
-requiredElementNoID=Element {0} does not have a wsu:Id attribute
+noSecProvider = Specified security provider not available
+noSecTokRef=WSSecurityEngine: EncryptedKey does not contain ds:KeyInfo/wsse:SecurityTokenReference
+noSecurityTokenReference = The SecurityTokenReference was required but not found
+noSigCryptoFile=WSSecurityEngine: No crypto property file supplied to verify signature
+noSignatureUser = Signature user is not set
noSignResult=No SIGN result in WSS4J result vector
-requiredElementNotSigned=Element {0} is not included in the signature
+noSKIHandling = Problem with SKI information: {0}
+notASOAPMessage = Request is not a valid SOAP Message
+noToken = Reference \"{0}\"
+noTokenUser = Token user is not set
+noUserCertsFound = No certificates for user {0} were found for {1}
+noXMLSig = Cannot setup signature data structure
+parseError = Cannot parse/decode the certificate data
+proxyNotFound = Proxy file ({0}) not found.
+requiredElementNoID=Element {0} is not signed; it does not have a wsu:Id attribute
requiredElementNotProtected=Element {0} is not protected
-
-invalidKeySize=Invalid keysize
-
-kerberosLoginError=An error occurred in trying to obtain a TGT: {0}
-kerberosServiceTicketError=An error occurred in trying to obtain a service ticket
-kerberosTicketValidationError=An error occurred in trying to validate a ticket
-spnegoKeyError=An error occurred in trying to unwrap a SPNEGO key
\ No newline at end of file
+requiredElementNotSigned=Element {0} is not included in the signature
+resourceNotFound = Cannot load the resource {0}
+secError00 = Failed to load credentials.
+signatureCryptoClassWrong = SignatureCryptoClass must be a sub-class of CryptoBase
+signatureCryptoFailure = SignatureCrypto instantiation failed
+signatureKeyStoreNotSet = Signature KeyStore is not set
+signatureVerificationCryptoClassWrong = SignatureVerificationCryptoClass must be a sub-class of CryptoBase
+signatureVerificationCryptoFailure = SignatureVerificationCrypto instantiation failed
+spnegoKeyError=An error occurred in trying to unwrap a SPNEGO key
+unableToLoadClass=Unable to load class {0}
+unhandledToken = Security token supported but currently not handled \"{0}\"
+unknownAction=Unknown Action {0}
+unknownSignatureAlgorithm = An unknown signature algorithm was specified: {0}
+unsupportedBinaryTokenType = Token type \\"{0}\\"
+unsupportedCertType = Certificate type not supported by security provider
+unsupportedKeyId=Unsupported key identification: {0}
+unsupportedKeyInfo = Unsupported KeyInfo type
+unsupportedKeyTransp=unsupported key transport encryption algorithm: {0}
Modified: webservices/wss4j/trunk/wss4j-dom/pom.xml
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/pom.xml?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/pom.xml (original)
+++ webservices/wss4j/trunk/wss4j-dom/pom.xml Fri Aug 17 15:40:59 2012
@@ -106,6 +106,12 @@
<dependencies>
<dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j-ws-security-common</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>compile</scope>
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSDocInfo.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSDocInfo.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSDocInfo.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSDocInfo.java Fri Aug 17 15:40:59 2012
@@ -37,7 +37,8 @@ import java.util.List;
import javax.xml.crypto.dom.DOMCryptoContext;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.CallbackLookup;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -104,7 +105,7 @@ public class WSDocInfo {
for (Element elem : tokenList) {
if (compareElementsById(element, elem)) {
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN, "duplicateError"
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, "duplicateError"
);
}
}
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSConfig.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSConfig.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSConfig.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSConfig.java Fri Aug 17 15:40:59 2012
@@ -32,8 +32,9 @@ import javax.xml.namespace.QName;
import org.apache.jcp.xml.dsig.internal.dom.XMLDSigRI;
import org.apache.ws.security.action.Action;
+import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.Loader;
import org.apache.ws.security.processor.Processor;
-import org.apache.ws.security.util.Loader;
import org.apache.ws.security.util.UUIDGenerator;
import org.apache.ws.security.validate.Validator;
import org.apache.xml.security.utils.XMLUtils;
@@ -669,7 +670,7 @@ public class WSSConfig {
if (LOG.isDebugEnabled()) {
LOG.debug(t.getMessage(), t);
}
- throw new WSSecurityException(WSSecurityException.FAILURE,
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"unableToLoadClass", new Object[] { ((Class<?>)actionObject).getName() }, t);
}
} else if (actionObject instanceof Action) {
@@ -761,7 +762,7 @@ public class WSSConfig {
if (LOG.isDebugEnabled()) {
LOG.debug(t.getMessage(), t);
}
- throw new WSSecurityException(WSSecurityException.FAILURE,
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"unableToLoadClass", new Object[] { ((Class<?>)validatorObject).getName() }, t);
}
} else if (validatorObject instanceof Validator) {
@@ -787,7 +788,7 @@ public class WSSConfig {
if (LOG.isDebugEnabled()) {
LOG.debug(t.getMessage(), t);
}
- throw new WSSecurityException(WSSecurityException.FAILURE,
+ throw new WSSecurityException(WSSecurityException.ErrorCode.FAILURE,
"unableToLoadClass", new Object[] { ((Class<?>)processorObject).getName() }, t);
}
} else if (processorObject instanceof Processor) {
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSecurityEngine.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSecurityEngine.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSecurityEngine.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/WSSecurityEngine.java Fri Aug 17 15:40:59 2012
@@ -19,7 +19,8 @@
package org.apache.ws.security;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.conversation.ConversationConstants;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.message.CallbackLookup;
@@ -380,7 +381,7 @@ public class WSSecurityEngine {
);
}
throw new WSSecurityException(
- WSSecurityException.INVALID_SECURITY_TOKEN, "invalidTimestamp"
+ WSSecurityException.ErrorCode.INVALID_SECURITY_TOKEN, "invalidTimestamp"
);
} else if (el.equals(TIMESTAMP)) {
foundTimestamp = true;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/Action.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/Action.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/Action.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/Action.java Fri Aug 17 15:40:59 2012
@@ -20,9 +20,9 @@
package org.apache.ws.security.action;
import org.w3c.dom.Document;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
-import org.apache.ws.security.WSSecurityException;
/**
* Interface for all actions
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/EncryptionAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/EncryptionAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/EncryptionAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/EncryptionAction.java Fri Aug 17 15:40:59 2012
@@ -24,10 +24,10 @@ import java.security.cert.X509Certificat
import javax.security.auth.callback.CallbackHandler;
import org.apache.ws.security.WSConstants;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoType;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoType;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenSignedAction.java Fri Aug 17 15:40:59 2012
@@ -21,9 +21,9 @@ package org.apache.ws.security.action;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenUnsignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenUnsignedAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenUnsignedAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SAMLTokenUnsignedAction.java Fri Aug 17 15:40:59 2012
@@ -19,7 +19,7 @@
package org.apache.ws.security.action;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.message.WSSecSAMLToken;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureAction.java Fri Aug 17 15:40:59 2012
@@ -21,8 +21,8 @@ package org.apache.ws.security.action;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.message.WSSecSignature;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureConfirmationAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureConfirmationAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureConfirmationAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/SignatureConfirmationAction.java Fri Aug 17 15:40:59 2012
@@ -22,7 +22,7 @@ package org.apache.ws.security.action;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/TimestampAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/TimestampAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/TimestampAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/TimestampAction.java Fri Aug 17 15:40:59 2012
@@ -19,7 +19,7 @@
package org.apache.ws.security.action;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.message.WSSecTimestamp;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenAction.java Fri Aug 17 15:40:59 2012
@@ -21,8 +21,8 @@ package org.apache.ws.security.action;
import javax.security.auth.callback.CallbackHandler;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.message.WSSecUsernameToken;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenSignedAction.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenSignedAction.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenSignedAction.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/action/UsernameTokenSignedAction.java Fri Aug 17 15:40:59 2012
@@ -27,8 +27,8 @@ import javax.security.auth.callback.Call
import org.apache.ws.security.SOAPConstants;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
-import org.apache.ws.security.WSPasswordCallback;
-import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.handler.RequestData;
import org.apache.ws.security.handler.WSHandler;
import org.apache.ws.security.message.WSSecUsernameToken;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/RequestData.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/RequestData.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/RequestData.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/RequestData.java Fri Aug 17 15:40:59 2012
@@ -32,9 +32,9 @@ import org.apache.ws.security.SOAPConsta
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
import org.apache.ws.security.WSSConfig;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.cache.ReplayCache;
-import org.apache.ws.security.components.crypto.Crypto;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.ext.WSSecurityException;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.token.UsernameToken;
import org.apache.ws.security.validate.Validator;
Modified: webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/WSHandler.java?rev=1374326&r1=1374325&r2=1374326&view=diff
==============================================================================
--- webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/wss4j-dom/src/main/java/org/apache/ws/security/handler/WSHandler.java Fri Aug 17 15:40:59 2012
@@ -21,17 +21,17 @@ package org.apache.ws.security.handler;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
-import org.apache.ws.security.WSPasswordCallback;
import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityEngine;
import org.apache.ws.security.WSSecurityEngineResult;
-import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.action.Action;
-import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.components.crypto.CryptoFactory;
+import org.apache.ws.security.common.crypto.Crypto;
+import org.apache.ws.security.common.crypto.CryptoFactory;
+import org.apache.ws.security.common.ext.WSPasswordCallback;
+import org.apache.ws.security.common.ext.WSSecurityException;
+import org.apache.ws.security.common.util.Loader;
import org.apache.ws.security.message.WSSecHeader;
import org.apache.ws.security.message.token.SignatureConfirmation;
-import org.apache.ws.security.util.Loader;
import org.apache.ws.security.util.StringUtil;
import org.apache.ws.security.util.WSSecurityUtil;
import org.w3c.dom.Document;
@@ -998,18 +998,18 @@ public abstract class WSHandler {
int doAction
) throws WSSecurityException {
- int reason = WSPasswordCallback.UNKNOWN;
+ WSPasswordCallback.Usage reason = WSPasswordCallback.Usage.UNKNOWN;
switch (doAction) {
case WSConstants.UT:
case WSConstants.UT_SIGN:
- reason = WSPasswordCallback.USERNAME_TOKEN;
+ reason = WSPasswordCallback.Usage.USERNAME_TOKEN;
break;
case WSConstants.SIGN:
- reason = WSPasswordCallback.SIGNATURE;
+ reason = WSPasswordCallback.Usage.SIGNATURE;
break;
case WSConstants.ENCR:
- reason = WSPasswordCallback.SECRET_KEY;
+ reason = WSPasswordCallback.Usage.SECRET_KEY;
break;
}
return new WSPasswordCallback(username, reason);