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/29 15:16:04 UTC
svn commit: r1780804 [7/10] - in
/axis/axis2/java/rampart/branches/RAMPART-252: ./ legal/
modules/distribution/ modules/documentation/
modules/documentation/src/site/resources/download/
modules/documentation/src/site/xdoc/ modules/documentation/src/sit...
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/EncryptedPartsBuilder.java Sun Jan 29 15:16:02 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SP12Const
import org.apache.ws.secpolicy.model.Header;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
-public class EncryptedPartsBuilder implements AssertionBuilder {
+public class EncryptedPartsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/HttpsTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -15,22 +15,20 @@
*/
package org.apache.ws.secpolicy12.builders;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.neethi.builders.xml.XmlPrimtiveAssertion;
-import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.HttpsToken;
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+import java.util.List;
+
/**
* This is a standard assertion builder implementation for the https token
* as specified by the ws security policy 1.2 specification. In order for this builder to be used
@@ -44,22 +42,24 @@ import org.apache.ws.secpolicy.model.Htt
* alternatives in the HttpsToken considering both cases whether the policy is normalized or not.
*
*/
-public class HttpsTokenBuilder implements AssertionBuilder {
+public class HttpsTokenBuilder implements AssertionBuilder<OMElement> {
/**
* {@inheritDoc}
*/
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
HttpsToken httpsToken = new HttpsToken(SPConstants.SP_V12);
-
- Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
- policy = (Policy) policy.normalize(false);
-
- for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
- processAlternative((List) iterator.next(), httpsToken);
- break; // since there should be only one alternative
+
+ if (element.getFirstElement()!= null) {
+ Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
+ policy = (Policy) policy.normalize(false);
+
+ for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
+ processAlternative((List) iterator.next(), httpsToken);
+ break; // since there should be only one alternative
+ }
}
-
+
return httpsToken;
}
@@ -85,7 +85,7 @@ public class HttpsTokenBuilder implement
private void processAlternative(List assertions, HttpsToken parent) {
for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- XmlPrimtiveAssertion primtive = (XmlPrimtiveAssertion) iterator.next();
+ Assertion primtive = (Assertion) iterator.next();
QName qname = primtive.getName();
if (qname != null) {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/InitiatorTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SP12Const
import org.apache.ws.secpolicy.model.InitiatorToken;
import org.apache.ws.secpolicy.model.Token;
-public class InitiatorTokenBuilder implements AssertionBuilder {
+public class InitiatorTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/IssuedTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -32,7 +32,7 @@ import javax.xml.namespace.QName;
import java.util.Iterator;
import java.util.List;
-public class IssuedTokenBuilder implements AssertionBuilder {
+public class IssuedTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/LayoutBuilder.java Sun Jan 29 15:16:02 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.Layout;
-public class LayoutBuilder implements AssertionBuilder {
+public class LayoutBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Layout layout = new Layout(SPConstants.SP_V12);
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/ProtectionTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SP12Const
import org.apache.ws.secpolicy.model.ProtectionToken;
import org.apache.ws.secpolicy.model.Token;
-public class ProtectionTokenBuilder implements AssertionBuilder {
+public class ProtectionTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
ProtectionToken protectionToken = new ProtectionToken(SPConstants.SP_V12);
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RecipientTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -31,7 +31,7 @@ import org.apache.ws.secpolicy.SP12Const
import org.apache.ws.secpolicy.model.RecipientToken;
import org.apache.ws.secpolicy.model.Token;
-public class RecipientTokenBuilder implements AssertionBuilder {
+public class RecipientTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredElementsBuilder.java Sun Jan 29 15:16:02 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SP12Const
import org.apache.ws.secpolicy.model.ContentEncryptedElements;
import org.apache.ws.secpolicy.model.RequiredElements;
-public class RequiredElementsBuilder implements AssertionBuilder {
+public class RequiredElementsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
@@ -57,7 +57,7 @@ public class RequiredElementsBuilder imp
QName name = element.getQName();
if (SP12Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(), nm.getPrefix());
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/RequiredPartsBuilder.java Sun Jan 29 15:16:02 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.model.Hea
import org.apache.ws.secpolicy.model.RequiredParts;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
-public class RequiredPartsBuilder implements AssertionBuilder {
+public class RequiredPartsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
RequiredParts requiredParts = new RequiredParts(SPConstants.SP_V12);
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecureConversationTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -28,7 +28,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.SecureConversationToken;
-public class SecureConversationTokenBuilder implements AssertionBuilder {
+public class SecureConversationTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecurityContextTokenBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecurityContextTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecurityContextTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SecurityContextTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -26,7 +26,7 @@ import org.apache.ws.secpolicy.model.Sec
import javax.xml.namespace.QName;
-public class SecurityContextTokenBuilder implements AssertionBuilder {
+public class SecurityContextTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedElementsBuilder.java Sun Jan 29 15:16:02 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.SignedEncryptedElements;
-public class SignedElementsBuilder implements AssertionBuilder {
+public class SignedElementsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
@@ -63,7 +63,7 @@ public class SignedElementsBuilder imple
QName name = element.getQName();
if (SP12Constants.XPATH.equals(name)) {
parent.addXPathExpression(element.getText());
- Iterator namespaces = element.getAllDeclaredNamespaces();
+ Iterator namespaces = element.getNamespacesInScope();
while (namespaces.hasNext()) {
OMNamespace nm = (OMNamespace) namespaces.next();
parent.addDeclaredNamespaces(nm.getNamespaceURI(), nm.getPrefix());
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SignedPartsBuilder.java Sun Jan 29 15:16:02 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SP12Const
import org.apache.ws.secpolicy.model.Header;
import org.apache.ws.secpolicy.model.SignedEncryptedParts;
-public class SignedPartsBuilder implements AssertionBuilder {
+public class SignedPartsBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
SignedEncryptedParts signedEncryptedParts = new SignedEncryptedParts(true, SPConstants.SP_V12);
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SupportingTokensBuilder.java Sun Jan 29 15:16:02 2017
@@ -36,7 +36,7 @@ import org.apache.ws.secpolicy.model.Sig
import org.apache.ws.secpolicy.model.SupportingToken;
import org.apache.ws.secpolicy.model.Token;
-public class SupportingTokensBuilder implements AssertionBuilder {
+public class SupportingTokensBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/SymmetricBindingBuilder.java Sun Jan 29 15:16:02 2017
@@ -33,7 +33,7 @@ import org.apache.ws.secpolicy.model.Lay
import org.apache.ws.secpolicy.model.ProtectionToken;
import org.apache.ws.secpolicy.model.SymmetricBinding;
-public class SymmetricBindingBuilder implements AssertionBuilder {
+public class SymmetricBindingBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
SymmetricBinding symmetricBinding = new SymmetricBinding(SPConstants.SP_V12);
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportBindingBuilder.java Sun Jan 29 15:16:02 2017
@@ -34,7 +34,7 @@ import org.apache.ws.secpolicy.model.Sup
import org.apache.ws.secpolicy.model.TransportBinding;
import org.apache.ws.secpolicy.model.TransportToken;
-public class TransportBindingBuilder implements AssertionBuilder {
+public class TransportBindingBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
TransportBinding transportBinding = new TransportBinding(SPConstants.SP_V12);
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/TransportTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -15,70 +15,46 @@
*/
package org.apache.ws.secpolicy12.builders;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
import org.apache.axiom.om.OMElement;
import org.apache.neethi.Assertion;
import org.apache.neethi.AssertionBuilderFactory;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyEngine;
import org.apache.neethi.builders.AssertionBuilder;
-import org.apache.neethi.builders.xml.XmlPrimtiveAssertion;
-import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.HttpsToken;
import org.apache.ws.secpolicy.model.TransportToken;
-public class TransportTokenBuilder implements AssertionBuilder {
-
-
-
+import javax.xml.namespace.QName;
+import java.util.Iterator;
+import java.util.List;
+
+public class TransportTokenBuilder implements AssertionBuilder<OMElement> {
+
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
TransportToken transportToken = new TransportToken(SPConstants.SP_V12);
-
Policy policy = PolicyEngine.getPolicy(element.getFirstElement());
policy = (Policy) policy.normalize(false);
-
+
for (Iterator iterator = policy.getAlternatives(); iterator.hasNext();) {
processAlternative((List) iterator.next(), transportToken);
break; // since there should be only one alternative
}
-
+
return transportToken;
}
-
+
public QName[] getKnownElements() {
return new QName[] {SP12Constants.TRANSPORT_TOKEN};
}
-
+
private void processAlternative(List assertions, TransportToken parent) {
-
for (Iterator iterator = assertions.iterator(); iterator.hasNext();) {
- XmlPrimtiveAssertion primtive = (XmlPrimtiveAssertion) iterator.next();
+ Assertion primtive = (Assertion) iterator.next();
QName qname = primtive.getName();
-
- if (SP12Constants.HTTPS_TOKEN.equals(qname)) {
- HttpsToken httpsToken = new HttpsToken(SPConstants.SP_V12);
-
- OMElement element = primtive.getValue().getFirstChildWithName(SPConstants.POLICY);
-
- if (element != null) {
- OMElement child = element.getFirstElement();
- if (child != null) {
- if (SP12Constants.HTTP_BASIC_AUTHENTICATION.equals(child.getQName())) {
- httpsToken.setHttpBasicAuthentication(true);
- } else if (SP12Constants.HTTP_DIGEST_AUTHENTICATION.equals(child.getQName())) {
- httpsToken.setHttpDigestAuthentication(true);
- } else if (SP12Constants.REQUIRE_CLIENT_CERTIFICATE.equals(child.getQName())) {
- httpsToken.setRequireClientCertificate(true);
- }
- }
- }
-
- parent.setToken(httpsToken);
+ if(SP12Constants.HTTPS_TOKEN.equals(qname)){
+ parent.setToken((HttpsToken)primtive);
}
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/Trust13Builder.java Sun Jan 29 15:16:02 2017
@@ -25,7 +25,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.Trust13;
-public class Trust13Builder implements AssertionBuilder {
+public class Trust13Builder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/UsernameTokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -32,7 +32,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.UsernameToken;
-public class UsernameTokenBuilder implements AssertionBuilder {
+public class UsernameTokenBuilder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory) throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS10Builder.java Sun Jan 29 15:16:02 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.Wss10;
-public class WSS10Builder implements AssertionBuilder {
+public class WSS10Builder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/WSS11Builder.java Sun Jan 29 15:16:02 2017
@@ -30,7 +30,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.Wss11;
-public class WSS11Builder implements AssertionBuilder {
+public class WSS11Builder implements AssertionBuilder<OMElement> {
public Assertion build(OMElement element, AssertionBuilderFactory factory)
throws IllegalArgumentException {
Modified: axis/axis2/java/rampart/branches/RAMPART-252/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-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/X509TokenBuilder.java Sun Jan 29 15:16:02 2017
@@ -32,7 +32,7 @@ import org.apache.ws.secpolicy.SPConstan
import org.apache.ws.secpolicy.SP12Constants;
import org.apache.ws.secpolicy.model.X509Token;
-public class X509TokenBuilder implements AssertionBuilder {
+public class X509TokenBuilder implements AssertionBuilder<OMElement> {
public final static String USER_CERT_ALIAS_LN = "userCertAlias";
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/basic/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/basic/build.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/basic/build.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/basic/build.xml Sun Jan 29 15:16:02 2017
@@ -23,9 +23,6 @@
<property name="keys.dir" value="../keys"/>
<property name="temp.client.dir" value="build/temp_client"/>
- <property name="addressing.mar" value="addressing-SNAPSHOT.mar"/>
- <property name="rampart.mar" value="rampart-SNAPSHOT.mar"/>
-
<property name="client.port" value="8080"/>
<property name="server.port" value="8080"/>
@@ -33,6 +30,15 @@
<property environment="env"/>
+ <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+
+ <path id="runtime.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${env.AXIS2_HOME}/conf"/>
+ </path>
+
<target name="check.dependency" unless="env.AXIS2_HOME">
<echo message="AXIS2_HOME must be set"/>
</target>
@@ -158,15 +164,18 @@
<sequential>
<property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}/services"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
+ <copy todir="${service.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ </fileset>
+ </copy>
<!-- create service -->
<mkdir dir="${temp.dir}"/>
@@ -195,11 +204,7 @@
<java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
+ <classpath refid="runtime.classpath"/>
</java>
</sequential>
@@ -210,7 +215,6 @@
<sequential>
<property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<!-- Create the client repo -->
<mkdir dir="${client.repos.dir}/sample@{sample.number}"/>
@@ -221,8 +225,12 @@
<copy file="sample@{sample.number}/client.axis2.xml" tofile="${client.repos.dir}/sample@{sample.number}/conf/axis2.xml" overwrite="true"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
+ <copy todir="${client.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ </fileset>
+ </copy>
<mkdir dir="${temp.client.dir}"/>
@@ -245,9 +253,7 @@
<arg value="${sample.services.url}/sample@{sample.number}"/>
<arg value="${client.repos.dir}/sample@{sample.number}"/>
<classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
+ <path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
</classpath>
</java>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/policy/build.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/policy/build.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/policy/build.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-samples/policy/build.xml Sun Jan 29 15:16:02 2017
@@ -24,17 +24,22 @@
<property name="keys.dir" value="../keys"/>
<property name="temp.client.dir" value="build/temp_client"/>
- <property name="addressing.mar" value="addressing-SNAPSHOT.mar"/>
- <property name="rampart.mar" value="rampart-SNAPSHOT.mar"/>
- <property name="rahas.mar" value="rahas-SNAPSHOT.mar"/>
-
<property name="client.port" value="8080"/>
<property name="server.port" value="8080"/>
<property name="sample.services.url" value="http://localhost:${client.port}/axis2/services"/>
<property environment="env"/>
-
+
+ <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
+
+ <path id="runtime.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement location="${env.AXIS2_HOME}/conf"/>
+ </path>
+
<target name="check.dependency" unless="env.AXIS2_HOME">
<echo message="AXIS2_HOME must be set"/>
</target>
@@ -130,16 +135,19 @@
<sequential>
<property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}/services"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rahas.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${rahas.mar}" overwrite="true"/>
+ <copy todir="${service.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ <include name="rahas-*.mar"/>
+ </fileset>
+ </copy>
<!-- create service -->
<mkdir dir="${temp.dir}"/>
@@ -169,11 +177,7 @@
<java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
+ <classpath refid="runtime.classpath"/>
</java>
</sequential>
@@ -185,16 +189,19 @@
<sequential>
<property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}/services"/>
<mkdir dir="${service.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rahas.mar}" tofile="${service.repos.dir}/sample@{sample.number}/modules/${rahas.mar}" overwrite="true"/>
+ <copy todir="${service.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ <include name="rahas-*.mar"/>
+ </fileset>
+ </copy>
<!-- create service -->
<mkdir dir="${temp.dir}"/>
@@ -225,11 +232,7 @@
<java classname="org.apache.axis2.transport.http.SimpleHTTPServer" fork="true">
<arg value="${service.repos.dir}/sample@{sample.number}"/>
<arg value="-p${server.port}"/>
- <classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
- </classpath>
+ <classpath refid="runtime.classpath"/>
</java>
</sequential>
@@ -240,7 +243,6 @@
<sequential>
<property name="modules.dir" value="${env.AXIS2_HOME}/repository/modules/"/>
- <property name="lib.dir" value="${env.AXIS2_HOME}/lib"/>
<!-- Create the client repo -->
<mkdir dir="${client.repos.dir}/sample@{sample.number}"/>
@@ -248,8 +250,12 @@
<mkdir dir="${client.repos.dir}/sample@{sample.number}/modules"/>
<!-- copy modules -->
- <copy file="${modules.dir}/${addressing.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${addressing.mar}" overwrite="true"/>
- <copy file="${modules.dir}/${rampart.mar}" tofile="${client.repos.dir}/sample@{sample.number}/modules/${rampart.mar}" overwrite="true"/>
+ <copy todir="${client.repos.dir}/sample@{sample.number}/modules">
+ <fileset dir="${modules.dir}">
+ <include name="addressing-*.mar"/>
+ <include name="rampart-*.mar"/>
+ </fileset>
+ </copy>
<mkdir dir="${temp.client.dir}"/>
@@ -273,9 +279,7 @@
<arg value="${client.repos.dir}/sample@{sample.number}"/>
<arg value="sample@{sample.number}/policy.xml"/>
<classpath>
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
+ <path refid="runtime.classpath"/>
<dirset dir="${temp.client.dir}" />
</classpath>
</java>
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/pom.xml?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/pom.xml (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/pom.xml Sun Jan 29 15:16:02 2017
@@ -1,11 +1,31 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-project</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -42,17 +62,25 @@
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-policy</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-trust</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart-core</artifactId>
- <version>${pom.version}</version>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
</dependency>
</dependencies>
@@ -61,9 +89,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
<configuration>
<templateDirectory>${basedir}</templateDirectory>
- <menu ref="parent"/>
+ <menu ref="parent" />
</configuration>
</plugin>
</plugins>
Propchange: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rahas/TokenRequestDispatcherConfigTest.java Sun Jan 29 15:16:02 2017
@@ -31,26 +31,20 @@ public class TokenRequestDispatcherConfi
/**
* Testing a valid config file
*/
- public void testWithConfigFile() {
- try {
- TokenRequestDispatcherConfig config = TokenRequestDispatcherConfig
- .load("test-resources/trust/dispatcher.config.xml");
+ public void testWithConfigFile() throws Exception {
+ TokenRequestDispatcherConfig config = TokenRequestDispatcherConfig
+ .load("test-resources/trust/dispatcher.config.xml");
- assertEquals("Incorrect default issuer class name",
- "org.apache.rahas.TempIssuer", config
- .getDefaultIssuerName());
+ assertEquals("Incorrect default issuer class name",
+ "org.apache.rahas.TempIssuer", config
+ .getDefaultIssuerName());
- TokenIssuer issuer = config
- .getIssuer("http://example.org/mySpecialToken1");
+ TokenIssuer issuer = config
+ .getIssuer("http://example.org/mySpecialToken1");
- assertEquals("Incorrect issuer for token type : "
- + "http://example.org/mySpecialToken1", TempIssuer.class
- .getName(), issuer.getClass().getName());
-
- } catch (TrustException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ assertEquals("Incorrect issuer for token type : "
+ + "http://example.org/mySpecialToken1", TempIssuer.class
+ .getName(), issuer.getClass().getName());
}
/**
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java Sun Jan 29 15:16:02 2017
@@ -27,224 +27,181 @@ import java.util.ArrayList;
public class AsymmetricBindingBuilderTest extends MessageBuilderTestBase {
- public void testAsymmBinding() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
+ public void testAsymmBinding() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingServerSide() {
- try {
- MessageContext ctx = getMsgCtx();
-
- ctx.setServerSide(true);
- String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingServerSide() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ ctx.setServerSide(true);
+ String policyXml = "test-resources/policy/rampart-asymm-binding-1.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingWithSigDK() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-asymm-binding-2-sig-dk.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingWithSigDK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-2-sig-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingWithDK() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-asymm-binding-3-dk.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingWithDKEncrBeforeSig() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
-
- public void testAsymmBindingEncrBeforeSig() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-asymm-binding-5-ebs.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- public void testAsymmBindingTripleDesRSA15() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-asymm-binding-6-3des-r15.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingWithDK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-3-dk.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingWithDKEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-4-dk-ebs.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+
+ public void testAsymmBindingEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-5-ebs.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
+ }
+
+ public void testAsymmBindingTripleDesRSA15() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-6-3des-r15.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.WSSE_NS, WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testAsymmBindingTripleDesRSA15DK() {
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-asymm-binding-7-3des-r15-DK.xml";
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.WSSE_NS,WSConstants.BINARY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
- } catch (Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testAsymmBindingTripleDesRSA15DK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-asymm-binding-7-3des-r15-DK.xml";
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.WSSE_NS,WSConstants.BINARY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
}
Modified: axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java Sun Jan 29 15:16:02 2017
@@ -17,11 +17,11 @@
package org.apache.rampart;
import org.apache.axiom.om.OMElement;
-import org.apache.axiom.om.impl.builder.StAXOMBuilder;
+import org.apache.axiom.om.OMXMLBuilderFactory;
+import org.apache.axiom.om.OMXMLParserWrapper;
import org.apache.axiom.soap.SOAPEnvelope;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAP12Constants;
-import org.apache.axiom.soap.impl.builder.StAXSOAPModelBuilder;
import org.apache.axis2.AxisFault;
import org.apache.axis2.client.Options;
import org.apache.axis2.context.ConfigurationContext;
@@ -40,9 +40,7 @@ import org.apache.ws.security.WSConstant
import javax.xml.namespace.QName;
import javax.xml.stream.FactoryConfigurationError;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
import java.io.FileInputStream;
import java.util.Iterator;
@@ -108,15 +106,13 @@ public class MessageBuilderTestBase exte
options.setAction("urn:testOperation");
ctx.setOptions(options);
- XMLStreamReader reader =
- XMLInputFactory.newInstance().
- createXMLStreamReader(new FileInputStream(messageResource));
- ctx.setEnvelope(new StAXSOAPModelBuilder(reader, null).getSOAPEnvelope());
+ ctx.setEnvelope(OMXMLBuilderFactory.createSOAPModelBuilder(
+ new FileInputStream(messageResource), null).getSOAPEnvelope());
return ctx;
}
protected 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-252/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java
URL: http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java?rev=1780804&r1=1780803&r2=1780804&view=diff
==============================================================================
--- axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java (original)
+++ axis/axis2/java/rampart/branches/RAMPART-252/modules/rampart-tests/src/test/java/org/apache/rampart/SymmetricBindingBuilderTest.java Sun Jan 29 15:16:02 2017
@@ -28,33 +28,26 @@ import org.apache.ws.security.conversati
public class SymmetricBindingBuilderTest extends MessageBuilderTestBase {
- public void testSymmBinding() {
-
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-symm-binding-1.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testSymmBinding() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-symm-binding-1.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
// public void testSymmBindingServerSide() {
@@ -84,127 +77,99 @@ public class SymmetricBindingBuilderTest
// }
// }
- public void testSymmBindingWithDK() {
-
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-symm-binding-2-dk.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testSymmBindingWithDK() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-symm-binding-2-dk.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testSymmBindingWithDKEncrSig() {
-
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-symm-binding-3-dk-es.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_DATA_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ public void testSymmBindingWithDKEncrSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-symm-binding-3-dk-es.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_DATA_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testSymmBindingEncrBeforeSig() {
+ public void testSymmBindingEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-symm-binding-4-ebs.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-symm-binding-4-ebs.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
- public void testSymmBindingWithDKEncrBeforeSig() {
+ public void testSymmBindingWithDKEncrBeforeSig() throws Exception {
+ MessageContext ctx = getMsgCtx();
+
+ String policyXml = "test-resources/policy/rampart-symm-binding-5-dk-ebs.xml";
+
+ Policy policy = this.loadPolicy(policyXml);
+
+ ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
+
+ MessageBuilder builder = new MessageBuilder();
+ builder.build(ctx);
+
+ ArrayList list = new ArrayList();
+
+ list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
+ list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
+ list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
+
- try {
- MessageContext ctx = getMsgCtx();
-
- String policyXml = "test-resources/policy/rampart-symm-binding-5-dk-ebs.xml";
-
- Policy policy = this.loadPolicy(policyXml);
-
- ctx.setProperty(RampartMessageData.KEY_RAMPART_POLICY, policy);
-
- MessageBuilder builder = new MessageBuilder();
- builder.build(ctx);
-
- ArrayList list = new ArrayList();
-
- list.add(new QName(WSConstants.WSU_NS, WSConstants.TIMESTAMP_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.ENC_KEY_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.SIG_NS, WSConstants.SIG_LN));
- list.add(new QName(ConversationConstants.WSC_NS_05_02, ConversationConstants.DERIVED_KEY_TOKEN_LN));
- list.add(new QName(WSConstants.ENC_NS, WSConstants.REF_LIST_LN));
-
-
- this.verifySecHeader(list.iterator(), ctx.getEnvelope());
-
- } catch(Exception e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
+ this.verifySecHeader(list.iterator(), ctx.getEnvelope());
}
}