svn commit: r1778773 [1/2] - in /axis/axis2/java/rampart/branches/RAMPART-426/modules: rampart-core/src/main/java/org/apache/rampart/ rampart-core/src/main/java/org/apache/rampart/policy/builders/ rampart-core/src/main/java/org/apache/rampart/policy/mo...

Sat, 14 Jan 2017 06:25:30 -0800 

Author: veithen
Date: Sat Jan 14 14:24:52 2017
New Revision: 1778773

URL: http://svn.apache.org/viewvc?rev=1778773&view=rev
Log:
Apply the patch provided by Boris Dushanov for RAMPART-426.

Added:
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/37.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/38.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/39.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/40.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/41.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/42.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-36.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-37.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-38.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-39.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-40.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-41.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-42.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-actor.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-6-3des-r15-inbound-outbound-actor.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/test-resources/policy/rampart-asymm-binding-6-3des-r15-outbound-actor.xml
   (with props)
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/test-resources/policy/soapmessage12.xml
   (with props)
Modified:
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/pom.xml
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/src/test/java/org/apache/rampart/AsymmetricBindingBuilderTest.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/src/test/java/org/apache/rampart/MessageBuilderTestBase.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/src/test/java/org/apache/rampart/RampartEngineTest.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/src/test/java/org/apache/rampart/policy/model/RampartPolicyTest.java
    
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-tests/test-resources/policy/rampart-policy-1.xml

Modified: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java?rev=1778773&r1=1778772&r2=1778773&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
 (original)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartEngine.java
 Sat Jan 14 14:24:52 2017
@@ -16,6 +16,15 @@
 
 package org.apache.rampart;
 
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Vector;
+
+import javax.xml.namespace.QName;
+
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axiom.soap.SOAPFault;
 import org.apache.axiom.soap.SOAPHeader;
@@ -27,19 +36,20 @@ import org.apache.commons.logging.LogFac
 import org.apache.rahas.Token;
 import org.apache.rahas.TokenStorage;
 import org.apache.rampart.policy.RampartPolicyData;
+import org.apache.rampart.policy.model.RampartConfig;
 import org.apache.rampart.saml.SAMLAssertionHandler;
 import org.apache.rampart.saml.SAMLAssertionHandlerFactory;
 import org.apache.rampart.util.Axis2Util;
 import org.apache.rampart.util.RampartUtil;
 import org.apache.ws.secpolicy.WSSPolicyException;
 import org.apache.ws.secpolicy.model.UsernameToken;
-import org.apache.ws.security.*;
+import org.apache.ws.security.WSConstants;
+import org.apache.ws.security.WSSecurityEngine;
+import org.apache.ws.security.WSSecurityEngineResult;
+import org.apache.ws.security.WSSecurityException;
+import org.apache.ws.security.WSUsernameTokenPrincipal;
 import org.apache.ws.security.components.crypto.Crypto;
 
-import javax.xml.namespace.QName;
-import java.security.cert.X509Certificate;
-import java.util.*;
-
 public class RampartEngine {
 
        private static Log log = LogFactory.getLog(RampartEngine.class);
@@ -131,8 +141,22 @@ public class RampartEngine {
                    }
                }
                
-               String actorValue = secHeader.getAttributeValue(new QName(rmd
-                               .getSoapConstants().getEnvelopeURI(), "actor"));
+               // get the configured 'actor' value and if it is NOT set
+               // then fallback to the one in the security header
+               String actorValue = null;
+               RampartConfig rampartConfig = rpd.getRampartConfig();
+               if(null != rampartConfig){
+                       actorValue = rampartConfig.getInboundActor();
+               }
+               
+               if(null == actorValue){
+                   String actorAttribute = WSConstants.ATTR_ACTOR;
+                   if 
(WSConstants.URI_SOAP12_ENV.equals(rmd.getSoapConstants().getEnvelopeURI())) {
+                       actorAttribute = WSConstants.ATTR_ROLE;
+                   }
+                       
+                   actorValue = secHeader.getAttributeValue(new 
QName(rmd.getSoapConstants().getEnvelopeURI(), actorAttribute));
+               }
 
                Crypto signatureCrypto = 
RampartUtil.getSignatureCrypto(rpd.getRampartConfig(), 
                        msgCtx.getAxisService().getClassLoader());
@@ -176,91 +200,94 @@ public class RampartEngine {
                 //get the sec context id from the req msg ctx 
                
                //Store username in MessageContext property
+               
+               if(null != results){
+               for (int j = 0; j < results.size(); j++) {
+                   WSSecurityEngineResult wser = (WSSecurityEngineResult) 
results.get(j);
+                   final Integer actInt =
+                           (Integer) 
wser.get(WSSecurityEngineResult.TAG_ACTION);
+                   if (WSConstants.ST_UNSIGNED == actInt.intValue()) {
+
+                       Object samlAssertion = 
wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
+
+                       SAMLAssertionHandler samlAssertionHandler
+                               = 
SAMLAssertionHandlerFactory.createAssertionHandler(samlAssertion);
+
+                       if (samlAssertionHandler.isBearerAssertion()) {
+                           break;
+                       }
+                       //Store the token
+                       try {
+                           TokenStorage store = rmd.getTokenStorage();
+                           if 
(store.getToken(samlAssertionHandler.getAssertionId()) == null) {
+                               Token token = new 
Token(samlAssertionHandler.getAssertionId(),
+                                       
samlAssertionHandler.getAssertionElement(),
+                                       samlAssertionHandler.getDateNotBefore(),
+                                       
samlAssertionHandler.getDateNotOnOrAfter());
+
+                               token.setSecret(samlAssertionHandler.
+                                       
getAssertionKeyInfoSecret(signatureCrypto, tokenCallbackHandler));
+                               store.add(token);
+                           }
+                       } catch (Exception e) {
+                           throw new RampartException(
+                                   "errorInAddingTokenIntoStore", e);
+                       }
+                   } else if (WSConstants.UT == actInt) {
+
+                               WSUsernameTokenPrincipal userNameTokenPrincipal 
= (WSUsernameTokenPrincipal)wser.get(WSSecurityEngineResult.TAG_PRINCIPAL);
+
+                       String username = userNameTokenPrincipal.getName();
+                       msgCtx.setProperty(RampartMessageData.USERNAME, 
username);
+                       
+                       if (userNameTokenPrincipal.getNonce() != null) {
+                           // Check whether this is a replay attack. To verify 
that we need to check whether nonce value
+                           // is a repeating one
+                           int nonceLifeTimeInSeconds = 0;
+
+                           if (rpd.getRampartConfig() != null) {
+                               
+                               String stringLifeTime = 
rpd.getRampartConfig().getNonceLifeTime();
+
+                               try {
+                                   nonceLifeTimeInSeconds = 
Integer.parseInt(stringLifeTime);
+
+                               } catch (NumberFormatException e) {
+                                   log.error("Invalid value for nonceLifeTime 
in rampart configuration file.", e);
+                                   throw new RampartException(
+                                               "invalidNonceLifeTime", e);
+
+                               }
+                           }
+
+                           String serviceEndpointName = 
msgCtx.getAxisService().getEndpointName();
+
+                           boolean valueRepeating = 
serviceNonceCache.isNonceRepeatingForService(serviceEndpointName, username, 
userNameTokenPrincipal.getNonce());
+
+                           if (valueRepeating){
+                               throw new 
RampartException("repeatingNonceValue", new Object[]{ 
userNameTokenPrincipal.getNonce(), username} );
+                           }
+
+                           
serviceNonceCache.addNonceForService(serviceEndpointName, username, 
userNameTokenPrincipal.getNonce(), nonceLifeTimeInSeconds);
+                       }
+                   } else if (WSConstants.SIGN == actInt) {
+                       X509Certificate cert = (X509Certificate) 
wser.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
+
+                       if (rpd.isAsymmetricBinding() && cert == null && 
rpd.getInitiatorToken() != null
+                               && !rpd.getInitiatorToken().isDerivedKeys()) {
+
+                           // If symmetric binding is used, the certificate 
should be null.
+                           // If certificate is not null then probably 
initiator and
+                           // recipient are using 2 different bindings.
+                           throw new RampartException("invalidSignatureAlgo");
+                       }
 
-        for (int j = 0; j < results.size(); j++) {
-            WSSecurityEngineResult wser = (WSSecurityEngineResult) 
results.get(j);
-            final Integer actInt =
-                    (Integer) wser.get(WSSecurityEngineResult.TAG_ACTION);
-            if (WSConstants.ST_UNSIGNED == actInt.intValue()) {
-
-                Object samlAssertion = 
wser.get(WSSecurityEngineResult.TAG_SAML_ASSERTION);
-
-                SAMLAssertionHandler samlAssertionHandler
-                        = 
SAMLAssertionHandlerFactory.createAssertionHandler(samlAssertion);
-
-                if (samlAssertionHandler.isBearerAssertion()) {
-                    break;
-                }
-                //Store the token
-                try {
-                    TokenStorage store = rmd.getTokenStorage();
-                    if (store.getToken(samlAssertionHandler.getAssertionId()) 
== null) {
-                        Token token = new 
Token(samlAssertionHandler.getAssertionId(),
-                                samlAssertionHandler.getAssertionElement(),
-                                samlAssertionHandler.getDateNotBefore(),
-                                samlAssertionHandler.getDateNotOnOrAfter());
-
-                        token.setSecret(samlAssertionHandler.
-                                getAssertionKeyInfoSecret(signatureCrypto, 
tokenCallbackHandler));
-                        store.add(token);
-                    }
-                } catch (Exception e) {
-                    throw new RampartException(
-                            "errorInAddingTokenIntoStore", e);
-                }
-            } else if (WSConstants.UT == actInt) {
-
-                       WSUsernameTokenPrincipal userNameTokenPrincipal = 
(WSUsernameTokenPrincipal)wser.get(WSSecurityEngineResult.TAG_PRINCIPAL);
-
-                String username = userNameTokenPrincipal.getName();
-                msgCtx.setProperty(RampartMessageData.USERNAME, username);
-                
-                if (userNameTokenPrincipal.getNonce() != null) {
-                    // Check whether this is a replay attack. To verify that 
we need to check whether nonce value
-                    // is a repeating one
-                    int nonceLifeTimeInSeconds = 0;
-
-                    if (rpd.getRampartConfig() != null) {
-                        
-                        String stringLifeTime = 
rpd.getRampartConfig().getNonceLifeTime();
-
-                        try {
-                            nonceLifeTimeInSeconds = 
Integer.parseInt(stringLifeTime);
-
-                        } catch (NumberFormatException e) {
-                            log.error("Invalid value for nonceLifeTime in 
rampart configuration file.", e);
-                            throw new RampartException(
-                                        "invalidNonceLifeTime", e);
-
-                        }
-                    }
-
-                    String serviceEndpointName = 
msgCtx.getAxisService().getEndpointName();
-
-                    boolean valueRepeating = 
serviceNonceCache.isNonceRepeatingForService(serviceEndpointName, username, 
userNameTokenPrincipal.getNonce());
-
-                    if (valueRepeating){
-                        throw new RampartException("repeatingNonceValue", new 
Object[]{ userNameTokenPrincipal.getNonce(), username} );
-                    }
-
-                    serviceNonceCache.addNonceForService(serviceEndpointName, 
username, userNameTokenPrincipal.getNonce(), nonceLifeTimeInSeconds);
-                }
-            } else if (WSConstants.SIGN == actInt) {
-                X509Certificate cert = (X509Certificate) 
wser.get(WSSecurityEngineResult.TAG_X509_CERTIFICATE);
-
-                if (rpd.isAsymmetricBinding() && cert == null && 
rpd.getInitiatorToken() != null
-                        && !rpd.getInitiatorToken().isDerivedKeys()) {
-
-                    // If symmetric binding is used, the certificate should be 
null.
-                    // If certificate is not null then probably initiator and
-                    // recipient are using 2 different bindings.
-                    throw new RampartException("invalidSignatureAlgo");
-                }
+                       msgCtx.setProperty(RampartMessageData.X509_CERT, cert);
+                   }
 
-                msgCtx.setProperty(RampartMessageData.X509_CERT, cert);
-            }
+               }
+               }
 
-        }
 
                SOAPEnvelope env = 
Axis2Util.getSOAPEnvelopeFromDOMDocument(rmd.getDocument(), true);
 

Modified: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1778773&r1=1778772&r2=1778773&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 (original)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
 Sat Jan 14 14:24:52 2017
@@ -16,6 +16,10 @@
 
 package org.apache.rampart;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
 import org.apache.axiom.om.OMElement;
 import org.apache.axiom.soap.SOAPEnvelope;
 import org.apache.axis2.AxisFault;
@@ -60,10 +64,6 @@ import org.apache.ws.security.util.Loade
 import org.apache.ws.security.util.WSSecurityUtil;
 import org.w3c.dom.Document;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
 public class RampartMessageData {
     
     /**
@@ -372,8 +372,19 @@ public class RampartMessageData {
                 this.customClassLoader = axisService.getClassLoader(); 
             } 
             
-            if(this.sender && this.policyData != null) {
-                this.secHeader = new WSSecHeader();
+            // set 'actor' of the WSSecHeader with the value from the rampart 
config 
+            if (this.sender && this.policyData != null) {
+               
+               this.secHeader = new WSSecHeader();
+               
+               RampartConfig rampartConfig = 
this.policyData.getRampartConfig();
+               if(null != rampartConfig){
+                       String actor = rampartConfig.getOutboundActor();
+                       if(null != actor){
+                               this.secHeader = new WSSecHeader(actor,true);
+                       }
+               }
+                
                 secHeader.insertSecurityHeader(this.document);
             }
             

Modified: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java?rev=1778773&r1=1778772&r2=1778773&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
 (original)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/builders/RampartConfigBuilder.java
 Sat Jan 14 14:24:52 2017
@@ -46,6 +46,18 @@ public class RampartConfigBuilder implem
         if (childElement != null) {
             rampartConfig.setUserCertAlias(childElement.getText().trim());
         }
+                
+        childElement = element.getFirstChildWithName(new 
QName(RampartConfig.NS,
+                       RampartConfig.INBOUND_ACTOR_LN));
+        if (childElement != null) {
+               rampartConfig.setInboundActor(childElement.getText().trim());
+        }
+        
+        childElement = element.getFirstChildWithName(new 
QName(RampartConfig.NS,
+                       RampartConfig.OUTBOUND_ACTOR_LN));
+        if (childElement != null) {
+               rampartConfig.setOutboundActor(childElement.getText().trim());
+        }
 
         childElement = element.getFirstChildWithName(new QName(
                 RampartConfig.NS, RampartConfig.ENCRYPTION_USER_LN));

Modified: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java?rev=1778773&r1=1778772&r2=1778773&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
 (original)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-core/src/main/java/org/apache/rampart/policy/model/RampartConfig.java
 Sat Jan 14 14:24:52 2017
@@ -40,6 +40,9 @@ import javax.xml.stream.XMLStreamWriter;
  *  &lt;ramp:timestampMaxSkew&gt;0&lt;/ramp:timestampMaxSkew&gt;
  *  
&lt;ramp:tokenStoreClass&gt;org.apache.rahas.StorageImpl&lt;/ramp:tokenStoreClass&gt;
  *  
&lt;ramp:nonceLifeTime&gt;org.apache.rahas.StorageImpl&lt;/ramp:nonceLifeTime&gt;
+ *  &lt;ramp:inboundActor&gt;inboundActorURI&lt;/ramp:inboundActor&gt;
+ *  &lt;ramp:outboundActor&gt;outboundActorURI&lt;/ramp:outboundActor&gt;
+
  *  
  *  &lt;ramp:signatureCrypto&gt;
  *  &lt;ramp:crypto 
provider=&quot;org.apache.ws.security.components.crypto.Merlin&quot;&gt;
@@ -78,6 +81,10 @@ public class RampartConfig implements As
 
     public final static String USER_LN = "user";
     
+    public final static String INBOUND_ACTOR_LN = "inboundActor";
+    
+    public final static String OUTBOUND_ACTOR_LN = "outboundActor";
+    
     public final static String USER_CERT_ALIAS_LN = "userCertAlias";
 
     public final static String ENCRYPTION_USER_LN = "encryptionUser";
@@ -150,6 +157,9 @@ public class RampartConfig implements As
     private String nonceLifeTime = Integer.toString(DEFAULT_NONCE_LIFE_TIME);
     
     private SSLConfig sslConfig;
+    
+    private String inboundActor;
+    private String outboundActor;
 
     /*To set timeStampStrict in WSSConfig through rampartConfig - default 
value is false*/
     private boolean timeStampStrict = false;
@@ -299,6 +309,18 @@ public class RampartConfig implements As
             writer.writeEndElement();
         }
         
+        if (getInboundActor() != null) {
+               writer.writeStartElement(NS, INBOUND_ACTOR_LN);
+               writer.writeCharacters(getInboundActor());
+               writer.writeEndElement();
+        }
+        
+        if (getOutboundActor() != null) {
+               writer.writeStartElement(NS, OUTBOUND_ACTOR_LN);
+               writer.writeCharacters(getOutboundActor());
+               writer.writeEndElement();
+        }
+        
         if (getUserCertAlias() != null) {
             writer.writeStartElement(NS, USER_CERT_ALIAS_LN);
             writer.writeCharacters(getUserCertAlias());
@@ -488,4 +510,42 @@ public class RampartConfig implements As
         this.timeStampStrict = Boolean.valueOf(timeStampStrict);
     }
     
+       /**       
+        * @return the inbound actor's URI
+        * 
+        */
+       public String getInboundActor() {
+               return inboundActor;
+       }
+
+       /**
+        * Sets the SOAP 1.1 actor or SOAP 1.2 role identifying the incoming 
SOAP Security header to process.
+        * If set, Rampart will expect a SOAP security header with a matching 
actor/role and fail if
+        * such is not available in the request. If not set 
(<code>null</code>), Rampart will process the first
+        * SOAP security header found.
+        *  
+        * @param the inbound actor URI to set
+        */
+       public void setInboundActor(String inboundActorUri) {
+               this.inboundActor = inboundActorUri;
+       }       
+       
+       /**       
+        * @return the outbound actor's URI
+        * 
+        */
+       public String getOutboundActor() {
+               return outboundActor;
+       }
+
+       /**     
+        * Sets the SOAP 1.1 actor or SOAP 1.2 role to set in the outgoing SOAP 
Security header.
+        * If not set (<code>null</code>), no SOAP actor/role attribute will be 
set in the SOAP security header.
+ 
+        * @param the outbound actor URI to set
+        */
+       public void setOutboundActor(String outboundActorUri) {
+               this.outboundActor = outboundActorUri;
+       }
+    
 }

Modified: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/pom.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/pom.xml?rev=1778773&r1=1778772&r2=1778773&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/pom.xml
 (original)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/pom.xml
 Sat Jan 14 14:24:52 2017
@@ -280,7 +280,34 @@
                                 <!-- Service 35 -->
                                 <copy overwrite="yes" 
file="src/test/resources/rampart/services-35.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
                                 <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService35.aar"
 basedir="target/temp-ramp" />
+                                
+                                <!-- Service 36 -->
+                                <copy overwrite="yes" 
file="src/test/resources/rampart/services-36.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
+                                <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService36.aar"
 basedir="target/temp-ramp" />
+                                
+                                <!-- Service 37 -->
+                                <copy overwrite="yes" 
file="src/test/resources/rampart/services-37.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
+                                <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService37.aar"
 basedir="target/temp-ramp" />
 
+                                                               <!-- Service 38 
-->
+                                <copy overwrite="yes" 
file="src/test/resources/rampart/services-38.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
+                                <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService38.aar"
 basedir="target/temp-ramp" />
+                                
+                                <!-- Service 39 -->
+                                <copy overwrite="yes" 
file="src/test/resources/rampart/services-39.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
+                                <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService39.aar"
 basedir="target/temp-ramp" />
+                                
+                                <!-- Service 40 -->
+                                <copy overwrite="yes" 
file="src/test/resources/rampart/services-40.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
+                                <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService40.aar"
 basedir="target/temp-ramp" />
+                                
+                                <!-- Service 41 -->
+                                <copy overwrite="yes" 
file="src/test/resources/rampart/services-41.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
+                                <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService41.aar"
 basedir="target/temp-ramp" />
+                                
+                                <!-- Service 42 -->
+                                <copy overwrite="yes" 
file="src/test/resources/rampart/services-42.xml" 
tofile="target/temp-ramp/META-INF/services.xml" />
+                                <jar 
jarfile="target/test-resources/rampart_service_repo/services/SecureService42.aar"
 basedir="target/temp-ramp" />
 
                                 <!-- Service SC-1 -->
                                 <copy overwrite="yes" 
file="src/test/resources/rampart/issuer.properties" 
tofile="target/temp-ramp/issuer.properties" />

Modified: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=1778773&r1=1778772&r2=1778773&view=diff
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
 (original)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
 Sat Jan 14 14:24:52 2017
@@ -135,7 +135,7 @@ public class RampartTest extends TestCas
             }
 
             //for (int i = 34; i <= 34; i++) { //<-The number of tests we have
-            for (int i = 1; i <= 35; i++) { //<-The number of tests we have
+            for (int i = 1; i <= 42; i++) { //<-The number of tests we have
                 if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
                     //Skip the Basic256 tests
                     continue;
@@ -179,7 +179,7 @@ public class RampartTest extends TestCas
                 }
                 
                 // Invoking the service in the TestCase-28 should fail. So 
handling it differently..
-                if (i == 28 || i == 34) {
+                if (i == 28 || i == 34 || i == 37 || i == 39 || i == 40 || i 
== 41) {
                     try {
 
                         //Blocking invocation
@@ -203,6 +203,8 @@ public class RampartTest extends TestCas
                             // Need to find the exact cause
                             
//assertEquals(resources.getString("invalidSignatureAlgo"), 
axisFault.getMessage());
                             System.out.println(axisFault.getMessage());
+                        }else{
+                               assertNotNull(axisFault);
                         }
 
                     }

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/36.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,70 @@
+<wsp:Policy wsu:Id="SigOnly" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+       <wsp:ExactlyOne>
+               <wsp:All>
+                       <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:InitiatorToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:InitiatorToken>
+                                       <sp:RecipientToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:RecipientToken>
+                                       <sp:AlgorithmSuite>
+                                               <wsp:Policy>
+                                                       <sp:Basic128/>
+                                               </wsp:Policy>
+                                       </sp:AlgorithmSuite>
+                                       <sp:Layout>
+                                               <wsp:Policy>
+                                                       <sp:Strict/>
+                                               </wsp:Policy>
+                                       </sp:Layout>
+                                       <sp:IncludeTimestamp/>
+                                       <sp:OnlySignEntireHeadersAndBody/>
+                               </wsp:Policy>
+                       </sp:AsymmetricBinding>
+                       <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:MustSupportRefKeyIdentifier/>
+                                       <sp:MustSupportRefIssuerSerial/>
+                               </wsp:Policy>
+                       </sp:Wss10>
+                       <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <sp:Body/>
+                       </sp:SignedParts>
+                       <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";> 
+                               <ramp:user>alice</ramp:user>
+                               <ramp:encryptionUser>bob</ramp:encryptionUser>
+                               
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                               
<ramp:outboundActor>outboundActor</ramp:outboundActor>
+                               
+                               <ramp:signatureCrypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:signatureCrypto>
+                               <ramp:encryptionCypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:encryptionCypto>
+                       </ramp:RampartConfig>
+               </wsp:All>
+       </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/36.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/37.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/37.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/37.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/37.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,70 @@
+<wsp:Policy wsu:Id="SigOnly" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+       <wsp:ExactlyOne>
+               <wsp:All>
+                       <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:InitiatorToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:InitiatorToken>
+                                       <sp:RecipientToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:RecipientToken>
+                                       <sp:AlgorithmSuite>
+                                               <wsp:Policy>
+                                                       <sp:Basic128/>
+                                               </wsp:Policy>
+                                       </sp:AlgorithmSuite>
+                                       <sp:Layout>
+                                               <wsp:Policy>
+                                                       <sp:Strict/>
+                                               </wsp:Policy>
+                                       </sp:Layout>
+                                       <sp:IncludeTimestamp/>
+                                       <sp:OnlySignEntireHeadersAndBody/>
+                               </wsp:Policy>
+                       </sp:AsymmetricBinding>
+                       <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:MustSupportRefKeyIdentifier/>
+                                       <sp:MustSupportRefIssuerSerial/>
+                               </wsp:Policy>
+                       </sp:Wss10>
+                       <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <sp:Body/>
+                       </sp:SignedParts>
+                       <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";> 
+                               <ramp:user>alice</ramp:user>
+                               <ramp:encryptionUser>bob</ramp:encryptionUser>
+                               
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                               
<ramp:inboundActor>inboundActor</ramp:inboundActor>
+                               
+                               <ramp:signatureCrypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:signatureCrypto>
+                               <ramp:encryptionCypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:encryptionCypto>
+                       </ramp:RampartConfig>
+               </wsp:All>
+       </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/37.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/38.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/38.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/38.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/38.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,71 @@
+<wsp:Policy wsu:Id="SigOnly" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+       <wsp:ExactlyOne>
+               <wsp:All>
+                       <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:InitiatorToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:InitiatorToken>
+                                       <sp:RecipientToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:RecipientToken>
+                                       <sp:AlgorithmSuite>
+                                               <wsp:Policy>
+                                                       <sp:Basic128/>
+                                               </wsp:Policy>
+                                       </sp:AlgorithmSuite>
+                                       <sp:Layout>
+                                               <wsp:Policy>
+                                                       <sp:Strict/>
+                                               </wsp:Policy>
+                                       </sp:Layout>
+                                       <sp:IncludeTimestamp/>
+                                       <sp:OnlySignEntireHeadersAndBody/>
+                               </wsp:Policy>
+                       </sp:AsymmetricBinding>
+                       <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:MustSupportRefKeyIdentifier/>
+                                       <sp:MustSupportRefIssuerSerial/>
+                               </wsp:Policy>
+                       </sp:Wss10>
+                       <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <sp:Body/>
+                       </sp:SignedParts>
+                       <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";> 
+                               <ramp:user>alice</ramp:user>
+                               <ramp:encryptionUser>bob</ramp:encryptionUser>
+                               
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                               
<ramp:inboundActor>inboundActor</ramp:inboundActor>
+                               
<ramp:outboundActor>outboundActor</ramp:outboundActor>
+                               
+                               <ramp:signatureCrypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:signatureCrypto>
+                               <ramp:encryptionCypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:encryptionCypto>
+                       </ramp:RampartConfig>
+               </wsp:All>
+       </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/38.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/39.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/39.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/39.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/39.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,70 @@
+<wsp:Policy wsu:Id="SigOnly" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+       <wsp:ExactlyOne>
+               <wsp:All>
+                       <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:InitiatorToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:InitiatorToken>
+                                       <sp:RecipientToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:RecipientToken>
+                                       <sp:AlgorithmSuite>
+                                               <wsp:Policy>
+                                                       <sp:Basic128/>
+                                               </wsp:Policy>
+                                       </sp:AlgorithmSuite>
+                                       <sp:Layout>
+                                               <wsp:Policy>
+                                                       <sp:Strict/>
+                                               </wsp:Policy>
+                                       </sp:Layout>
+                                       <sp:IncludeTimestamp/>
+                                       <sp:OnlySignEntireHeadersAndBody/>
+                               </wsp:Policy>
+                       </sp:AsymmetricBinding>
+                       <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:MustSupportRefKeyIdentifier/>
+                                       <sp:MustSupportRefIssuerSerial/>
+                               </wsp:Policy>
+                       </sp:Wss10>
+                       <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <sp:Body/>
+                       </sp:SignedParts>
+                       <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";> 
+                               <ramp:user>alice</ramp:user>
+                               <ramp:encryptionUser>bob</ramp:encryptionUser>
+                               
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
                          
+                               
<ramp:outboundActor>outboundActor</ramp:outboundActor>
+                               
+                               <ramp:signatureCrypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:signatureCrypto>
+                               <ramp:encryptionCypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:encryptionCypto>
+                       </ramp:RampartConfig>
+               </wsp:All>
+       </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/39.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/40.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/40.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/40.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/40.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,70 @@
+<wsp:Policy wsu:Id="SigOnly" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+       <wsp:ExactlyOne>
+               <wsp:All>
+                       <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:InitiatorToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:InitiatorToken>
+                                       <sp:RecipientToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:RecipientToken>
+                                       <sp:AlgorithmSuite>
+                                               <wsp:Policy>
+                                                       <sp:Basic128/>
+                                               </wsp:Policy>
+                                       </sp:AlgorithmSuite>
+                                       <sp:Layout>
+                                               <wsp:Policy>
+                                                       <sp:Strict/>
+                                               </wsp:Policy>
+                                       </sp:Layout>
+                                       <sp:IncludeTimestamp/>
+                                       <sp:OnlySignEntireHeadersAndBody/>
+                               </wsp:Policy>
+                       </sp:AsymmetricBinding>
+                       <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:MustSupportRefKeyIdentifier/>
+                                       <sp:MustSupportRefIssuerSerial/>
+                               </wsp:Policy>
+                       </sp:Wss10>
+                       <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <sp:Body/>
+                       </sp:SignedParts>
+                       <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";> 
+                               <ramp:user>alice</ramp:user>
+                               <ramp:encryptionUser>bob</ramp:encryptionUser>
+                               
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
                          
+                               
<ramp:inboundActor>inboundActor</ramp:inboundActor>
+                               
+                               <ramp:signatureCrypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:signatureCrypto>
+                               <ramp:encryptionCypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:encryptionCypto>
+                       </ramp:RampartConfig>
+               </wsp:All>
+       </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/40.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/41.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/41.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/41.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/41.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,69 @@
+<wsp:Policy wsu:Id="SigOnly" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+       <wsp:ExactlyOne>
+               <wsp:All>
+                       <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:InitiatorToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:InitiatorToken>
+                                       <sp:RecipientToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:RecipientToken>
+                                       <sp:AlgorithmSuite>
+                                               <wsp:Policy>
+                                                       <sp:Basic128/>
+                                               </wsp:Policy>
+                                       </sp:AlgorithmSuite>
+                                       <sp:Layout>
+                                               <wsp:Policy>
+                                                       <sp:Strict/>
+                                               </wsp:Policy>
+                                       </sp:Layout>
+                                       <sp:IncludeTimestamp/>
+                                       <sp:OnlySignEntireHeadersAndBody/>
+                               </wsp:Policy>
+                       </sp:AsymmetricBinding>
+                       <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:MustSupportRefKeyIdentifier/>
+                                       <sp:MustSupportRefIssuerSerial/>
+                               </wsp:Policy>
+                       </sp:Wss10>
+                       <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <sp:Body/>
+                       </sp:SignedParts>
+                       <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";> 
+                               <ramp:user>alice</ramp:user>
+                               <ramp:encryptionUser>bob</ramp:encryptionUser>
+                               
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                               
+                               <ramp:signatureCrypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:signatureCrypto>
+                               <ramp:encryptionCypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:encryptionCypto>
+                       </ramp:RampartConfig>
+               </wsp:All>
+       </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/41.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/42.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/42.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/42.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/42.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,69 @@
+<wsp:Policy wsu:Id="SigOnly" 
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
 xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+       <wsp:ExactlyOne>
+               <wsp:All>
+                       <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:InitiatorToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:InitiatorToken>
+                                       <sp:RecipientToken>
+                                               <wsp:Policy>
+                                                       <sp:X509Token 
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                                               <wsp:Policy>
+                                                                       
<sp:WssX509V3Token10/>
+                                                               </wsp:Policy>
+                                                       </sp:X509Token>
+                                               </wsp:Policy>
+                                       </sp:RecipientToken>
+                                       <sp:AlgorithmSuite>
+                                               <wsp:Policy>
+                                                       <sp:Basic128/>
+                                               </wsp:Policy>
+                                       </sp:AlgorithmSuite>
+                                       <sp:Layout>
+                                               <wsp:Policy>
+                                                       <sp:Strict/>
+                                               </wsp:Policy>
+                                       </sp:Layout>
+                                       <sp:IncludeTimestamp/>
+                                       <sp:OnlySignEntireHeadersAndBody/>
+                               </wsp:Policy>
+                       </sp:AsymmetricBinding>
+                       <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <wsp:Policy>
+                                       <sp:MustSupportRefKeyIdentifier/>
+                                       <sp:MustSupportRefIssuerSerial/>
+                               </wsp:Policy>
+                       </sp:Wss10>
+                       <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                               <sp:Body/>
+                       </sp:SignedParts>
+                       <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";> 
+                               <ramp:user>alice</ramp:user>
+                               <ramp:encryptionUser>bob</ramp:encryptionUser>
+                               
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                               
+                               <ramp:signatureCrypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:signatureCrypto>
+                               <ramp:encryptionCypto>
+                                       <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks</ramp:property>
+                                               <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password</ramp:property>
+                                       </ramp:crypto>
+                               </ramp:encryptionCypto>
+                       </ramp:RampartConfig>
+               </wsp:All>
+       </wsp:ExactlyOne>
+</wsp:Policy>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/policy/42.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-36.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-36.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-36.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-36.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,87 @@
+<service name="SecureService36">
+
+       <module ref="addressing"/>
+       <module ref="rampart"/>
+
+       <parameter locked="false" 
name="ServiceClass">org.apache.rampart.Service</parameter>
+
+    <operation name="echo">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:echo</actionMapping>
+    </operation>
+
+    <operation name="returnError">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:returnError</actionMapping>
+    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic128/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:Layout>
+                            <wsp:Policy>
+                                <sp:Strict/>
+                            </wsp:Policy>
+                        </sp:Layout>
+                        <sp:IncludeTimestamp/>
+                        <sp:OnlySignEntireHeadersAndBody/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";>
+                    <ramp:user>alice</ramp:user>
+                    <ramp:encryptionUser>bob</ramp:encryptionUser>
+                    
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+
+                    <ramp:signatureCrypto>
+                        <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks
+                            </ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password
+                            </ramp:property>
+                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-36.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-37.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-37.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-37.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-37.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,87 @@
+<service name="SecureService37">
+
+       <module ref="addressing"/>
+       <module ref="rampart"/>
+
+       <parameter locked="false" 
name="ServiceClass">org.apache.rampart.Service</parameter>
+
+    <operation name="echo">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:echo</actionMapping>
+    </operation>
+
+    <operation name="returnError">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:returnError</actionMapping>
+    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic128/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:Layout>
+                            <wsp:Policy>
+                                <sp:Strict/>
+                            </wsp:Policy>
+                        </sp:Layout>
+                        <sp:IncludeTimestamp/>
+                        <sp:OnlySignEntireHeadersAndBody/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";>
+                    <ramp:user>alice</ramp:user>
+                    <ramp:encryptionUser>bob</ramp:encryptionUser>
+                    
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+
+                    <ramp:signatureCrypto>
+                        <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks
+                            </ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password
+                            </ramp:property>
+                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-37.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-38.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-38.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-38.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-38.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,89 @@
+<service name="SecureService38">
+
+       <module ref="addressing"/>
+       <module ref="rampart"/>
+
+       <parameter locked="false" 
name="ServiceClass">org.apache.rampart.Service</parameter>
+
+    <operation name="echo">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:echo</actionMapping>
+    </operation>
+
+    <operation name="returnError">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:returnError</actionMapping>
+    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic128/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:Layout>
+                            <wsp:Policy>
+                                <sp:Strict/>
+                            </wsp:Policy>
+                        </sp:Layout>
+                        <sp:IncludeTimestamp/>
+                        <sp:OnlySignEntireHeadersAndBody/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";>
+                    <ramp:user>alice</ramp:user>
+                    <ramp:encryptionUser>bob</ramp:encryptionUser>
+                    
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                    <ramp:inboundActor>outboundActor</ramp:inboundActor>
+                                       
<ramp:outboundActor>inboundActor</ramp:outboundActor>
+
+                    <ramp:signatureCrypto>
+                        <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks
+                            </ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password
+                            </ramp:property>
+                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-38.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-39.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-39.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-39.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-39.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,88 @@
+<service name="SecureService39">
+
+       <module ref="addressing"/>
+       <module ref="rampart"/>
+
+       <parameter locked="false" 
name="ServiceClass">org.apache.rampart.Service</parameter>
+
+    <operation name="echo">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:echo</actionMapping>
+    </operation>
+
+    <operation name="returnError">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:returnError</actionMapping>
+    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic128/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:Layout>
+                            <wsp:Policy>
+                                <sp:Strict/>
+                            </wsp:Policy>
+                        </sp:Layout>
+                        <sp:IncludeTimestamp/>
+                        <sp:OnlySignEntireHeadersAndBody/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";>
+                    <ramp:user>alice</ramp:user>
+                    <ramp:encryptionUser>bob</ramp:encryptionUser>
+                    
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                    <ramp:inboundActor>inboundActor</ramp:inboundActor>
+
+                    <ramp:signatureCrypto>
+                        <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks
+                            </ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password
+                            </ramp:property>
+                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-39.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-40.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-40.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-40.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-40.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,88 @@
+<service name="SecureService40">
+
+       <module ref="addressing"/>
+       <module ref="rampart"/>
+
+       <parameter locked="false" 
name="ServiceClass">org.apache.rampart.Service</parameter>
+
+    <operation name="echo">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:echo</actionMapping>
+    </operation>
+
+    <operation name="returnError">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:returnError</actionMapping>
+    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic128/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:Layout>
+                            <wsp:Policy>
+                                <sp:Strict/>
+                            </wsp:Policy>
+                        </sp:Layout>
+                        <sp:IncludeTimestamp/>
+                        <sp:OnlySignEntireHeadersAndBody/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";>
+                    <ramp:user>alice</ramp:user>
+                    <ramp:encryptionUser>bob</ramp:encryptionUser>
+                    
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                    <ramp:outboundActor>outboundActor</ramp:outboundActor>
+
+                    <ramp:signatureCrypto>
+                        <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks
+                            </ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password
+                            </ramp:property>
+                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-40.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-41.xml
URL: 
http://svn.apache.org/viewvc/axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-41.xml?rev=1778773&view=auto
==============================================================================
--- 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-41.xml
 (added)
+++ 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-41.xml
 Sat Jan 14 14:24:52 2017
@@ -0,0 +1,88 @@
+<service name="SecureService41">
+
+       <module ref="addressing"/>
+       <module ref="rampart"/>
+
+       <parameter locked="false" 
name="ServiceClass">org.apache.rampart.Service</parameter>
+
+    <operation name="echo">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:echo</actionMapping>
+    </operation>
+
+    <operation name="returnError">
+        <messageReceiver 
class="org.apache.axis2.receivers.RawXMLINOutMessageReceiver"/>
+        <actionMapping>urn:returnError</actionMapping>
+    </operation>
+
+    <wsp:Policy wsu:Id="SigOnly"
+                
xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd";
+                xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy";>
+        <wsp:ExactlyOne>
+            <wsp:All>
+                <sp:AsymmetricBinding 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:InitiatorToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:InitiatorToken>
+                        <sp:RecipientToken>
+                            <wsp:Policy>
+                                <sp:X509Token
+                                        
sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Never";>
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+                        </sp:RecipientToken>
+                        <sp:AlgorithmSuite>
+                            <wsp:Policy>
+                                <sp:Basic128/>
+                            </wsp:Policy>
+                        </sp:AlgorithmSuite>
+                        <sp:Layout>
+                            <wsp:Policy>
+                                <sp:Strict/>
+                            </wsp:Policy>
+                        </sp:Layout>
+                        <sp:IncludeTimestamp/>
+                        <sp:OnlySignEntireHeadersAndBody/>
+                    </wsp:Policy>
+                </sp:AsymmetricBinding>
+                <sp:Wss10 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <wsp:Policy>
+                        <sp:MustSupportRefKeyIdentifier/>
+                        <sp:MustSupportRefIssuerSerial/>
+                    </wsp:Policy>
+                </sp:Wss10>
+                <sp:SignedParts 
xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy";>
+                    <sp:Body/>
+                </sp:SignedParts>
+                <ramp:RampartConfig 
xmlns:ramp="http://ws.apache.org/rampart/policy";>
+                    <ramp:user>alice</ramp:user>
+                    <ramp:encryptionUser>bob</ramp:encryptionUser>
+                    
<ramp:passwordCallbackClass>org.apache.rampart.PWCallback</ramp:passwordCallbackClass>
+                    <ramp:inboundActor>inboundActor</ramp:inboundActor>
+
+                    <ramp:signatureCrypto>
+                        <ramp:crypto 
provider="org.apache.ws.security.components.crypto.Merlin">
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.type">JKS</ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.file">rampart/store.jks
+                            </ramp:property>
+                            <ramp:property 
name="org.apache.ws.security.crypto.merlin.keystore.password">password
+                            </ramp:property>
+                        </ramp:crypto>
+                    </ramp:signatureCrypto>
+                </ramp:RampartConfig>
+            </wsp:All>
+        </wsp:ExactlyOne>
+    </wsp:Policy>
+
+</service>

Propchange: 
axis/axis2/java/rampart/branches/RAMPART-426/modules/rampart-integration/src/test/resources/rampart/services-41.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Reply via email to