You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2017/01/30 17:50:59 UTC
svn commit: r1780953 [5/9] - in
/axis/axis2/java/rampart/branches/RAMPART-289: ./ apidocs/ code-coverage/
etc/ legal/ modules/distribution/ modules/distribution/src/
modules/documentation/ modules/rampart-core/
modules/rampart-core/src/main/java/META-I...
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/InitiatorTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -40,19 +40,19 @@ public class InitiatorTokenBuilder imple
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), initiatorToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), initiatorToken);
break; // TODO process all the token that must be set ..
}
return initiatorToken;
}
- private void processAlternative(List assertions, InitiatorToken parent) {
+ private void processAlternative(List<Assertion> assertions, InitiatorToken parent) {
Object token;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
token = iterator.next();
if (token instanceof Token) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/IssuedTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -83,9 +83,9 @@ public class IssuedTokenBuilder implemen
Policy policy = PolicyEngine.getPolicy(policyElement);
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator
.hasNext();) {
- processAlternative((List) iterator.next(), issuedToken);
+ processAlternative(iterator.next(), issuedToken);
break; // since there should be only one alternative ..
}
}
@@ -97,12 +97,12 @@ public class IssuedTokenBuilder implemen
return new QName[] { SP11Constants.ISSUED_TOKEN };
}
- private void processAlternative(List assertions, IssuedToken parent) {
+ private void processAlternative(List<Assertion> assertions, IssuedToken parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP11Constants.REQUIRE_DERIVED_KEYS.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/LayoutBuilder.java Mon Jan 30 17:50:58 2017
@@ -40,8 +40,8 @@ public class LayoutBuilder implements As
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext(); ) {
- processAlternative((List) iterator.next(), layout);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext(); ) {
+ processAlternative(iterator.next(), layout);
break; // there should be only one alternative
}
@@ -52,10 +52,10 @@ public class LayoutBuilder implements As
return new QName[] {SP11Constants.LAYOUT};
}
- public void processAlternative(List assertions, Layout parent) {
+ public void processAlternative(List<Assertion> assertions, Layout parent) {
- 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.STRICT.equals(qname)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/ProtectionTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -39,8 +39,8 @@ public class ProtectionTokenBuilder impl
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), protectionToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), protectionToken);
break; // since there should be only one alternative ..
}
@@ -51,7 +51,7 @@ public class ProtectionTokenBuilder impl
return new QName[] {SP11Constants.PROTECTION_TOKEN};
}
- private void processAlternative(List assertions, ProtectionToken parent) {
+ private void processAlternative(List<Assertion> assertions, ProtectionToken parent) {
Object token = assertions.get(0);
if (token instanceof Token) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/RecipientTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -40,8 +40,8 @@ public class RecipientTokenBuilder imple
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), recipientToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), recipientToken);
/*
* for the moment we will pick the first token specified in the policy
@@ -52,12 +52,12 @@ public class RecipientTokenBuilder imple
return recipientToken;
}
- private void processAlternative(List assertions, RecipientToken parent) {
+ private void processAlternative(List<Assertion> assertions, RecipientToken parent) {
Assertion assertion;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
if (assertion instanceof Token) {
parent.setToken((Token) assertion);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SignedPartsBuilder.java Mon Jan 30 17:50:58 2017
@@ -43,7 +43,7 @@ public class SignedPartsBuilder implemen
processElement((OMElement) iterator.next(), signedEncryptedParts);
}
- // Presense of <sp:SignedParts/> enforces the requirement for sign body and all the header blocks
+ // Presence of <sp:SignedParts/> enforces the requirement for sign body and all the header blocks
if(!element.getChildren().hasNext()){
signedEncryptedParts.setBody(true);
signedEncryptedParts.setSignAllHeaders(true);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SupportingTokensBuilder.java Mon Jan 30 17:50:58 2017
@@ -62,8 +62,8 @@ public class SupportingTokensBuilder imp
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), supportingToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), supportingToken);
/*
* for the moment we will say there should be only one alternative
*/
@@ -80,11 +80,11 @@ public class SupportingTokensBuilder imp
SP11Constants.SIGNED_ENDORSING_SUPPORTING_TOKENS};
}
- private void processAlternative(List assertions, SupportingToken supportingToken) {
+ private void processAlternative(List<Assertion> assertions, SupportingToken supportingToken) {
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
- Assertion primitive = (Assertion) iterator.next();
+ Assertion primitive = iterator.next();
QName qname = primitive.getName();
if (SP11Constants.ALGORITHM_SUITE.equals(qname)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/SymmetricBindingBuilder.java Mon Jan 30 17:50:58 2017
@@ -28,9 +28,12 @@ import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
+import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
+import org.apache.ws.secpolicy.model.EncryptionToken;
import org.apache.ws.secpolicy.model.Layout;
import org.apache.ws.secpolicy.model.ProtectionToken;
+import org.apache.ws.secpolicy.model.SignatureToken;
import org.apache.ws.secpolicy.model.SymmetricBinding;
public class SymmetricBindingBuilder implements AssertionBuilder<OMElement> {
@@ -41,8 +44,8 @@ public class SymmetricBindingBuilder imp
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternatives((List) iterator.next(), symmetricBinding);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternatives(iterator.next(), symmetricBinding);
/*
* since there should be only one alternative ..
@@ -56,37 +59,47 @@ public class SymmetricBindingBuilder imp
return new QName[] {SP11Constants.SYMMETRIC_BINDING};
}
- private void processAlternatives(List assertions, SymmetricBinding symmetricBinding) {
+ private void processAlternatives(List<Assertion> assertions, SymmetricBinding symmetricBinding) {
Assertion assertion;
QName name;
-
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
- name = assertion.getName();
-
- if (SP11Constants.ALGORITHM_SUITE.equals(name)) {
- symmetricBinding.setAlgorithmSuite((AlgorithmSuite) assertion);
-
- } else if (SP11Constants.LAYOUT.equals(name)) {
- symmetricBinding.setLayout((Layout) assertion);
-
- } else if (SP11Constants.INCLUDE_TIMESTAMP.equals(name)) {
- symmetricBinding.setIncludeTimestamp(true);
-
- } else if (SP11Constants.PROTECTION_TOKEN.equals(name)) {
- symmetricBinding.setProtectionToken((ProtectionToken) assertion);
-
- } else if (SPConstants.ENCRYPT_BEFORE_SIGNING.equals(name.getLocalPart())) {
- symmetricBinding.setProtectionOrder(SPConstants.ENCRYPT_BEFORE_SIGNING);
-
- } else if (SPConstants.SIGN_BEFORE_ENCRYPTING.equals(name.getLocalPart())) {
- symmetricBinding.setProtectionOrder(SPConstants.SIGN_BEFORE_ENCRYPTING);
-
- } else if (SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {
- symmetricBinding.setEntireHeadersAndBodySignatures(true);
- } else if (SP11Constants.ENCRYPT_SIGNATURE.equals(name)) {
- symmetricBinding.setSignatureProtection(true);
- }
- }
+ try {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
+ name = assertion.getName();
+
+ if (SP11Constants.ALGORITHM_SUITE.equals(name)) {
+ symmetricBinding.setAlgorithmSuite((AlgorithmSuite) assertion);
+
+ } else if (SP11Constants.LAYOUT.equals(name)) {
+ symmetricBinding.setLayout((Layout) assertion);
+
+ } else if (SP11Constants.INCLUDE_TIMESTAMP.equals(name)) {
+ symmetricBinding.setIncludeTimestamp(true);
+
+ } else if (SP11Constants.PROTECTION_TOKEN.equals(name)) {
+ symmetricBinding.setProtectionToken((ProtectionToken) assertion);
+
+ } else if (SPConstants.ENCRYPT_BEFORE_SIGNING.equals(name.getLocalPart())) {
+ symmetricBinding.setProtectionOrder(SPConstants.ENCRYPT_BEFORE_SIGNING);
+
+ } else if (SPConstants.SIGN_BEFORE_ENCRYPTING.equals(name.getLocalPart())) {
+ symmetricBinding.setProtectionOrder(SPConstants.SIGN_BEFORE_ENCRYPTING);
+
+ } else if (SPConstants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name.getLocalPart())) {
+ symmetricBinding.setEntireHeadersAndBodySignatures(true);
+
+ } else if (SP11Constants.ENCRYPT_SIGNATURE.equals(name)) {
+ symmetricBinding.setSignatureProtection(true);
+
+ } else if (SP11Constants.ENCRYPTION_TOKEN.equals(name)) {
+ symmetricBinding.setEncryptionToken((EncryptionToken) assertion);
+
+ } else if (SP11Constants.SIGNATURE_TOKEN.equals(name)) {
+ symmetricBinding.setSignatureToken((SignatureToken) assertion);
+ }
+ }
+ } catch (WSSPolicyException e) {
+ throw new IllegalArgumentException(e);
+ }
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportBindingBuilder.java Mon Jan 30 17:50:58 2017
@@ -42,8 +42,8 @@ public class TransportBindingBuilder imp
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), transportBinding, factory);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), transportBinding, factory);
/*
* since there should be only one alternative
@@ -58,11 +58,11 @@ public class TransportBindingBuilder imp
return new QName[] {SP11Constants.TRANSPORT_BINDING};
}
- private void processAlternative(List assertionList, TransportBinding parent, AssertionBuilderFactory factory) {
+ private void processAlternative(List<Assertion> assertionList, TransportBinding parent, AssertionBuilderFactory factory) {
- for (Iterator iterator = assertionList.iterator(); iterator.hasNext(); ) {
+ for (Iterator<Assertion> iterator = assertionList.iterator(); iterator.hasNext(); ) {
- Assertion primitive = (Assertion) iterator.next();
+ Assertion primitive = iterator.next();
QName name = primitive.getName();
if (name.equals(SP11Constants.ALGORITHM_SUITE)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/TransportTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -20,7 +20,6 @@ import java.util.List;
import javax.xml.namespace.QName;
-import org.apache.axiom.om.OMAttribute;
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
@@ -43,8 +42,8 @@ public class TransportTokenBuilder imple
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), transportToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), transportToken);
break; // since there should be only one alternative
}
@@ -55,10 +54,10 @@ public class TransportTokenBuilder imple
return new QName[] {SP11Constants.TRANSPORT_TOKEN};
}
- private void processAlternative(List assertions, TransportToken parent) {
+ private void processAlternative(List<Assertion> assertions, TransportToken parent) {
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- Assertion primtive = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ Assertion primtive = iterator.next();
QName qname = primtive.getName();
if (SP11Constants.HTTPS_TOKEN.equals(qname)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/UsernameTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -53,13 +53,13 @@ public class UsernameTokenBuilder implem
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);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), usernameToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), usernameToken);
/*
* since there should be only one alternative
@@ -75,10 +75,10 @@ public class UsernameTokenBuilder implem
return new QName[] {SP11Constants.USERNAME_TOKEN};
}
- private void processAlternative(List assertions, UsernameToken parent) {
+ private void processAlternative(List<Assertion> assertions, UsernameToken parent) {
- 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)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS10Builder.java Mon Jan 30 17:50:58 2017
@@ -40,8 +40,8 @@ public class WSS10Builder implements Ass
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), wss10);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), wss10);
/*
* since there should be only one alternative
*/
@@ -55,13 +55,13 @@ public class WSS10Builder implements Ass
return new QName[] {SP11Constants.WSS10};
}
- private void processAlternative(List assertions, Wss10 parent) {
+ private void processAlternative(List<Assertion> assertions, Wss10 parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext(); ) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext(); ) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP11Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/WSS11Builder.java Mon Jan 30 17:50:58 2017
@@ -39,8 +39,8 @@ public class WSS11Builder implements Ass
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), wss11);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), wss11);
/*
* since there should be only one alternative
*/
@@ -54,13 +54,13 @@ public class WSS11Builder implements Ass
return new QName[] {SP11Constants.WSS11};
}
- private void processAlternative(List assertions, Wss11 parent) {
+ private void processAlternative(List<Assertion> assertions, Wss11 parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP11Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/X509TokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -77,9 +77,9 @@ public class X509TokenBuilder implements
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator
.hasNext();) {
- processAlternative((List) iterator.next(), x509Token);
+ processAlternative(iterator.next(), x509Token);
/*
* since there should be only one alternative
@@ -105,12 +105,12 @@ public class X509TokenBuilder implements
return x509Token;
}
- private void processAlternative(List assertions, X509Token parent) {
+ private void processAlternative(List<Assertion> assertions, X509Token parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP11Constants.REQUIRE_KEY_IDENTIFIRE_REFERENCE.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java Mon Jan 30 17:50:58 2017
@@ -40,8 +40,8 @@ public class AlgorithmSuiteBuilder imple
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- Iterator iterAlterns = policy.getAlternatives();
- List assertions = ((List) iterAlterns.next());
+ Iterator<List<Assertion>> iterAlterns = policy.getAlternatives();
+ List<Assertion> assertions = iterAlterns.next();
processAlternative(assertions, algorithmSuite);
@@ -49,9 +49,9 @@ public class AlgorithmSuiteBuilder imple
}
- private void processAlternative(List assertions, AlgorithmSuite algorithmSuite) {
- Iterator iterator = assertions.iterator();
- Assertion assertion = ((Assertion) iterator.next());
+ private void processAlternative(List<Assertion> assertions, AlgorithmSuite algorithmSuite) {
+ Iterator<Assertion> iterator = assertions.iterator();
+ Assertion assertion = iterator.next();
String name = assertion.getName().getLocalPart();
try {
algorithmSuite.setAlgorithmSuite(name);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AsymmetricBindingBuilder.java Mon Jan 30 17:50:58 2017
@@ -43,8 +43,8 @@ public class AsymmetricBindingBuilder im
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), asymmetricBinding);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), asymmetricBinding);
/*
* since there should be only one alternative
@@ -55,13 +55,13 @@ public class AsymmetricBindingBuilder im
return asymmetricBinding;
}
- private void processAlternative(List assertions, AsymmetricBinding asymmetricBinding) {
+ private void processAlternative(List<Assertion> assertions, AsymmetricBinding asymmetricBinding) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP12Constants.INITIATOR_TOKEN.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -54,8 +54,8 @@ public class HttpsTokenBuilder implement
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), httpsToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), httpsToken);
break; // since there should be only one alternative
}
}
@@ -82,10 +82,10 @@ public class HttpsTokenBuilder implement
* @param assertions the list of assertions to be searched through.
* @param parent the https token, that is to be populated with retrieved data.
*/
- private void processAlternative(List assertions, HttpsToken parent) {
+ private void processAlternative(List<Assertion> assertions, HttpsToken parent) {
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- Assertion primtive = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ Assertion primtive = iterator.next();
QName qname = primtive.getName();
if (qname != null) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -40,19 +40,19 @@ public class InitiatorTokenBuilder imple
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), initiatorToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), initiatorToken);
break; // TODO process all the token that must be set ..
}
return initiatorToken;
}
- private void processAlternative(List assertions, InitiatorToken parent) {
+ private void processAlternative(List<Assertion> assertions, InitiatorToken parent) {
Object token;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
token = iterator.next();
if (token instanceof Token) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -84,9 +84,9 @@ public class IssuedTokenBuilder implemen
Policy policy = PolicyEngine.getPolicy(policyElement);
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator
.hasNext();) {
- processAlternative((List) iterator.next(), issuedToken);
+ processAlternative(iterator.next(), issuedToken);
break; // since there should be only one alternative ..
}
}
@@ -98,12 +98,12 @@ public class IssuedTokenBuilder implemen
return new QName[] { SP12Constants.ISSUED_TOKEN };
}
- private void processAlternative(List assertions, IssuedToken parent) {
+ private void processAlternative(List<Assertion> assertions, IssuedToken parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP12Constants.REQUIRE_DERIVED_KEYS.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java Mon Jan 30 17:50:58 2017
@@ -38,8 +38,8 @@ public class LayoutBuilder implements As
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext(); ) {
- processAlternative((List) iterator.next(), layout);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext(); ) {
+ processAlternative(iterator.next(), layout);
break; // there should be only one alternative
}
@@ -50,10 +50,10 @@ public class LayoutBuilder implements As
return new QName[] {SP12Constants.LAYOUT};
}
- public void processAlternative(List assertions, Layout parent) {
+ public void processAlternative(List<Assertion> assertions, Layout parent) {
- 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 (SP12Constants.STRICT.equals(qname)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -39,8 +39,8 @@ public class ProtectionTokenBuilder impl
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), protectionToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), protectionToken);
break; // since there should be only one alternative ..
}
@@ -51,7 +51,7 @@ public class ProtectionTokenBuilder impl
return new QName[] {SP12Constants.PROTECTION_TOKEN};
}
- private void processAlternative(List assertions, ProtectionToken parent) {
+ private void processAlternative(List<Assertion> assertions, ProtectionToken parent) {
Object token = assertions.get(0);
if (token instanceof Token) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -40,8 +40,8 @@ public class RecipientTokenBuilder imple
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), recipientToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), recipientToken);
/*
* for the moment we will pick the first token specified in the policy
@@ -52,11 +52,11 @@ public class RecipientTokenBuilder imple
return recipientToken;
}
- private void processAlternative(List assertions, RecipientToken parent) {
+ private void processAlternative(List<Assertion> assertions, RecipientToken parent) {
Assertion assertion;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
assertion = (Assertion) iterator.next();
if (assertion instanceof Token) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java Mon Jan 30 17:50:58 2017
@@ -45,7 +45,7 @@ public class SignedPartsBuilder implemen
.booleanValue());
}
- //presense of <sp:SignedParts/> enforces the requirement for sign body and all the header blocks
+ //Presence of <sp:SignedParts/> enforces the requirement for sign body and all the header blocks
if(!element.getChildren().hasNext()){
signedEncryptedParts.setBody(true);
signedEncryptedParts.setSignAllHeaders(true);
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java Mon Jan 30 17:50:58 2017
@@ -78,8 +78,8 @@ public class SupportingTokensBuilder imp
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), supportingToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), supportingToken);
/*
* for the moment we will say there should be only one alternative
*/
@@ -101,11 +101,11 @@ public class SupportingTokensBuilder imp
};
}
- private void processAlternative(List assertions, SupportingToken supportingToken) {
+ private void processAlternative(List<Assertion> assertions, SupportingToken supportingToken) {
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
- Assertion primitive = (Assertion) iterator.next();
+ Assertion primitive = iterator.next();
QName qname = primitive.getName();
if (SP12Constants.ALGORITHM_SUITE.equals(qname)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java Mon Jan 30 17:50:58 2017
@@ -28,9 +28,12 @@ import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
+import org.apache.ws.secpolicy.model.EncryptionToken;
import org.apache.ws.secpolicy.model.Layout;
import org.apache.ws.secpolicy.model.ProtectionToken;
+import org.apache.ws.secpolicy.model.SignatureToken;
import org.apache.ws.secpolicy.model.SymmetricBinding;
public class SymmetricBindingBuilder implements AssertionBuilder<OMElement> {
@@ -41,8 +44,8 @@ public class SymmetricBindingBuilder imp
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternatives((List) iterator.next(), symmetricBinding);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternatives(iterator.next(), symmetricBinding);
/*
* since there should be only one alternative ..
@@ -56,37 +59,47 @@ public class SymmetricBindingBuilder imp
return new QName[] {SP12Constants.SYMMETRIC_BINDING};
}
- private void processAlternatives(List assertions, SymmetricBinding symmetricBinding) {
+ private void processAlternatives(List<Assertion> assertions, SymmetricBinding symmetricBinding) {
Assertion assertion;
QName name;
-
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
- name = assertion.getName();
-
- if (SP12Constants.ALGORITHM_SUITE.equals(name)) {
- symmetricBinding.setAlgorithmSuite((AlgorithmSuite) assertion);
-
- } else if (SP12Constants.LAYOUT.equals(name)) {
- symmetricBinding.setLayout((Layout) assertion);
-
- } else if (SP12Constants.INCLUDE_TIMESTAMP.equals(name)) {
- symmetricBinding.setIncludeTimestamp(true);
-
- } else if (SP12Constants.PROTECTION_TOKEN.equals(name)) {
- symmetricBinding.setProtectionToken((ProtectionToken) assertion);
-
- } else if (SP12Constants.ENCRYPT_BEFORE_SIGNING.equals(name)) {
- symmetricBinding.setProtectionOrder(SPConstants.ENCRYPT_BEFORE_SIGNING);
-
- } else if (SP12Constants.SIGN_BEFORE_ENCRYPTING.equals(name)) {
- symmetricBinding.setProtectionOrder(SPConstants.SIGN_BEFORE_ENCRYPTING);
-
- } else if (SP12Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name)) {
- symmetricBinding.setEntireHeadersAndBodySignatures(true);
- } else if (SP12Constants.ENCRYPT_SIGNATURE.equals(name)) {
- symmetricBinding.setSignatureProtection(true);
- }
- }
+ try {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
+ name = assertion.getName();
+
+ if (SP12Constants.ALGORITHM_SUITE.equals(name)) {
+ symmetricBinding.setAlgorithmSuite((AlgorithmSuite) assertion);
+
+ } else if (SP12Constants.LAYOUT.equals(name)) {
+ symmetricBinding.setLayout((Layout) assertion);
+
+ } else if (SP12Constants.INCLUDE_TIMESTAMP.equals(name)) {
+ symmetricBinding.setIncludeTimestamp(true);
+
+ } else if (SP12Constants.PROTECTION_TOKEN.equals(name)) {
+ symmetricBinding.setProtectionToken((ProtectionToken) assertion);
+
+ } else if (SP12Constants.ENCRYPT_BEFORE_SIGNING.equals(name)) {
+ symmetricBinding.setProtectionOrder(SPConstants.ENCRYPT_BEFORE_SIGNING);
+
+ } else if (SP12Constants.SIGN_BEFORE_ENCRYPTING.equals(name)) {
+ symmetricBinding.setProtectionOrder(SPConstants.SIGN_BEFORE_ENCRYPTING);
+
+ } else if (SP12Constants.ONLY_SIGN_ENTIRE_HEADERS_AND_BODY.equals(name)) {
+ symmetricBinding.setEntireHeadersAndBodySignatures(true);
+
+ } else if (SP12Constants.ENCRYPT_SIGNATURE.equals(name)) {
+ symmetricBinding.setSignatureProtection(true);
+
+ } else if (SP12Constants.ENCRYPTION_TOKEN.equals(name)) {
+ symmetricBinding.setEncryptionToken((EncryptionToken) assertion);
+
+ } else if (SP12Constants.SIGNATURE_TOKEN.equals(name)) {
+ symmetricBinding.setSignatureToken((SignatureToken) assertion);
+ }
+ }
+ } catch (WSSPolicyException e) {
+ throw new IllegalArgumentException(e);
+ }
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java Mon Jan 30 17:50:58 2017
@@ -42,8 +42,8 @@ public class TransportBindingBuilder imp
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), transportBinding, factory);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), transportBinding, factory);
/*
* since there should be only one alternative
@@ -58,11 +58,11 @@ public class TransportBindingBuilder imp
return new QName[] {SP12Constants.TRANSPORT_BINDING};
}
- private void processAlternative(List assertionList, TransportBinding parent, AssertionBuilderFactory factory) {
+ private void processAlternative(List<Assertion> assertionList, TransportBinding parent, AssertionBuilderFactory factory) {
- for (Iterator iterator = assertionList.iterator(); iterator.hasNext(); ) {
+ for (Iterator<Assertion> iterator = assertionList.iterator(); iterator.hasNext(); ) {
- Assertion primitive = (Assertion) iterator.next();
+ Assertion primitive = iterator.next();
QName name = primitive.getName();
if (name.equals(SP12Constants.ALGORITHM_SUITE)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -37,8 +37,8 @@ public class TransportTokenBuilder imple
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), transportToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), transportToken);
break; // since there should be only one alternative
}
@@ -49,8 +49,8 @@ public class TransportTokenBuilder imple
return new QName[] {SP12Constants.TRANSPORT_TOKEN};
}
- private void processAlternative(List assertions, TransportToken parent) {
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ private void processAlternative(List<Assertion> assertions, TransportToken parent) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
Assertion primtive = (Assertion) iterator.next();
QName qname = primtive.getName();
if(SP12Constants.HTTPS_TOKEN.equals(qname)){
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -58,8 +58,8 @@ public class UsernameTokenBuilder implem
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), usernameToken);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), usernameToken);
/*
* since there should be only one alternative
@@ -75,9 +75,9 @@ public class UsernameTokenBuilder implem
return new QName[] {SP12Constants.USERNAME_TOKEN};
}
- private void processAlternative(List assertions, UsernameToken parent) {
+ private void processAlternative(List<Assertion> assertions, UsernameToken parent) {
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
Assertion assertion = (Assertion) iterator.next();
QName qname = assertion.getName();
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java Mon Jan 30 17:50:58 2017
@@ -40,8 +40,8 @@ public class WSS10Builder implements Ass
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), wss10);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), wss10);
/*
* since there should be only one alternative
*/
@@ -55,13 +55,13 @@ public class WSS10Builder implements Ass
return new QName[] {SP12Constants.WSS10};
}
- private void processAlternative(List assertions, Wss10 parent) {
+ private void processAlternative(List<Assertion> assertions, Wss10 parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext(); ) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext(); ) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP12Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java Mon Jan 30 17:50:58 2017
@@ -39,8 +39,8 @@ public class WSS11Builder implements Ass
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), wss11);
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative(iterator.next(), wss11);
/*
* since there should be only one alternative
*/
@@ -54,13 +54,13 @@ public class WSS11Builder implements Ass
return new QName[] {SP12Constants.WSS11};
}
- private void processAlternative(List assertions, Wss11 parent) {
+ private void processAlternative(List<Assertion> assertions, Wss11 parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP12Constants.MUST_SUPPORT_REF_KEY_IDENTIFIER.equals(name)) {
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java Mon Jan 30 17:50:58 2017
@@ -79,9 +79,9 @@ public class X509TokenBuilder implements
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
- for (Iterator iterator = policy.getAlternatives(); iterator
+ for (Iterator<List<Assertion>> iterator = policy.getAlternatives(); iterator
.hasNext();) {
- processAlternative((List) iterator.next(), x509Token);
+ processAlternative(iterator.next(), x509Token);
/*
* since there should be only one alternative
@@ -107,12 +107,12 @@ public class X509TokenBuilder implements
return x509Token;
}
- private void processAlternative(List assertions, X509Token parent) {
+ private void processAlternative(List<Assertion> assertions, X509Token parent) {
Assertion assertion;
QName name;
- for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- assertion = (Assertion) iterator.next();
+ for (Iterator<Assertion> iterator = assertions.iterator(); iterator.hasNext();) {
+ assertion = iterator.next();
name = assertion.getName();
if (SP12Constants.REQUIRE_KEY_IDENTIFIRE_REFERENCE.equals(name)) {
Propchange: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Jan 30 17:50:58 2017
@@ -0,0 +1,4 @@
+.classpath
+.project
+.settings
+target
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/README.txt Mon Jan 30 17:50:58 2017
@@ -11,8 +11,8 @@ This directory contains three sub direct
- keys - The keystore files that contains the keys used by the samples
-Please use Apache Ant with the build.xml file available here to copy all jars
-and mars to required places.
+Please use Apache Ant with the build.xml file available in the top level directory
+to copy all jars and mars to required places.
- Please copy log4j.jar to AXIS2_HOME/lib directory before trying out samples.
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/service.jks
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/keys/service.jks?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
Binary files - no diff available.
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/build.xml Mon Jan 30 17:50:58 2017
@@ -18,11 +18,13 @@
<project basedir="." default="clean">
- <property name="service.repos.dir" value="build/service_repositories"/>
- <property name="client.repos.dir" value="build/client_repositories"/>
- <property name="temp.dir" value="build/temp"/>
+ <property name="build.dir" value="build"/>
+ <property name="service.repos.dir" value="${build.dir}/service_repositories"/>
+ <property name="client.repos.dir" value="${build.dir}/client_repositories"/>
+ <property name="temp.dir" value="${build.dir}/temp"/>
<property name="keys.dir" value="../keys"/>
- <property name="temp.client.dir" value="build/temp_client"/>
+ <property name="temp.client.dir" value="${build.dir}/temp_client"/>
+ <property name="endorsed.dir" value="${build.dir}/endorsed"/>
<property name="client.port" value="8080"/>
<property name="server.port" value="8080"/>
@@ -33,6 +35,8 @@
<property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+ <property name="vmargs" value=""/>
+
<path id="runtime.classpath">
<fileset dir="${lib.dir}">
<include name="**/*.jar"/>
@@ -124,9 +128,25 @@
<create.and.run.client sample.number="08"/>
</target>
+ <!--Sample Service 09-->
+ <target name="service.09" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.service.repo sample.number="09"/>
+ </target>
+
+ <!--Sample Client 09-->
+ <target name="client.09" if="env.AXIS2_HOME" depends="check.dependency">
+ <create.and.run.client sample.number="09"/>
+ </target>
+
+ <target name="setup">
+ <mkdir dir="${endorsed.dir}"/>
+ <get src="http://repo2.maven.org/maven2/xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"
+ dest="${endorsed.dir}/xercesImpl-2.9.1.jar" verbose="true"/>
+ </target>
+
<target name="clean">
- <delete dir="build" />
+ <delete dir="${build.dir}" />
</target>
<!-- Macro to create a service repo for a given sample -->
@@ -163,7 +183,11 @@
<exclude name="**/Client.java"/>
</javac>
- <copy file="sample@{sample.number}/services.xml" tofile="${temp.dir}/META-INF/services.xml" overwrite="true"/>
+ <copy file="sample@{sample.number}/services.xml" tofile="${temp.dir}/META-INF/services.xml" overwrite="true">
+ <filterset>
+ <filter token="port" value="${server.port}"/>
+ </filterset>
+ </copy>
<copy file="${keys.dir}/service.jks" tofile="${temp.dir}/service.jks" overwrite="true"/>
<copy file="${keys.dir}/sts.jks" tofile="${temp.dir}/sts.jks" overwrite="true"/>
<copy file="${keys.dir}/service.properties" tofile="${temp.dir}/service.properties" overwrite="true"/>
@@ -178,6 +202,7 @@
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
<classpath refid="runtime.classpath"/>
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir} ${vmargs}"/>
</java>
</sequential>
@@ -217,8 +242,16 @@
<exclude name="**/Client.java"/>
</javac>
- <copy file="sample@{sample.number}/services.xml" tofile="${temp.dir}/META-INF/services.xml" overwrite="true"/>
- <copy file="sample@{sample.number}/mex_policy.xml" tofile="${temp.dir}/mex_policy.xml" overwrite="true"/>
+ <copy file="sample@{sample.number}/services.xml" tofile="${temp.dir}/META-INF/services.xml" overwrite="true">
+ <filterset>
+ <filter token="port" value="${server.port}"/>
+ </filterset>
+ </copy>
+ <copy file="sample@{sample.number}/mex_policy.xml" tofile="${temp.dir}/mex_policy.xml" overwrite="true">
+ <filterset>
+ <filter token="port" value="${server.port}"/>
+ </filterset>
+ </copy>
<copy file="${keys.dir}/service.jks" tofile="${temp.dir}/service.jks" overwrite="true"/>
<copy file="${keys.dir}/sts.jks" tofile="${temp.dir}/sts.jks" overwrite="true"/>
<copy file="${keys.dir}/service.properties" tofile="${temp.dir}/service.properties" overwrite="true"/>
@@ -233,6 +266,7 @@
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
<classpath refid="runtime.classpath"/>
+ <jvmarg line="-Djava.endorsed.dirs=${endorsed.dir} ${vmargs}"/>
</java>
</sequential>
@@ -271,17 +305,26 @@
<copy file="${keys.dir}/client.jks" tofile="${temp.client.dir}/client.jks" overwrite="true"/>
<copy file="${keys.dir}/client.properties" tofile="${temp.client.dir}/client.properties" overwrite="true"/>
+ <copy todir="${temp.client.dir}" overwrite="true">
+ <fileset dir="sample@{sample.number}">
+ <include name="*policy*.xml"/>
+ </fileset>
+ <filterset>
+ <filter token="port" value="${client.port}"/>
+ </filterset>
+ </copy>
<!-- Run client -->
- <java classname="org.apache.rampart.samples.policy.sample@{sample.number}.Client" fork="true">
+ <java classname="org.apache.rampart.samples.policy.sample@{sample.number}.Client" fork="true" failonerror="true">
<arg value="${sample.services.url}/sample@{sample.number}"/>
<arg value="${client.repos.dir}/sample@{sample.number}"/>
- <arg value="sample@{sample.number}/policy.xml"/>
+ <arg value="${temp.client.dir}/policy.xml"/>
<classpath>
<path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
</classpath>
+ <jvmarg line="${vmargs}"/>
</java>
<!-- <delete dir="${temp.client.dir}"/> -->
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/PWCBHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/PWCBHandler.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/PWCBHandler.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample-tomcat/src/org/apache/rampart/tomcat/sample/PWCBHandler.java Mon Jan 30 17:50:58 2017
@@ -33,7 +33,7 @@ public class PWCBHandler implements Call
//When the server side need to authenticate the user
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
if (pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN) {
- if(pwcb.getIdentifer().equals("alice") && pwcb.getPassword().equals("bobPW")) {
+ if(pwcb.getIdentifier().equals("alice") && pwcb.getPassword().equals("bobPW")) {
return;
} else {
throw new UnsupportedCallbackException(callbacks[i], "check failed");
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/README.txt
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/README.txt?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/README.txt (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/README.txt Mon Jan 30 17:50:58 2017
@@ -3,6 +3,16 @@ UsernameToken Authentication
The policy uses a TransportBinding and requires a SignedSupportingToken which
is a UsernameToken and the inclusion of a TimeStamp.
-Note that Rampart does not enforce the use of HTTPS transport and that
+Note that Rampart enforces the use of HTTPS transport and that
{http://ws.apache.org/rampart/policy}RampartConfig assertion provides
-additional information required to secure the message.
\ No newline at end of file
+additional information required to secure the message.
+
+The policy included in the services.xml file has the following comment :
+<!--<sp:HttpsToken RequireClientCertificate="false"/> -->
+
+If you uncomment this and deploy the service you will see the following error message :
+org.apache.axis2.AxisFault: Expected transport is "https" but incoming transport found : "http"
+
+You can find a complete tutorial on transport level
+security here:
+http://wso2.org/library/3190
\ No newline at end of file
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/services.xml Mon Jan 30 17:50:58 2017
@@ -32,7 +32,8 @@
<wsp:Policy>
<sp:TransportToken>
<wsp:Policy>
- <sp:HttpsToken RequireClientCertificate="false"/>
+ <!-- REMOVED TO MAKE THE SAMPLE RUN WITH THE axis2server-->
+ <!--<sp:HttpsToken RequireClientCertificate="false"/> -->
</wsp:Policy>
</sp:TransportToken>
<sp:AlgorithmSuite>
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/Client.java Mon Jan 30 17:50:58 2017
@@ -20,7 +20,8 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -30,6 +31,8 @@ import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rampart.RampartMessageData;
+import java.io.FileInputStream;
+
import javax.xml.namespace.QName;
public class Client {
@@ -59,7 +62,7 @@ public class Client {
}
private static Policy loadPolicy(String xmlPath) throws Exception {
- StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
return PolicyEngine.getPolicy(builder.getDocumentElement());
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/PWCBHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/PWCBHandler.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/PWCBHandler.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample01/src/org/apache/rampart/samples/policy/sample01/PWCBHandler.java Mon Jan 30 17:50:58 2017
@@ -33,7 +33,7 @@ public class PWCBHandler implements Call
//When the server side need to authenticate the user
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
if (pwcb.getUsage() == WSPasswordCallback.USERNAME_TOKEN_UNKNOWN) {
- if(pwcb.getIdentifer().equals("alice") && pwcb.getPassword().equals("bobPW")) {
+ if(pwcb.getIdentifier().equals("alice") && pwcb.getPassword().equals("bobPW")) {
return;
} else {
throw new UnsupportedCallbackException(callbacks[i], "check failed");
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/Client.java Mon Jan 30 17:50:58 2017
@@ -20,7 +20,8 @@ import org.apache.axiom.om.OMAbstractFac
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
import org.apache.axiom.om.OMNamespace;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axis2.addressing.EndpointReference;
import org.apache.axis2.client.Options;
import org.apache.axis2.client.ServiceClient;
@@ -30,6 +31,8 @@ import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.rampart.RampartMessageData;
+import java.io.FileInputStream;
+
import javax.xml.namespace.QName;
public class Client {
@@ -59,7 +62,7 @@ public class Client {
}
private static Policy loadPolicy(String xmlPath) throws Exception {
- StAXOMBuilder builder = new StAXOMBuilder(xmlPath);
+ OMXMLParserWrapper builder = OMXMLBuilderFactory.createOMBuilder(new FileInputStream(xmlPath));
return PolicyEngine.getPolicy(builder.getDocumentElement());
}
Modified: axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/PWCBHandler.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/PWCBHandler.java?rev=1780953&r1=1780952&r2=1780953&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/PWCBHandler.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-289/modules/rampart-samples/policy/sample02/src/org/apache/rampart/samples/policy/sample02/PWCBHandler.java Mon Jan 30 17:50:58 2017
@@ -30,7 +30,7 @@ public class PWCBHandler implements Call
UnsupportedCallbackException {
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pwcb = (WSPasswordCallback)callbacks[i];
- String id = pwcb.getIdentifer();
+ String id = pwcb.getIdentifier();
if("client".equals(id)) {
pwcb.setPassword("apache");
} else if("service".equals(id)) {