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 2017/02/13 11:20:05 UTC
svn commit: r1782748 [1/9] - in /webservices/wss4j/trunk:
bindings/src/main/java/org/apache/wss4j/binding/wssc200502/
policy/src/main/java/org/apache/wss4j/policy/builders/
policy/src/main/java/org/apache/wss4j/policy/model/
ws-security-common/src/main...
Author: coheigea
Date: Mon Feb 13 11:20:02 2017
New Revision: 1782748
URL: http://svn.apache.org/viewvc?rev=1782748&view=rev
Log:
Whitespace corrections
Modified:
webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractTokenWrapper.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AsymmetricBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/ContentEncryptedElements.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedElements.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedParts.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptionToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Header.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorEncryptionToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorSignatureToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KerberosToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/KeyValueToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Layout.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/NSStack.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/ProtectionToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RecipientEncryptionToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RecipientSignatureToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RecipientToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RelToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredElements.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/RequiredParts.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SamlToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SecureConversationToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SecurityContextToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SignatureToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SignedElements.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SignedParts.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SpnegoContextToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SupportingTokens.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/SymmetricBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/TransportBinding.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/TransportToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Trust10.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Trust13.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/UsernameToken.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Wss10.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Wss11.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/X509Token.java
webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/XPath.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/NamePasswordCallbackHandler.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/bsp/BSPRule.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/AlgorithmSuite.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/CertificateStore.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Crypto.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/DERDecoder.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/Merlin.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/crypto/X509SubjectPublicKeyInfo.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/derivedKey/ConversationConstants.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/AttachmentRequestCallback.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/ext/WSSecurityException.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosClientExceptionAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/kerberos/KerberosServiceExceptionAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/OpenSAMLUtil.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/saml/bean/SubjectBean.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoClientAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/spnego/DefaultSpnegoServiceAction.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/AttachmentUtils.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/DOM2Writer.java
webservices/wss4j/trunk/ws-security-common/src/main/java/org/apache/wss4j/common/util/NSStack.java
webservices/wss4j/trunk/ws-security-common/src/test/java/org/apache/wss4j/common/attachment/AttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/WSConstants.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/AbstractDerivedAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/action/SignatureAction.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/engine/WSSecurityEngineResult.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/handler/WSHandler.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/Encryptor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKEncrypt.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDKSign.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecDerivedKeyBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncrypt.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecEncryptedKey.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecHeader.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSAMLToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSecurityContextToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignature.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureBase.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecSignatureConfirmation.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecTimestamp.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/WSSecUsernameToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/DerivedKeyToken.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/KerberosSecurity.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/message/token/Timestamp.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/EncryptedKeyProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/ReferenceListProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SignatureProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/saml/WSSecSignatureSAML.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentCompleteSignatureTransform.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/transform/AttachmentContentSignatureTransform.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/EncryptionUtils.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/SignatureUtils.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/WSSecurityUtil.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/util/X509Util.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/validate/UsernameTokenValidator.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CertificateStoreTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoProviderTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/components/crypto/CryptoTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/handler/CustomActionProcessorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/AttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/CertErrorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionGCMTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionPartsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/EncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ModifiedRequestTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/NoSoapPrefixSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordEncryptorTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/PasswordTypeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/ReplayTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/RequireSignedEncryptedDataElementsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SKISignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/STRSignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAKITest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCRLTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertConstraintsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureCertTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureEncryptionTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureIssuerCertConstraintsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureKeyValueTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignaturePartsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/SignatureTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UTDerivedKeyTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/message/XOPAttachmentTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/FaultCodeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/misc/PrincipalTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/EncryptedKeyDataRefTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/processor/ReferenceListDataRefTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlAlgorithmSuiteTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlConditionsTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlNegativeTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlReferenceTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenHOKTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenSVTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SamlTokenTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/saml/SignedSamlTokenHOKTest.java
webservices/wss4j/trunk/ws-security-dom/src/test/java/org/apache/wss4j/dom/validate/ValidatorTest.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/AlgorithmSuiteAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/ContentEncryptedElementsAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/EncryptedElementsAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/HttpsTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/IssuedTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/KerberosTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/LayoutAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/OnlySignEntireHeadersAndBodyAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/ProtectionOrderAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/RelTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SamlTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SecurityContextTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SignatureProtectionAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/SpnegoContextTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/TokenProtectionAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/UsernameTokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/assertionStates/X509TokenAssertionState.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/enforcer/PolicyEnforcer.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/enforcer/PolicyEnforcerFactory.java
webservices/wss4j/trunk/ws-security-policy-stax/src/main/java/org/apache/wss4j/policy/stax/enforcer/PolicyInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/ext/WSSConstants.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/InboundWSSecurityContextImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/WSSecurityStreamReader.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/BinarySecurityTokenInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/DecryptInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/EncryptedDataInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SAMLTokenInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityContextTokenInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SecurityTokenReferenceInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/SignatureConfirmationInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/TimestampInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/UsernameTokenInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSEncryptedKeyInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureInputHandler.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/input/WSSSignatureReferenceVerifyInputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/BinarySecurityTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/CustomTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/DerivedKeyTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/EncryptedKeyOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SAMLTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityContextTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SecurityHeaderReorderProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/SignatureConfirmationOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/TimestampOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/UsernameTokenOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureEndingOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/processor/output/WSSSignatureOutputProcessor.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverSameDocument.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/resourceResolvers/ResolverXPointer.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/DsaKeyValueSecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/ECKeyValueSecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/ExternalSecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/KerberosServiceSecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/RsaKeyValueSecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SamlSecurityTokenImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/impl/securityToken/SecurityTokenFactoryImpl.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/securityToken/WSSecurityTokenConstants.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/ConfigurationConverter.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/OutboundWSSec.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/setup/WSSec.java
webservices/wss4j/trunk/ws-security-stax/src/main/java/org/apache/wss4j/stax/utils/WSSUtils.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/AttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/ReplayTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/UsernameTokenTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/XOPAttachmentTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLCallbackHandlerImpl.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenHOKTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenReferenceTest.java
webservices/wss4j/trunk/ws-security-stax/src/test/java/org/apache/wss4j/stax/test/saml/SAMLTokenTest.java
Modified: webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java (original)
+++ webservices/wss4j/trunk/bindings/src/main/java/org/apache/wss4j/binding/wssc200502/SecurityContextTokenType.java Mon Feb 13 11:20:02 2017
@@ -48,7 +48,7 @@ import org.w3c.dom.Element;
/**
*
* Actual content model is non-deterministic, hence wildcard. The following shows intended content model:
- *
+ *
* <pre>
* <?xml version="1.0" encoding="UTF-8"?><xs:element xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:p416641_="http://java.sun.com/xml/ns/jaxb" xmlns:p454050_="http://jaxb2-commons.dev.java.net/basic/inheritance" xmlns:wsc="http://schemas.xmlsoap.org/ws/2005/02/sc" xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" minOccurs="1" ref="wsc:Identifier"/>
* </pre>
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/HttpsTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -48,7 +48,7 @@ public class HttpsTokenBuilder implement
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KerberosTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -48,7 +48,7 @@ public class KerberosTokenBuilder implem
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
@@ -58,7 +58,7 @@ public class KerberosTokenBuilder implem
} else {
nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
-
+
KerberosToken kerberosToken = new KerberosToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/KeyValueTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -46,7 +46,7 @@ public class KeyValueTokenBuilder implem
throw new IllegalArgumentException(SPConstants.ERR_INVALID_POLICY);
}
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SamlTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -48,7 +48,7 @@ public class SamlTokenBuilder implements
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
@@ -58,7 +58,7 @@ public class SamlTokenBuilder implements
} else {
nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
-
+
SamlToken samlToken = new SamlToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecureConversationTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -45,7 +45,7 @@ public class SecureConversationTokenBuil
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
@@ -55,7 +55,7 @@ public class SecureConversationTokenBuil
} else {
nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
-
+
SecureConversationToken secureConversationToken = new SecureConversationToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SecurityContextTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -48,7 +48,7 @@ public class SecurityContextTokenBuilder
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
@@ -58,7 +58,7 @@ public class SecurityContextTokenBuilder
} else {
nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
-
+
SecurityContextToken securityContextToken = new SecurityContextToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/SpnegoContextTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -45,7 +45,7 @@ public class SpnegoContextTokenBuilder i
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
@@ -55,7 +55,7 @@ public class SpnegoContextTokenBuilder i
} else {
nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
-
+
SpnegoContextToken spnegoContextToken = new SpnegoContextToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/UsernameTokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -48,7 +48,7 @@ public class UsernameTokenBuilder implem
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
@@ -58,7 +58,7 @@ public class UsernameTokenBuilder implem
} else {
nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
-
+
UsernameToken usernameToken = new UsernameToken(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/builders/X509TokenBuilder.java Mon Feb 13 11:20:02 2017
@@ -48,7 +48,7 @@ public class X509TokenBuilder implements
}
final Element claims = SPUtils.getFirstChildElement(element, spVersion.getSPConstants().getClaims());
final Element nestedPolicyElement = SPUtils.getFirstPolicyChildElement(element);
-
+
Policy nestedPolicy = null;
if (nestedPolicyElement == null) {
if (spVersion != SPConstants.SPVersion.SP11) {
@@ -58,7 +58,7 @@ public class X509TokenBuilder implements
} else {
nestedPolicy = factory.getPolicyEngine().getPolicy(nestedPolicyElement);
}
-
+
X509Token x509Token = new X509Token(
spVersion,
spVersion.getSPConstants().getInclusionFromAttributeValue(includeTokenValue),
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractBinding.java Mon Feb 13 11:20:02 2017
@@ -50,35 +50,35 @@ public abstract class AbstractBinding ex
public Policy getPolicy() {
return nestedPolicy;
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof AbstractBinding)) {
return false;
}
-
+
AbstractBinding that = (AbstractBinding)object;
if (algorithmSuite != null && !algorithmSuite.equals(that.algorithmSuite)
|| algorithmSuite == null && that.algorithmSuite != null) {
return false;
}
-
+
if (layout != null && !layout.equals(that.layout)
|| layout == null && that.layout != null) {
return false;
}
-
+
if (includeTimestamp != that.includeTimestamp) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -89,7 +89,7 @@ public abstract class AbstractBinding ex
result = 31 * result + layout.hashCode();
}
result = 31 * result + Boolean.hashCode(includeTimestamp);
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecuredParts.java Mon Feb 13 11:20:02 2017
@@ -43,7 +43,7 @@ public abstract class AbstractSecuredPar
public QName getName() {
return getVersion().getSPConstants().getSignedParts();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -52,19 +52,19 @@ public abstract class AbstractSecuredPar
if (!(object instanceof AbstractSecuredParts)) {
return false;
}
-
+
AbstractSecuredParts that = (AbstractSecuredParts)object;
if (body != that.body) {
return false;
}
- if (attachments != null && !attachments.equals(that.attachments)
+ if (attachments != null && !attachments.equals(that.attachments)
|| attachments == null && that.attachments != null) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -72,7 +72,7 @@ public abstract class AbstractSecuredPar
result = 31 * result + attachments.hashCode();
}
result = 31 * result + Boolean.hashCode(body);
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSecurityAssertion.java Mon Feb 13 11:20:02 2017
@@ -72,7 +72,7 @@ public abstract class AbstractSecurityAs
public boolean equal(PolicyComponent policyComponent) {
return policyComponent == this;
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -81,7 +81,7 @@ public abstract class AbstractSecurityAs
if (!(object instanceof AbstractSecurityAssertion)) {
return false;
}
-
+
AbstractSecurityAssertion that = (AbstractSecurityAssertion)object;
if (isOptional != that.isOptional) {
return false;
@@ -89,15 +89,15 @@ public abstract class AbstractSecurityAs
if (isIgnorable != that.isIgnorable) {
return false;
}
-
+
if (version != null && !version.equals(that.version)
|| version == null && that.version != null) {
return false;
}
-
+
return true;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -106,10 +106,10 @@ public abstract class AbstractSecurityAs
}
result = 31 * result + Boolean.hashCode(isOptional);
result = 31 * result + Boolean.hashCode(isIgnorable);
-
+
return result;
}
-
+
@Override
public PolicyComponent normalize() {
if (normalized == null) {
@@ -185,13 +185,13 @@ public abstract class AbstractSecurityAs
writer.writeStartElement(getName().getPrefix(), getName().getLocalPart(), getName().getNamespaceURI());
writer.writeNamespace(getName().getPrefix(), getName().getNamespaceURI());
if (isOptional()) {
- writer.writeAttribute(Constants.ATTR_WSP,
- writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
Constants.ATTR_OPTIONAL, "true");
}
if (isIgnorable()) {
- writer.writeAttribute(Constants.ATTR_WSP,
- writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
Constants.ATTR_IGNORABLE, "true");
}
nestedPolicy.serialize(writer);
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractSymmetricAsymmetricBinding.java Mon Feb 13 11:20:02 2017
@@ -55,17 +55,17 @@ public abstract class AbstractSymmetricA
parseNestedSymmetricAsymmetricBindingBasePolicy(nestedPolicy, this);
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof AbstractSymmetricAsymmetricBinding)) {
return false;
}
-
+
AbstractSymmetricAsymmetricBinding that = (AbstractSymmetricAsymmetricBinding)object;
if (protectionOrder != that.protectionOrder
|| encryptSignature != that.encryptSignature
@@ -73,10 +73,10 @@ public abstract class AbstractSymmetricA
|| onlySignEntireHeadersAndBody != that.onlySignEntireHeadersAndBody) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -86,7 +86,7 @@ public abstract class AbstractSymmetricA
result = 31 * result + Boolean.hashCode(encryptSignature);
result = 31 * result + Boolean.hashCode(protectTokens);
result = 31 * result + Boolean.hashCode(onlySignEntireHeadersAndBody);
-
+
return 31 * result + super.hashCode();
}
@@ -111,7 +111,7 @@ public abstract class AbstractSymmetricA
asymmetricBindingBase.setProtectionOrder(protectionOrder);
continue;
}
-
+
QName encryptSignature = getVersion().getSPConstants().getEncryptSignature();
if (encryptSignature.getLocalPart().equals(assertionName)
&& encryptSignature.getNamespaceURI().equals(assertionNamespace)) {
@@ -121,7 +121,7 @@ public abstract class AbstractSymmetricA
asymmetricBindingBase.setEncryptSignature(true);
continue;
}
-
+
QName protectTokens = getVersion().getSPConstants().getProtectTokens();
if (protectTokens.getLocalPart().equals(assertionName)
&& protectTokens.getNamespaceURI().equals(assertionNamespace)) {
@@ -131,8 +131,8 @@ public abstract class AbstractSymmetricA
asymmetricBindingBase.setProtectTokens(true);
continue;
}
-
- QName onlySign = getVersion().getSPConstants().getOnlySignEntireHeadersAndBody();
+
+ QName onlySign = getVersion().getSPConstants().getOnlySignEntireHeadersAndBody();
if (onlySign.getLocalPart().equals(assertionName)
&& onlySign.getNamespaceURI().equals(assertionNamespace)) {
if (asymmetricBindingBase.isOnlySignEntireHeadersAndBody()) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractToken.java Mon Feb 13 11:20:02 2017
@@ -79,7 +79,7 @@ public abstract class AbstractToken exte
public PolicyComponent normalize() {
return super.normalize(getPolicy());
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -88,7 +88,7 @@ public abstract class AbstractToken exte
if (!(object instanceof AbstractToken)) {
return false;
}
-
+
AbstractToken that = (AbstractToken)object;
if (includeTokenType != that.includeTokenType
|| derivedKeys != that.derivedKeys) {
@@ -98,30 +98,30 @@ public abstract class AbstractToken exte
|| issuerName == null && that.issuerName != null) {
return false;
}
-
+
if (issuer == null && that.issuer != null
|| issuer != null && issuer == null) {
return false;
}
-
- if (issuer != null
+
+ if (issuer != null
&& !DOM2Writer.nodeToString(issuer).equals(DOM2Writer.nodeToString(that.issuer))) {
return false;
}
-
+
if (claims == null && that.claims != null
|| claims != null && claims == null) {
return false;
}
-
- if (claims != null
+
+ if (claims != null
&& !DOM2Writer.nodeToString(claims).equals(DOM2Writer.nodeToString(that.claims))) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -134,14 +134,14 @@ public abstract class AbstractToken exte
if (issuerName != null) {
result = 31 * result + issuerName.hashCode();
}
-
+
if (issuer != null) {
result = 31 * result + DOM2Writer.nodeToString(issuer).hashCode();
}
if (claims != null) {
result = 31 * result + DOM2Writer.nodeToString(claims).hashCode();
}
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractTokenWrapper.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractTokenWrapper.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractTokenWrapper.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AbstractTokenWrapper.java Mon Feb 13 11:20:02 2017
@@ -46,7 +46,7 @@ public abstract class AbstractTokenWrapp
public Policy getPolicy() {
return nestedPolicy;
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -55,23 +55,23 @@ public abstract class AbstractTokenWrapp
if (!(object instanceof AbstractTokenWrapper)) {
return false;
}
-
+
AbstractTokenWrapper that = (AbstractTokenWrapper)object;
if (token != null && !token.equals(that.token)
|| token == null && that.token != null) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
if (token != null) {
result = 31 * result + token.hashCode();
}
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AlgorithmSuite.java Mon Feb 13 11:20:02 2017
@@ -219,11 +219,11 @@ public class AlgorithmSuite extends Abst
private String ns;
private String encryptionDigest;
- public AlgorithmSuiteType(String name, String digest, String encryption, String symmetricKeyWrap,
- String asymmetricKeyWrap, String encryptionKeyDerivation,
+ public AlgorithmSuiteType(String name, String digest, String encryption, String symmetricKeyWrap,
+ String asymmetricKeyWrap, String encryptionKeyDerivation,
String signatureKeyDerivation, int encryptionDerivedKeyLength,
int signatureDerivedKeyLength, int minimumSymmetricKeyLength,
- int maximumSymmetricKeyLength, int minimumAsymmetricKeyLength,
+ int maximumSymmetricKeyLength, int minimumAsymmetricKeyLength,
int maximumAsymmetricKeyLength) {
this.name = name;
this.digest = digest;
@@ -256,17 +256,17 @@ public class AlgorithmSuite extends Abst
this.maximumAsymmetricKeyLength = algorithmSuiteType.maximumAsymmetricKeyLength;
this.mgfAlgo = algorithmSuiteType.mgfAlgo;
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof AlgorithmSuiteType)) {
return false;
}
-
+
AlgorithmSuiteType that = (AlgorithmSuiteType)object;
if (name != null && !name.equals(that.name)
|| name == null && that.name != null) {
@@ -308,7 +308,7 @@ public class AlgorithmSuite extends Abst
|| encryptionDigest == null && that.encryptionDigest != null) {
return false;
}
-
+
if (encryptionDerivedKeyLength != that.encryptionDerivedKeyLength
|| signatureDerivedKeyLength != that.signatureDerivedKeyLength
|| minimumSymmetricKeyLength != that.minimumSymmetricKeyLength
@@ -317,10 +317,10 @@ public class AlgorithmSuite extends Abst
|| maximumAsymmetricKeyLength != that.maximumAsymmetricKeyLength) {
return false;
}
-
+
return true;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -345,14 +345,14 @@ public class AlgorithmSuite extends Abst
if (signatureKeyDerivation != null) {
result = 31 * result + signatureKeyDerivation.hashCode();
}
-
+
result = 31 * result + Integer.hashCode(encryptionDerivedKeyLength);
result = 31 * result + Integer.hashCode(signatureDerivedKeyLength);
result = 31 * result + Integer.hashCode(minimumSymmetricKeyLength);
result = 31 * result + Integer.hashCode(maximumSymmetricKeyLength);
result = 31 * result + Integer.hashCode(minimumAsymmetricKeyLength);
result = 31 * result + Integer.hashCode(maximumAsymmetricKeyLength);
-
+
if (mgfAlgo != null) {
result = 31 * result + mgfAlgo.hashCode();
}
@@ -362,7 +362,7 @@ public class AlgorithmSuite extends Abst
if (encryptionDigest != null) {
result = 31 * result + encryptionDigest.hashCode();
}
-
+
return 31 * result + super.hashCode();
}
@@ -433,11 +433,11 @@ public class AlgorithmSuite extends Abst
public String getMGFAlgo() {
return mgfAlgo;
}
-
+
public void setEncryptionDigest(String encryptionDigest) {
this.encryptionDigest = encryptionDigest;
}
-
+
public String getEncryptionDigest() {
return encryptionDigest;
}
@@ -582,23 +582,23 @@ public class AlgorithmSuite extends Abst
public QName getName() {
return getVersion().getSPConstants().getAlgorithmSuite();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof AlgorithmSuite)) {
return false;
}
-
+
AlgorithmSuite that = (AlgorithmSuite)object;
if (c14n != that.c14n || soapNormType != that.soapNormType || strType != that.strType
|| xPathType != that.xPathType) {
return false;
}
-
+
if (algorithmSuiteType != null && !algorithmSuiteType.equals(that.algorithmSuiteType)
|| algorithmSuiteType == null && that.algorithmSuiteType != null) {
return false;
@@ -615,10 +615,10 @@ public class AlgorithmSuite extends Abst
|| computedKey == null && that.computedKey != null) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -646,7 +646,7 @@ public class AlgorithmSuite extends Abst
if (computedKey != null) {
result = 31 * result + computedKey.hashCode();
}
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AsymmetricBinding.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AsymmetricBinding.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AsymmetricBinding.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/AsymmetricBinding.java Mon Feb 13 11:20:02 2017
@@ -45,17 +45,17 @@ public class AsymmetricBinding extends A
public QName getName() {
return getVersion().getSPConstants().getAsymmetricBinding();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof AsymmetricBinding)) {
return false;
}
-
+
AsymmetricBinding that = (AsymmetricBinding)object;
if (initiatorToken != null && !initiatorToken.equals(that.initiatorToken)
|| initiatorToken == null && that.initiatorToken != null) {
@@ -69,7 +69,7 @@ public class AsymmetricBinding extends A
|| initiatorEncryptionToken == null && that.initiatorEncryptionToken != null) {
return false;
}
-
+
if (recipientToken != null && !recipientToken.equals(that.recipientToken)
|| recipientToken == null && that.recipientToken != null) {
return false;
@@ -82,10 +82,10 @@ public class AsymmetricBinding extends A
|| recipientEncryptionToken == null && that.recipientEncryptionToken != null) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -98,7 +98,7 @@ public class AsymmetricBinding extends A
if (initiatorEncryptionToken != null) {
result = 31 * result + initiatorEncryptionToken.hashCode();
}
-
+
if (recipientToken != null) {
result = 31 * result + recipientToken.hashCode();
}
@@ -108,7 +108,7 @@ public class AsymmetricBinding extends A
if (recipientEncryptionToken != null) {
result = 31 * result + recipientEncryptionToken.hashCode();
}
-
+
return 31 * result + super.hashCode();
}
@@ -128,7 +128,7 @@ public class AsymmetricBinding extends A
Assertion assertion = assertions.get(i);
String assertionName = assertion.getName().getLocalPart();
String assertionNamespace = assertion.getName().getNamespaceURI();
-
+
QName initiatorToken = getVersion().getSPConstants().getInitiatorToken();
if (initiatorToken.getLocalPart().equals(assertionName)
&& initiatorToken.getNamespaceURI().equals(assertionNamespace)) {
@@ -142,7 +142,7 @@ public class AsymmetricBinding extends A
initiatorToken1.setParentAssertion(asymmetricBinding);
continue;
}
-
+
QName initiatorSigToken = getVersion().getSPConstants().getInitiatorSignatureToken();
if (initiatorSigToken.getLocalPart().equals(assertionName)
&& initiatorSigToken.getNamespaceURI().equals(assertionNamespace)) {
@@ -155,7 +155,7 @@ public class AsymmetricBinding extends A
initiatorSignatureToken1.setParentAssertion(asymmetricBinding);
continue;
}
-
+
QName initiatorEncToken = getVersion().getSPConstants().getInitiatorEncryptionToken();
if (initiatorEncToken.getLocalPart().equals(assertionName)
&& initiatorEncToken.getNamespaceURI().equals(assertionNamespace)) {
@@ -168,7 +168,7 @@ public class AsymmetricBinding extends A
initiatorEncryptionToken1.setParentAssertion(asymmetricBinding);
continue;
}
-
+
QName recipientToken = getVersion().getSPConstants().getRecipientToken();
if (recipientToken.getLocalPart().equals(assertionName)
&& recipientToken.getNamespaceURI().equals(assertionNamespace)) {
@@ -182,7 +182,7 @@ public class AsymmetricBinding extends A
recipientToken1.setParentAssertion(asymmetricBinding);
continue;
}
-
+
QName recipientSigToken = getVersion().getSPConstants().getRecipientSignatureToken();
if (recipientSigToken.getLocalPart().equals(assertionName)
&& recipientSigToken.getNamespaceURI().equals(assertionNamespace)) {
@@ -195,8 +195,8 @@ public class AsymmetricBinding extends A
recipientSignatureToken1.setParentAssertion(asymmetricBinding);
continue;
}
-
- QName recipientEncToken = getVersion().getSPConstants().getRecipientEncryptionToken();
+
+ QName recipientEncToken = getVersion().getSPConstants().getRecipientEncryptionToken();
if (recipientEncToken.getLocalPart().equals(assertionName)
&& recipientEncToken.getNamespaceURI().equals(assertionNamespace)) {
if (asymmetricBinding.getRecipientToken() != null
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Attachments.java Mon Feb 13 11:20:02 2017
@@ -31,7 +31,7 @@ public class Attachments extends Abstrac
private boolean contentSignatureTransform;
private boolean attachmentCompleteSignatureTransform;
- public Attachments(SPConstants.SPVersion version, boolean contentSignatureTransform,
+ public Attachments(SPConstants.SPVersion version, boolean contentSignatureTransform,
boolean attachmentCompleteSignatureTransform) {
super(version);
@@ -43,17 +43,17 @@ public class Attachments extends Abstrac
public QName getName() {
return getVersion().getSPConstants().getAttachments();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof Attachments)) {
return false;
}
-
+
Attachments that = (Attachments)object;
if (contentSignatureTransform != that.contentSignatureTransform) {
return false;
@@ -61,16 +61,16 @@ public class Attachments extends Abstrac
if (attachmentCompleteSignatureTransform != that.attachmentCompleteSignatureTransform) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
result = 31 * result + Boolean.hashCode(contentSignatureTransform);
result = 31 * result + Boolean.hashCode(attachmentCompleteSignatureTransform);
-
+
return 31 * result + super.hashCode();
}
@@ -84,13 +84,13 @@ public class Attachments extends Abstrac
writer.writeStartElement(getName().getPrefix(), getName().getLocalPart(), getName().getNamespaceURI());
writer.writeNamespace(getName().getPrefix(), getName().getNamespaceURI());
if (!isNormalized() && isOptional()) {
- writer.writeAttribute(Constants.ATTR_WSP,
- writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
Constants.ATTR_OPTIONAL, "true");
}
if (isIgnorable()) {
- writer.writeAttribute(Constants.ATTR_WSP,
- writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
Constants.ATTR_IGNORABLE, "true");
}
if (isContentSignatureTransform()) {
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/ContentEncryptedElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/ContentEncryptedElements.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/ContentEncryptedElements.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/ContentEncryptedElements.java Mon Feb 13 11:20:02 2017
@@ -34,7 +34,7 @@ public class ContentEncryptedElements ex
public QName getName() {
return getVersion().getSPConstants().getContentEncryptedElements();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -43,14 +43,14 @@ public class ContentEncryptedElements ex
if (!(object instanceof ContentEncryptedElements)) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/DOM2Writer.java Mon Feb 13 11:20:02 2017
@@ -38,7 +38,7 @@ final class DOM2Writer {
public static final char NL = '\n';
public static final String LS = System.getProperty("line.separator",
Character.valueOf(NL).toString());
-
+
public static final String XMLNS_NS = "http://www.w3.org/2000/xmlns/";
public static final String XML_NS = "http://www.w3.org/XML/1998/namespace";
@@ -241,7 +241,7 @@ final class DOM2Writer {
PrintWriter out) {
String namespaceURI = node.getNamespaceURI();
String prefix = node.getPrefix();
- if (!(namespaceURI.equals(XMLNS_NS) && prefix.equals("xmlns"))
+ if (!(namespaceURI.equals(XMLNS_NS) && prefix.equals("xmlns"))
&& !(namespaceURI.equals(XML_NS) && prefix.equals("xml"))) {
if (getNamespace(prefix, owner) == null) {
out.print(" xmlns:" + prefix + "=\"" + namespaceURI + '\"');
@@ -280,7 +280,7 @@ final class DOM2Writer {
}
}
}
-
+
private static String getNamespace(String prefix, Node e) {
while (e != null && e.getNodeType() == Node.ELEMENT_NODE) {
Attr attr = null;
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedElements.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedElements.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedElements.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedElements.java Mon Feb 13 11:20:02 2017
@@ -34,7 +34,7 @@ public class EncryptedElements extends R
public QName getName() {
return getVersion().getSPConstants().getEncryptedElements();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -43,14 +43,14 @@ public class EncryptedElements extends R
if (!(object instanceof EncryptedElements)) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedParts.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedParts.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedParts.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptedParts.java Mon Feb 13 11:20:02 2017
@@ -34,24 +34,24 @@ public class EncryptedParts extends Abst
public QName getName() {
return getVersion().getSPConstants().getEncryptedParts();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof EncryptedParts)) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptionToken.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptionToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/EncryptionToken.java Mon Feb 13 11:20:02 2017
@@ -33,7 +33,7 @@ public class EncryptionToken extends Abs
public QName getName() {
return getVersion().getSPConstants().getEncryptionToken();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -42,14 +42,14 @@ public class EncryptionToken extends Abs
if (!(object instanceof EncryptionToken)) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Header.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Header.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Header.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/Header.java Mon Feb 13 11:20:02 2017
@@ -35,31 +35,31 @@ public class Header {
public String getNamespace() {
return namespace;
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
return true;
}
-
+
if (!(object instanceof Header)) {
return false;
}
-
+
Header that = (Header)object;
if (name != null && !name.equals(that.name)
|| name == null && that.name != null) {
return false;
}
-
+
if (namespace != null && !namespace.equals(that.namespace)
|| namespace == null && that.namespace != null) {
return false;
}
-
+
return true;
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -69,7 +69,7 @@ public class Header {
if (namespace != null) {
result = 31 * result + namespace.hashCode();
}
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/HttpsToken.java Mon Feb 13 11:20:02 2017
@@ -64,7 +64,7 @@ public class HttpsToken extends Abstract
public QName getName() {
return getVersion().getSPConstants().getHttpsToken();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -73,29 +73,29 @@ public class HttpsToken extends Abstract
if (!(object instanceof HttpsToken)) {
return false;
}
-
+
HttpsToken that = (HttpsToken)object;
if (authenticationType != that.authenticationType) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
if (authenticationType != null) {
result = 31 * result + authenticationType.hashCode();
}
-
+
return 31 * result + super.hashCode();
}
@Override
protected AbstractSecurityAssertion cloneAssertion(Policy nestedPolicy) {
boolean requireClientCert = authenticationType == AuthenticationType.RequireClientCertificate;
- return new HttpsToken(getVersion(), getIncludeTokenType(), getIssuer(), getIssuerName(),
+ return new HttpsToken(getVersion(), getIncludeTokenType(), getIssuer(), getIssuerName(),
getClaims(), nestedPolicy, requireClientCert);
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorEncryptionToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorEncryptionToken.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorEncryptionToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorEncryptionToken.java Mon Feb 13 11:20:02 2017
@@ -33,7 +33,7 @@ public class InitiatorEncryptionToken ex
public QName getName() {
return getVersion().getSPConstants().getInitiatorEncryptionToken();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -42,14 +42,14 @@ public class InitiatorEncryptionToken ex
if (!(object instanceof InitiatorEncryptionToken)) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorSignatureToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorSignatureToken.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorSignatureToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorSignatureToken.java Mon Feb 13 11:20:02 2017
@@ -33,7 +33,7 @@ public class InitiatorSignatureToken ext
public QName getName() {
return getVersion().getSPConstants().getInitiatorSignatureToken();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -42,14 +42,14 @@ public class InitiatorSignatureToken ext
if (!(object instanceof InitiatorSignatureToken)) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorToken.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/InitiatorToken.java Mon Feb 13 11:20:02 2017
@@ -33,7 +33,7 @@ public class InitiatorToken extends Abst
public QName getName() {
return getVersion().getSPConstants().getInitiatorToken();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -42,14 +42,14 @@ public class InitiatorToken extends Abst
if (!(object instanceof InitiatorToken)) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
-
+
return 31 * result + super.hashCode();
}
Modified: webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java?rev=1782748&r1=1782747&r2=1782748&view=diff
==============================================================================
--- webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java (original)
+++ webservices/wss4j/trunk/policy/src/main/java/org/apache/wss4j/policy/model/IssuedToken.java Mon Feb 13 11:20:02 2017
@@ -38,7 +38,7 @@ public class IssuedToken extends Abstrac
private boolean requireInternalReference;
public IssuedToken(SPConstants.SPVersion version, SPConstants.IncludeTokenType includeTokenType,
- Element issuer, String issuerName, Element requestSecurityTokenTemplate, Element claims,
+ Element issuer, String issuerName, Element requestSecurityTokenTemplate, Element claims,
Policy nestedPolicy) {
super(version, includeTokenType, issuer, issuerName, claims, nestedPolicy);
setRequestSecurityTokenTemplate(requestSecurityTokenTemplate);
@@ -50,7 +50,7 @@ public class IssuedToken extends Abstrac
public QName getName() {
return getVersion().getSPConstants().getIssuedToken();
}
-
+
@Override
public boolean equals(Object object) {
if (object == this) {
@@ -59,27 +59,27 @@ public class IssuedToken extends Abstrac
if (!(object instanceof IssuedToken)) {
return false;
}
-
+
IssuedToken that = (IssuedToken)object;
if (requireExternalReference != that.requireExternalReference
|| requireInternalReference != that.requireInternalReference) {
return false;
}
-
+
if (requestSecurityTokenTemplate == null && that.requestSecurityTokenTemplate != null
|| requestSecurityTokenTemplate != null && requestSecurityTokenTemplate == null) {
return false;
}
-
- if (requestSecurityTokenTemplate != null
+
+ if (requestSecurityTokenTemplate != null
&& !DOM2Writer.nodeToString(requestSecurityTokenTemplate).equals(
DOM2Writer.nodeToString(that.requestSecurityTokenTemplate))) {
return false;
}
-
+
return super.equals(object);
}
-
+
@Override
public int hashCode() {
int result = 17;
@@ -88,7 +88,7 @@ public class IssuedToken extends Abstrac
}
result = 31 * result + Boolean.hashCode(requireExternalReference);
result = 31 * result + Boolean.hashCode(requireInternalReference);
-
+
return 31 * result + super.hashCode();
}
@@ -105,13 +105,13 @@ public class IssuedToken extends Abstrac
);
}
if (!isNormalized() && isOptional()) {
- writer.writeAttribute(Constants.ATTR_WSP,
- writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
Constants.ATTR_OPTIONAL, "true");
}
if (isIgnorable()) {
- writer.writeAttribute(Constants.ATTR_WSP,
- writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
+ writer.writeAttribute(Constants.ATTR_WSP,
+ writer.getNamespaceContext().getNamespaceURI(Constants.ATTR_WSP),
Constants.ATTR_IGNORABLE, "true");
}
if (getIssuer() != null) {
@@ -159,7 +159,7 @@ public class IssuedToken extends Abstrac
issuedToken.setDerivedKeys(derivedKeys);
continue;
}
-
+
QName requireExternalRef = getVersion().getSPConstants().getRequireExternalReference();
if (requireExternalRef.getLocalPart().equals(assertionName)
&& requireExternalRef.getNamespaceURI().equals(assertionNamespace)) {
@@ -169,7 +169,7 @@ public class IssuedToken extends Abstrac
issuedToken.setRequireExternalReference(true);
continue;
}
-
+
QName requireInternalRef = getVersion().getSPConstants().getRequireInternalReference();
if (requireInternalRef.getLocalPart().equals(assertionName)
&& requireInternalRef.getNamespaceURI().equals(assertionNamespace)) {