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/30 17:08:20 UTC
svn commit: r1780946 [1/5] - in
/axis/axis2/java/rampart/branches/RAMPART-289: ./ modules/distribution/
modules/documentation/src/site/ modules/documentation/src/site/resources/
modules/documentation/src/site/resources/css/ modules/documentation/src/si...
Author: veithen
Date: Mon Jan 30 17:08:19 2017
New Revision: 1780946
URL: http://svn.apache.org/viewvc?rev=1780946&view=rev
Log:
Merge changes up to r1052171 from trunk.
Added:
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/axis.jpg
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/axis.jpg
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/axis.png
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/axis.png
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/breadcrumbs-bg.gif
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/breadcrumbs-bg.gif
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/h2-bg.gif
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/h2-bg.gif
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/home-top.gif
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/home-top.gif
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/leftcolumn-bg.gif
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/leftcolumn-bg.gif
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/menu-back.gif
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/resources/images/menu-back.gif
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.4/
- copied from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.4/
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.5/
- copied from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5/
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.5.1/
- copied from r1052171, axis/axis2/java/rampart/trunk/modules/documentation/src/site/xdoc/download/1.5.1/
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/AbstractUniqueMessageAttributeCache.java
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/AbstractUniqueMessageAttributeCache.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/NonceCache.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/ServiceNonceCache.java
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/ServiceNonceCache.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/UniqueMessageAttributeCache.java
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/UniqueMessageAttributeCache.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/policy/30.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-30.xml
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-integration/src/test/resources/rampart/services-30.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample08/
- copied from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-samples/policy/sample08/
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/src/test/java/org/apache/rampart/NonceCacheTest.java
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/NonceCacheTest.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-tests/src/test/java/org/apache/rampart/PolicyAssertionsTest.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-asymm-required-elements-2.xml
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy/rampart-asymm-required-elements-2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-asymm-required-elements.xml
- copied unchanged from r1052171, axis/axis2/java/rampart/trunk/modules/rampart-tests/test-resources/policy/rampart-asymm-required-elements.xml
Removed:
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/main/java/org/apache/axis2/integration/UtilsTCPServer.java
Modified:
axis/axis2/java/rampart/branches/RAMPART-289/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/distribution/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/distribution/bin.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/css/site.css
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/apache-rampart-banner.jpg
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/rampart-config.xsd
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample01.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample05.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample06.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/site.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.1/download.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.2/download.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.3/download.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/svn.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/RampartReceiver.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/handler/WSDoAllSender.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyData.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/OptimizePartsConfig.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/Axis2Util.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/HandlerParameterDecoder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/util/RampartUtil.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/pom.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/conf/axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2-publicKey.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding-saml2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-symm-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/service-policy-transport-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-asymm-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-symm-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rahas/policy/sts-policy-transport-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/1.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/10.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/13.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/14.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/15.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/17.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/18.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/19.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/20.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/21.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/22.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/23.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/24.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/25.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/26.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/27.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/28.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/3.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/4.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/5.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-1.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/policy/sc-3.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-1.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-10.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-13.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-14.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-15.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-17.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-18.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-19.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-20.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-21.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-22.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-23.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-24.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-25.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-26.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-27.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-28.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-3.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-4.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-5.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-1.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/rampart/services-sc-3.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/complete.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s1.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s2a.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s3.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s4.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s5.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s6.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/s7.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/sST1.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-integration/src/test/resources/security/secMtom.service.axis2.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-mar/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AbstractSecurityAssertion.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedElements.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/SignedEncryptedParts.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/TransportBinding.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/basic/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/client.jks
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/service.jks
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/sts.jks
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/policy.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/services.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/policy.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/policy.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample05/services.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample06/policy.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample06/services.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample06/src/org/apache/rampart/samples/policy/sample06/MexService.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/src/test/java/org/apache/rahas/SimpleTokenStoreTest.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy-asymm-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy-symm-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy-transport-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-1.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-2-sig-dk.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-3-dk.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-5-ebs.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-symm-binding-1.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-symm-binding-2-dk.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-symm-binding-3-dk-es.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-symm-binding-4-ebs.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-symm-binding-5-dk-ebs.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-transport-binding-dk.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-transport-binding-no-bst.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-tests/test-resources/policy/rampart-transport-binding.xml
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust-mar/ (props changed)
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/EncryptedKeyToken.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/SimpleTokenStore.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/Token.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/client/STSClient.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/errors.properties
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAML2TokenIssuer.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuer.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/impl/SAMLTokenIssuerConfig.java
axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-trust/src/main/java/org/apache/rahas/impl/util/SAML2Utils.java
axis/axis2/java/rampart/branches/RAMPART-289/pom.xml
axis/axis2/java/rampart/branches/RAMPART-289/release-docs/ChangeLog.txt
axis/axis2/java/rampart/branches/RAMPART-289/release-docs/NOTICE.txt
axis/axis2/java/rampart/branches/RAMPART-289/release-docs/README.txt
axis/axis2/java/rampart/branches/RAMPART-289/release-docs/release-notes.html
Propchange: axis/axis2/java/rampart/branches/RAMPART-289/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1 @@
+target
Propchange: axis/axis2/java/rampart/branches/RAMPART-289/
------------------------------------------------------------------------------
svn:mergeinfo = /axis/axis2/java/rampart/trunk:936233-1052171
Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/distribution/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1 @@
+target
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/distribution/bin.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/distribution/bin.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/distribution/bin.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/distribution/bin.xml Mon Jan 30 17:08:19 2017
@@ -22,14 +22,15 @@
<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: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>velocity:velocity:jar</include>
- <include>commons-collections:commons-collections:jar</include>
- <include>org.opensaml:openws: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>velocity:velocity:jar</include>
+ <include>commons-collections:commons-collections:jar</include>
+ <include>org.opensaml:openws:jar</include>
+ <include>commons-lang:commons-lang:jar</include>
</includes>
</dependencySet>
</dependencySets>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/css/site.css
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/css/site.css?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/css/site.css (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/css/site.css Mon Jan 30 17:08:19 2017
@@ -1,297 +1,272 @@
-/* page general styles */
-body{
- padding:0px;
- margin:0px;
- width:1000px;
-}
-a{
- color:#557f95;
- text-decoration:none;
-}
-a:hover{
- color:#000000;
- text-decoration:underline;
-}
-body, td, tr, input,h1,h2,h3,h4,h5,h6,a{
- font: 12px Verdana, Arial, Helvetica, sans-serif;
- line-height:18px;
+/*
+ * 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.
+ */
+.img-title {
+ text-align: center
}
-pre{
- overflow-x:auto;
+
+.img {
+ text-align: center
}
-h1 {
- color:#575757;
- font-size:24px;
- font-weight:bold;
- line-height:normal;
- margin:5px 0px;
- padding:2px;
+
+.special-td {
+ font-family: Arial;
+ font-size: 10pt;
+ font-weight: bold
}
+
+.special {
+ font-family: Arial;
+ font-weight: bold;
+ border-style: solid;
+ border-width: 1;
+ padding-left: 4;
+ padding-right: 4;
+ padding-top: 1;
+ padding-bottom: 1;
+ background-color: #C0C0C0;
+ font-size: 10pt
}
-h2{
- padding:0px;
- margin:0px;
- font-size:14px;
- font-weight:bold;
- height:22px;
- background-color:#bcbcbc;
- text-indent:10px;
- color:#000000;
+
+.xml {
+ font-family: Arial;
+ font-size: 10pt;
+ color: #0000FF;
+ font-style: italic
}
-h3{
- padding:0px;
- margin:0px;
- font-weight:bold;
-}
-h4{
- font-weight:bold;
- color:#777777;
-}
-p{
- padding-top:5px;
- padding-bottom:5px;
- line-height:18px;
-}
-/* page styles */
-.page-padding{
- padding-left:10px;
- padding-right:10px;
-}
-.composite{
-/* Uncomment these lines to give a fixed width with centered positioning ....*/
- position:absolute;
- left:50%;
- width:980px;
- margin-left:-490px;
- border:solid 1px #83b0c0;
- margin-top:5px;
+
+/*
+.code {
+ font-family: Courier New;
+ font-size: 10pt;
+ color: #800000
+}
+*/
+
+/*
+-----------------------------------------------------------------------
+Generic element styles
+----------------------------------------------------------------------- */
+body {
+ color: #111;
+ font-family: "Trebuchet MS", Verdana, sans-serif;
+ font-size: 1em;
+ padding: 5;
+ padding-bottom:0px;
+ border-width: 0;
+ outline-width: 0;
+ list-style-position: outside;
+ display: block;
+
+ margin: 0 auto; /* center, not in IE5 */
+ height: auto !important; /* real browsers */
+ height: 100%; /* IE6: treaded as min-height*/
+
+ min-height: 100%; /* real browsers */
+ width: 980px;
+ background-image: url(../images/home-top.gif);
+ background-position: left top;
+ background-repeat: repeat-x;
+}
+
+#breadcrumbs {
+ background-image: url(../images/menu-back.gif);
+ background-position: left top;
+ background-repeat: repeat-x;
+ border-bottom: solid 1px #d4d4d4;
+ height: 28px;
+ font-size: 0.8em;
+ background-color: transparent;
+ border: 1px solid #6895c2;
}
-/* header styles */
#banner{
- background-image:url(../images/apache-rampart-banner-background.jpg);
- background-repeat:repeat-x;
- background-position:0px 0px;
- height:98px;
+ margin-top:10px;
+ padding-top:10px;
+ padding-bottom:10px;
}
#bannerLeft{
- background-image:url(../images/apache-rampart-logo.jpg);
- background-repeat:no-repeat;
- background-position:0px 0px;
- height:103px;
- text-align:right;
- padding-right:10px;
+ background-image: url(../images/apache-rampart-logo.jpg);
+ background-position: left top;
+ background-repeat: no-repeat;
+ text-indent:-1700px;/*We do this to hide the text. This needs to be updated to a beter solution.*/
+ width:204px;
+ height:56px;
display:block;
-}
-#breadcrumbs{
- position:absolute;
- top:70px;
- background-color:transparent;
- border-bottom:none;
- border-top:none;
- font-size:auto;
- margin:0pt;
- padding:0px;
+ float:left;
}
#bannerRight{
- background-image:url(../images/apache-rampart-banner.jpg);
- background-repeat:no-repeat;
- background-position:right 0px;
display:block;
- height:65px;
- position:absolute;
- right:0px;
- top:0px;
-}
-.xleft{
- color:#929292;
- right:200px;
- position:absolute;
-}
-.top-menu a{
- color:#000000;
- text-decoration:none;
-}
-.top-menu a:hover{
- text-decoration:underline;
-}
-.top-menu-gap{
- padding-left:30px;
-}
-
-/* content text */
-.content{
-
-}
-#leftColumn{
- width:179px;
- background-color:transparent;
- border:none;
- margin:10px 0px 0px 5px;
-}
-#navcolumn h5{
- text-indent:15px;
- height:23px;
- color:#ffffff;
- background-image:url(../images/apache-rampart-menu-top.jpg);
- background-repeat:no-repeat;
- background-position:left 0px;
-}
-#navcolumn{
- background-image:url(../images/apache-rampart-menu.jpg);
- background-repeat:no-repeat;
- background-position:0px 0px;
- background-color:#e5e5e5;
- border-bottom:solid 1px #b4b4b4;
- padding:0px 0px 0pt 0px;
- font-size:11px;
-}
-#navcolumn ul{
- padding:0px;
- margin:0px;
- list-style:none;
- padding-left:10px;
-}
-#navcolumn ul ul{
- margin-left:-10px;
-}
-#navcolumn li{
- margin-top:3px;
-}
-#navcolumn strong{
- font-weight:bold;
-}
-#navcolumn ul li a {
- text-indent:0px;
- font-size:12px;
- color:#224351;
-}
-#navcolumn li.expanded {
- background-image:url(../images/apache-rampart-menu-button.gif);
- background-repeat:no-repeat;
- background-position:0px 5px;
-}
-#navcolumn ul li ul li a{
- background-image:none;
- text-indent:0px;
- font-size:11px;
- color:#557f95;
- font-size:11px;
-}
-#bodyColumn{
- background-color:#F3F3F3;
- border:1px solid #B4B4B4;
- margin-right:10px;
- margin-left:194px;
- margin-top:10px;
- padding-left:10px;
+ float:right;
+ height:51px;
+ width:537px;
}
-.menu-bottom-left{
- background-image:url(../images/apache-rampart-menu-bottom.jpg);
- background-repeat:no-repeat;
- background-position:0px 0px;
- background-color:#e5e5e5;
- width:15px;
- height:13px;
- float:left;
+.xright, #bannerRight {
+ text-shadow: none;
}
-.menu-bottom-right{
- background-color:#e5e5e5;
- border-bottom:solid 1px #b4b4b4;
- height:13px;
- float:right;
- width:164px;
+
+#leftColumn {
+ border: none;
+ background-color: transparent;
+ margin: 1em 0 0 0;
}
-.content-back1{
- background-image:url(../images/apache-rampart-spliter.jpg);
- background-repeat:no-repeat;
- background-position:0px 0px;
-}
-.content-back2{
- background-image:url(../images/apache-rampart-content-back.jpg);
- background-repeat:repeat-y;
- background-position:0px 0px;
- background-color:#f3f3f3;
- border-bottom:solid 1px #b4b4b4;
- border-right:solid 1px #b4b4b4;
- margin-right:10px;
+
+#navcolumn {
+ padding: 0;
}
-.content-display{
- margin-left:32px;
- padding-bottom:10px;
+
+#navcolumn h5 {
+ background-color: #e8f4ff;
+ border-left: solid 1px #ff2700;
+ border-bottom: none;
+ font-size: 0.9em;
+ padding: 5px;
+ color: #333333;
+ font-weight: normal;
}
-.poweredBy{
- margin-left:30px;
- margin-top:5px;
+
+#navcolumn li {
+ font-size: 0.9em;
+ margin-top: 0.5em;
+ margin-bottom: 0.5em;
}
-.footer{
- color:#929292;
- margin-top:10px;
- margin-left:10px;
+
+#bodyColumn {
+ margin-left: 190px;
+ margin-right: 0;
}
-.command {
- border: 1px dashed #3c78b5;
- text-align: left;
- background-color: #f0f0f0;
- padding: 3px;
- font-size: 11px;
- font-family: Courier;
- margin: 10px;
- line-height: 13px;
-}
-.consoleOutput {
- border: 1px dashed #3c78b5;
- font-size: 11px;
- font-family: Courier;
- margin: 10px;
- line-height: 13px;
- background-color: #f0f0f0;
- border-bottom: 1px dashed #3c78b5;
- padding: 3px;
- border-style: solid;
+
+#contentBox {
+ color: #333333;
}
-.info {
- border-style: solid;
- border-width: 1px;
- border-color: #090;
- background-color: #dfd;
- text-align:left;
- margin-top: 5px;
- margin-bottom: 5px;
-}
-.data-table{
- font-family:Verdana,Arial,Helvetica,sans-serif;
- font-size:11px;
- border:0px;
- margin:0px;
- border:solid 1px #cdcdcd;
-}
-.data-table th{
- background-color:#eeeeee;
- border-bottom:solid 1px #8d8d8d;
- padding-top:5px;
- padding-left:3px;
- text-align:left;
-}
-.data-table td{
- padding-top:4px;
- padding-left:3px;
- border-bottom:solid 1px #e1e1e1;
-}
-.download-pre {
- font-family:Verdana,Arial,Helvetica,sans-serif;
- font-size:11px;
- font-style:normal;
- margin:0;
- padding-bottom:3px;
- padding-top:3px;
-}
-
-.download-header-pre {
- font-family:Verdana,Arial,Helvetica,sans-serif;
- font-size:12px;
- font-weight:bold;
- margin:0;
- padding-top:3px;
- padding-bottom:3px;
+
+#contentBox p, #contentBox td, #contentBox li {
+ font-family: "Trebuchet MS", Verdana, sans-serif;
+ line-height: 1.5em;
+ font-size: 0.94em;
+}
+
+#contentBox p, #contentBox li {
+ text-align: justify;
+}
+
+a:link {
+ color: #039;
+}
+
+a:hover {
+ color: #03c;
+ text-decoration: none;
+}
+
+a.externalLink, a.externalLink:link, a.externalLink:visited, a.externalLink:active, a.externalLink:hover {
+ background: none;
+ padding: 0;
+}
+
+table.bodyTable th {
+ background-color: #6f8aa5;
+}
+
+table.bodyTable tr.a {
+ background-color: #d1dce7;
+}
+
+table.bodyTable tr.b {
+ background-color: #eceef1;
+}
+
+h1 {
+ color: #4f4f4f;
+ font-size: 2.5em;
+ font-weight: normal;
+}
+
+h2 {
+ color: #646b71;
+ font-size: 1.7em;
+ background-color: transparent;
+ border: none;
+ padding: 0;
+ font-weight: normal;
+}
+
+h3 {
+ color: #7d858d;
+ font-weight: bold;
+ font-size: 1.2em;
+ background-color: transparent;
+ border: none;
+ padding: 0;
+}
+
+h4 {
+ color: #333333;
+ font-size: 1em;
+ font-weight: bold;
+ background-color: transparent;
+ border: none;
+ padding: 0;
+}
+
+th {
+ background-color: #f5f5f5;
+ height: 20;
+ paddong: 0px;
+ spacing: 0px;
+}
+
+table {
+ margin: 0;
+ padding: 0;
+ border: solid 0 #dcdcdc;
+}
+
+.header {
+ height: 80px;
+ background-image: url( ../images/doc_header.jpg );
+ background-repeat: no-repeat;
+ background-attachment: scroll;
+ background-position: left top;
+}
+
+pre, div.source {
+ border: 1px dotted;
+ background-color: #e2ecf6;
+ padding: 0.8em;
+ margin: 0;
+ overflow: auto;
+ font-size: 0.9em;
+}
+
+/* Xdoc generates <div class="source"><pre>...</pre></div> for <source> elements.
+ Because we already apply styles to every <pre>, we need to suppress styles here. */
+div.source pre {
+ border: none;
+ background-color: transparent;
+ padding: none;
+}
+#footer{
+ background-color:#E9E9E9;
+ color:#828282;
+ left:0;
+ padding-top:10px;
+ text-indent:10px;
+ width:100%;
+ height:100px;
}
\ No newline at end of file
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/apache-rampart-banner.jpg
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/apache-rampart-banner.jpg?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
Binary files - no diff available.
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/images/apache-rampart-logo.jpg?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
Binary files - no diff available.
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/rampart-config.xsd
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/rampart-config.xsd?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/rampart-config.xsd (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/rampart-config.xsd Mon Jan 30 17:08:19 2017
@@ -20,18 +20,29 @@
<xs:element name="timestampMaxSkew" type="xs:integer" minOccurs="0"/>
<xs:element name="tokenStoreClass" type="xs:string" minOccurs="0"/>
<xs:element name="optimizeParts" type="xs:string" minOccurs="0"/>
- <xs:element name="sslConfig" type="ssl" minOccurs="0"/>
+ <xs:element name="sslConfig" type="ramp:ssl" minOccurs="0"/>
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:complexType name="crypto">
- <xs:annotation>
- <xs:documentation>http://ws.apache.org/wss4j/apidocs/org/apache/ws/security/components/crypto/Crypto.html</xs:documentation>
- </xs:annotation>
- <xs:sequence maxOccurs="unbounded">
- <xs:element name="property" type="xs:string"/>
- </xs:sequence>
- <xs:attribute name="provider"/>
+ <xs:sequence maxOccurs="1">
+ <xs:element name="crypto">
+ <xs:complexType>
+ <xs:sequence maxOccurs="unbounded">
+ <xs:element name="property">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:string">
+ <xs:attribute name="name" type="xs:string" use="required"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ <xs:attribute name="provider" type="xs:string" use="required"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
</xs:complexType>
<xs:complexType name="ssl">
<xs:sequence maxOccurs="unbounded">
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample01.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample01.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample01.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample01.xml Mon Jan 30 17:08:19 2017
@@ -11,7 +11,7 @@
</sp:TransportToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample05.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample05.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample05.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample05.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample06.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample06.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample06.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/resources/samples/policy/sample06.xml Mon Jan 30 17:08:19 2017
@@ -19,7 +19,7 @@
</sp:ProtectionToken>
<sp:AlgorithmSuite>
<wsp:Policy>
- <sp:Basic256/>
+ <sp:Basic128/>
</wsp:Policy>
</sp:AlgorithmSuite>
<sp:Layout>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/site.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/site.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/site.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/site.xml Mon Jan 30 17:08:19 2017
@@ -40,41 +40,40 @@
<body>
<links>
- <item name="WebServices" href="http://ws.apache.org/"/>
- <item name="Axis2/Java" href="http://ws.apache.org/axis2" />
+ <item name="Apache Axis2/Java" href="http://axis.apache.org/axis2/java/core/" />
</links>
<menu name="Apache Rampart">
- <item name="Home" href="index.html" />
- <item name="Downloads">
- <item name="Releases" href="download.html"/>
- <item name="Source Code" href="source-repository.html"/>
- </item>
- <item name="Documentation">
- <item name="Getting Started" href="quick-start.html"/>
- <item name="Samples" href="samples.html"/>
- <item name="FAQ" href="http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/>
- <item name="Rampart Configuration" href="rampartconfig-guide.html"/>
- <item name="STS Configuration" href="setting-up-sts.html"/>
- <item name="Developer Guide" href="developer-guide.html"/>
- <item name="Build the Site" href="siteHowTo.html" />
- </item>
- <item name="Resources">
- <item name="Articles" href="articles.html" />
- <item name="Specifications" href="specifications.html"/>
- <item name="Online Javadocs" href="apidocs/index.html"/>
+ <item name="Home" href="index.html" />
+ <item name="Downloads">
+ <item name="Releases" href="download.html"/>
+ <item name="Source Code" href="svn.html"/>
</item>
- <item name="Project Information">
- <item name="Project Team" href="team-list.html" />
- <item name="Issue Tracking" href="http://issues.apache.org/jira/browse/Rampart" />
- <item name="Mailing Lists" href="mail-lists.html"/>
- <item name="Source Code"
- href="http://svn.apache.org/viewcvs.cgi/webservices/rampart/trunk/?root=Apache-SVN" />
- <item name="Dependencies" href="dependencies.html"/>
- <item name="License"
- href="http://www.apache.org/licenses/LICENSE-2.0.html" />
- </item>
- </menu>
+ </menu>
+ <menu name="Documentation">
+ <item name="Getting Started" href="quick-start.html"/>
+ <item name="Samples" href="samples.html"/>
+ <item name="FAQ" href="http://wiki.apache.org/ws/FrontPage/Rampart/FAQ"/>
+ <item name="Rampart Configuration" href="rampartconfig-guide.html"/>
+ <item name="STS Configuration" href="setting-up-sts.html"/>
+ <item name="Developer Guide" href="developer-guide.html"/>
+ <item name="Build the Site" href="siteHowTo.html" />
+ </menu>
+ <menu name="Resources">
+ <item name="Articles" href="articles.html" />
+ <item name="Specifications" href="specifications.html"/>
+ <item name="Online Javadocs" href="apidocs/index.html"/>
+ </menu>
+ <menu name="Project Information">
+ <item name="Project Team" href="team-list.html" />
+ <item name="Issue Tracking" href="http://issues.apache.org/jira/browse/Rampart" />
+ <item name="Mailing Lists" href="mail-lists.html"/>
+ <item name="Source Code"
+ href="http://svn.apache.org/viewvc/axis/axis2/java/rampart/" />
+ <item name="Dependencies" href="dependencies.html"/>
+ <item name="License"
+ href="http://www.apache.org/licenses/LICENSE-2.0.html" />
+ </menu>
</body>
</project>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download.xml Mon Jan 30 17:08:19 2017
@@ -19,63 +19,81 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
- <body>
- <h1>Download Apache Rampart module</h1>
- <h2>Apache Rampart Releases</h2>
- <p>This page provides links to the release versions of Apache Rampart Java.</p>
- <table border="1" style="border-collapse: collapse" width="93%" id="table1">
- <tbody>
- <tr>
- <th>Version</th>
- <th>Date</th>
- <th>Description</th>
- </tr>
- <tr>
+ <body>
+ <h1>Download Apache Rampart Module</h1>
+ <h2>Apache Rampart Releases</h2>
+ <p>This page provides links to the release versions of Apache Rampart Java.</p>
+ <table border="1" style="border-collapse: collapse" width="93%" id="table1">
+ <tbody>
+ <tr>
+ <th>Version</th>
+ <th>Date</th>
+ <th>Description</th>
+ </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>
+ </tr>
+ <tr>
+ <td>
+ <a href="download/1.5/download.cgi">
+ <strong>1.5</strong>
+ </a>
+ </td>
+ <td>01 Feb 2010</td>
+ <td>1.5 Release (Archived)</td>
+ </tr>
+ <tr>
<td>
<a href="download/1.4/download.cgi">
<strong>1.4</strong>
</a>
</td>
- <td></td>
- <td>1.4 Release (Mirrored)</td>
+ <td>12 Jun 2008</td>
+ <td>1.4 Release (Archived)</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="download/1.3/download.cgi">
+ <strong>1.3</strong>
+ </a>
+ </td>
+ <td>06 Sep 2007</td>
+ <td>1.3 Release (Archived)</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="download/1.2/download.cgi">
+ <strong>1.2</strong>
+ </a>
+ </td>
+ <td>02 Jun 2007</td>
+ <td>1.2 Release (Archived)</td>
+ </tr>
+ <tr>
+ <td>
+ <a href="download/1.1/download.cgi">
+ <strong>1.1</strong>
+ </a>
+ </td>
+ <td>11 Dec 2006</td>
+ <td>1.1 Release (Archived)</td>
</tr>
- <tr>
- <td>
- <a href="download/1.3/download.cgi">
- <strong>1.3</strong>
- </a>
- </td>
- <td></td>
- <td>1.3 Release (Mirrored)</td>
- </tr>
- <tr>
- <td>
- <a href="download/1.2/download.cgi">
- <strong>1.2</strong>
- </a>
- </td>
- <td></td>
- <td>1.2 Release (Mirrored)</td>
- </tr>
- <tr>
- <td>
- <a href="download/1.1/download.cgi">
- <strong>1.1</strong>
- </a>
- </td>
- <td></td>
- <td>1.1 Release (Mirrored)</td>
- </tr>
- </tbody>
- </table>
- <p>
- <strong>Apache Rampart Distributions : <a href="http://people.apache.org/~ruchithf/rampart/SNAPSHOT">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>
- <a href=""></a>
- </strong>
- </p>
- </body>
+ </tbody>
+ </table>
+ <p>
+ <strong>Apache Rampart Distributions : <a href="http://people.apache.org/~ruchithf/rampart/SNAPSHOT">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>
+ <a href=""></a>
+ </strong>
+ </p>
+ </body>
</html>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.1/download.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.1/download.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.1/download.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.1/download.xml Mon Jan 30 17:08:19 2017
@@ -51,75 +51,47 @@ urchinTracker();
Distribution</strong></td>
<td>This is the complete version of Apache Rampart and will contain samples
as well.</td>
-<td><a href="[preferred]/ws/rampart/1_1/rampart-1.1.zip" title=
-"[preferred]/ws/rampart/1_1/rampart-1.1.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.1.zip');">zip</a>
-<a href="http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip.md5"
-title="http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip.md5">MD5</a>
-<a href="http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip.asc"
-title="http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip.asc">PGP</a></td>
+<a href="http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip.md5"
+title="http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip.md5">MD5</a>
+<a href="http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1.zip.asc"
+title="http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1.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]/ws/rampart/1_1/rampart-1.1-src.zip" title=
-"[preferred]/ws/rampart/1_1/rampart-1.1-src.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.1-src.zip');">zip</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.md5"
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.md5"
title=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.md5">MD5</a>
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.md5">MD5</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.asc"
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.asc"
title=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.asc">PGP</a></td>
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-src.zip.asc">PGP</a></td>
</tr>
<tr>
<td><strong>Documents Distribution</strong></td>
<td>This will contain all the documentation in one package.</td>
-<td><a href="[preferred]/ws/rampart/1_1/rampart-1.1-docs.zip" title=
-"[preferred]/ws/rampart/1_1/rampart-1.1-docs.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.1-docs.zip');">zip</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.md5"
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.md5"
title=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.md5">MD5</a>
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.md5">MD5</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.asc"
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.asc"
title=
-"http://www.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.asc">PGP</a></td>
+"http://archive.apache.org/dist/ws/rampart/1_1/rampart-1.1-docs.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
</div>
-<div align="left"><br />
-<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]"
-border="0" /></a>[end] The currently selected mirror is
-<b>[preferred]</b>. If you encounter a problem with this mirror,
-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>
-<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
-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
-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
-trust</a> is used to confirm the identity of these keys.</p>
-</div>
</body>
</html>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.2/download.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.2/download.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.2/download.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.2/download.xml Mon Jan 30 17:08:19 2017
@@ -51,75 +51,47 @@ urchinTracker();
Distribution</strong></td>
<td>This is the complete version of Apache Rampart and will contain samples
as well.</td>
-<td><a href="[preferred]/ws/rampart/1_2/rampart-1.2.zip" title=
-"[preferred]/ws/rampart/1_2/rampart-1.2.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.2.zip');">zip</a>
-<a href="http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip.md5"
-title="http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip.md5">MD5</a>
-<a href="http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip.asc"
-title="http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip.asc">PGP</a></td>
+<a href="http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip.md5"
+title="http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip.md5">MD5</a>
+<a href="http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2.zip.asc"
+title="http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2.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]/ws/rampart/1_2/rampart-1.2-src.zip" title=
-"[preferred]/ws/rampart/1_2/rampart-1.2-src.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.2-src.zip');">zip</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.md5"
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.md5"
title=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.md5">MD5</a>
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.md5">MD5</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.asc"
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.asc"
title=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.asc">PGP</a></td>
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-src.zip.asc">PGP</a></td>
</tr>
<tr>
<td><strong>Documents Distribution</strong></td>
<td>This will contain all the documentation in one package.</td>
-<td><a href="[preferred]/ws/rampart/1_2/rampart-1.2-docs.zip" title=
-"[preferred]/ws/rampart/1_2/rampart-1.2-docs.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.2-docs.zip');">zip</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.md5"
+"hhttp://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.md5"
title=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.md5">MD5</a>
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.md5">MD5</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.asc"
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.asc"
title=
-"http://www.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.asc">PGP</a></td>
+"http://archive.apache.org/dist/ws/rampart/1_2/rampart-1.2-docs.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
</div>
-<div align="left"><br />
-<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]"
-border="0" /></a>[end] The currently selected mirror is
-<b>[preferred]</b>. If you encounter a problem with this mirror,
-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>
-<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
-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
-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
-trust</a> is used to confirm the identity of these keys.</p>
-</div>
</body>
</html>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.3/download.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.3/download.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.3/download.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/download/1.3/download.xml Mon Jan 30 17:08:19 2017
@@ -51,75 +51,47 @@ urchinTracker();
Distribution</strong></td>
<td>This is the complete version of Apache Rampart and will contain samples
as well.</td>
-<td><a href="[preferred]/ws/rampart/1_3/rampart-1.3.zip" title=
-"[preferred]/ws/rampart/1_3/rampart-1.3.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.3.zip');">zip</a>
-<a href="http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip.md5"
-title="http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip.md5">MD5</a>
-<a href="http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip.asc"
-title="http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip.asc">PGP</a></td>
+<a href="http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip.md5"
+title="http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip.md5">MD5</a>
+<a href="http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3.zip.asc"
+title="http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3.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]/ws/rampart/1_3/rampart-1.3-src.zip" title=
-"[preferred]/ws/rampart/1_3/rampart-1.3-src.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.3-src.zip');">zip</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.md5"
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.md5"
title=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.md5">MD5</a>
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.md5">MD5</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.asc"
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.asc"
title=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.asc">PGP</a></td>
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-src.zip.asc">PGP</a></td>
</tr>
<tr>
<td><strong>Documents Distribution</strong></td>
<td>This will contain all the documentation in one package.</td>
-<td><a href="[preferred]/ws/rampart/1_3/rampart-1.3-docs.zip" title=
-"[preferred]/ws/rampart/1_3/rampart-1.3-docs.zip" onClick=
+<td><a href="http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip" title=
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip" onClick=
"javascript:urchinTracker ('/downloads/rampart-1.3-docs.zip');">zip</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.md5"
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.md5"
title=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.md5">MD5</a>
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.md5">MD5</a>
<a href=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.asc"
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.asc"
title=
-"http://www.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.asc">PGP</a></td>
+"http://archive.apache.org/dist/ws/rampart/1_3/rampart-1.3-docs.zip.asc">PGP</a></td>
</tr>
</tbody>
</table>
</div>
-<div align="left"><br />
-<p>[if-any logo] <a href="[link]"><img align="right" src="[logo]"
-border="0" /></a>[end] The currently selected mirror is
-<b>[preferred]</b>. If you encounter a problem with this mirror,
-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>
-<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
-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
-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
-trust</a> is used to confirm the identity of these keys.</p>
-</div>
</body>
</html>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/rampartconfig-guide.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/rampartconfig-guide.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/rampartconfig-guide.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/rampartconfig-guide.xml Mon Jan 30 17:08:19 2017
@@ -43,14 +43,14 @@
</td></tr>
<tr class="b"><td>encryptionCypto</td><td>properties to needed perform signature, such as crypto
provider, keystore and its password</td><td>
-<pre>
+<pre>
<encryptionCypto>
....crypto element ......
</encryptionCypto>
</pre></td></tr>
<tr class="a"><td>decryptionCrypto</td><td>properties to needed perform signature, such as crypto
provider, keystore and its password</td><td>
-<pre>
+<pre>
<decryptionCrypto>
....crypto element ......
</decryptionCrypto></pre></td></tr>
@@ -67,10 +67,66 @@
the org.apache.ws.security.components.crypto.Crypto interface to provide the
crypto information required by WSS4J. The other properties defined are the
configuration properties used by the implementation class
-(org.apache.ws.security.components.crypto.Merlin).
+(org.apache.ws.security.components.crypto.Merlin).
<br></br>
-<a name="ref"></a><a name="references"></a></p>
-<a name="References"></a>
-<h3>References</h3>1. <a href="http://ws.apache.org/wss4j">Apache WSS4J -Home</a>
+ <a name="ref"></a>
+ <a name="references"></a>
+ </p>
+ <a name="References"></a>
+ <h3>Crypto Caching</h3>
+ <p>Enabling caching of crypto objects will improve the performance of security processing.
+ After
+ enabling crypto caching, the crypto objects will be read from a cache instead of
+ constructing them by reading the keystore files.
+ </p>
+ <p>To enable caching of Crypto objects, two attributes should be added to the crypto elements
+ of signatureCrypto/encryptionCrypto of RampartConfig.
+ </p>
+ <ol>
+ <li xmlns="http://www.w3.org/1999/xhtml" xml:space="preserve">
+ <b>cryptoKey</b> - <p>As the value of this attribute, specify the property of a Crypto
+ implementation which points to the location of the keystore. For example in
+ Merlin, the
+ property "org.apache.ws.security.crypto.merlin.file" is unique and its pointing to
+ the
+ location of the keystore. Absence of this attribute will not enable caching.</p>
+ </li>
+ <li xmlns="http://www.w3.org/1999/xhtml" xml:space="preserve">
+ <b>cacheRefreshInterval</b> - <p>This is the cache refresh interval specified in
+ milliseconds. Any
+ object that resides in the cache longer than this period will be considered as
+ expired.
+ Cache will not be refreshed if this attribute is not present in the configuration.
+ If you
+ do not want to refresh the cache, provide only the "cryptoKey" attribute.</p>
+ </li>
+ </ol>
+ <p>
+ A sample configuration is provided below. It uses the Merlin crypto implementation for
+ signing and encryption. Here, the value of the cryptoKey attribute is eqaul to
+ "org.apache.ws.security.crypto.merlin.file" and the cache refresh interval is 300000
+ milliseconds.
+ </p>
+ <pre xmlns="http://www.w3.org/1999/xhtml" xml:space="preserve">
+ <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy";>
+ <ramp:signatureCrypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin" cryptoKey="org.apache.ws.security.crypto.merlin.file" cacheRefreshInterval="300000">
+ <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>
+ <ramp:encryptionCypto>
+ <ramp:crypto provider="org.apache.ws.security.components.crypto.Merlin" cryptoKey="org.apache.ws.security.crypto.merlin.file" cacheRefreshInterval="300000>
+ <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">apache</ramp:property>
+ </ramp:crypto>
+ </ramp:encryptionCypto>
+ </ramp:RampartConfig>
+ </pre>
+ <br></br>
+ <h3>References</h3>1.
+ <a href="http://ws.apache.org/wss4j">Apache WSS4J -Home</a>
</body>
</html>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/svn.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/svn.xml?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/svn.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/documentation/src/site/xdoc/svn.xml Mon Jan 30 17:08:19 2017
@@ -55,13 +55,13 @@ Subversion repository, you must use one
depending on your level of access to the Rampart source code:</p>
<ul>
<li><b>If you are not a committer:</b> <a href=
-"http://svn.apache.org/repos/asf/webservices/rampart/trunk/java"
+"http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk"
target=
-"_blank">http://svn.apache.org/repos/asf/webservices/rampart/trunk/java</a></li>
+"_blank">http://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk</a></li>
<li><b>If you are a committer:</b> <a href=
-"https://svn.apache.org/repos/asf/webservices/rampart/trunk/java"
+"https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk"
target=
-"_blank">https://svn.apache.org/repos/asf/webservices/rampart/trunk/java</a></li>
+"_blank">https://svn.apache.org/repos/asf/axis/axis2/java/rampart/trunk</a></li>
</ul>
If you are a committer, make sure that you have selected an
svnpasswd. To do this, you must log into svn.apache.org. For more
Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:08:19 2017
@@ -0,0 +1,4 @@
+.settings
+target
+.classpath
+.project
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java Mon Jan 30 17:08:19 2017
@@ -495,7 +495,7 @@ public class PolicyBasedResultsValidator
.get(WSSecurityEngineResult.TAG_ACTION);
int action = actInt.intValue();
if(WSConstants.SIGN == action || WSConstants.ENCR == action) {
- sigEncrActions.add(new Integer(action));
+ sigEncrActions.add(Integer.valueOf(action));
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java?rev=1780946&r1=1780945&r2=1780946&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-core/src/main/java/org/apache/rampart/Rampart.java Mon Jan 30 17:08:19 2017
@@ -23,6 +23,9 @@ import org.apache.axis2.description.Axis
import org.apache.axis2.modules.Module;
import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
+import org.apache.rampart.policy.model.RampartConfig;
+import org.apache.ws.secpolicy.SP11Constants;
+import org.apache.ws.secpolicy.SP12Constants;
public class Rampart implements Module /* , ModulePolicyExtension */ {
@@ -48,8 +51,18 @@ public class Rampart implements Module /
}
public boolean canSupportAssertion(Assertion assertion) {
- //TODO doesn't we need to check whether policy is security policy or
- // RampartConfig assertion
- return true;
+ if(assertion == null) {
+ return false;
+ }
+
+ String ns = assertion.getName().getNamespaceURI();
+
+ // Rampart module can handle WS-SecurityPolicy 1.1 & 1.2 and RampartConfig assertions
+ if (SP11Constants.SP_NS.equals(ns) || SP12Constants.SP_NS.equals(ns) || RampartConfig.NS.equals(ns)) {
+ return true;
+ } else {
+ return false;
+ }
+
}
}