You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/29 15:16:04 UTC
svn commit: r1780804 [1/10] - in
/axis/axis2/java/rampart/branches/RAMPART-252: ./ legal/
modules/distribution/ modules/documentation/
modules/documentation/src/site/resources/download/
modules/documentation/src/site/xdoc/ modules/documentation/src/sit...
Author: veithen
Date: Sun Jan 29 15:16:02 2017
New Revision: 1780804
URL: http://svn.apache.org/viewvc?rev=1780804&view=rev
Log:
Merge changes up to r1240267 from trunk.
Added:
axis/axis2/java/rampart/branches/RAMPART-252/legal/bcprov-LICENSE.txt
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/legal/bcprov-LICENSE.txt
axis/axis2/java/rampart/branches/RAMPART-252/legal/commons-lang-LICENSE.txt
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/legal/commons-lang-LICENSE.txt
axis/axis2/java/rampart/branches/RAMPART-252/legal/slf4j-jcl-LICENSE.txt
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/legal/slf4j-jcl-LICENSE.txt
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/resources/download/
- copied from r1240267, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/download/
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5.2/
- copied from r1240267, axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.2/
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.6.0/
- copied from r1240267, axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.6.0/
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.6.1/
- copied from r1240267, axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.6.1/
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/saml/
- copied from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/saml/
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAML2TokenUTForBearerTest.java
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAML2TokenUTForBearerTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/log4j.properties
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/log4j.properties
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/31.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/31.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/32.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/32.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/33.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/34.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/34.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/sc-4.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-4.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/sc-5.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-5.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/sc-6.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/sc-6.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-31.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-31.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-32.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-32.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-33.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-33.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-34.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-34.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-sc-4.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-4.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-sc-5.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-5.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-sc-6.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/test-resources/log4j.properties
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/log4j.properties
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/Rahas.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/RampartSAMLBootstrap.java
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/RampartSAMLBootstrap.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/AxiomParserPool.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/CommonUtil.java
- copied unchanged from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/CommonUtil.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/test/
- copied from r1240267, axis/axis2/java/rampart/trunk/modules/rampart-trust/src/test/
Removed:
axis/axis2/java/rampart/branches/RAMPART-252/legal/slf4j-jdk14-LICENSE.txt
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.1/download.cgi
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.2/download.cgi
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.3/download.cgi
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.4/download.cgi
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5.1/download.cgi
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5/download.cgi
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/commons-logging.properties
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/commons-logging.properties
Modified:
axis/axis2/java/rampart/branches/RAMPART-252/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-252/build.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/src.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/developer-guide.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/index.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/svn.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartException.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/TokenCallbackHandler.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartSender.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSSHandlerConstants.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/CryptoConfigBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/OptimizePartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/SSLConfigBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/CryptoConfig.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/SSLConfig.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAML2TokenCertForHoKTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAML2TokenTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenAttributeTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenCertForHoKTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenCertForHoKV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForBearerV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForHoKTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenUTForHoKV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/RahasSAMLTokenV1205Test.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rahas/SAMLDataProvider.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/16.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/3.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-16.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-3.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-integration/src/test/resources/rampart/services-30.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-mar/module.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-mar/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/META-INF/services/org.apache.neethi.builders.AssertionBuilder
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/SPConstants.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AsymmetricBinding.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ContentEncryptedElements.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/EncryptionToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/HttpsToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/InitiatorToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/IssuedToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Layout.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/ProtectionToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RecipientToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredElements.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/RequiredParts.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SecureConversationToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignatureToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SupportingToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SymmetricBinding.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust10.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Trust13.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/UsernameToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss10.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/Wss11.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/X509Token.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RequiredElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecureConversationTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SecurityContextTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/Trust10Builder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ContentEncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecurityContextTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/basic/build.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/policy/build.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/TransportBindingBuilderTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy/model/SecpolicyModelTest.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust-mar/module.xml
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust-mar/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/STSMessageReceiver.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/TokenRequestDispatcher.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/TokenStorage.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenRenewer.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenValidator.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SCTIssuer.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/TokenCancelerConfig.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLAttributeCallback.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallback.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLCallbackHandler.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLNameIdentifierCallback.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAMLUtils.java
axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SignKeyHolder.java
axis/axis2/java/rampart/branches/RAMPART-252/pom.xml (contents, props changed)
axis/axis2/java/rampart/branches/RAMPART-252/release-docs/ChangeLog.txt
axis/axis2/java/rampart/branches/RAMPART-252/release-docs/README.txt
axis/axis2/java/rampart/branches/RAMPART-252/release-docs/release-notes.html
Propchange: axis/axis2/java/rampart/branches/RAMPART-252/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Jan 29 15:16:02 2017
@@ -1 +1 @@
-/axis/axis2/java/rampart/trunk:987929-1052172
+/axis/axis2/java/rampart/trunk:987929-1240267
Modified: axis/axis2/java/rampart/branches/RAMPART-252/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/build.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/build.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/build.xml Sun Jan 29 15:16:02 2017
@@ -1,3 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
<project name="Apache Rampart release build" default="dist">
<property name="rampart.version" value="SNAPSHOT"/>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/bin.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/bin.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/bin.xml Sun Jan 29 15:16:02 2017
@@ -22,15 +22,19 @@
<include>org.apache.rampart:rampart-core:jar</include>
<include>org.apache.rampart:rampart-policy:jar</include>
<include>org.apache.rampart:rampart-trust:jar</include>
+ <include>org.opensaml:opensaml1:jar</include>
<include>org.opensaml:opensaml:jar</include>
<include>org.opensaml:xmltooling:jar</include>
<include>joda-time:joda-time:jar</include>
<include>org.slf4j:slf4j-api:jar</include>
- <include>org.slf4j:slf4j-jdk14:jar</include>
+ <include>org.slf4j:slf4j-jcl:jar</include>
<include>velocity:velocity:jar</include>
<include>commons-collections:commons-collections:jar</include>
<include>org.opensaml:openws:jar</include>
<include>commons-lang:commons-lang:jar</include>
+ <include>org.apache.xerces:xercesImpl:jar</include>
+ <include>org.apache.xerces:resolver:jar</include>
+ <include>org.apache.xerces:serializer:jar</include>
</includes>
</dependencySet>
</dependencySets>
@@ -58,6 +62,7 @@
<source>../../release-docs/README.txt</source>
<outputDirectory>${dist.dir}</outputDirectory>
<destName>README</destName>
+ <filtered>true</filtered>
</file>
<file>
<source>../../release-docs/LICENSE.txt</source>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/pom.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/pom.xml Sun Jan 29 15:16:02 2017
@@ -1,11 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -25,25 +45,19 @@
<phase>package</phase>
<configuration>
<tasks>
- <javadoc packagenames="org.apache.rampart.*,org.apache.rahas.*"
- destdir="target/apidocs"
- author="true"
- breakiterator="true"
- version="true"
- use="true"
- windowtitle="Apache Rampart API">
+ <javadoc packagenames="org.apache.rampart.*,org.apache.rahas.*" destdir="target/apidocs" author="true" breakiterator="true" version="true" use="true" windowtitle="Apache Rampart API">
<sourcepath>
<dirset dir="../..">
- <include name="**/rampart-core/src/main/java"/>
- <include name="**/rampart-policy/src/main/java"/>
- <include name="**/rampart-trust/src/main/java"/>
+ <include name="**/rampart-core/src/main/java" />
+ <include name="**/rampart-policy/src/main/java" />
+ <include name="**/rampart-trust/src/main/java" />
</dirset>
</sourcepath>
- <classpath refid="maven.dependency.classpath"/>
- <classpath refid="maven.compile.classpath"/>
- <classpath refid="maven.runtime.classpath"/>
+ <classpath refid="maven.dependency.classpath" />
+ <classpath refid="maven.compile.classpath" />
+ <classpath refid="maven.runtime.classpath" />
</javadoc>
</tasks>
@@ -55,15 +69,35 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.codehaus.gmaven</groupId>
+ <artifactId>gmaven-plugin</artifactId>
+ <version>1.2</version>
+ <executions>
+ <execution>
+ <id>generate-timestamp</id>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>execute</goal>
+ </goals>
+ <configuration>
+ <source>
+ import java.util.Date
+ import java.text.MessageFormat
+ project.properties['buildTimestamp'] = MessageFormat.format("{0,date,MMM dd, yyyy}", new Date())
+ </source>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-1</version>
<executions>
<execution>
<id>distribution-package</id>
<phase>package</phase>
<goals>
- <goal>attached</goal>
+ <goal>single</goal>
</goals>
<configuration>
<descriptors>
@@ -81,40 +115,39 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
- <version>${rampart.mar.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rahas</artifactId>
- <version>${rahas.mar.version}</version>
+ <version>${project.version}</version>
<type>mar</type>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>bouncycastle</groupId>
- <artifactId>bcprov-jdk14</artifactId>
- <version>${bcprov.jdk14.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>bouncycastle</groupId>
<artifactId>bcprov-jdk15</artifactId>
<version>${bcprov.jdk15.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jcl</artifactId>
+ </dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Propchange: axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/src.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/src.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/src.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/distribution/src.xml Sun Jan 29 15:16:02 2017
@@ -8,7 +8,7 @@
<fileSets>
<fileSet>
<directory>../..</directory>
- <outputDirectory>rampart-src-${rampart.version}</outputDirectory>
+ <outputDirectory>rampart-src-${project.version}</outputDirectory>
<includes>
<include>**/modules/**/*</include>
<include>**/pom.xml</include>
@@ -28,7 +28,16 @@
<exclude>**/.settings</exclude>
<exclude>**/.settings/**/*</exclude>
<exclude>**/.svn/**</exclude>
+ <exclude>release-docs/README.txt</exclude>
</excludes>
</fileSet>
+ <fileSet>
+ <directory>../..</directory>
+ <outputDirectory>rampart-src-${project.version}</outputDirectory>
+ <filtered>true</filtered>
+ <includes>
+ <include>release-docs/README.txt</include>
+ </includes>
+ </fileSet>
</fileSets>
</assembly>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/pom.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/pom.xml Sun Jan 29 15:16:02 2017
@@ -1,15 +1,34 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>rampart-documentaion</artifactId>
+ <artifactId>rampart-documentation</artifactId>
<packaging>pom</packaging>
<name>Rampart - Documentation</name>
<build>
@@ -30,4 +49,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Propchange: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/developer-guide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/developer-guide.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/developer-guide.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/developer-guide.xml Sun Jan 29 15:16:02 2017
@@ -36,9 +36,9 @@ Stack</em></strong></p>
<li>Download the source code.
<ul>
<li>Anon Checkout <a
- href="http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/">http://svn.apache.org/repos/asf/webservices/rampart/trunk/java/</a></li>
+ href="http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/">http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/</a></li>
<li>Committers <a
- href="https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/">https://svn.apache.org/repos/asf/webservices/rampart/trunk/java/</a></li>
+ href="https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/">https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk/</a></li>
</ul>
</li>
<li>The Rampart project has 8 modules under it. They are:
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download.xml Sun Jan 29 15:16:02 2017
@@ -32,12 +32,39 @@
</tr>
<tr>
<td>
+ <a href="download/1.6.1/download.cgi">
+ <strong>1.6.1</strong>
+ </a>
+ </td>
+ <td>24 Sep 2011</td>
+ <td>1.6.1 Release (Mirrored)</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="download/1.5.2/download.cgi">
+ <strong>1.5.2</strong>
+ </a>
+ </td>
+ <td>24 Sep 2011</td>
+ <td>1.5.2 Release (Mirrored)</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="download/1.6.0/download.cgi">
+ <strong>1.6.0</strong>
+ </a>
+ </td>
+ <td>06 Jun 2011</td>
+ <td>1.6.0 Release (Archived)</td>
+ </tr>
+ <tr>
+ <td>
<a href="download/1.5.1/download.cgi">
<strong>1.5.1</strong>
</a>
</td>
- <td></td>
- <td>1.5.1 Release (Mirrored)</td>
+ <td>10 Jan 2011</td>
+ <td>1.5.1 Release (Archived)</td>
</tr>
<tr>
<td>
@@ -87,11 +114,11 @@
</tbody>
</table>
<p>
- <strong>Apache Rampart Distributions : <a href="http://people.apache.org/~ruchithf/rampart/SNAPSHOT">Nightly builds</a>
+ <strong>Apache Rampart Distributions : <a href="https://hudson.apache.org/hudson/job/Rampart/lastStableBuild/org.apache.rampart$rampart-dist/">Nightly builds</a>
</strong>
</p>
<p>
- <strong>Maven Repository: <a href="http://people.apache.org/repo/m2-ibiblio-rsync-repository/">Released Apache Rampart jars</a> | <a href="http://people.apache.org/repo/m2-snapshot-repository/">Nightly SNAPSHOT</a>
+ <strong>Maven Repository: <a href="http://people.apache.org/repo/m2-ibiblio-rsync-repository/">Released Apache Rampart jars</a> | <a href="http://repository.apache.org/snapshots/">Nightly SNAPSHOT</a>
<a href=""></a>
</strong>
</p>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5.1/download.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5.1/download.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5.1/download.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/download/1.5.1/download.xml Sun Jan 29 15:16:02 2017
@@ -51,29 +51,29 @@ urchinTracker();
Distribution</strong></td>
<td>This is the complete version of Apache Rampart and will contain samples
as well.</td>
-<td><a href="[preferred]/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip" title=
- "[preferred]/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip" onClick=
-"javascript:urchinTracker ('/downloads/rampart-1.5.1.zip');">zip</a>
-<a href="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.md5"
- title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.md5">MD5</a>
-<a href="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.asc"
- title="http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1.zip.asc">PGP</a></td>
+<td><a href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip" title=
+ "http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip" onClick=
+"javascript:urchinTracker ('/downloads/rampart-dist-1.5.1-bin.zip');">zip</a>
+<a href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.md5"
+ title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.md5">MD5</a>
+<a href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.asc"
+ title="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-bin.zip.asc">PGP</a></td>
</tr>
<tr>
<td><a name="src" id="src"></a> <strong>Source
Distribution</strong></td>
<td>This will contain the sources of Apache Rampart distribution.</td>
-<td><a href="[preferred]/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip" title=
- "[preferred]/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip" onClick=
-"javascript:urchinTracker ('/downloads/rampart-1.5.1-src.zip');">zip</a>
+<td><a href="http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip" title=
+ "http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip" onClick=
+"javascript:urchinTracker ('/downloads/rampart-dist-1.5.1-src.zip');">zip</a>
<a href=
- "http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.md5"
+ "http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.md5"
title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.md5">MD5</a>
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.md5">MD5</a>
<a href=
- "http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc"
+ "http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.asc"
title=
-"http://www.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-1.5.1-src.zip.asc">PGP</a></td>
+"http://archive.apache.org/dist/axis/axis2/java/rampart/1.5.1/rampart-dist-1.5.1-src.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
@@ -85,14 +85,19 @@ border="0" /></a>[end] The currently sel
please select another mirror. If all mirrors are failing, there are
<i>backup</i> mirrors (at the end of the mirrors list) that should
be available.</p>
-<form action="[location]" method="get" id="SelectMirror" name=
-"SelectMirror">Other mirrors: <select name="Preferred">
-<option value="[http]" selected="selected">[http]</option>
-<option value="[ftp]">[ftp]</option>
-<option value="[backup]">[backup] (backup)</option>
-</select> <input type="submit" value="Change" /></form>
-<p>You may also consult the <a href=
-"http://www.apache.org/mirrors/">complete list of mirrors</a>.</p>
+<form action="[location]" method="get" id="SelectMirror" name="SelectMirror">
+Other mirrors: <select name="Preferred">
+[if-any http]
+ [for http]<option value="[http]">[http]</option>[end]
+[end]
+[if-any ftp]
+ [for ftp]<option value="[ftp]">[ftp]</option>[end]
+[end]
+[if-any backup]
+ [for backup]<option value="[backup]">[backup] (backup)</option>[end]
+[end]
+</select><input type="submit" value="Change"/></form><p>You may also consult the <a class="externalLink" href="http://www.apache.org/mirrors/">complete list of mirrors</a>
+.</p>
<p><strong>Note:</strong> when downloading from a mirror please
check the <a href=
"http://www.apache.org/dev/release-signing#md5">md5sum</a> and
@@ -100,7 +105,7 @@ verify the <a href=
"http://www.apache.org/dev/release-signing#openpgp">OpenPGP</a>
compatible signature from the main Apache site. These can be
downloaded by following the links above. This <a href=
-"http://www.apache.org/dist/ws/axis2/KEYS">KEYS</a> file contains
+"http://www.apache.org/dist/axis/axis2/java/rampart/KEYS">KEYS</a> file contains
the public keys that can be used for verifying signatures. It is
recommended that (when possible)a <a href=
"http://www.apache.org/dev/release-signing#web-of-trust">Web of
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/index.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/index.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/index.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/index.xml Sun Jan 29 15:16:02 2017
@@ -18,7 +18,9 @@
~ under the License.
-->
-<document>
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
<properties>
@@ -32,22 +34,45 @@ according to specifications in the WS-Se
following specifications:</p>
</section>
- <h2>Features of Rampart Latest Version</h2>
+ <section name="Features of Rampart Latest Version">
<ul>
- <li>WS - Security 1.0</li>
- <li>WS - Security 1.1</li>
- <li>WS - Secure Conversation - February 2005</li>
- <li>WS - Security Policy - 1.1 - July 2005</li>
- <li>WS - Security Policy - 1.2 </li>
- <li>WS - Trust - February 2005</li>
- <li>WS - Trust - WS-SX spec - EXPERIMENTAL</li>
+ <li><p>WS - Security 1.0</p></li>
+ <li><p>WS - Security 1.1</p></li>
+ <li><p>WS - Secure Conversation - February 2005</p></li>
+ <li><p>WS - Security Policy - 1.1 - July 2005</p></li>
+ <li><p>WS - Security Policy - 1.2</p></li>
+ <li><p>WS - Trust - February 2005</p></li>
+ <li><p>WS - Trust - WS-SX spec - EXPERIMENTAL</p></li>
+ </ul>
+ </section>
+
+ <section name="Apache Rampart News">
+ <h3>Sep 24, 2011 : Apache Rampart 1.5.2 and 1.6.1 released</h3>
+ <p>Both releases update WSS4J to version 1.5.12 and ensure compatibility with the latest
+ Axis2 releases from the corresponding branches. Rampart 1.5.2 is supported with Axis2 1.5.6
+ and Rampart 1.6.1 is supported with Axis2 1.6.1. Please note that Rampart 1.6.1 will not
+ work with Axis2 1.6.0 and that users of Axis2 1.6.1 are required to update to Rampart 1.6.1,
+ i.e. Rampart 1.6.0 doesn't work with Axis2 1.6.1.</p>
+
+ <h3>Jun 06, 2011 : Apache Rampart 1.6.0 released</h3>
+ <p>Apache Rampart 1.6.0 was released with lots of bug fixes.</p>
+
+ <h3>Jan 10, 2011 : Apache Rampart 1.5.1 released</h3>
+ <p>Apache Rampart 1.5.1 was released with lots of bug fixes.</p>
+
+ <h3>Feb 01, 2010 : Apache Rampart 1.5 released</h3>
+ <p>Apache Rampart 1.5 was released with lots of bug fixes and new features.</p>
+ <p>New features include</p>
+ <ul>
+ <li>SAML 2.0 support - Issuance </li>
+ <li>Key store caching</li>
+ <li>Signing / Encrypting with multiple keys</li>
+ <li>Tests for negative scenarios</li>
</ul>
-
- <h2>Apache Rampart News</h2>
<h3>Jun 12, 2008 : Apache Rampart 1.4 released</h3>
- <p>Apache Rampart 1.4 was released with lots of bug fixes and new features.<br></br>
- New features include</p>
+ <p>Apache Rampart 1.4 was released with lots of bug fixes and new features.</p>
+ <p>New features include</p>
<ul>
<li>WS Security 1.1</li>
<ul>
@@ -67,7 +92,8 @@ following specifications:</p>
<li>Ability turn off mili second precision</li>
</ul>
<li>Ability to secure messages faults </li>
- <li>Increased interoparability with WCF 3.5 </li>
+ <li>Increased interoperability with WCF 3.5 </li>
</ul>
+ </section>
</body>
</document>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/rampartconfig-guide.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/rampartconfig-guide.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/rampartconfig-guide.xml Sun Jan 29 15:16:02 2017
@@ -125,6 +125,20 @@ configuration properties used by the imp
</ramp:encryptionCypto>
</ramp:RampartConfig>
</pre>
+ <p>Crypto caching is enabled by default when Merlin is used as the crypto provider. So Rampart will cache the crypto objects
+ with an infinite cache refresh interval. This crypto refresh interval can be overridden by setting the cacheRefreshInterval parameter
+ as described above. If it is required to disable crypto caching when Merlin is used, set the 'enableCryptoCaching' parameter
+ value to 'false'. Please refer to the following example.
+ </p>
+ <pre xmlns="http://www.w3.org/1999/xhtml" xml:space="preserve">
+ <ramp:signatureCrypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin" enableCryptoCaching="false">
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.file">service.jks</ramp:property>
+ <ramp:property name="org.apache.ws.security.crypto.merlin.keystore.password">servicePW</ramp:property>
+ </ramp:crypto>
+ </ramp:signatureCrypto>
+ </pre>
<br></br>
<h3>References</h3>1.
<a href="http://ws.apache.org/wss4j">Apache WSS4J -Home</a>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/svn.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/svn.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/svn.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/documentation/src/site/xdoc/svn.xml Sun Jan 29 15:16:02 2017
@@ -71,7 +71,7 @@ information, please read the ASF <a href
<p>Once you have successfully installed Subversion, you can check
out Rampart trunk by following these steps:</p>
<ol type="1">
-<li>Run <strong>svn co <repository URL> axis2</strong> where
+<li>Run <strong>svn co <repository URL> rampart</strong> where
the repository URL is one of the URLs from the previous list.</li>
<li>This step will check out the latest version of the Rampart Java
codebase to a directory named "rampart". The second parameter to the
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/pom.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/pom.xml Sun Jan 29 15:16:02 2017
@@ -1,11 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -40,12 +60,16 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
</dependency>
</dependencies>
@@ -54,9 +78,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent"/>
+ <menu ref="parent" />
</configuration>
</plugin>
</plugins>
Propchange: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java Sun Jan 29 15:16:02 2017
@@ -52,7 +52,7 @@ import javax.xml.namespace.QName;
public class MessageBuilder {
private static Log log = LogFactory.getLog(MessageBuilder.class);
-
+
public void build(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
@@ -135,13 +135,13 @@ public class MessageBuilder {
}
if(rpd.isTransportBinding()) {
- log.debug("Building transport binding");
- TransportBindingBuilder building = new TransportBindingBuilder();
- building.build(rmd);
+ log.debug("Building transport binding");
+ TransportBindingBuilder building = new TransportBindingBuilder();
+ building.build(rmd);
} else if(rpd.isSymmetricBinding()) {
- log.debug("Building SymmetricBinding");
- SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
- builder.build(rmd);
+ log.debug("Building SymmetricBinding");
+ SymmetricBindingBuilder builder = new SymmetricBindingBuilder();
+ builder.build(rmd);
} else {
AsymmetricBindingBuilder builder = new AsymmetricBindingBuilder();
builder.build(rmd);
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java Sun Jan 29 15:16:02 2017
@@ -758,11 +758,13 @@ public class PolicyBasedResultsValidator
}
// If certificates have been found, the certificates must be compared
- // to ensure againgst phony DNs (compare encoded form including signature)
+ // to ensure against phony DNs (compare encoded form including signature)
if (certs != null && certs.length > 0 && cert.equals(certs[0])) {
if (doDebug) {
log.debug("Direct trust for certificate with " + subjectString);
}
+ // Set the alias of the cert used for the msg. sig. as a msg. cxt. property
+ rmd.getMsgContext().setProperty(RampartMessageData.SIGNATURE_CERT_ALIAS, alias);
return true;
}
} else {
@@ -844,7 +846,9 @@ public class PolicyBasedResultsValidator
}
}
- log.debug("WSHandler: Certificate path could not be verified for certificate with subject " + subjectString);
+ if (doDebug) {
+ log.debug("WSHandler: Certificate path could not be verified for certificate with subject " + subjectString);
+ }
return false;
}
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartConstants.java Sun Jan 29 15:16:02 2017
@@ -5,5 +5,6 @@ public class RampartConstants {
public static final String TIME_LOG = "org.apache.rampart.TIME";
public static final String MESSAGE_LOG = "org.apache.rampart.MESSAGE";
public static final String SEC_FAULT = "SECURITY_VALIDATION_FAILURE";
-
+ public static final String MERLIN_CRYPTO_IMPL = "org.apache.ws.security.components.crypto.Merlin";
+ public static final String MERLIN_CRYPTO_IMPL_CACHE_KEY = "org.apache.ws.security.crypto.merlin.file";
}
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java Sun Jan 29 15:16:02 2017
@@ -16,37 +16,37 @@
package org.apache.rampart;
-import org.apache.axiom.om.OMElement;
-import org.apache.axiom.soap.*;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
+import org.apache.axiom.soap.SOAPEnvelope;
+import org.apache.axiom.soap.SOAPFault;
+import org.apache.axiom.soap.SOAPFaultCode;
+import org.apache.axiom.soap.SOAPFaultSubCode;
+import org.apache.axiom.soap.SOAPFaultValue;
+import org.apache.axiom.soap.SOAPHeader;
+import org.apache.axiom.soap.SOAPHeaderBlock;
import org.apache.axis2.AxisFault;
import org.apache.axis2.context.MessageContext;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.rahas.Token;
import org.apache.rahas.TokenStorage;
-import org.apache.rahas.impl.util.SAML2KeyInfo;
-import org.apache.rahas.impl.util.SAML2Utils;
import org.apache.rampart.policy.RampartPolicyData;
+import org.apache.rampart.saml.SAMLAssertionHandler;
+import org.apache.rampart.saml.SAMLAssertionHandlerFactory;
import org.apache.rampart.util.Axis2Util;
import org.apache.rampart.util.RampartUtil;
import org.apache.ws.secpolicy.WSSPolicyException;
-import org.apache.ws.security.*;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSecurityEngine;
+import org.apache.ws.security.WSSecurityEngineResult;
+import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.WSUsernameTokenPrincipal;
import org.apache.ws.security.components.crypto.Crypto;
-import org.apache.ws.security.saml.SAMLKeyInfo;
-import org.apache.ws.security.saml.SAMLUtil;
-import org.opensaml.SAMLAssertion;
-import org.opensaml.saml2.core.Assertion;
-import org.opensaml.saml2.core.Subject;
-import org.opensaml.saml2.core.SubjectConfirmationData;
-import org.opensaml.saml2.core.Conditions;
import javax.xml.namespace.QName;
-import java.security.Principal;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Iterator;
import java.util.Vector;
@@ -59,12 +59,9 @@ public class RampartEngine {
public Vector process(MessageContext msgCtx) throws WSSPolicyException,
RampartException, WSSecurityException, AxisFault {
- boolean doDebug = log.isDebugEnabled();
boolean dotDebug = tlog.isDebugEnabled();
- if(doDebug){
- log.debug("Enter process(MessageContext msgCtx)");
- }
+ log.debug("Enter process(MessageContext msgCtx)");
RampartMessageData rmd = new RampartMessageData(msgCtx, false);
@@ -89,14 +86,12 @@ public class RampartEngine {
//Convert back to llom since the inflow cannot use llom
msgCtx.setEnvelope(env);
Axis2Util.useDOOM(false);
- if(doDebug){
- log.debug("Return process MessageContext msgCtx)");
- }
- return null;
+ log.debug("Return process MessageContext msgCtx)");
+ return null;
}
- Vector results = null;
+ Vector results;
WSSecurityEngine engine = new WSSecurityEngine();
@@ -139,19 +134,23 @@ public class RampartEngine {
if(rpd.isSymmetricBinding()) {
//Here we have to create the CB handler to get the tokens from the
//token storage
- if(doDebug){
- log.debug("Processing security header using SymetricBinding");
- }
- results = engine.processSecurityHeader(rmd.getDocument(),
+ log.debug("Processing security header using SymetricBinding");
+ results = engine.processSecurityHeader(rmd.getDocument(),
actorValue,
tokenCallbackHandler,
signatureCrypto,
RampartUtil.getEncryptionCrypto(rpd.getRampartConfig(),
msgCtx.getAxisService().getClassLoader()));
+
+ // Remove encryption tokens if this is the initiator and if initiator is receiving a message
+
+ if (rmd.isInitiator() && (msgCtx.getFLOW() == MessageContext.IN_FLOW ||
+ msgCtx.getFLOW() == MessageContext.IN_FAULT_FLOW)) {
+ tokenCallbackHandler.removeEncryptedToken();
+ }
+
} else {
- if(doDebug){
- log.debug("Processing security header in normal path");
- }
+ log.debug("Processing security header in normal path");
results = engine.processSecurityHeader(rmd.getDocument(),
actorValue,
tokenCallbackHandler,
@@ -177,77 +176,30 @@ public class RampartEngine {
(Integer) wser.get(WSSecurityEngineResult.TAG_ACTION);
if (WSConstants.ST_UNSIGNED == actInt.intValue()) {
- // If this is a SAML2.0 assertion
- if (wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION) instanceof Assertion) {
+ Object samlAssertion = wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- final Assertion assertion = (Assertion) wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
- String id = assertion.getID();
- Subject subject = assertion.getSubject();
-
- Date dateOfCreation = null;
- Date dateOfExpiration = null;
-
- //Read the validity period from the 'Conditions' element, else read it from SC Data
- if (assertion.getConditions() != null) {
- Conditions conditions = assertion.getConditions();
- if (conditions.getNotBefore() != null) {
- dateOfCreation = conditions.getNotBefore().toDate();
- }
- if (conditions.getNotOnOrAfter() != null) {
- dateOfExpiration = conditions.getNotOnOrAfter().toDate();
- }
- } else {
- SubjectConfirmationData scData = subject.getSubjectConfirmations()
- .get(0).getSubjectConfirmationData();
- if (scData.getNotBefore() != null) {
- dateOfCreation = scData.getNotBefore().toDate();
- }
- if (scData.getNotOnOrAfter() != null) {
- dateOfExpiration = scData.getNotOnOrAfter().toDate();
- }
- }
-
- // TODO : SAML2KeyInfo element needs to be moved to WSS4J.
- SAML2KeyInfo saml2KeyInfo = SAML2Utils.
- getSAML2KeyInfo(assertion, signatureCrypto, tokenCallbackHandler);
-
- //Store the token
- try {
- TokenStorage store = rmd.getTokenStorage();
- if (store.getToken(id) == null) {
- Token token = new Token(id, (OMElement) SAML2Utils.getElementFromAssertion(assertion), dateOfCreation, dateOfExpiration);
- token.setSecret(saml2KeyInfo.getSecret());
- store.add(token);
- }
- } catch (Exception e) {
- throw new RampartException(
- "errorInAddingTokenIntoStore", e);
- }
+ SAMLAssertionHandler samlAssertionHandler
+ = SAMLAssertionHandlerFactory.createAssertionHandler(samlAssertion);
+ if (samlAssertionHandler.isBearerAssertion()) {
+ break;
}
- //if this is a SAML1.1 assertion
- else {
- final SAMLAssertion assertion =
-
- ((SAMLAssertion) wser
- .get(WSSecurityEngineResult.TAG_SAML_ASSERTION));
- String id = assertion.getId();
- Date created = assertion.getNotBefore();
- Date expires = assertion.getNotOnOrAfter();
- SAMLKeyInfo samlKi = SAMLUtil.getSAMLKeyInfo(assertion,
- signatureCrypto, tokenCallbackHandler);
- try {
- TokenStorage store = rmd.getTokenStorage();
- if (store.getToken(id) == null) {
- Token token = new Token(id, (OMElement) assertion.toDOM(), created, expires);
- token.setSecret(samlKi.getSecret());
- store.add(token);
- }
- } catch (Exception e) {
- throw new RampartException(
- "errorInAddingTokenIntoStore", e);
+ //Store the token
+ try {
+ TokenStorage store = rmd.getTokenStorage();
+ if (store.getToken(samlAssertionHandler.getAssertionId()) == null) {
+ Token token = new Token(samlAssertionHandler.getAssertionId(),
+ samlAssertionHandler.getAssertionElement(),
+ samlAssertionHandler.getDateNotBefore(),
+ samlAssertionHandler.getDateNotOnOrAfter());
+
+ token.setSecret(samlAssertionHandler.
+ getAssertionKeyInfoSecret(signatureCrypto, tokenCallbackHandler));
+ store.add(token);
}
-
+ } catch (Exception e) {
+ throw new RampartException(
+ "errorInAddingTokenIntoStore", e);
}
} else if (WSConstants.UT == actInt.intValue()) {
@@ -288,6 +240,16 @@ public class RampartEngine {
}
} else if (WSConstants.SIGN == actInt.intValue()) {
X509Certificate cert = (X509Certificate) wser.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
+
+ if (rpd.isAsymmetricBinding() && cert == null && rpd.getInitiatorToken() != null
+ && !rpd.getInitiatorToken().isDerivedKeys()) {
+
+ // If symmetric binding is used, the certificate should be null.
+ // If certificate is not null then probably initiator and
+ // recipient are using 2 different bindings.
+ throw new RampartException("invalidSignatureAlgo");
+ }
+
msgCtx.setProperty(RampartMessageData.X509_CERT, cert);
}
@@ -314,9 +276,7 @@ public class RampartEngine {
", PolicyBasedResultsValidattor took " + (t3 - t2));
}
- if(doDebug){
- log.debug("Return process(MessageContext msgCtx)");
- }
+ log.debug("Return process(MessageContext msgCtx)");
return results;
}
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartException.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartException.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartException.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-core/src/main/java/org/apache/rampart/RampartException.java Sun Jan 29 15:16:02 2017
@@ -45,7 +45,7 @@ public class RampartException extends Ex
/**
* Construct the fault properly code for the standard faults
- * @param faultCode2
+ * @param code code as definfed in property file under
* @return
*/
private String getFaultCode(String code) {