You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by na...@apache.org on 2008/02/08 14:34:35 UTC

svn commit: r619881 - in /webservices/rampart/trunk/java/modules/rampart-integration: ./ src/test/java/org/apache/rampart/ src/test/resources/rampart/ src/test/resources/rampart/policy/

Author: nandana
Date: Fri Feb  8 05:34:34 2008
New Revision: 619881

URL: http://svn.apache.org/viewvc?rev=619881&view=rev
Log:
Fixing issue https://issues.apache.org/jira/browse/RAMPART-137

Added:
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/17.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/18.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/19.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/20.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-17.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-18.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-19.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-20.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml
Modified:
    webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
    webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java

Modified: webservices/rampart/trunk/java/modules/rampart-integration/pom.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/pom.xml?rev=619881&r1=619880&r2=619881&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/pom.xml (original)
+++ webservices/rampart/trunk/java/modules/rampart-integration/pom.xml Fri Feb  8 05:34:34 2008
@@ -253,6 +253,30 @@
                                       tofile="target/temp-ramp/META-INF/services.xml"/>
                                 <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService16.aar"
                                      basedir="target/temp-ramp"/>
+                               <!-- Service 17 -->
+                               <copy overwrite="yes"
+                                      file="src/test/resources/rampart/services-17.xml"
+                                      tofile="target/temp-ramp/META-INF/services.xml"/>
+                                <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService17.aar"
+                                     basedir="target/temp-ramp"/>  
+                               <!-- Service 18 -->
+                               <copy overwrite="yes"
+                                      file="src/test/resources/rampart/services-18.xml"
+                                      tofile="target/temp-ramp/META-INF/services.xml"/>
+                                <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService18.aar"
+                                     basedir="target/temp-ramp"/>   
+                               <!-- Service 19 -->
+                               <copy overwrite="yes"
+                                      file="src/test/resources/rampart/services-19.xml"
+                                      tofile="target/temp-ramp/META-INF/services.xml"/>
+                                <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService19.aar"
+                                     basedir="target/temp-ramp"/>  
+                               <!-- Service 20 -->
+                               <copy overwrite="yes"
+                                      file="src/test/resources/rampart/services-20.xml"
+                                      tofile="target/temp-ramp/META-INF/services.xml"/>
+                                <jar jarfile="target/test-resources/rampart_service_repo/services/SecureService20.aar"
+                                     basedir="target/temp-ramp"/>  
                                 <!-- Service SC-1 -->
                                 <copy overwrite="yes"
                                       file="src/test/resources/rampart/issuer.properties"

Modified: webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java?rev=619881&r1=619880&r2=619881&view=diff
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/java/org/apache/rampart/RampartTest.java Fri Feb  8 05:34:34 2008
@@ -74,7 +74,7 @@
                         "Unlimited Strength Jurisdiction Policy !!!");
             }
             
-            for (int i = 1; i <= 16; i++) { //<-The number of tests we have
+            for (int i = 1; i <= 20; i++) { //<-The number of tests we have
                 if(!basic256Supported && (i == 3 || i == 4 || i == 5)) {
                     //Skip the Basic256 tests
                     continue;

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/17.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/17.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/17.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/17.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,68 @@
+<wsp:Policy wsu:Id="EncrSupTokens"
+		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"
+		xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+		xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+    <wsp:ExactlyOne>
+        <wsp:All>
+        	<sp:SymmetricBinding>
+				<wsp:Policy>
+					<sp:ProtectionToken>
+						<wsp:Policy>
+							<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+								<wsp:Policy>
+									<sp:RequireThumbprintReference/>
+									<sp:WssX509V3Token10/>
+								</wsp:Policy>
+							</sp:X509Token>
+						</wsp:Policy>
+					</sp:ProtectionToken>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Lax/>
+						</wsp:Policy>
+					</sp:Layout>
+					<sp:OnlySignEntireHeadersAndBody/>
+				</wsp:Policy>
+			</sp:SymmetricBinding>
+		    <sp:EncryptedParts>
+				<sp:Body />
+			</sp:EncryptedParts> 
+			 <sp:SignedParts>
+                <sp:Body />
+            </sp:SignedParts> 
+		    <sp:EncryptedSupportingTokens
+                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                <wsp:Policy>
+                    <sp:UsernameToken
+                            sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient"/>
+                </wsp:Policy>
+            </sp:EncryptedSupportingTokens>
+			<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>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/18.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/18.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/18.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/18.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,69 @@
+<wsp:Policy wsu:Id="SignedEncrSupTokens"
+		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"
+		xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+		xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+    <wsp:ExactlyOne>
+        <wsp:All>
+        	<sp:SymmetricBinding>
+				<wsp:Policy>
+					<sp:ProtectionToken>
+						<wsp:Policy>
+							<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+								<wsp:Policy>
+									<sp:RequireThumbprintReference/>
+									<sp:WssX509V3Token10/>
+								</wsp:Policy>
+							</sp:X509Token>
+						</wsp:Policy>
+					</sp:ProtectionToken>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Lax/>
+						</wsp:Policy>
+					</sp:Layout>
+					<sp:IncludeTimestamp/>
+					<sp:OnlySignEntireHeadersAndBody/>
+				</wsp:Policy>
+			</sp:SymmetricBinding>
+		    <sp:EncryptedParts>
+				<sp:Body />
+			</sp:EncryptedParts> 
+			 <sp:SignedParts>
+                <sp:Body />
+            </sp:SignedParts> 
+		    <sp:SignedEncryptedSupportingTokens
+                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                <wsp:Policy>
+                    <sp:UsernameToken
+                            sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient"/>
+                </wsp:Policy>
+            </sp:SignedEncryptedSupportingTokens>
+			<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>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/19.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/19.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/19.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/19.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,72 @@
+<wsp:Policy wsu:Id="EndorsingEncrSupTokens"
+		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"
+		xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+		xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+    <wsp:ExactlyOne>
+        <wsp:All>
+        	<sp:SymmetricBinding>
+				<wsp:Policy>
+					<sp:ProtectionToken>
+						<wsp:Policy>
+							<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+								<wsp:Policy>
+									<sp:RequireThumbprintReference/>
+									<sp:WssX509V3Token10/>
+								</wsp:Policy>
+							</sp:X509Token>
+						</wsp:Policy>
+					</sp:ProtectionToken>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Lax/>
+						</wsp:Policy>
+					</sp:Layout>
+					<sp:IncludeTimestamp/>
+					<sp:OnlySignEntireHeadersAndBody/>
+				</wsp:Policy>
+			</sp:SymmetricBinding>
+		    <sp:EncryptedParts>
+				<sp:Body />
+			</sp:EncryptedParts> 
+			 <sp:SignedParts>
+                <sp:Body />
+            </sp:SignedParts> 
+             <sp:EndorsingEncryptedSupportingTokens
+                     xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                         <wsp:Policy>
+                             <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                 <wsp:Policy>
+                                     <sp:WssX509V3Token10/>
+                                 </wsp:Policy>
+                             </sp:X509Token>
+                         </wsp:Policy>
+             </sp:EndorsingEncryptedSupportingTokens>
+			<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>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/20.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/20.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/20.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/policy/20.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,72 @@
+<wsp:Policy wsu:Id="SignedEndorsingEncrSupTokens"
+		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"
+		xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+		xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+    <wsp:ExactlyOne>
+        <wsp:All>
+        	<sp:SymmetricBinding>
+				<wsp:Policy>
+					<sp:ProtectionToken>
+						<wsp:Policy>
+							<sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+								<wsp:Policy>
+									<sp:RequireThumbprintReference/>
+									<sp:WssX509V3Token10/>
+								</wsp:Policy>
+							</sp:X509Token>
+						</wsp:Policy>
+					</sp:ProtectionToken>
+					<sp:AlgorithmSuite>
+						<wsp:Policy>
+							<sp:Basic256/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Lax/>
+						</wsp:Policy>
+					</sp:Layout>
+					<sp:IncludeTimestamp/>
+					<sp:OnlySignEntireHeadersAndBody/>
+				</wsp:Policy>
+			</sp:SymmetricBinding>
+		    <sp:EncryptedParts>
+				<sp:Body />
+			</sp:EncryptedParts> 
+			 <sp:SignedParts>
+                <sp:Body />
+            </sp:SignedParts> 
+             <sp:SignedEndorsingEncryptedSupportingTokens
+                     xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                         <wsp:Policy>
+                             <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                 <wsp:Policy>
+                                     <sp:WssX509V3Token10/>
+                                 </wsp:Policy>
+                             </sp:X509Token>
+                         </wsp:Policy>
+             </sp:SignedEndorsingEncryptedSupportingTokens>
+			<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>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-17.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-17.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-17.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-17.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,82 @@
+<service name="SecureService17">
+
+	<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>
+
+	<wsp:Policy wsu:Id="EncrSupTokens"
+	        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"
+	        xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+	        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+	    <wsp:ExactlyOne>
+	        <wsp:All>
+	            <sp:SymmetricBinding>
+	                <wsp:Policy>
+	                    <sp:ProtectionToken>
+	                        <wsp:Policy>
+	                            <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+	                                <wsp:Policy>
+	                                    <sp:RequireThumbprintReference/>
+	                                    <sp:WssX509V3Token10/>
+	                                </wsp:Policy>
+	                            </sp:X509Token>
+	                        </wsp:Policy>
+	                    </sp:ProtectionToken>
+	                    <sp:AlgorithmSuite>
+	                        <wsp:Policy>
+	                            <sp:Basic256/>
+	                        </wsp:Policy>
+	                    </sp:AlgorithmSuite>
+	                    <sp:Layout>
+	                        <wsp:Policy>
+	                            <sp:Lax/>
+	                        </wsp:Policy>
+	                    </sp:Layout>
+	                    <sp:OnlySignEntireHeadersAndBody/>
+	                </wsp:Policy>
+	            </sp:SymmetricBinding>
+	            <sp:EncryptedParts>
+	                <sp:Body />
+	            </sp:EncryptedParts> 
+	            <sp:SignedParts>
+                    <sp:Body />
+                </sp:SignedParts> 
+	            <sp:EncryptedSupportingTokens
+	                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+	                <wsp:Policy>
+	                    <sp:UsernameToken
+	                            sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient"/>
+	                </wsp:Policy>
+	            </sp:EncryptedSupportingTokens>
+	            <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+	                    <ramp:user>bob</ramp:user>
+	                    <ramp:encryptionUser>alice</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>
+
+</service>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-18.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-18.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-18.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-18.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,83 @@
+<service name="SecureService18">
+
+	<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>
+
+	<wsp:Policy wsu:Id="EncrSupTokens"
+	        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"
+	        xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+	        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+	    <wsp:ExactlyOne>
+	        <wsp:All>
+	            <sp:SymmetricBinding>
+	                <wsp:Policy>
+	                    <sp:ProtectionToken>
+	                        <wsp:Policy>
+	                            <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+	                                <wsp:Policy>
+	                                    <sp:RequireThumbprintReference/>
+	                                    <sp:WssX509V3Token10/>
+	                                </wsp:Policy>
+	                            </sp:X509Token>
+	                        </wsp:Policy>
+	                    </sp:ProtectionToken>
+	                    <sp:AlgorithmSuite>
+	                        <wsp:Policy>
+	                            <sp:Basic256/>
+	                        </wsp:Policy>
+	                    </sp:AlgorithmSuite>
+	                    <sp:Layout>
+	                        <wsp:Policy>
+	                            <sp:Lax/>
+	                        </wsp:Policy>
+	                    </sp:Layout>
+	                    <sp:IncludeTimestamp/>
+	                    <sp:OnlySignEntireHeadersAndBody/>
+	                </wsp:Policy>
+	            </sp:SymmetricBinding>
+	            <sp:EncryptedParts>
+	                <sp:Body />
+	            </sp:EncryptedParts> 
+	            <sp:SignedParts>
+                    <sp:Body />
+                </sp:SignedParts> 
+	            <sp:SignedEncryptedSupportingTokens
+	                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+	                <wsp:Policy>
+	                    <sp:UsernameToken
+	                            sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient"/>
+	                </wsp:Policy>
+	            </sp:SignedEncryptedSupportingTokens>
+	            <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+	                    <ramp:user>bob</ramp:user>
+	                    <ramp:encryptionUser>alice</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>
+
+</service>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-19.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-19.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-19.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-19.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,85 @@
+<service name="SecureService19">
+
+	<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>
+
+	<wsp:Policy wsu:Id="EndorsingEncrSupTokens"
+	        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"
+	        xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+	        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+	    <wsp:ExactlyOne>
+	        <wsp:All>
+	            <sp:SymmetricBinding>
+	                <wsp:Policy>
+	                    <sp:ProtectionToken>
+	                        <wsp:Policy>
+	                            <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+	                                <wsp:Policy>
+	                                    <sp:RequireThumbprintReference/>
+	                                    <sp:WssX509V3Token10/>
+	                                </wsp:Policy>
+	                            </sp:X509Token>
+	                        </wsp:Policy>
+	                    </sp:ProtectionToken>
+	                    <sp:AlgorithmSuite>
+	                        <wsp:Policy>
+	                            <sp:Basic256/>
+	                        </wsp:Policy>
+	                    </sp:AlgorithmSuite>
+	                    <sp:Layout>
+	                        <wsp:Policy>
+	                            <sp:Lax/>
+	                        </wsp:Policy>
+	                    </sp:Layout>
+	                    <sp:IncludeTimestamp/>
+	                    <sp:OnlySignEntireHeadersAndBody/>
+	                </wsp:Policy>
+	            </sp:SymmetricBinding>
+	            <sp:EncryptedParts>
+	                <sp:Body />
+	            </sp:EncryptedParts> 
+	             <sp:SignedParts>
+	                <sp:Body />
+	            </sp:SignedParts>             
+	            <sp:EndorsingEncryptedSupportingTokens
+	                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                            <wsp:Policy>
+                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+	            </sp:EndorsingEncryptedSupportingTokens>
+	            <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+	                <ramp:user>bob</ramp:user>
+	                <ramp:encryptionUser>alice</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>
+</service>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-20.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-20.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-20.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-20.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,85 @@
+<service name="SecureService20">
+
+	<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>
+
+	<wsp:Policy wsu:Id="SignedEndorsingEncrSupTokens"
+	        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"
+	        xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+	        xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+	    <wsp:ExactlyOne>
+	        <wsp:All>
+	            <sp:SymmetricBinding>
+	                <wsp:Policy>
+	                    <sp:ProtectionToken>
+	                        <wsp:Policy>
+	                            <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never">
+	                                <wsp:Policy>
+	                                    <sp:RequireThumbprintReference/>
+	                                    <sp:WssX509V3Token10/>
+	                                </wsp:Policy>
+	                            </sp:X509Token>
+	                        </wsp:Policy>
+	                    </sp:ProtectionToken>
+	                    <sp:AlgorithmSuite>
+	                        <wsp:Policy>
+	                            <sp:Basic256/>
+	                        </wsp:Policy>
+	                    </sp:AlgorithmSuite>
+	                    <sp:Layout>
+	                        <wsp:Policy>
+	                            <sp:Lax/>
+	                        </wsp:Policy>
+	                    </sp:Layout>
+	                    <sp:IncludeTimestamp/>
+	                    <sp:OnlySignEntireHeadersAndBody/>
+	                </wsp:Policy>
+	            </sp:SymmetricBinding>
+	            <sp:EncryptedParts>
+	                <sp:Body />
+	            </sp:EncryptedParts> 
+	             <sp:SignedParts>
+	                <sp:Body />
+	            </sp:SignedParts>             
+	            <sp:SignedEndorsingEncryptedSupportingTokens
+	                    xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702">
+                            <wsp:Policy>
+                                <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/AlwaysToRecipient">
+                                    <wsp:Policy>
+                                        <sp:WssX509V3Token10/>
+                                    </wsp:Policy>
+                                </sp:X509Token>
+                            </wsp:Policy>
+	            </sp:SignedEndorsingEncryptedSupportingTokens>
+	            <ramp:RampartConfig xmlns:ramp="http://ws.apache.org/rampart/policy"> 
+	                <ramp:user>bob</ramp:user>
+	                <ramp:encryptionUser>alice</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>
+</service>

Added: webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml?rev=619881&view=auto
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml (added)
+++ webservices/rampart/trunk/java/modules/rampart-integration/src/test/resources/rampart/services-9.xml Fri Feb  8 05:34:34 2008
@@ -0,0 +1,88 @@
+<service name="SecureService9">
+
+	<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>
+	
+	<wsp:Policy wsu:Id="SigEncrTripleDesRSA15" 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:TripleDesRsa15/>
+						</wsp:Policy>
+					</sp:AlgorithmSuite>
+					<sp:Layout>
+						<wsp:Policy>
+							<sp:Strict/>
+						</wsp:Policy>
+					</sp:Layout>
+					<sp:IncludeTimestamp/>
+					<sp:EncryptSignature />
+					<sp:EncryptBeforeSigning />
+					<!--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>
+			<sp:EncryptedParts xmlns:sp="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy">
+				<sp:Body/>
+			</sp:EncryptedParts>
+
+			<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>
+</service>