This is an automated email from the ASF dual-hosted git repository. billblough pushed a commit to branch RAMPART-289 in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 64584cc76509a8183bc7cc7c1ed5d870286ed2b8 Merge: 5f0e39d 4b544ad Author: Andreas Veithen <veit...@apache.org> AuthorDate: Sun Jan 29 20:58:27 2017 +0000 Create development branch for RAMPART-289. NOTICE | 9 - apidocs/pom.xml | 117 -- apidocs/src/main/assembly/apidocs.xml | 32 - build.xml | 160 +++ code-coverage/pom.xml | 188 --- etc/dist.py | 45 - legal/bcprov-LICENSE.txt | 19 - legal/commons-lang-LICENSE.txt | 202 ---- legal/esapi-LICENSE.txt | 12 - ...f4j-jcl-LICENSE.txt => slf4j-jdk14-LICENSE.txt} | 0 modules/distribution/bin.xml | 76 +- modules/distribution/pom.xml | 124 +- modules/distribution/src.xml | 69 +- modules/documentation/pom.xml | 33 + .../src/site/resources/css/maven-base.css | 143 +++ .../src/site/resources/css/maven-theme.css | 129 ++ .../documentation/src/site/resources/css/print.css | 7 + .../documentation/src/site/resources/css/site.css | 297 +++++ .../documentation/src/site/resources/css/style.css | 184 +++ .../images/apache-rampart-banner-background.jpg | Bin 0 -> 373 bytes .../resources/images/apache-rampart-banner.jpg | Bin 0 -> 14840 bytes .../images/apache-rampart-content-back.jpg | Bin 0 -> 309 bytes .../site/resources/images/apache-rampart-logo.jpg | Bin 0 -> 4906 bytes .../images/apache-rampart-menu-bottom.jpg | Bin 0 -> 381 bytes .../images/apache-rampart-menu-button.gif | Bin 0 -> 192 bytes .../resources/images/apache-rampart-menu-top.jpg | Bin 0 -> 633 bytes .../site/resources/images/apache-rampart-menu.jpg | Bin 0 -> 1221 bytes .../resources/images/apache-rampart-spliter.jpg | Bin 0 -> 650 bytes .../src/site/resources/images/external.png | Bin 0 -> 230 bytes .../site/resources/images/logos/asf_logo_wide.png | Bin .../images/logos/build-by-maven-black.png | Bin 0 -> 2294 bytes .../images/logos/build-by-maven-white.png | Bin 0 -> 2260 bytes .../site/resources/images/logos/maven-feather.png | Bin 0 -> 3330 bytes .../src}/site/resources/images/message-builder.jpg | Bin .../src}/site/resources/images/rampart-engine.jpg | Bin .../site/resources/images/rampart-handlers.jpg | Bin .../src}/site/resources/images/rampart-trust.jpg | Bin .../src}/site/resources/images/security-stack.jpg | Bin .../src}/site/resources/rampart-config.xsd | 27 +- .../src}/site/resources/samples/msgs/creq04.xml | 0 .../src}/site/resources/samples/msgs/cres04.xml | 0 .../src}/site/resources/samples/msgs/req01.xml | 0 .../src}/site/resources/samples/msgs/req02.xml | 0 .../src}/site/resources/samples/msgs/req03.xml | 0 .../src}/site/resources/samples/msgs/req04.xml | 0 .../src}/site/resources/samples/msgs/res01.xml | 0 .../src}/site/resources/samples/msgs/res02.xml | 0 .../src}/site/resources/samples/msgs/res03.xml | 0 .../src}/site/resources/samples/msgs/res04.xml | 0 .../src}/site/resources/samples/msgs/rst04.xml | 0 .../src}/site/resources/samples/msgs/rstr04.xml | 0 .../site/resources/samples/policy/sample01.xml | 2 +- .../site/resources/samples/policy/sample02.xml | 0 .../site/resources/samples/policy/sample03.xml | 0 .../site/resources/samples/policy/sample04.xml | 0 .../site/resources/samples/policy/sample05.xml | 2 +- .../site/resources/samples/policy/sample06.xml | 2 +- modules/documentation/src/site/site.xml | 80 ++ .../documentation/src}/site/xdoc/articles.xml | 0 .../src}/site/xdoc/developer-guide.xml | 4 +- modules/documentation/src/site/xdoc/download.xml | 81 ++ .../src/site/xdoc/download/1.1/download.cgi | 6 + .../src/site/xdoc/download/1.1/download.xml | 125 ++ .../src/site/xdoc/download/1.2/download.cgi | 6 + .../src/site/xdoc/download/1.2/download.xml | 125 ++ .../src/site/xdoc/download/1.3/download.cgi | 6 + .../src/site/xdoc/download/1.3/download.xml | 125 ++ modules/documentation/src/site/xdoc/index.xml | 73 ++ .../documentation/src}/site/xdoc/quick-start.xml | 2 +- .../src/site/xdoc/rampartconfig-guide.xml | 76 ++ .../documentation/src}/site/xdoc/samples.xml | 1 - .../src}/site/xdoc/setting-up-sts.xml | 2 +- .../documentation/src}/site/xdoc/siteHowTo.xml | 0 .../src}/site/xdoc/specifications.xml | 0 .../documentation/src}/site/xdoc/svn.xml | 10 +- modules/rampart-core/pom.xml | 112 +- .../org.apache.neethi.builders.AssertionBuilder | 3 +- .../AbstractUniqueMessageAttributeCache.java | 61 - .../ExtendedPolicyValidatorCallbackHandler.java | 23 - .../java/org/apache/rampart/MessageBuilder.java | 14 +- .../main/java/org/apache/rampart/NonceCache.java | 160 --- .../rampart/PolicyBasedResultsValidator.java | 777 ++++++------ .../src/main/java/org/apache/rampart/Rampart.java | 19 +- .../java/org/apache/rampart/RampartConstants.java | 4 - .../java/org/apache/rampart/RampartEngine.java | 352 ++---- .../java/org/apache/rampart/RampartException.java | 2 +- .../org/apache/rampart/RampartMessageData.java | 326 ++--- .../java/org/apache/rampart/ServiceNonceCache.java | 69 -- .../org/apache/rampart/TokenCallbackHandler.java | 26 +- .../rampart/UniqueMessageAttributeCache.java | 65 - .../rampart/builder/AsymmetricBindingBuilder.java | 289 ++--- .../org/apache/rampart/builder/BindingBuilder.java | 514 +++----- .../rampart/builder/SymmetricBindingBuilder.java | 234 ++-- .../rampart/builder/TransportBindingBuilder.java | 312 ++--- .../org/apache/rampart/errors.properties | 19 +- .../rampart/handler/CertificateValidator.java | 45 - .../handler/PostDispatchVerificationHandler.java | 14 +- .../apache/rampart/handler/RampartReceiver.java | 30 +- .../org/apache/rampart/handler/RampartSender.java | 17 +- .../handler/RampartUsernameTokenValidator.java | 71 -- .../org/apache/rampart/handler/WSDoAllHandler.java | 210 ++++ .../apache/rampart/handler/WSDoAllReceiver.java | 383 ++++++ .../org/apache/rampart/handler/WSDoAllSender.java | 270 +++++ .../rampart/handler/WSSHandlerConstants.java | 2 - .../handler/config/InflowConfiguration.java | 181 +++ .../handler/config/OutflowConfiguration.java | 600 ++++++++++ .../rampart/policy/RampartPolicyBuilder.java | 70 +- .../apache/rampart/policy/RampartPolicyData.java | 95 +- .../rampart/policy/SupportingPolicyData.java | 99 +- .../policy/builders/CryptoConfigBuilder.java | 8 +- .../policy/builders/KerberosConfigBuilder.java | 100 -- .../policy/builders/OptimizePartsBuilder.java | 2 +- .../policy/builders/RampartConfigBuilder.java | 38 +- .../rampart/policy/builders/SSLConfigBuilder.java | 2 +- .../apache/rampart/policy/model/CryptoConfig.java | 27 +- .../rampart/policy/model/KerberosConfig.java | 361 ------ .../rampart/policy/model/OptimizePartsConfig.java | 16 +- .../apache/rampart/policy/model/RampartConfig.java | 95 +- .../org/apache/rampart/policy/model/SSLConfig.java | 3 - .../apache/rampart/saml/SAML1AssertionHandler.java | 92 -- .../apache/rampart/saml/SAML2AssertionHandler.java | 111 -- .../apache/rampart/saml/SAMLAssertionHandler.java | 92 -- .../rampart/saml/SAMLAssertionHandlerFactory.java | 37 - .../java/org/apache/rampart/util/Axis2Util.java | 99 +- .../rampart/util/HandlerParameterDecoder.java | 292 +++++ .../org/apache/rampart/util/MessageOptimizer.java | 25 +- .../java/org/apache/rampart/util/RampartUtil.java | 1245 ++++++++------------ .../policy/builders/KerberosConfigBuilderTest.java | 121 -- .../org/apache/rampart/util/RampartUtilTest.java | 44 - .../rampart/policy/builders/kerberosConfig.policy | 22 - .../apache/rampart/util/soap11-invalid-fault.xml | 9 - .../apache/rampart/util/soap11-security-fault.xml | 10 - .../apache/rampart/util/soap12-security-fault.xml | 17 - modules/rampart-integration/pom.xml | 1038 +++++++++------- .../apache/axis2/integration/TestConstants.java | 25 - .../org/apache/axis2/integration/UtilServer.java | 244 ++++ .../axis2/integration/UtilServerBasedTestCase.java | 68 ++ .../apache/axis2/integration/UtilsTCPServer.java | 99 ++ .../src/main/java/org/apache/rahas/PWCallback.java | 47 +- .../src/main/java/org/apache/rahas/TestClient.java | 136 ++- .../main/java/org/apache/rampart/PWCallback.java | 18 +- .../src/main/resources/ping/ping.wsdl | 68 ++ .../apache/axis2/oasis/ping/PingPortSkeleton.java | 74 ++ .../axis2/security/InteropScenarioClient.java | 180 +++ .../src/org/apache/axis2/security}/PWCallback.java | 8 +- .../commons-logging.properties} | 61 +- .../axis2/security/AddressingMTOMSecurityTest.java | 125 ++ .../org/apache/axis2/security/InteropTestBase.java | 239 ++++ .../axis2/security/MTOMOptimizedSecurityTest.java | 119 ++ .../org/apache/axis2/security/Scenario1Test.java | 68 ++ .../org/apache/axis2/security/Scenario2Test.java | 105 ++ .../org/apache/axis2/security/Scenario2aTest.java | 99 ++ .../org/apache/axis2/security/Scenario3Test.java | 119 ++ .../org/apache/axis2/security/Scenario4Test.java | 119 ++ .../org/apache/axis2/security/Scenario5Test.java | 113 ++ .../org/apache/axis2/security/Scenario6Test.java | 114 ++ .../org/apache/axis2/security/Scenario7Test.java | 141 +++ .../rahas/RahasSAML2TokenCertForHoKTest.java | 49 +- .../java/org/apache/rahas/RahasSAML2TokenTest.java | 40 +- .../rahas/RahasSAML2TokenUTForBearerTest.java | 159 --- .../apache/rahas/RahasSAMLTokenAttributeTest.java | 35 +- .../apache/rahas/RahasSAMLTokenCertForHoKTest.java | 40 +- .../rahas/RahasSAMLTokenCertForHoKV1205Test.java | 56 +- .../java/org/apache/rahas/RahasSAMLTokenTest.java | 45 +- .../rahas/RahasSAMLTokenUTForBearerTest.java | 92 +- .../rahas/RahasSAMLTokenUTForBearerV1205Test.java | 38 +- .../apache/rahas/RahasSAMLTokenUTForHoKTest.java | 35 +- .../rahas/RahasSAMLTokenUTForHoKV1205Test.java | 43 +- .../org/apache/rahas/RahasSAMLTokenV1205Test.java | 41 +- .../java/org/apache/rahas/SAMLDataProvider.java | 36 +- .../apache/rampart/KerberosDelegationService.java | 78 -- .../KerberosDelegationServiceValidator.java | 46 - .../org/apache/rampart/RampartKerberosTest.java | 296 ----- .../test/java/org/apache/rampart/RampartTest.java | 174 ++- .../org/apache/rampart/util/KerberosServer.java | 207 ---- .../rampart/util/KerberosTokenDecoderImpl.java | 156 --- .../src/test/resources/commons-logging.properties} | 55 +- .../src/test/resources/conf/axis2.xml | 63 +- .../src/test/resources/kerberos/alice.keytab | Bin 666 -> 0 bytes .../src/test/resources/kerberos/bob.keytab | Bin 328 -> 0 bytes .../src/test/resources/kerberos/jaas.conf | 49 - .../src/test/resources/kerberos/krb5.conf.template | 8 - .../src/test/resources/kerberos/readme | 9 - .../src/test/resources/kerberos/users.ldif | 60 - .../src/test/resources/rahas/1.xml | 74 -- .../src/test/resources/rahas/3.xml | 37 - .../src/test/resources/rahas/issuer.properties} | 3 +- ...service-policy-symm-binding-saml2-publicKey.xml | 2 +- .../policy/service-policy-symm-binding-saml2.xml | 2 +- .../rahas/policy/service-policy-symm-binding.xml | 2 +- .../policy/service-policy-transport-binding.xml | 2 +- .../rahas/policy/sts-policy-asymm-binding.xml | 2 +- .../rahas/policy/sts-policy-symm-binding.xml | 2 +- .../rahas/policy/sts-policy-transport-binding.xml | 2 +- .../src/test/resources/rahas/rahas-sec.properties} | 4 +- .../src/test/resources/rahas/s1-services.xml | 92 +- .../src/test/resources/rahas/s3-services.xml | 50 +- .../src/test/resources/rahas/s5-services.xml | 52 +- .../src/test/resources/rahas/saml.s1.properties | 9 + .../test/resources/rahas/samlIssuer.properties} | 3 +- .../rampart/kerberos/KerberosDelegation.xml | 86 -- .../kerberos/KerberosOverTransportKeytab.xml | 85 -- .../rampart/kerberos/KerberosOverTransportPWCB.xml | 88 -- .../src/test/resources/rampart/policy/1.xml | 2 +- .../src/test/resources/rampart/policy/10.xml | 4 +- .../src/test/resources/rampart/policy/13.xml | 2 +- .../src/test/resources/rampart/policy/14.xml | 2 +- .../src/test/resources/rampart/policy/15.xml | 2 +- .../src/test/resources/rampart/policy/16.xml | 4 +- .../src/test/resources/rampart/policy/17.xml | 2 +- .../src/test/resources/rampart/policy/18.xml | 2 +- .../src/test/resources/rampart/policy/19.xml | 2 +- .../src/test/resources/rampart/policy/2.xml | 2 +- .../src/test/resources/rampart/policy/20.xml | 2 +- .../src/test/resources/rampart/policy/21.xml | 4 +- .../src/test/resources/rampart/policy/22.xml | 2 +- .../src/test/resources/rampart/policy/23.xml | 2 +- .../src/test/resources/rampart/policy/24.xml | 2 +- .../src/test/resources/rampart/policy/25.xml | 2 +- .../src/test/resources/rampart/policy/26.xml | 2 +- .../src/test/resources/rampart/policy/27.xml | 2 +- .../src/test/resources/rampart/policy/28.xml | 2 +- .../src/test/resources/rampart/policy/3.xml | 2 +- .../src/test/resources/rampart/policy/30.xml | 77 -- .../src/test/resources/rampart/policy/31.xml | 75 -- .../src/test/resources/rampart/policy/32.xml | 90 -- .../src/test/resources/rampart/policy/33.xml | 103 -- .../src/test/resources/rampart/policy/34.xml | 102 -- .../src/test/resources/rampart/policy/35.xml | 76 -- .../src/test/resources/rampart/policy/4.xml | 2 +- .../src/test/resources/rampart/policy/5.xml | 2 +- .../src/test/resources/rampart/policy/sc-1.xml | 2 +- .../src/test/resources/rampart/policy/sc-3.xml | 4 +- .../src/test/resources/rampart/policy/sc-4.xml | 123 -- .../src/test/resources/rampart/policy/sc-5.xml | 131 -- .../src/test/resources/rampart/policy/sc-6.xml | 98 -- .../src/test/resources/rampart/services-1.xml | 2 +- .../src/test/resources/rampart/services-10.xml | 2 +- .../src/test/resources/rampart/services-13.xml | 2 +- .../src/test/resources/rampart/services-14.xml | 2 +- .../src/test/resources/rampart/services-15.xml | 2 +- .../src/test/resources/rampart/services-16.xml | 4 +- .../src/test/resources/rampart/services-17.xml | 2 +- .../src/test/resources/rampart/services-18.xml | 2 +- .../src/test/resources/rampart/services-19.xml | 2 +- .../src/test/resources/rampart/services-2.xml | 2 +- .../src/test/resources/rampart/services-20.xml | 2 +- .../src/test/resources/rampart/services-21.xml | 2 +- .../src/test/resources/rampart/services-22.xml | 2 +- .../src/test/resources/rampart/services-23.xml | 2 +- .../src/test/resources/rampart/services-24.xml | 2 +- .../src/test/resources/rampart/services-25.xml | 2 +- .../src/test/resources/rampart/services-26.xml | 2 +- .../src/test/resources/rampart/services-27.xml | 2 +- .../src/test/resources/rampart/services-28.xml | 2 +- .../src/test/resources/rampart/services-3.xml | 2 +- .../src/test/resources/rampart/services-30.xml | 90 -- .../src/test/resources/rampart/services-31.xml | 111 -- .../src/test/resources/rampart/services-32.xml | 128 -- .../src/test/resources/rampart/services-33.xml | 140 --- .../src/test/resources/rampart/services-34.xml | 113 -- .../src/test/resources/rampart/services-35.xml | 94 -- .../src/test/resources/rampart/services-4.xml | 2 +- .../src/test/resources/rampart/services-5.xml | 2 +- .../src/test/resources/rampart/services-sc-1.xml | 2 +- .../src/test/resources/rampart/services-sc-3.xml | 2 +- .../src/test/resources/rampart/services-sc-4.xml | 177 --- .../src/test/resources/rampart/services-sc-5.xml | 186 --- .../src/test/resources/rampart/services-sc-6.xml | 154 --- .../resources/security/complete.client.axis2.xml | 133 +++ .../resources/security/complete.service.axis2.xml | 147 +++ .../test/resources/security/complete.service.xml | 31 + .../test/resources/security/s1.client.axis2.xml | 109 ++ .../test/resources/security/s1.service.axis2.xml | 139 +++ .../src/test/resources/security/s1.service.xml | 15 + .../test/resources/security/s2.client.axis2.xml | 118 ++ .../test/resources/security/s2.service.axis2.xml | 139 +++ .../src/test/resources/security/s2.service.xml | 16 + .../test/resources/security/s2a.client.axis2.xml | 116 ++ .../test/resources/security/s2a.service.axis2.xml | 138 +++ .../src/test/resources/security/s2a.service.xml | 16 + .../test/resources/security/s3.client.axis2.xml | 127 ++ .../test/resources/security/s3.service.axis2.xml | 138 +++ .../src/test/resources/security/s3.service.xml | 31 + .../test/resources/security/s4.client.axis2.xml | 124 ++ .../test/resources/security/s4.service.axis2.xml | 139 +++ .../src/test/resources/security/s4.service.xml | 30 + .../test/resources/security/s5.client.axis2.xml | 122 ++ .../test/resources/security/s5.service.axis2.xml | 140 +++ .../src/test/resources/security/s5.service.xml | 16 + .../test/resources/security/s6.client.axis2.xml | 125 ++ .../test/resources/security/s6.service.axis2.xml | 140 +++ .../src/test/resources/security/s6.service.xml | 29 + .../test/resources/security/s7.client.axis2.xml | 125 ++ .../test/resources/security/s7.service.axis2.xml | 141 +++ .../src/test/resources/security/s7.service.xml | 31 + .../test/resources/security/sST1.client.axis2.xml | 109 ++ .../test/resources/security/sST1.service.axis2.xml | 140 +++ .../src/test/resources/security/sST1.service.xml | 14 + .../src/test/resources/security/sc/s1-services.xml | 84 ++ .../src/test/resources/security/sc/s2-services.xml | 64 + .../src/test/resources/security/sc/s3-services.xml | 66 ++ .../src/test/resources/security/sc/s4-services.xml | 67 ++ .../resources/security/sc/sctIssuer.properties} | 3 +- .../src/test/resources/security/sc/sec.jks | Bin 0 -> 5467 bytes .../src/test/resources/security/sc/sec.properties} | 4 +- .../src/test/resources/security/sc/sts.jks | Bin 0 -> 4759 bytes .../resources/security/secMtom.client.axis2.xml | 126 ++ .../resources/security/secMtom.service.axis2.xml | 141 +++ .../test/resources/security/secMtom.service.xml | 31 + modules/rampart-mar/module.xml | 6 + modules/rampart-mar/pom.xml | 219 ++-- modules/rampart-policy/pom.xml | 83 +- .../org.apache.neethi.builders.AssertionBuilder | 9 +- .../java/org/apache/ws/secpolicy/Constants.java | 4 - .../org/apache/ws/secpolicy/SP11Constants.java | 9 - .../org/apache/ws/secpolicy/SP12Constants.java | 9 - .../java/org/apache/ws/secpolicy/SPConstants.java | 11 +- .../AbstractConfigurableSecurityAssertion.java | 6 +- .../secpolicy/model/AbstractSecurityAssertion.java | 57 +- .../apache/ws/secpolicy/model/AlgorithmSuite.java | 40 +- .../ws/secpolicy/model/AsymmetricBinding.java | 49 +- .../secpolicy/model/ContentEncryptedElements.java | 38 +- .../apache/ws/secpolicy/model/EncryptionToken.java | 42 +- .../org/apache/ws/secpolicy/model/HttpsToken.java | 20 +- .../apache/ws/secpolicy/model/InitiatorToken.java | 20 +- .../org/apache/ws/secpolicy/model/IssuedToken.java | 50 +- .../apache/ws/secpolicy/model/KerberosToken.java | 152 --- .../java/org/apache/ws/secpolicy/model/Layout.java | 23 +- .../apache/ws/secpolicy/model/ProtectionToken.java | 42 +- .../apache/ws/secpolicy/model/RecipientToken.java | 20 +- .../ws/secpolicy/model/RequiredElements.java | 35 +- .../apache/ws/secpolicy/model/RequiredParts.java | 24 +- .../secpolicy/model/SecureConversationToken.java | 52 +- .../apache/ws/secpolicy/model/SignatureToken.java | 44 +- .../secpolicy/model/SignedEncryptedElements.java | 35 +- .../ws/secpolicy/model/SignedEncryptedParts.java | 39 +- .../apache/ws/secpolicy/model/SupportingToken.java | 31 +- .../ws/secpolicy/model/SymmetricBinding.java | 119 +- .../ws/secpolicy/model/TransportBinding.java | 54 +- .../apache/ws/secpolicy/model/TransportToken.java | 22 +- .../org/apache/ws/secpolicy/model/Trust10.java | 35 +- .../org/apache/ws/secpolicy/model/Trust13.java | 42 +- .../apache/ws/secpolicy/model/UsernameToken.java | 87 +- .../java/org/apache/ws/secpolicy/model/Wss10.java | 33 +- .../java/org/apache/ws/secpolicy/model/Wss11.java | 40 +- .../org/apache/ws/secpolicy/model/X509Token.java | 39 +- .../builders/AlgorithmSuiteBuilder.java | 10 +- .../builders/AsymmetricBindingBuilder.java | 12 +- .../builders/EncryptedElementsBuilder.java | 8 +- .../builders/EncryptedPartsBuilder.java | 6 +- .../builders/EncryptionTokenBuilder.java | 65 - .../builders/InitiatorTokenBuilder.java | 10 +- .../secpolicy11/builders/IssuedTokenBuilder.java | 12 +- .../secpolicy11/builders/KerberosTokenBuilder.java | 84 -- .../ws/secpolicy11/builders/LayoutBuilder.java | 12 +- .../builders/ProtectionTokenBuilder.java | 8 +- .../builders/RecipientTokenBuilder.java | 12 +- .../builders/RequiredElementsBuilder.java | 4 +- .../builders/SecureConversationTokenBuilder.java | 2 +- .../builders/SecurityContextTokenBuilder.java | 2 +- .../builders/SignatureTokenBuilder.java | 65 - .../builders/SignedElementsBuilder.java | 8 +- .../secpolicy11/builders/SignedPartsBuilder.java | 14 +- .../builders/SupportingTokensBuilder.java | 16 +- .../builders/SymmetricBindingBuilder.java | 79 +- .../builders/TransportBindingBuilder.java | 12 +- .../builders/TransportTokenBuilder.java | 19 +- .../ws/secpolicy11/builders/Trust10Builder.java | 2 +- .../secpolicy11/builders/UsernameTokenBuilder.java | 18 +- .../ws/secpolicy11/builders/WSS10Builder.java | 12 +- .../ws/secpolicy11/builders/WSS11Builder.java | 12 +- .../ws/secpolicy11/builders/X509TokenBuilder.java | 16 +- .../builders/AlgorithmSuiteBuilder.java | 12 +- .../builders/AsymmetricBindingBuilder.java | 12 +- .../builders/ContentEncryptedElementsBuilder.java | 4 +- .../builders/EncryptedElementsBuilder.java | 8 +- .../builders/EncryptedPartsBuilder.java | 6 +- .../builders/EncryptionTokenBuilder.java | 65 - .../ws/secpolicy12/builders/HttpsTokenBuilder.java | 38 +- .../builders/InitiatorTokenBuilder.java | 10 +- .../secpolicy12/builders/IssuedTokenBuilder.java | 12 +- .../secpolicy12/builders/KerberosTokenBuilder.java | 84 -- .../ws/secpolicy12/builders/LayoutBuilder.java | 12 +- .../builders/ProtectionTokenBuilder.java | 8 +- .../builders/RecipientTokenBuilder.java | 10 +- .../builders/RequiredElementsBuilder.java | 4 +- .../secpolicy12/builders/RequiredPartsBuilder.java | 2 +- .../builders/SecureConversationTokenBuilder.java | 2 +- .../builders/SecurityContextTokenBuilder.java | 2 +- .../builders/SignatureTokenBuilder.java | 65 - .../builders/SignedElementsBuilder.java | 8 +- .../secpolicy12/builders/SignedPartsBuilder.java | 12 +- .../builders/SupportingTokensBuilder.java | 16 +- .../builders/SymmetricBindingBuilder.java | 79 +- .../builders/TransportBindingBuilder.java | 15 +- .../builders/TransportTokenBuilder.java | 60 +- .../ws/secpolicy12/builders/Trust13Builder.java | 2 +- .../secpolicy12/builders/UsernameTokenBuilder.java | 14 +- .../ws/secpolicy12/builders/WSS10Builder.java | 12 +- .../ws/secpolicy12/builders/WSS11Builder.java | 12 +- .../ws/secpolicy12/builders/X509TokenBuilder.java | 16 +- .../apache/ws/secpolicy/KerberosPolicyTest.java | 212 ---- .../src/test/resources/policy/kerberos-11.xml | 16 - .../src/test/resources/policy/kerberos-12.xml | 16 - .../src/test/resources/policy/kerberos-gss-11.xml | 16 - .../src/test/resources/policy/kerberos-gss-12.xml | 16 - .../resources/policy/kerberos-gss-keyref-11.xml | 18 - .../resources/policy/kerberos-gss-keyref-12.xml | 17 - .../test/resources/policy/kerberos-keyref-11.xml | 17 - .../test/resources/policy/kerberos-keyref-12.xml | 17 - modules/rampart-samples/README.txt | 8 +- modules/rampart-samples/basic/README.txt | 44 + modules/rampart-samples/basic/build.xml | 259 ++++ modules/rampart-samples/basic/sample01/README.txt | 6 + .../basic/sample01}/client.axis2.xml | 875 +++++++------- .../rampart-samples/basic/sample01/services.xml | 27 + .../apache/rampart/samples/sample01}/Client.java | 30 +- .../rampart/samples/sample01}/SimpleService.java | 2 +- modules/rampart-samples/basic/sample02/README.txt | 10 + .../basic/sample02}/client.axis2.xml | 884 +++++++------- .../rampart-samples/basic/sample02/services.xml | 33 + .../apache/rampart/samples/sample02}/Client.java | 30 +- .../rampart/samples/sample02}/PWCBHandler.java | 10 +- .../rampart/samples/sample02}/SimpleService.java | 3 +- modules/rampart-samples/basic/sample03/README.txt | 12 + .../basic/sample03}/client.axis2.xml | 885 +++++++------- .../rampart-samples/basic/sample03/services.xml | 33 + .../apache/rampart/samples/sample03}/Client.java | 30 +- .../rampart/samples/sample03}/PWCBHandler.java | 6 +- .../rampart/samples/sample03}/SimpleService.java | 18 +- modules/rampart-samples/basic/sample04/README.txt | 7 + .../basic/sample04}/client.axis2.xml | 893 +++++++------- .../rampart-samples/basic/sample04/services.xml | 44 + .../apache/rampart/samples/sample04}/Client.java | 30 +- .../rampart/samples}/sample04/PWCBHandler.java | 5 +- .../rampart/samples/sample04}/SimpleService.java | 3 +- modules/rampart-samples/basic/sample05/README.txt | 7 + .../basic/sample05}/client.axis2.xml | 892 +++++++------- .../rampart-samples/basic/sample05/services.xml | 45 + .../apache/rampart/samples/sample05}/Client.java | 30 +- .../rampart/samples/sample05}/PWCBHandler.java | 5 +- .../rampart/samples/sample05}/SimpleService.java | 3 +- modules/rampart-samples/basic/sample06/README.txt | 8 + .../basic/sample06}/client.axis2.xml | 898 +++++++------- .../rampart-samples/basic/sample06/services.xml | 47 + .../apache/rampart/samples/sample06}/Client.java | 30 +- .../rampart/samples/sample06}/PWCBHandler.java | 5 +- .../rampart/samples/sample06}/SimpleService.java | 3 +- modules/rampart-samples/basic/sample07/README.txt | 8 + .../basic/sample07}/client.axis2.xml | 897 +++++++------- .../rampart-samples/basic/sample07/services.xml | 46 + .../apache/rampart/samples}/sample07/Client.java | 30 +- .../rampart/samples/sample07}/PWCBHandler.java | 5 +- .../rampart/samples/sample07}/SimpleService.java | 3 +- modules/rampart-samples/basic/sample08/README.txt | 10 + .../basic/sample08}/client.axis2.xml | 898 +++++++------- .../rampart-samples/basic/sample08/services.xml | 35 + .../apache/rampart/samples/sample08}/Client.java | 30 +- .../rampart/samples/sample08}/PWCBHandler.java | 5 +- .../rampart/samples}/sample08/SimpleService.java | 3 +- modules/rampart-samples/basic/sample09/README.txt | 8 + .../basic/sample09}/client.axis2.xml | 896 +++++++------- .../rampart-samples/basic/sample09/services.xml | 46 + .../apache/rampart/samples/sample09}/Client.java | 30 +- .../rampart/samples/sample09}/PWCBHandler.java | 22 +- .../rampart/samples/sample09}/SimpleService.java | 3 +- modules/rampart-samples/basic/sample10/README.txt | 8 + .../basic/sample10}/client.axis2.xml | 901 +++++++------- .../rampart-samples/basic/sample10/services.xml | 47 + .../apache/rampart/samples/sample10}/Client.java | 30 +- .../rampart/samples/sample10}/PWCBHandler.java | 5 +- .../rampart/samples/sample10}/SimpleService.java | 3 +- modules/rampart-samples/basic/sample11/README.txt | 8 + .../basic/sample11}/client.axis2.xml | 874 +++++++------- .../rampart-samples/basic/sample11/services.xml | 46 + .../apache/rampart/samples/sample11}/Client.java | 56 +- .../rampart/samples/sample11}/PWCBHandler.java | 5 +- .../rampart/samples/sample11}/SimpleService.java | 3 +- .../src/main/files => rampart-samples}/build.xml | 5 +- modules/rampart-samples/keys/client.jks | Bin 4014 -> 4008 bytes modules/rampart-samples/keys/service.jks | Bin 3307 -> 2675 bytes modules/rampart-samples/keys/sts.jks | Bin 2683 -> 2677 bytes modules/rampart-samples/policy/build.xml | 123 +- .../policy/sample-tomcat/policy.xml | 2 +- .../policy/sample-tomcat/services.xml | 4 +- .../apache/rampart/tomcat/sample/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample01/README.txt | 14 +- modules/rampart-samples/policy/sample01/policy.xml | 2 +- .../rampart-samples/policy/sample01/services.xml | 5 +- .../rampart/samples/policy/sample01/Client.java | 7 +- .../samples/policy/sample01/PWCBHandler.java | 2 +- .../rampart/samples/policy/sample02/Client.java | 7 +- .../samples/policy/sample02/PWCBHandler.java | 2 +- .../rampart/samples/policy/sample03/Client.java | 7 +- .../samples/policy/sample03/PWCBHandler.java | 2 +- .../rampart/samples/policy/sample04/Client.java | 7 +- .../samples/policy/sample04/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample05/policy.xml | 4 +- .../rampart-samples/policy/sample05/services.xml | 216 ++-- .../rampart/samples/policy/sample05/Client.java | 18 +- .../samples/policy/sample05/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample06/policy.xml | 11 +- .../rampart-samples/policy/sample06/services.xml | 255 ++-- .../rampart/samples/policy/sample06/Client.java | 17 +- .../samples/policy/sample06/MexService.java | 25 +- .../samples/policy/sample06/PWCBHandler.java | 2 +- .../rampart/samples/policy/sample07/Client.java | 7 +- .../samples/policy/sample07/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample08/README.txt | 8 - modules/rampart-samples/policy/sample08/policy.xml | 73 -- .../rampart-samples/policy/sample08/services.xml | 127 -- .../rampart/samples/policy/sample08/Client.java | 88 -- .../samples/policy/sample08/PWCBHandler.java | 42 - .../rampart-samples/policy/sample08/sts_policy.xml | 83 -- modules/rampart-samples/pom.xml | 182 --- .../rampart-samples/src/test/conf/log4j.properties | 24 - .../apache/rampart/samples/runner/Controller.java | 82 -- .../org/apache/rampart/samples/runner/Logger.java | 38 - .../org/apache/rampart/samples/runner/Sample.java | 64 - .../apache/rampart/samples/runner/SampleTest.java | 49 - .../rampart/samples/runner/ServerRunner.java | 43 - .../rampart/samples/runner/ServerWatcher.java | 86 -- modules/rampart-tests/pom.xml | 67 +- .../org/apache/rahas/SimpleTokenStoreTest.java | 55 +- .../rahas/TokenRequestDispatcherConfigTest.java | 28 +- .../rampart/AsymmetricBindingBuilderTest.java | 357 +++--- .../org/apache/rampart/MessageBuilderTestBase.java | 42 +- .../java/org/apache/rampart/NonceCacheTest.java | 75 -- .../org/apache/rampart/PolicyAssertionsTest.java | 161 --- .../java/org/apache/rampart/RampartEngineTest.java | 82 +- .../rampart/SymmetricBindingBuilderTest.java | 234 ++-- .../java/org/apache/rampart/TestCBHandler.java | 44 +- .../rampart/TransportBindingBuilderTest.java | 132 ++- .../handler/config/InflowConfigurationTest.java | 73 ++ .../handler/config/OutflowConfigurationTest.java | 194 +++ .../rampart/policy/model/RampartPolicyTest.java | 89 +- .../ws/secpolicy/model/SecpolicyModelTest.java | 93 +- .../rampart-tests/test-resources/PWCallback.java | 8 +- modules/rampart-tests/test-resources/axis2.xml | 12 +- .../rampart-tests/test-resources/log4j.properties | 25 - .../test-resources/policy-asymm-binding.xml | 2 +- .../test-resources/policy-symm-binding-fault1.xml | 64 - .../test-resources/policy-symm-binding.xml | 2 +- .../test-resources/policy-transport-binding.xml | 2 +- .../policy/rampart-asymm-binding-1.xml | 2 +- .../policy/rampart-asymm-binding-2-sig-dk.xml | 2 +- .../policy/rampart-asymm-binding-3-dk.xml | 2 +- .../policy/rampart-asymm-binding-4-dk-ebs.xml | 2 +- .../policy/rampart-asymm-binding-5-ebs.xml | 2 +- .../policy/rampart-asymm-required-elements-2.xml | 84 -- .../policy/rampart-asymm-required-elements.xml | 84 -- .../policy/rampart-hashed-password.xml | 18 - .../policy/rampart-plaintext-password.xml | 14 - .../policy/rampart-symm-binding-1.xml | 2 +- .../policy/rampart-symm-binding-2-dk.xml | 2 +- .../policy/rampart-symm-binding-3-dk-es.xml | 2 +- .../policy/rampart-symm-binding-4-ebs.xml | 2 +- .../policy/rampart-symm-binding-5-dk-ebs.xml | 2 +- .../policy/rampart-transport-binding-dk.xml | 2 +- .../policy/rampart-transport-binding-no-bst.xml | 2 +- .../policy/rampart-transport-binding.xml | 2 +- .../test-resources/policy/soapmessage12.xml | 57 - modules/rampart-trust-mar/module.xml | 19 +- modules/rampart-trust-mar/pom.xml | 117 +- modules/rampart-trust/pom.xml | 102 +- .../java/org/apache/rahas/EncryptedKeyToken.java | 71 +- .../src/main/java/org/apache/rahas/Rahas.java | 61 - .../main/java/org/apache/rahas/RahasConstants.java | 17 +- .../src/main/java/org/apache/rahas/RahasData.java | 156 +-- .../org/apache/rahas/RampartSAMLBootstrap.java | 102 -- .../java/org/apache/rahas/STSMessageReceiver.java | 12 +- .../java/org/apache/rahas/SimpleTokenStore.java | 28 +- .../src/main/java/org/apache/rahas/Token.java | 335 ++---- .../main/java/org/apache/rahas/TokenIssuer.java | 8 +- .../org/apache/rahas/TokenRequestDispatcher.java | 37 +- .../apache/rahas/TokenRequestDispatcherConfig.java | 9 +- .../main/java/org/apache/rahas/TokenStorage.java | 8 +- .../src/main/java/org/apache/rahas/TrustUtil.java | 145 +-- .../java/org/apache/rahas/client/STSClient.java | 307 ++--- .../org/apache/rahas/errors.properties | 22 +- .../apache/rahas/impl/AbstractIssuerConfig.java | 32 - .../org/apache/rahas/impl/SAML2TokenIssuer.java | 1063 ++++++++--------- .../org/apache/rahas/impl/SAMLTokenIssuer.java | 755 ++++++------ .../apache/rahas/impl/SAMLTokenIssuerConfig.java | 190 +-- .../org/apache/rahas/impl/SAMLTokenRenewer.java | 185 +-- .../org/apache/rahas/impl/SAMLTokenValidator.java | 292 ++--- .../main/java/org/apache/rahas/impl/SCTIssuer.java | 35 +- .../org/apache/rahas/impl/SCTIssuerConfig.java | 7 +- .../org/apache/rahas/impl/TokenCancelerConfig.java | 21 +- .../org/apache/rahas/impl/TokenIssuerUtil.java | 19 +- .../apache/rahas/impl/util/AxiomParserPool.java | 52 - .../org/apache/rahas/impl/util/CommonUtil.java | 477 -------- .../org/apache/rahas/impl/util/SAML2Utils.java | 193 ++- .../rahas/impl/util/SAMLAttributeCallback.java | 77 +- .../org/apache/rahas/impl/util/SAMLCallback.java | 32 +- .../rahas/impl/util/SAMLCallbackHandler.java | 28 +- .../impl/util/SAMLNameIdentifierCallback.java | 58 +- .../java/org/apache/rahas/impl/util/SAMLUtils.java | 606 +--------- .../org/apache/rahas/impl/util/SignKeyHolder.java | 2 +- .../apache/rahas/impl/SAML2TokenIssuerTest.java | 88 -- .../org/apache/rahas/impl/util/CommonUtilTest.java | 289 ----- .../org/apache/rahas/impl/util/SAMLUtilsTest.java | 316 ----- .../apache/rahas/test/util/AbstractTestCase.java | 95 -- .../rahas/test/util/TestCallbackHandler.java | 45 - .../rahas/test/util/TestSAMLCallbackHandler.java | 32 - .../org/apache/rahas/test/util/TestSTSClient.java | 45 - .../java/org/apache/rahas/test/util/TestUtil.java | 444 ------- .../rampart-trust/src/test/resources/keystore.jks | Bin 2191 -> 0 bytes pom.xml | 837 +++++-------- release-docs/ChangeLog.txt | 169 +++ LICENSE => release-docs/LICENSE.txt | 0 release-docs/NOTICE.txt | 12 + README => release-docs/README.txt | 32 +- .../src/main/files => release-docs}/build.xml | 2 +- release-docs/release-notes.html | 75 ++ src/site/markdown/download.md.vm | 60 - src/site/markdown/index.md | 23 - src/site/markdown/release-notes/1.6.1.md | 7 - src/site/markdown/release-notes/1.6.2.md | 10 - src/site/markdown/release-notes/1.6.3.md | 7 - src/site/markdown/release-notes/1.6.4.md | 7 - src/site/markdown/release-notes/1.7.0.md | 11 - src/site/markdown/release-notes/1.8.0.md | 0 src/site/resources/images/apache-rampart-logo.jpg | Bin 14742 -> 0 bytes src/site/site.xml | 84 -- src/site/xdoc/rampartconfig-guide.xml | 146 --- 627 files changed, 23795 insertions(+), 25283 deletions(-)