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 27ac5d2f588da50605f2ee63d714b57c028cea3a Merge: dbb633e ec0ce32 Author: Andreas Veithen <veit...@apache.org> AuthorDate: Mon Jan 30 17:50:58 2017 +0000 Merge remaining changes from trunk. release-docs/LICENSE.txt => LICENSE | 0 release-docs/NOTICE.txt => NOTICE | 0 release-docs/README.txt => README | 0 apidocs/pom.xml | 117 +++ apidocs/src/main/assembly/apidocs.xml | 32 + build.xml | 181 ---- code-coverage/pom.xml | 188 ++++ etc/dist.py | 45 + legal/esapi-LICENSE.txt | 12 + modules/distribution/bin.xml | 56 +- modules/distribution/pom.xml | 81 +- modules/distribution/src.xml | 78 +- .../distribution/src/main/files}/build.xml | 2 +- modules/documentation/pom.xml | 52 - .../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 | 272 ------ .../documentation/src/site/resources/css/style.css | 184 ---- .../src/site/resources/download/1.1/download.cgi | 6 - .../src/site/resources/download/1.2/download.cgi | 6 - .../src/site/resources/download/1.3/download.cgi | 6 - .../src/site/resources/download/1.4/download.cgi | 6 - .../src/site/resources/download/1.5.1/download.cgi | 6 - .../src/site/resources/download/1.5.2/download.cgi | 6 - .../src/site/resources/download/1.5/download.cgi | 6 - .../src/site/resources/download/1.6.0/download.cgi | 6 - .../src/site/resources/download/1.6.1/download.cgi | 6 - .../images/apache-rampart-banner-background.jpg | Bin 373 -> 0 bytes .../resources/images/apache-rampart-banner.jpg | Bin 27612 -> 0 bytes .../images/apache-rampart-content-back.jpg | Bin 309 -> 0 bytes .../site/resources/images/apache-rampart-logo.jpg | Bin 10154 -> 0 bytes .../images/apache-rampart-menu-bottom.jpg | Bin 381 -> 0 bytes .../images/apache-rampart-menu-button.gif | Bin 192 -> 0 bytes .../resources/images/apache-rampart-menu-top.jpg | Bin 633 -> 0 bytes .../site/resources/images/apache-rampart-menu.jpg | Bin 1221 -> 0 bytes .../resources/images/apache-rampart-spliter.jpg | Bin 650 -> 0 bytes .../src/site/resources/images/axis.jpg | Bin 13887 -> 0 bytes .../src/site/resources/images/axis.png | Bin 13745 -> 0 bytes .../src/site/resources/images/breadcrumbs-bg.gif | Bin 198 -> 0 bytes .../src/site/resources/images/external.png | Bin 230 -> 0 bytes .../src/site/resources/images/h2-bg.gif | Bin 202 -> 0 bytes .../src/site/resources/images/home-top.gif | Bin 804 -> 0 bytes .../src/site/resources/images/leftcolumn-bg.gif | Bin 523 -> 0 bytes .../images/logos/build-by-maven-black.png | Bin 2294 -> 0 bytes .../images/logos/build-by-maven-white.png | Bin 2260 -> 0 bytes .../site/resources/images/logos/maven-feather.png | Bin 3330 -> 0 bytes .../src/site/resources/images/menu-back.gif | Bin 827 -> 0 bytes modules/documentation/src/site/site.xml | 79 -- modules/documentation/src/site/xdoc/download.xml | 126 --- .../src/site/xdoc/download/1.1/download.xml | 97 -- .../src/site/xdoc/download/1.2/download.xml | 97 -- .../src/site/xdoc/download/1.3/download.xml | 97 -- .../src/site/xdoc/download/1.4/download.xml | 82 -- .../src/site/xdoc/download/1.5.1/download.xml | 115 --- .../src/site/xdoc/download/1.5.2/download.xml | 115 --- .../src/site/xdoc/download/1.5/download.xml | 82 -- .../src/site/xdoc/download/1.6.0/download.xml | 115 --- .../src/site/xdoc/download/1.6.1/download.xml | 115 --- modules/documentation/src/site/xdoc/index.xml | 99 -- modules/rampart-core/pom.xml | 79 +- .../ExtendedPolicyValidatorCallbackHandler.java | 1 - .../main/java/org/apache/rampart/NonceCache.java | 6 +- .../rampart/PolicyBasedResultsValidator.java | 69 +- .../java/org/apache/rampart/RampartEngine.java | 299 +++--- .../org/apache/rampart/RampartMessageData.java | 109 +-- .../rampart/builder/AsymmetricBindingBuilder.java | 14 +- .../org/apache/rampart/builder/BindingBuilder.java | 138 ++- .../rampart/builder/TransportBindingBuilder.java | 80 ++ .../handler/PostDispatchVerificationHandler.java | 9 +- .../handler/RampartUsernameTokenValidator.java | 71 ++ .../org/apache/rampart/handler/WSDoAllHandler.java | 210 ---- .../apache/rampart/handler/WSDoAllReceiver.java | 388 -------- .../org/apache/rampart/handler/WSDoAllSender.java | 281 ------ .../handler/config/InflowConfiguration.java | 202 ---- .../handler/config/OutflowConfiguration.java | 621 ------------ .../rampart/policy/RampartPolicyBuilder.java | 37 +- .../apache/rampart/policy/RampartPolicyData.java | 10 +- .../rampart/policy/SupportingPolicyData.java | 99 +- .../policy/builders/KerberosConfigBuilder.java | 100 ++ .../policy/builders/RampartConfigBuilder.java | 17 + .../rampart/policy/model/KerberosConfig.java | 361 +++++++ .../apache/rampart/policy/model/RampartConfig.java | 64 +- .../java/org/apache/rampart/util/Axis2Util.java | 29 +- .../rampart/util/HandlerParameterDecoder.java | 292 ------ .../java/org/apache/rampart/util/RampartUtil.java | 149 ++- .../org.apache.neethi.builders.AssertionBuilder | 3 +- .../org/apache/rampart/errors.properties | 9 + .../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 | 553 +++++------ .../apache/axis2/integration/TestConstants.java | 25 + .../org/apache/axis2/integration/UtilServer.java | 244 ----- .../axis2/integration/UtilServerBasedTestCase.java | 68 -- .../src/main/java/org/apache/rahas/PWCallback.java | 35 +- .../src/main/java/org/apache/rahas/TestClient.java | 136 +-- .../src/main/resources/ping/ping.wsdl | 68 -- .../apache/axis2/oasis/ping/PingPortSkeleton.java | 79 -- .../axis2/security/InteropScenarioClient.java | 179 ---- .../src/org/apache/axis2/security/PWCallback.java | 185 ---- .../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 | 126 --- .../org/apache/axis2/security/Scenario5Test.java | 113 --- .../org/apache/axis2/security/Scenario6Test.java | 114 --- .../org/apache/axis2/security/Scenario7Test.java | 141 --- .../rahas/RahasSAML2TokenCertForHoKTest.java | 48 +- .../java/org/apache/rahas/RahasSAML2TokenTest.java | 39 +- .../rahas/RahasSAML2TokenUTForBearerTest.java | 33 +- .../apache/rahas/RahasSAMLTokenAttributeTest.java | 31 +- .../apache/rahas/RahasSAMLTokenCertForHoKTest.java | 36 +- .../rahas/RahasSAMLTokenCertForHoKV1205Test.java | 52 +- .../java/org/apache/rahas/RahasSAMLTokenTest.java | 40 +- .../rahas/RahasSAMLTokenUTForBearerTest.java | 33 +- .../rahas/RahasSAMLTokenUTForBearerV1205Test.java | 34 +- .../apache/rahas/RahasSAMLTokenUTForHoKTest.java | 31 +- .../rahas/RahasSAMLTokenUTForHoKV1205Test.java | 39 +- .../org/apache/rahas/RahasSAMLTokenV1205Test.java | 36 +- .../apache/rampart/KerberosDelegationService.java | 78 ++ .../KerberosDelegationServiceValidator.java | 46 + .../org/apache/rampart/RampartKerberosTest.java | 296 ++++++ .../test/java/org/apache/rampart/RampartTest.java | 127 ++- .../org/apache/rampart/util/KerberosServer.java | 207 ++++ .../rampart/util/KerberosTokenDecoderImpl.java | 156 +++ .../src/test/resources/conf/axis2.xml | 53 +- .../src/test/resources/kerberos/alice.keytab | Bin 0 -> 666 bytes .../src/test/resources/kerberos/bob.keytab | Bin 0 -> 328 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/log4j.properties | 6 + .../src/test/resources/rahas/1.xml} | 25 +- .../src/test/resources/rahas/3.xml | 37 + .../src/test/resources/rahas/issuer.properties | 4 - .../src/test/resources/rahas/rahas-sec.properties | 5 - .../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 - .../src/test/resources/rahas/samlIssuer.properties | 4 - .../rampart/kerberos/KerberosDelegation.xml | 86 ++ .../kerberos/KerberosOverTransportKeytab.xml | 85 ++ .../rampart/kerberos/KerberosOverTransportPWCB.xml | 88 ++ .../src/test/resources/rampart/policy/35.xml | 76 ++ .../src/test/resources/rampart/services-35.xml | 94 ++ .../resources/security/complete.client.axis2.xml | 133 --- .../resources/security/complete.service.axis2.xml | 142 --- .../test/resources/security/complete.service.xml | 31 - .../test/resources/security/s1.client.axis2.xml | 109 --- .../test/resources/security/s1.service.axis2.xml | 134 --- .../src/test/resources/security/s1.service.xml | 15 - .../test/resources/security/s2.client.axis2.xml | 118 --- .../test/resources/security/s2.service.axis2.xml | 134 --- .../src/test/resources/security/s2.service.xml | 16 - .../test/resources/security/s2a.client.axis2.xml | 116 --- .../test/resources/security/s2a.service.axis2.xml | 133 --- .../src/test/resources/security/s2a.service.xml | 16 - .../test/resources/security/s3.client.axis2.xml | 127 --- .../test/resources/security/s3.service.axis2.xml | 133 --- .../src/test/resources/security/s3.service.xml | 31 - .../test/resources/security/s4.client.axis2.xml | 125 --- .../test/resources/security/s4.service.axis2.xml | 134 --- .../src/test/resources/security/s4.service.xml | 31 - .../test/resources/security/s5.client.axis2.xml | 122 --- .../test/resources/security/s5.service.axis2.xml | 135 --- .../src/test/resources/security/s5.service.xml | 16 - .../test/resources/security/s6.client.axis2.xml | 125 --- .../test/resources/security/s6.service.axis2.xml | 135 --- .../src/test/resources/security/s6.service.xml | 29 - .../test/resources/security/s7.client.axis2.xml | 125 --- .../test/resources/security/s7.service.axis2.xml | 136 --- .../src/test/resources/security/s7.service.xml | 31 - .../test/resources/security/sST1.client.axis2.xml | 109 --- .../test/resources/security/sST1.service.axis2.xml | 135 --- .../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 | 4 - .../src/test/resources/security/sc/sec.jks | Bin 5467 -> 0 bytes .../src/test/resources/security/sc/sec.properties | 5 - .../src/test/resources/security/sc/sts.jks | Bin 4759 -> 0 bytes .../resources/security/secMtom.client.axis2.xml | 126 --- .../resources/security/secMtom.service.axis2.xml | 136 --- .../test/resources/security/secMtom.service.xml | 31 - modules/rampart-mar/module.xml | 12 - modules/rampart-mar/pom.xml | 25 +- modules/rampart-policy/pom.xml | 58 +- .../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 | 5 +- .../AbstractConfigurableSecurityAssertion.java | 6 +- .../secpolicy/model/AbstractSecurityAssertion.java | 3 - .../ws/secpolicy/model/AsymmetricBinding.java | 5 +- .../secpolicy/model/ContentEncryptedElements.java | 13 +- .../apache/ws/secpolicy/model/KerberosToken.java | 152 +++ .../ws/secpolicy/model/RequiredElements.java | 10 +- .../apache/ws/secpolicy/model/RequiredParts.java | 9 +- .../secpolicy/model/SignedEncryptedElements.java | 12 +- .../ws/secpolicy/model/SignedEncryptedParts.java | 8 +- .../apache/ws/secpolicy/model/SupportingToken.java | 8 +- .../ws/secpolicy/model/SymmetricBinding.java | 79 +- .../ws/secpolicy/model/TransportBinding.java | 11 +- .../org/apache/ws/secpolicy/model/Trust10.java | 1 - .../org/apache/ws/secpolicy/model/Trust13.java | 1 - .../apache/ws/secpolicy/model/UsernameToken.java | 61 +- .../builders/AlgorithmSuiteBuilder.java | 8 +- .../builders/AsymmetricBindingBuilder.java | 10 +- .../builders/EncryptionTokenBuilder.java | 65 ++ .../builders/InitiatorTokenBuilder.java | 8 +- .../secpolicy11/builders/IssuedTokenBuilder.java | 10 +- .../secpolicy11/builders/KerberosTokenBuilder.java | 84 ++ .../ws/secpolicy11/builders/LayoutBuilder.java | 10 +- .../builders/ProtectionTokenBuilder.java | 6 +- .../builders/RecipientTokenBuilder.java | 10 +- .../builders/SignatureTokenBuilder.java | 65 ++ .../secpolicy11/builders/SignedPartsBuilder.java | 2 +- .../builders/SupportingTokensBuilder.java | 10 +- .../builders/SymmetricBindingBuilder.java | 77 +- .../builders/TransportBindingBuilder.java | 10 +- .../builders/TransportTokenBuilder.java | 11 +- .../secpolicy11/builders/UsernameTokenBuilder.java | 12 +- .../ws/secpolicy11/builders/WSS10Builder.java | 10 +- .../ws/secpolicy11/builders/WSS11Builder.java | 10 +- .../ws/secpolicy11/builders/X509TokenBuilder.java | 10 +- .../builders/AlgorithmSuiteBuilder.java | 10 +- .../builders/AsymmetricBindingBuilder.java | 10 +- .../builders/EncryptionTokenBuilder.java | 65 ++ .../ws/secpolicy12/builders/HttpsTokenBuilder.java | 10 +- .../builders/InitiatorTokenBuilder.java | 8 +- .../secpolicy12/builders/IssuedTokenBuilder.java | 10 +- .../secpolicy12/builders/KerberosTokenBuilder.java | 84 ++ .../ws/secpolicy12/builders/LayoutBuilder.java | 10 +- .../builders/ProtectionTokenBuilder.java | 6 +- .../builders/RecipientTokenBuilder.java | 8 +- .../builders/SignatureTokenBuilder.java | 65 ++ .../secpolicy12/builders/SignedPartsBuilder.java | 2 +- .../builders/SupportingTokensBuilder.java | 10 +- .../builders/SymmetricBindingBuilder.java | 77 +- .../builders/TransportBindingBuilder.java | 10 +- .../builders/TransportTokenBuilder.java | 8 +- .../secpolicy12/builders/UsernameTokenBuilder.java | 8 +- .../ws/secpolicy12/builders/WSS10Builder.java | 10 +- .../ws/secpolicy12/builders/WSS11Builder.java | 10 +- .../ws/secpolicy12/builders/X509TokenBuilder.java | 10 +- .../org.apache.neethi.builders.AssertionBuilder | 8 +- .../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 | 4 +- modules/rampart-samples/basic/README.txt | 44 - modules/rampart-samples/basic/build.xml | 265 ----- modules/rampart-samples/basic/sample01/README.txt | 6 - .../basic/sample01/client.axis2.xml | 455 --------- .../rampart-samples/basic/sample01/services.xml | 27 - .../apache/rampart/samples/sample01/Client.java | 62 -- .../rampart/samples/sample01/SimpleService.java | 24 - modules/rampart-samples/basic/sample02/README.txt | 10 - .../basic/sample02/client.axis2.xml | 464 --------- .../rampart-samples/basic/sample02/services.xml | 33 - .../apache/rampart/samples/sample02/Client.java | 62 -- .../rampart/samples/sample02/PWCBHandler.java | 40 - .../rampart/samples/sample02/SimpleService.java | 25 - modules/rampart-samples/basic/sample03/README.txt | 12 - .../basic/sample03/client.axis2.xml | 465 --------- .../rampart-samples/basic/sample03/services.xml | 33 - .../apache/rampart/samples/sample03/Client.java | 62 -- .../rampart/samples/sample03/PWCBHandler.java | 51 - .../rampart/samples/sample03/SimpleService.java | 36 - modules/rampart-samples/basic/sample04/README.txt | 7 - .../basic/sample04/client.axis2.xml | 473 --------- .../rampart-samples/basic/sample04/services.xml | 44 - .../apache/rampart/samples/sample04/Client.java | 62 -- .../rampart/samples/sample04/PWCBHandler.java | 43 - .../rampart/samples/sample04/SimpleService.java | 25 - modules/rampart-samples/basic/sample05/README.txt | 7 - .../basic/sample05/client.axis2.xml | 472 --------- .../rampart-samples/basic/sample05/services.xml | 45 - .../apache/rampart/samples/sample05/Client.java | 62 -- .../rampart/samples/sample05/PWCBHandler.java | 43 - .../rampart/samples/sample05/SimpleService.java | 25 - modules/rampart-samples/basic/sample06/README.txt | 8 - .../basic/sample06/client.axis2.xml | 478 --------- .../rampart-samples/basic/sample06/services.xml | 47 - .../apache/rampart/samples/sample06/Client.java | 62 -- .../rampart/samples/sample06/PWCBHandler.java | 43 - .../rampart/samples/sample06/SimpleService.java | 25 - modules/rampart-samples/basic/sample07/README.txt | 8 - .../basic/sample07/client.axis2.xml | 477 --------- .../rampart-samples/basic/sample07/services.xml | 46 - .../apache/rampart/samples/sample07/Client.java | 62 -- .../rampart/samples/sample07/PWCBHandler.java | 43 - .../rampart/samples/sample07/SimpleService.java | 25 - modules/rampart-samples/basic/sample08/README.txt | 10 - .../basic/sample08/client.axis2.xml | 478 --------- .../rampart-samples/basic/sample08/services.xml | 35 - .../apache/rampart/samples/sample08/Client.java | 62 -- .../rampart/samples/sample08/PWCBHandler.java | 43 - .../rampart/samples/sample08/SimpleService.java | 25 - modules/rampart-samples/basic/sample09/README.txt | 8 - .../basic/sample09/client.axis2.xml | 476 --------- .../rampart-samples/basic/sample09/services.xml | 46 - .../apache/rampart/samples/sample09/Client.java | 62 -- .../rampart/samples/sample09/PWCBHandler.java | 50 - .../rampart/samples/sample09/SimpleService.java | 25 - modules/rampart-samples/basic/sample10/README.txt | 8 - .../basic/sample10/client.axis2.xml | 481 --------- .../rampart-samples/basic/sample10/services.xml | 47 - .../apache/rampart/samples/sample10/Client.java | 62 -- .../rampart/samples/sample10/PWCBHandler.java | 43 - .../rampart/samples/sample10/SimpleService.java | 25 - modules/rampart-samples/basic/sample11/README.txt | 8 - .../rampart-samples/basic/sample11/services.xml | 46 - .../apache/rampart/samples/sample11/Client.java | 98 -- .../rampart/samples/sample11/PWCBHandler.java | 43 - .../rampart/samples/sample11/SimpleService.java | 25 - modules/rampart-samples/build.xml | 49 - modules/rampart-samples/keys/service.jks | Bin 2683 -> 3307 bytes modules/rampart-samples/policy/build.xml | 63 +- .../apache/rampart/tomcat/sample/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample01/README.txt | 14 +- .../rampart-samples/policy/sample01/services.xml | 3 +- .../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 | 2 +- .../rampart/samples/policy/sample05/Client.java | 18 +- .../samples/policy/sample05/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample06/policy.xml | 6 +- .../rampart-samples/policy/sample06/services.xml | 2 +- .../rampart/samples/policy/sample06/Client.java | 17 +- .../samples/policy/sample06/MexService.java | 9 +- .../samples/policy/sample06/PWCBHandler.java | 2 +- .../rampart/samples/policy/sample07/Client.java | 7 +- .../samples/policy/sample07/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample08/policy.xml | 2 +- .../rampart/samples/policy/sample08/Client.java | 24 +- .../samples/policy/sample08/PWCBHandler.java | 2 +- modules/rampart-samples/policy/sample09/README.txt | 4 + .../policy/sample09/client_in_policy.xml | 70 ++ .../policy/sample09/client_out_policy.xml | 79 ++ .../rampart-samples/policy/sample09/services.xml | 191 ++++ .../rampart/samples/policy/sample09}/Client.java | 45 +- .../samples/policy/sample09/PWCBHandler.java | 44 + .../samples/policy/sample09/SimpleService.java | 25 + modules/rampart-samples/pom.xml | 182 ++++ .../src/test/conf}/log4j.properties | 49 +- .../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 | 50 + .../rampart/samples/runner/ServerRunner.java | 43 + .../rampart/samples/runner/ServerWatcher.java | 86 ++ modules/rampart-tests/pom.xml | 28 +- .../org/apache/rahas/SimpleTokenStoreTest.java | 36 +- .../rampart/AsymmetricBindingBuilderTest.java | 16 +- .../org/apache/rampart/MessageBuilderTestBase.java | 18 +- .../org/apache/rampart/PolicyAssertionsTest.java | 78 ++ .../java/org/apache/rampart/RampartEngineTest.java | 75 +- .../rampart/SymmetricBindingBuilderTest.java | 11 +- .../rampart/TransportBindingBuilderTest.java | 8 +- .../handler/config/InflowConfigurationTest.java | 73 -- .../handler/config/OutflowConfigurationTest.java | 194 ---- .../ws/secpolicy/model/SecpolicyModelTest.java | 19 +- modules/rampart-tests/test-resources/axis2.xml | 12 +- .../test-resources/policy-symm-binding-fault1.xml | 64 ++ .../policy/rampart-hashed-password.xml | 18 + .../policy/rampart-plaintext-password.xml | 14 + .../test-resources/policy/soapmessage12.xml | 57 ++ modules/rampart-trust-mar/module.xml | 2 +- modules/rampart-trust-mar/pom.xml | 23 +- modules/rampart-trust/pom.xml | 83 +- .../src/main/java/org/apache/rahas/Rahas.java | 6 +- .../main/java/org/apache/rahas/RahasConstants.java | 2 + .../src/main/java/org/apache/rahas/RahasData.java | 80 +- .../java/org/apache/rahas/STSMessageReceiver.java | 10 +- .../java/org/apache/rahas/SimpleTokenStore.java | 6 +- .../src/main/java/org/apache/rahas/Token.java | 36 +- .../main/java/org/apache/rahas/TokenIssuer.java | 8 +- .../apache/rahas/TokenRequestDispatcherConfig.java | 9 +- .../java/org/apache/rahas/client/STSClient.java | 65 +- .../apache/rahas/impl/AbstractIssuerConfig.java | 32 + .../org/apache/rahas/impl/SAML2TokenIssuer.java | 1033 ++++++++++---------- .../org/apache/rahas/impl/SAMLTokenIssuer.java | 126 +-- .../apache/rahas/impl/SAMLTokenIssuerConfig.java | 65 +- .../org/apache/rahas/impl/SAMLTokenRenewer.java | 14 +- .../org/apache/rahas/impl/SAMLTokenValidator.java | 2 +- .../main/java/org/apache/rahas/impl/SCTIssuer.java | 12 +- .../org/apache/rahas/impl/SCTIssuerConfig.java | 7 +- .../org/apache/rahas/impl/TokenCancelerConfig.java | 7 +- .../org/apache/rahas/impl/TokenIssuerUtil.java | 6 +- .../apache/rahas/impl/util/AxiomParserPool.java | 2 +- .../org/apache/rahas/impl/util/CommonUtil.java | 307 +++++- .../org/apache/rahas/impl/util/SAML2Utils.java | 150 +-- .../java/org/apache/rahas/impl/util/SAMLUtils.java | 200 +--- .../org/apache/rahas/errors.properties | 7 +- .../apache/rahas/impl/SAML2TokenIssuerTest.java | 83 +- .../org/apache/rahas/impl/util/CommonUtilTest.java | 289 ++++++ .../org/apache/rahas/impl/util/SAMLUtilsTest.java | 54 +- .../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 | 389 +++++++- .../src/test/resources/log4j.properties | 0 .../src/test/resources/repo/conf}/client.axis2.xml | 874 ++++++++--------- pom.xml | 523 +++++++--- release-docs/ChangeLog.txt | 255 ----- release-docs/release-notes.html | 67 -- 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 0 -> 14742 bytes .../site/resources/images/logos/asf_logo_wide.png | Bin .../site/resources/images/message-builder.jpg | Bin .../site/resources/images/rampart-engine.jpg | Bin .../site/resources/images/rampart-handlers.jpg | Bin .../site/resources/images/rampart-trust.jpg | Bin .../site/resources/images/security-stack.jpg | Bin .../src => src}/site/resources/rampart-config.xsd | 0 .../site/resources/samples/msgs/creq04.xml | 0 .../site/resources/samples/msgs/cres04.xml | 0 .../site/resources/samples/msgs/req01.xml | 0 .../site/resources/samples/msgs/req02.xml | 0 .../site/resources/samples/msgs/req03.xml | 0 .../site/resources/samples/msgs/req04.xml | 0 src/site/resources/samples/msgs/req09.xml | 59 ++ .../site/resources/samples/msgs/res01.xml | 0 .../site/resources/samples/msgs/res02.xml | 0 .../site/resources/samples/msgs/res03.xml | 0 .../site/resources/samples/msgs/res04.xml | 0 src/site/resources/samples/msgs/res09.xml | 51 + .../site/resources/samples/msgs/rst04.xml | 0 .../site/resources/samples/msgs/rstr04.xml | 0 .../site/resources/samples/policy/sample01.xml | 0 .../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 | 0 .../site/resources/samples/policy/sample06.xml | 0 src/site/site.xml | 84 ++ .../src => src}/site/xdoc/articles.xml | 0 .../src => src}/site/xdoc/developer-guide.xml | 0 .../src => src}/site/xdoc/quick-start.xml | 2 +- .../src => src}/site/xdoc/rampartconfig-guide.xml | 0 .../src => src}/site/xdoc/samples.xml | 1 + .../src => src}/site/xdoc/setting-up-sts.xml | 2 +- .../src => src}/site/xdoc/siteHowTo.xml | 0 .../src => src}/site/xdoc/specifications.xml | 0 .../documentation/src => src}/site/xdoc/svn.xml | 0 478 files changed, 10254 insertions(+), 21276 deletions(-)