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 bi...@apache.org on 2020/04/15 16:07:31 UTC
[axis-axis2-java-rampart] branch RAMPART-385 created (now eb1ead9)
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a change to branch RAMPART-385
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git.
at eb1ead9 Merge changes from trunk.
This branch includes the following new commits:
new 56bed65 Create development branch for RAMPART-385.
new 9a1991b RAMPART-385: Apply patch provided by Suresh Attanayake.
new eb1ead9 Merge changes from trunk.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[axis-axis2-java-rampart] 01/03: Create development branch for
RAMPART-385.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-385
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 56bed656ed45090165916caf570d4eb2d83858bd
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Mon Jan 30 18:21:00 2017 +0000
Create development branch for RAMPART-385.
[axis-axis2-java-rampart] 02/03: RAMPART-385: Apply patch provided
by Suresh Attanayake.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-385
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit 9a1991b214f494d33292ae9bcbb6830b2b0a87c2
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Mon Jan 30 18:25:09 2017 +0000
RAMPART-385: Apply patch provided by Suresh Attanayake.
---
.../secpolicy11/builders/UsernameTokenBuilder.java | 16 ++++-
.../secpolicy12/builders/UsernameTokenBuilder.java | 32 ++++++++-
.../builders/UsernameTokenBuilderTest.java | 47 ++++++++++++++
.../builders/UsernameTokenBuilderTest.java | 75 ++++++++++++++++++++++
.../username-token-assertion-1.1-nopolicy.xml | 2 +
.../username-token-assertion-1.1-ut11prof.xml | 6 ++
.../username-token-assertion-1.2-hashpwd.xml | 8 +++
.../username-token-assertion-1.2-nopolicy.xml | 4 ++
.../username-token-assertion-1.2-nopwd.xml | 9 +++
9 files changed, 196 insertions(+), 3 deletions(-)
diff --git a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
index 74a70e7..9b76ff5 100644
--- a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
+++ b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
@@ -22,6 +22,8 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Constants;
@@ -34,6 +36,7 @@ import org.apache.ws.secpolicy.model.UsernameToken;
public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
+ private static Log log = LogFactory.getLog(UsernameTokenBuilder.class);
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
UsernameToken usernameToken = new UsernameToken(SPConstants.SP_V11);
@@ -53,7 +56,7 @@ public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
OMElement policyElement = element.getFirstElement();
- if (policyElement != null && !policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
+ if (policyElement != null && policyElement.getQName().equals(org.apache.neethi.Constants.Q_ELEM_POLICY)) {
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
@@ -76,6 +79,10 @@ public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
}
private void processAlternative(List assertions, UsernameToken parent) {
+
+ // UT profile version
+ boolean usernameToken10Set = false;
+ boolean usernameToken11Set = false;
for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
Assertion assertion = (Assertion) iterator.next();
@@ -83,10 +90,17 @@ public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
if (SP11Constants.WSS_USERNAME_TOKEN10.equals(qname)) {
parent.setUseUTProfile10(true);
+ usernameToken10Set = true;
} else if (SP11Constants.WSS_USERNAME_TOKEN11.equals(qname)) {
parent.setUseUTProfile11(true);
+ usernameToken11Set = true;
}
}
+
+ // doing a policy validation
+ if(usernameToken10Set && usernameToken11Set) {
+ log.warn("Invalid UsernameToken Assertion in the policy. This may result an unexpected behaviour!");
+ }
}
}
diff --git a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
index f3d901b..c593ecd 100755
--- a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
+++ b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
@@ -22,6 +22,8 @@ import javax.xml.namespace.QName;
import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Constants;
@@ -33,7 +35,8 @@ import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.UsernameToken;
public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
-
+
+ private static Log log = LogFactory.getLog(UsernameTokenBuilder.class);
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
UsernameToken usernameToken = new UsernameToken(SPConstants.SP_V12);
@@ -76,26 +79,51 @@ public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
}
private void processAlternative(List assertions, UsernameToken parent) {
+
+ // UT profile version
+ boolean usernameToken10Set = false;
+ boolean usernameToken11Set = false;
+ // password options
+ boolean noPasswordSet = false;
+ boolean hasPasswordSet = false;
+ // derived keys conf
+ boolean derivedKeysSet = false;
+ boolean expDerivedKeysSet = false;
+ boolean impDerivedKeysSet = false;
for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
Assertion assertion = (Assertion) iterator.next();
QName qname = assertion.getName();
if (SP12Constants.WSS_USERNAME_TOKEN10.equals(qname)) {
- parent.setUseUTProfile10(true);
+ parent.setUseUTProfile10(true);
+ usernameToken10Set = true;
} else if (SP12Constants.WSS_USERNAME_TOKEN11.equals(qname)) {
parent.setUseUTProfile11(true);
+ usernameToken11Set = true;
} else if (SP12Constants.NO_PASSWORD.equals(qname)) {
parent.setNoPassword(true);
+ noPasswordSet = true;
} else if (SP12Constants.HASH_PASSWORD.equals(qname)) {
parent.setHashPassword(true);
+ hasPasswordSet = true;
} else if (SP12Constants.REQUIRE_DERIVED_KEYS.equals(qname)) {
parent.setDerivedKeys(true);
+ derivedKeysSet = true;
} else if (SP12Constants.REQUIRE_EXPLICIT_DERIVED_KEYS.equals(qname)) {
parent.setExplicitDerivedKeys(true);
+ expDerivedKeysSet = true;
} else if (SP12Constants.REQUIRE_IMPLIED_DERIVED_KEYS.equals(qname)) {
parent.setImpliedDerivedKeys(true);
+ impDerivedKeysSet = true;
}
}
+
+ // doing a policy validation
+ if(usernameToken10Set && usernameToken11Set || noPasswordSet && hasPasswordSet ||
+ derivedKeysSet && expDerivedKeysSet || derivedKeysSet && impDerivedKeysSet ||
+ impDerivedKeysSet && expDerivedKeysSet) {
+ log.warn("Invalid UsernameToken Assertion in the policy. This may result an unexpected behaviour!");
+ }
}
}
diff --git a/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilderTest.java b/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilderTest.java
new file mode 100644
index 0000000..caefb30
--- /dev/null
+++ b/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilderTest.java
@@ -0,0 +1,47 @@
+package org.apache.ws.secpolicy11.builders;
+
+import java.io.FileInputStream;
+
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.neethi.AssertionBuilderFactoryImpl;
+import org.apache.neethi.PolicyBuilder;
+import org.apache.ws.secpolicy.model.UsernameToken;
+
+public class UsernameTokenBuilderTest extends TestCase {
+
+ public UsernameTokenBuilderTest(String name){
+ super(name);
+ }
+
+ AssertionBuilderFactoryImpl factory = new AssertionBuilderFactoryImpl(new PolicyBuilder());
+ UsernameTokenBuilder utBuilder = new UsernameTokenBuilder();
+ OMElement utElement = null;
+ UsernameToken ut = null;
+
+ public void testNoPolicyAlternatives() throws Exception {
+
+ String xmlPath = "test-resources/policy/assertions/username-token-assertion-1.1-nopolicy.xml";
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
+ utElement = builder.getDocumentElement();
+ ut = (UsernameToken) utBuilder.build(utElement, factory);
+
+ assertEquals(false, ut.isUseUTProfile10());
+ assertEquals(false, ut.isUseUTProfile11());
+ }
+
+ public void testUT11Profile() throws Exception {
+
+ String xmlPath = "test-resources/policy/assertions/username-token-assertion-1.1-ut11prof.xml";
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
+ utElement = builder.getDocumentElement();
+ ut = (UsernameToken) utBuilder.build(utElement, factory);
+
+ assertEquals(false, ut.isUseUTProfile10());
+ assertEquals(true, ut.isUseUTProfile11());
+ }
+
+}
diff --git a/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilderTest.java b/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilderTest.java
new file mode 100644
index 0000000..158c113
--- /dev/null
+++ b/modules/rampart-tests/src/test/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilderTest.java
@@ -0,0 +1,75 @@
+package org.apache.ws.secpolicy12.builders;
+
+import java.io.FileInputStream;
+
+import junit.framework.TestCase;
+
+import org.apache.axiom.om.OMElement;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
+import org.apache.neethi.AssertionBuilderFactoryImpl;
+import org.apache.neethi.PolicyBuilder;
+import org.apache.ws.secpolicy.model.UsernameToken;
+
+public class UsernameTokenBuilderTest extends TestCase {
+
+ public UsernameTokenBuilderTest(String name){
+ super(name);
+ }
+
+ AssertionBuilderFactoryImpl factory = new AssertionBuilderFactoryImpl(new PolicyBuilder());
+ UsernameTokenBuilder utBuilder = new UsernameTokenBuilder();
+ OMElement utElement = null;
+ UsernameToken ut = null;
+
+ public void testNoPolicyAlternatives() throws Exception {
+
+ String xmlPath = "test-resources/policy/assertions/username-token-assertion-1.2-nopolicy.xml";
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
+ utElement = builder.getDocumentElement();
+ ut = (UsernameToken) utBuilder.build(utElement, factory);
+
+ assertEquals(false, ut.isNoPassword());
+ assertEquals(false, ut.isHashPassword());
+ assertEquals(false, ut.isDerivedKeys());
+ assertEquals(false, ut.isExplicitDerivedKeys());
+ assertEquals(false, ut.isImpliedDerivedKeys());
+ assertEquals(false, ut.isUseUTProfile10());
+ assertEquals(false, ut.isUseUTProfile11());
+
+ }
+
+ public void testNoPassword() throws Exception {
+
+ String xmlPath = "test-resources/policy/assertions/username-token-assertion-1.2-nopwd.xml";
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
+ utElement = builder.getDocumentElement();
+ ut = (UsernameToken) utBuilder.build(utElement, factory);
+
+ assertEquals(true, ut.isNoPassword());
+ assertEquals(false, ut.isHashPassword());
+ assertEquals(true, ut.isDerivedKeys());
+ assertEquals(false, ut.isExplicitDerivedKeys());
+ assertEquals(false, ut.isImpliedDerivedKeys());
+ assertEquals(true, ut.isUseUTProfile10());
+ assertEquals(false, ut.isUseUTProfile11());
+ }
+
+ public void testHashPassword() throws Exception {
+
+ String xmlPath = "test-resources/policy/assertions/username-token-assertion-1.2-hashpwd.xml";
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
+ utElement = builder.getDocumentElement();
+ ut = (UsernameToken) utBuilder.build(utElement, factory);
+
+ assertEquals(false, ut.isNoPassword());
+ assertEquals(true, ut.isHashPassword());
+ assertEquals(false, ut.isDerivedKeys());
+ assertEquals(false, ut.isExplicitDerivedKeys());
+ assertEquals(false, ut.isImpliedDerivedKeys());
+ assertEquals(false, ut.isUseUTProfile10());
+ assertEquals(true, ut.isUseUTProfile11());
+
+ }
+
+}
diff --git a/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.1-nopolicy.xml b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.1-nopolicy.xml
new file mode 100644
index 0000000..c0200ca
--- /dev/null
+++ b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.1-nopolicy.xml
@@ -0,0 +1,2 @@
+<sp:UsernameToken xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient" />
\ No newline at end of file
diff --git a/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.1-ut11prof.xml b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.1-ut11prof.xml
new file mode 100644
index 0000000..de3355b
--- /dev/null
+++ b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.1-ut11prof.xml
@@ -0,0 +1,6 @@
+<sp:UsernameToken xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy"
+ sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <sp:WssUsernameToken11/>
+ </wsp:Policy>
+</sp:UsernameToken>
\ No newline at end of file
diff --git a/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-hashpwd.xml b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-hashpwd.xml
new file mode 100644
index 0000000..c378341
--- /dev/null
+++ b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-hashpwd.xml
@@ -0,0 +1,8 @@
+<sp:UsernameToken
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <sp:HashPassword />
+ <sp:WssUsernameToken11 />
+ </wsp:Policy>
+</sp:UsernameToken>
\ No newline at end of file
diff --git a/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-nopolicy.xml b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-nopolicy.xml
new file mode 100644
index 0000000..3b52493
--- /dev/null
+++ b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-nopolicy.xml
@@ -0,0 +1,4 @@
+<sp:UsernameToken
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+</sp:UsernameToken>
\ No newline at end of file
diff --git a/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-nopwd.xml b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-nopwd.xml
new file mode 100644
index 0000000..2cc178b
--- /dev/null
+++ b/modules/rampart-tests/test-resources/policy/assertions/username-token-assertion-1.2-nopwd.xml
@@ -0,0 +1,9 @@
+<sp:UsernameToken
+ xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702"
+ sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+ <wsp:Policy xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy">
+ <sp:NoPassword />
+ <sp:RequireDerivedKeys />
+ <sp:WssUsernameToken10 />
+ </wsp:Policy>
+</sp:UsernameToken>
\ No newline at end of file
[axis-axis2-java-rampart] 03/03: Merge changes from trunk.
Posted by bi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
billblough pushed a commit to branch RAMPART-385
in repository https://gitbox.apache.org/repos/asf/axis-axis2-java-rampart.git
commit eb1ead9f24ce4679a7528b2ccded84e566929423
Merge: 9a1991b 0717777
Author: Andreas Veithen <ve...@apache.org>
AuthorDate: Tue Jan 31 00:17:19 2017 +0000
Merge 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 ++
modules/distribution/bin.xml | 52 +-
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
.../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/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 | 135 -----
.../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 ----
.../src/site/xdoc/download/1.6.2/download.xml | 115 ----
modules/documentation/src/site/xdoc/index.xml | 102 ----
modules/rampart-core/pom.xml | 78 +--
.../ExtendedPolicyValidatorCallbackHandler.java | 1 -
.../main/java/org/apache/rampart/NonceCache.java | 6 +-
.../rampart/PolicyBasedResultsValidator.java | 26 +-
.../java/org/apache/rampart/RampartEngine.java | 256 ++++++---
.../org/apache/rampart/RampartMessageData.java | 65 +--
.../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 | 11 +
.../rampart/policy/model/KerberosConfig.java | 361 ++++++++++++
.../apache/rampart/policy/model/RampartConfig.java | 18 +
.../java/org/apache/rampart/util/Axis2Util.java | 27 +-
.../rampart/util/HandlerParameterDecoder.java | 292 ----------
.../java/org/apache/rampart/util/RampartUtil.java | 122 +++-
.../org.apache.neethi.builders.AssertionBuilder | 3 +-
.../org/apache/rampart/errors.properties | 9 +
.../policy/builders/KerberosConfigBuilderTest.java | 121 ++++
.../rampart/policy/builders/kerberosConfig.policy | 22 +
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 | 102 ++--
.../src/main/resources/ping/ping.wsdl | 68 ---
.../apache/axis2/oasis/ping/PingPortSkeleton.java | 79 ---
.../axis2/security/InteropScenarioClient.java | 176 ------
.../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 | 35 +-
.../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 | 121 ++--
.../org/apache/rampart/util/KerberosServer.java | 207 +++++++
.../rampart/util/KerberosTokenDecoderImpl.java | 156 ++++++
.../src/test/resources/conf/axis2.xml | 43 +-
.../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 | 143 -----
.../resources/security/complete.service.axis2.xml | 152 -----
.../test/resources/security/complete.service.xml | 31 -
.../test/resources/security/s1.client.axis2.xml | 119 ----
.../test/resources/security/s1.service.axis2.xml | 144 -----
.../src/test/resources/security/s1.service.xml | 15 -
.../test/resources/security/s2.client.axis2.xml | 128 -----
.../test/resources/security/s2.service.axis2.xml | 144 -----
.../src/test/resources/security/s2.service.xml | 16 -
.../test/resources/security/s2a.client.axis2.xml | 126 -----
.../test/resources/security/s2a.service.axis2.xml | 143 -----
.../src/test/resources/security/s2a.service.xml | 16 -
.../test/resources/security/s3.client.axis2.xml | 137 -----
.../test/resources/security/s3.service.axis2.xml | 143 -----
.../src/test/resources/security/s3.service.xml | 31 -
.../test/resources/security/s4.client.axis2.xml | 135 -----
.../test/resources/security/s4.service.axis2.xml | 144 -----
.../src/test/resources/security/s4.service.xml | 31 -
.../test/resources/security/s5.client.axis2.xml | 132 -----
.../test/resources/security/s5.service.axis2.xml | 145 -----
.../src/test/resources/security/s5.service.xml | 16 -
.../test/resources/security/s6.client.axis2.xml | 135 -----
.../test/resources/security/s6.service.axis2.xml | 145 -----
.../src/test/resources/security/s6.service.xml | 29 -
.../test/resources/security/s7.client.axis2.xml | 135 -----
.../test/resources/security/s7.service.axis2.xml | 146 -----
.../src/test/resources/security/s7.service.xml | 31 -
.../test/resources/security/sST1.client.axis2.xml | 119 ----
.../test/resources/security/sST1.service.axis2.xml | 145 -----
.../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 | 136 -----
.../resources/security/secMtom.service.axis2.xml | 146 -----
.../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 | 10 +-
.../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 | 465 ---------------
.../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 | 474 ----------------
.../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 | 475 ----------------
.../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 | 483 ----------------
.../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 | 482 ----------------
.../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 | 488 ----------------
.../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 | 487 ----------------
.../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 | 488 ----------------
.../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 | 487 ----------------
.../rampart-samples/basic/sample09/services.xml | 47 --
.../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 | 491 ----------------
.../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 -
.../basic/sample11/client.axis2.xml | 464 ---------------
.../rampart-samples/basic/sample11/services.xml | 46 --
.../apache/rampart/samples/sample11/Client.java | 96 ----
.../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 | 60 +-
modules/rampart-samples/policy/sample01/README.txt | 14 +-
.../rampart-samples/policy/sample01/services.xml | 3 +-
.../rampart/samples/policy/sample01/Client.java | 7 +-
.../rampart/samples/policy/sample02/Client.java | 7 +-
.../rampart/samples/policy/sample03/Client.java | 7 +-
.../rampart/samples/policy/sample04/Client.java | 7 +-
modules/rampart-samples/policy/sample05/policy.xml | 2 +-
.../rampart/samples/policy/sample05/Client.java | 10 +-
modules/rampart-samples/policy/sample06/policy.xml | 6 +-
.../rampart-samples/policy/sample06/services.xml | 2 +-
.../rampart/samples/policy/sample06/Client.java | 6 +-
.../samples/policy/sample06/MexService.java | 9 +-
.../rampart/samples/policy/sample07/Client.java | 7 +-
modules/rampart-samples/policy/sample08/policy.xml | 2 +-
.../rampart/samples/policy/sample08/Client.java | 10 +-
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 | 160 ++++--
.../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 | 33 +-
.../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 | 2 +-
.../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/pom.xml | 23 +-
modules/rampart-trust/pom.xml | 62 +-
.../java/org/apache/rahas/STSMessageReceiver.java | 10 +-
.../java/org/apache/rahas/SimpleTokenStore.java | 62 +-
.../java/org/apache/rahas/client/STSClient.java | 4 +-
.../org/apache/rahas/impl/SAML2TokenIssuer.java | 8 +-
.../org/apache/rahas/impl/SCTIssuerConfig.java | 7 +-
.../org/apache/rahas/impl/TokenCancelerConfig.java | 7 +-
.../java/org/apache/rahas/impl/util/SAMLUtils.java | 10 +-
.../org/apache/rahas/errors.properties | 0
pom.xml | 466 ++++++++++++----
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
.../site/resources/images/apache-rampart-logo.jpg | Bin
.../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 | 0
.../src => src}/site/xdoc/siteHowTo.xml | 0
.../src => src}/site/xdoc/specifications.xml | 0
.../documentation/src => src}/site/xdoc/svn.xml | 0
436 files changed, 7306 insertions(+), 20607 deletions(-)
diff --cc modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
index 9b76ff5,d9a4016..2dc7027
--- a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
+++ b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
@@@ -78,14 -75,10 +78,14 @@@ public class UsernameTokenBuilder imple
return new QName[] {SP11Constants.USERNAME_TOKEN};
}
- private void processAlternative(List assertions, UsernameToken parent) {
+ private void processAlternative(List<Assertion> assertions, UsernameToken parent) {
+
+ // UT profile version
+ boolean usernameToken10Set = false;
+ boolean usernameToken11Set = false;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- Assertion assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ Assertion assertion = iterator.next();
QName qname = assertion.getName();
if (SP11Constants.WSS_USERNAME_TOKEN10.equals(qname)) {
diff --cc modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
index c593ecd,4924ddf..b2fce34
--- a/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
+++ b/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
@@@ -78,20 -75,9 +78,20 @@@ public class UsernameTokenBuilder imple
return new QName[] {SP12Constants.USERNAME_TOKEN};
}
- private void processAlternative(List assertions, UsernameToken parent) {
+ private void processAlternative(List<Assertion> assertions, UsernameToken parent) {
+
+ // UT profile version
+ boolean usernameToken10Set = false;
+ boolean usernameToken11Set = false;
+ // password options
+ boolean noPasswordSet = false;
+ boolean hasPasswordSet = false;
+ // derived keys conf
+ boolean derivedKeysSet = false;
+ boolean expDerivedKeysSet = false;
+ boolean impDerivedKeysSet = false;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
Assertion assertion = (Assertion) iterator.next();
QName qname = assertion.getName();