This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-252
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit f20bf073a374763840ebaf2b09de79ef8b5f0758
Merge: 0455173 3ca0909
Author: Andreas Veithen <veit...@apache.org>
AuthorDate: Sun Jan 29 15:02:12 2017 +0000
Merge changes up to r1052171 from trunk.
modules/distribution/bin.xml | 17 +-
.../documentation/src/site/resources/css/site.css | 535 ++++++++++-----------
.../resources/images/apache-rampart-banner.jpg | Bin 14840 -> 27612 bytes
.../site/resources/images/apache-rampart-logo.jpg | Bin 4906 -> 10154 bytes
.../src/site/resources/images/axis.jpg | Bin 0 -> 13887 bytes
.../src/site/resources/images/axis.png | Bin 0 -> 13745 bytes
.../src/site/resources/images/breadcrumbs-bg.gif | Bin 0 -> 198 bytes
.../src/site/resources/images/h2-bg.gif | Bin 0 -> 202 bytes
.../src/site/resources/images/home-top.gif | Bin 0 -> 804 bytes
.../src/site/resources/images/leftcolumn-bg.gif | Bin 0 -> 523 bytes
.../src/site/resources/images/menu-back.gif | Bin 0 -> 827 bytes
.../src/site/resources/rampart-config.xsd | 27 +-
modules/documentation/src/site/site.xml | 61 ++-
modules/documentation/src/site/xdoc/download.xml | 124 +++--
.../src/site/xdoc/download/1.1/download.xml | 64 +--
.../src/site/xdoc/download/1.2/download.xml | 64 +--
.../src/site/xdoc/download/1.3/download.xml | 64 +--
.../src/site/xdoc/download/1.4/download.cgi | 6 +
.../src/site/xdoc/download/1.4/download.xml | 82 ++++
.../src/site/xdoc/download/1.5.1/download.cgi | 6 +
.../site/xdoc/download/{1.2 => 1.5.1}/download.xml | 235 +++++----
.../src/site/xdoc/download/1.5/download.cgi | 6 +
.../src/site/xdoc/download/1.5/download.xml | 82 ++++
.../src/site/xdoc/rampartconfig-guide.xml | 68 ++-
modules/documentation/src/site/xdoc/svn.xml | 8 +-
.../main/java/org/apache/rampart/NonceCache.java | 25 +-
.../rampart/PolicyBasedResultsValidator.java | 2 +-
.../src/main/java/org/apache/rampart/Rampart.java | 19 +-
.../java/org/apache/rampart/RampartEngine.java | 77 ++-
.../org/apache/rampart/RampartMessageData.java | 13 +-
.../rampart/builder/AsymmetricBindingBuilder.java | 10 +-
.../org/apache/rampart/builder/BindingBuilder.java | 30 +-
.../rampart/builder/TransportBindingBuilder.java | 2 +-
.../main/java/org/apache/rampart/errors.properties | 1 +
.../apache/rampart/handler/RampartReceiver.java | 20 +-
.../org/apache/rampart/handler/WSDoAllSender.java | 2 +-
.../rampart/policy/RampartPolicyBuilder.java | 2 +
.../apache/rampart/policy/RampartPolicyData.java | 10 +
.../policy/builders/RampartConfigBuilder.java | 13 +
.../rampart/policy/model/OptimizePartsConfig.java | 1 +
.../java/org/apache/rampart/util/Axis2Util.java | 8 +-
.../rampart/util/HandlerParameterDecoder.java | 2 +-
.../java/org/apache/rampart/util/RampartUtil.java | 82 +++-
modules/rampart-integration/pom.xml | 50 +-
.../test/java/org/apache/rampart/RampartTest.java | 2 +-
.../src/test/resources/rampart/policy/30.xml | 77 +++
.../src/test/resources/rampart/services-30.xml | 90 ++++
.../secpolicy/model/AbstractSecurityAssertion.java | 4 +-
.../secpolicy/model/SignedEncryptedElements.java | 6 +-
.../ws/secpolicy/model/SignedEncryptedParts.java | 10 +
.../ws/secpolicy/model/TransportBinding.java | 18 +
.../builders/EncryptedElementsBuilder.java | 4 +-
.../builders/EncryptedPartsBuilder.java | 4 +-
.../builders/SignedElementsBuilder.java | 4 +-
.../secpolicy11/builders/SignedPartsBuilder.java | 12 +-
.../builders/SupportingTokensBuilder.java | 4 +-
.../secpolicy11/builders/UsernameTokenBuilder.java | 4 +-
.../ws/secpolicy11/builders/X509TokenBuilder.java | 4 +-
.../builders/EncryptedElementsBuilder.java | 4 +-
.../builders/EncryptedPartsBuilder.java | 4 +-
.../builders/SignedElementsBuilder.java | 4 +-
.../secpolicy12/builders/SignedPartsBuilder.java | 10 +-
.../builders/SupportingTokensBuilder.java | 4 +-
.../builders/TransportBindingBuilder.java | 3 +
.../secpolicy12/builders/UsernameTokenBuilder.java | 4 +-
.../ws/secpolicy12/builders/X509TokenBuilder.java | 4 +-
modules/rampart-samples/README.txt | 4 +
modules/rampart-samples/keys/client.jks | Bin 4008 -> 4014 bytes
modules/rampart-samples/keys/service.jks | Bin 2675 -> 2683 bytes
modules/rampart-samples/keys/sts.jks | Bin 2677 -> 2683 bytes
modules/rampart-samples/policy/build.xml | 11 +
modules/rampart-samples/policy/sample06/policy.xml | 3 -
.../rampart-samples/policy/sample06/services.xml | 3 -
.../samples/policy/sample06/MexService.java | 16 +
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 | 94 ++++
.../samples/policy/sample08/PWCBHandler.java | 42 ++
.../samples/policy/sample08/SimpleService.java | 24 +
.../rampart-samples/policy/sample08/sts_policy.xml | 83 ++++
.../org/apache/rahas/SimpleTokenStoreTest.java | 71 ++-
.../org/apache/rampart/MessageBuilderTestBase.java | 37 +-
.../java/org/apache/rampart/NonceCacheTest.java | 14 +
...rtEngineTest.java => PolicyAssertionsTest.java} | 66 +--
.../java/org/apache/rampart/RampartEngineTest.java | 84 +++-
.../policy/rampart-asymm-required-elements-2.xml | 84 ++++
.../policy/rampart-asymm-required-elements.xml | 84 ++++
.../java/org/apache/rahas/EncryptedKeyToken.java | 23 +
.../src/main/java/org/apache/rahas/RahasData.java | 4 +
.../java/org/apache/rahas/SimpleTokenStore.java | 7 +-
.../src/main/java/org/apache/rahas/Token.java | 301 +++++++++---
.../java/org/apache/rahas/client/STSClient.java | 143 +++++-
.../main/java/org/apache/rahas/errors.properties | 1 +
.../org/apache/rahas/impl/SAML2TokenIssuer.java | 9 +-
.../org/apache/rahas/impl/SAMLTokenIssuer.java | 10 +-
.../apache/rahas/impl/SAMLTokenIssuerConfig.java | 23 +-
pom.xml | 128 ++---
release-docs/ChangeLog.txt | 69 ++-
release-docs/NOTICE.txt | 15 +-
release-docs/README.txt | 48 +-
release-docs/release-notes.html | 34 +-
102 files changed, 2760 insertions(+), 1081 deletions(-)
diff --cc
modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
index 2920547,3c4cda5..3ea99a2
--- a/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
+++ b/modules/rampart-core/src/main/java/org/apache/rampart/errors.properties
@@@ -98,5 -98,4 +98,6 @@@ invalidTransport = Expected transport i
requiredElementsMissing = Required Elements not found in the incoming message
: {0}
repeatingNonceValue = Nonce value : {0}, already seen before for user name :
{1}. Possibly this could be a replay attack.
invalidNonceLifeTime = Invalid value for nonceLifeTime in rampart
configuration file.
-invalidIssuerAddress = Invalid value for Issuer
++invalidIssuerAddress = Invalid value for Issuer
+algorithmNotFound = Couldn't find the algorithm used
+invalidAlgorithm = Algorithm verification failed. Required Algorithm : {0},
Algorithm found {1}
