cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1075384 - in /cxf/trunk/systests/ws-specs/src/test: java/org/apache/cxf/systest/ws/wssec11/ java/org/apache/cxf/systest/ws/wssec11/client/ java/org/apache/cxf/systest/ws/wssec11/server/ resources/wsdl_systest_wsspec/wssec11/
Date Mon, 28 Feb 2011 15:40:00 GMT
Author: coheigea
Date: Mon Feb 28 15:40:00 2011
New Revision: 1075384

URL: http://svn.apache.org/viewvc?rev=1075384&view=rev
Log:
Moving WS-Security systest to use AES 256 instead of 192, as AES-192 is not a supported algorithm
as per the Basic Security Profile spec.

Modified:
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/client/client.xml
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
    cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy.wsdl
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy_restricted.wsdl
    cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
(original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
Mon Feb 28 15:40:00 2011
@@ -28,7 +28,7 @@ import org.junit.Test;
 
 /**
  * This class runs the second half of the tests, as having all in 
- * the one class causes an out of meemory problem in eclipse
+ * the one class causes an out of memory problem in eclipse
  */
 public class WSSecurity112Test extends WSSecurity11Common {
     private static boolean unrestrictedPoliciesInstalled;
@@ -75,7 +75,7 @@ public class WSSecurity112Test extends W
                 "X",
                 "X-NoTimestamp",
                 "X-AES128",
-                "X-AES192",
+                "X-AES256",
                 "X-TripleDES",
                 "XD",
                 "XD-ES",

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/client/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/client/client.xml?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/client/client.xml
(original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/client/client.xml
Mon Feb 28 15:40:00 2011
@@ -129,7 +129,7 @@
             <entry key="ws-security.encryption.properties" value="org/apache/cxf/systest/ws/wssec11/client/bob.properties"/>

         </jaxws:properties>
     </jaxws:client>
-    <jaxws:client name="{http://WSSec/wssec11}X-AES192_IPingService" createdFromAPI="true">
+    <jaxws:client name="{http://WSSec/wssec11}X-AES256_IPingService" createdFromAPI="true">
         <jaxws:properties>
             <entry key="ws-security.username" value="Alice"/>
             <entry key="ws-security.callback-handler" value="org.apache.cxf.systest.ws.wssec11.client.KeystorePasswordCallback"/>

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
(original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/Server.java
Mon Feb 28 15:40:00 2011
@@ -50,7 +50,7 @@ public class Server extends AbstractBusT
         doPublish(baseUrl + "/XPingService", new XPingService());
         doPublish(baseUrl + "/X-NoTimestampPingService", new XNoTimestampPingService());
         doPublish(baseUrl + "/X-AES128PingService", new XAES128PingService());
-        doPublish(baseUrl + "/X-AES192PingService", new XAES192PingService());
+        doPublish(baseUrl + "/X-AES256PingService", new XAES256PingService());
         doPublish(baseUrl + "/X-TripleDESPingService", new XTripleDESPingService());
         doPublish(baseUrl + "/XDPingService", new XDPingService());
         doPublish(baseUrl + "/XD-ESPingService", new XDESPingService());
@@ -211,10 +211,10 @@ public class Server extends AbstractBusT
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
-                portName = "X-AES192_IPingService", 
+                portName = "X-AES256_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl")
       
-    public static class XAES192PingService extends PingService {
+    public static class XAES256PingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 

Modified: cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
(original)
+++ cxf/trunk/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/wssec11/server/ServerRestricted.java
Mon Feb 28 15:40:00 2011
@@ -50,7 +50,7 @@ public class ServerRestricted extends Ab
         doPublish(baseUrl + "/XPingService", new XPingService());
         doPublish(baseUrl + "/X-NoTimestampPingService", new XNoTimestampPingService());
 //        doPublish(baseUrl + "/X-AES128PingService", new XAES128PingService());
-//        doPublish(baseUrl + "/X-AES192PingService", new XAES192PingService());
+//        doPublish(baseUrl + "/X-AES256PingService", new XAES256PingService());
 //        doPublish(baseUrl + "/X-TripleDESPingService", new XTripleDESPingService());
         doPublish(baseUrl + "/XDPingService", new XDPingService());
         doPublish(baseUrl + "/XD-ESPingService", new XDESPingService());
@@ -225,11 +225,11 @@ public class ServerRestricted extends Ab
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 
-                portName = "X-AES192_IPingService", 
+                portName = "X-AES256_IPingService", 
                 endpointInterface = "wssec.wssec11.IPingService",
                 wsdlLocation = 
                               "target/test-classes/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl")
-    public static class XAES192PingService extends PingService {
+    public static class XAES256PingService extends PingService {
     }
     @WebService(targetNamespace = "http://WSSec/wssec11", 
                 serviceName = "PingService11", 

Modified: cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl
(original)
+++ cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11.wsdl
Mon Feb 28 15:40:00 2011
@@ -140,9 +140,9 @@
 			<soap12:address
 				location="http://localhost/Security_WsSecurity_Service_Indigo/WsSecurity11.svc/X-AES128"
/>
 		</wsdl:port>
-		<wsdl:port name="X-AES192_IPingService" binding="wssec11test:X-AES192_IPingService">
+		<wsdl:port name="X-AES256_IPingService" binding="wssec11test:X-AES256_IPingService">
 			<soap12:address
-				location="http://localhost/Security_WsSecurity_Service_Indigo/WsSecurity11.svc/X-AES192"
/>
+				location="http://localhost/Security_WsSecurity_Service_Indigo/WsSecurity11.svc/X-AES256"
/>
 		</wsdl:port>
 		<wsdl:port name="X-TripleDES_IPingService" binding="wssec11test:X-TripleDES_IPingService">
 			<soap12:address

Modified: cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy.wsdl?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy.wsdl
(original)
+++ cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy.wsdl
Mon Feb 28 15:40:00 2011
@@ -1525,7 +1525,7 @@
 		</wsp:ExactlyOne>
 	</wsp:Policy>
 
-	<wsp:Policy wsu:Id="X-AES192_IPingService_policy">
+	<wsp:Policy wsu:Id="X-AES256_IPingService_policy">
 		<wsp:ExactlyOne>
 			<wsp:All>
 				<sp:SymmetricBinding
@@ -1544,7 +1544,7 @@
 						</sp:ProtectionToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic192 />
+								<sp:Basic256 />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -1589,7 +1589,7 @@
 		</wsp:ExactlyOne>
 	</wsp:Policy>
 
-	<wsp:Policy wsu:Id="X-AES192_IPingService_echo_Input_policy">
+	<wsp:Policy wsu:Id="X-AES256_IPingService_echo_Input_policy">
 		<wsp:ExactlyOne>
 			<wsp:All>
 				<sp:SignedParts
@@ -1617,7 +1617,7 @@
 			</wsp:All>
 		</wsp:ExactlyOne>
 	</wsp:Policy>
-	<wsp:Policy wsu:Id="X-AES192_IPingService_echo_output_policy">
+	<wsp:Policy wsu:Id="X-AES256_IPingService_echo_output_policy">
 		<wsp:ExactlyOne>
 			<wsp:All>
 				<sp:SignedParts
@@ -2453,19 +2453,19 @@
 		</wsdl:operation>
 
 	</wsdl:binding>
-	<wsdl:binding name="X-AES192_IPingService" type="wssec11test:IPingService">
-		<wsp:PolicyReference URI="#X-AES192_IPingService_policy" />
+	<wsdl:binding name="X-AES256_IPingService" type="wssec11test:IPingService">
+		<wsp:PolicyReference URI="#X-AES256_IPingService_policy" />
 		<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
 
 		<wsdl:operation name="echo">
 			<soap12:operation soapAction="http://WSSec/wssec11/echo"
 				style="document" />
 			<wsdl:input>
-				<wsp:PolicyReference URI="#X-AES192_IPingService_echo_Input_policy" />
+				<wsp:PolicyReference URI="#X-AES256_IPingService_echo_Input_policy" />
 				<soap12:body use="literal" />
 			</wsdl:input>
 			<wsdl:output>
-				<wsp:PolicyReference URI="#X-AES192_IPingService_echo_output_policy" />
+				<wsp:PolicyReference URI="#X-AES256_IPingService_echo_output_policy" />
 				<soap12:body use="literal" />
 			</wsdl:output>
 		</wsdl:operation>

Modified: cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy_restricted.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy_restricted.wsdl?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy_restricted.wsdl
(original)
+++ cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_policy_restricted.wsdl
Mon Feb 28 15:40:00 2011
@@ -1525,7 +1525,7 @@
 		</wsp:ExactlyOne>
 	</wsp:Policy>
 
-	<wsp:Policy wsu:Id="X-AES192_IPingService_policy">
+	<wsp:Policy wsu:Id="X-AES_IPingService_policy">
 		<wsp:ExactlyOne>
 			<wsp:All>
 				<sp:SymmetricBinding
@@ -1544,7 +1544,7 @@
 						</sp:ProtectionToken>
 						<sp:AlgorithmSuite>
 							<wsp:Policy>
-								<sp:Basic192 />
+								<sp:Basic />
 							</wsp:Policy>
 						</sp:AlgorithmSuite>
 						<sp:Layout>
@@ -1589,7 +1589,7 @@
 		</wsp:ExactlyOne>
 	</wsp:Policy>
 
-	<wsp:Policy wsu:Id="X-AES192_IPingService_echo_Input_policy">
+	<wsp:Policy wsu:Id="X-AES_IPingService_echo_Input_policy">
 		<wsp:ExactlyOne>
 			<wsp:All>
 				<sp:SignedParts
@@ -1617,7 +1617,7 @@
 			</wsp:All>
 		</wsp:ExactlyOne>
 	</wsp:Policy>
-	<wsp:Policy wsu:Id="X-AES192_IPingService_echo_output_policy">
+	<wsp:Policy wsu:Id="X-AES_IPingService_echo_output_policy">
 		<wsp:ExactlyOne>
 			<wsp:All>
 				<sp:SignedParts
@@ -2453,19 +2453,19 @@
 		</wsdl:operation>
 
 	</wsdl:binding>
-	<wsdl:binding name="X-AES192_IPingService" type="wssec11test:IPingService">
-		<wsp:PolicyReference URI="#X-AES192_IPingService_policy" />
+	<wsdl:binding name="X-AES_IPingService" type="wssec11test:IPingService">
+		<wsp:PolicyReference URI="#X-AES_IPingService_policy" />
 		<soap12:binding transport="http://schemas.xmlsoap.org/soap/http" />
 
 		<wsdl:operation name="echo">
 			<soap12:operation soapAction="http://WSSec/wssec11/echo"
 				style="document" />
 			<wsdl:input>
-				<wsp:PolicyReference URI="#X-AES192_IPingService_echo_Input_policy" />
+				<wsp:PolicyReference URI="#X-AES_IPingService_echo_Input_policy" />
 				<soap12:body use="literal" />
 			</wsdl:input>
 			<wsdl:output>
-				<wsp:PolicyReference URI="#X-AES192_IPingService_echo_output_policy" />
+				<wsp:PolicyReference URI="#X-AES_IPingService_echo_output_policy" />
 				<soap12:body use="literal" />
 			</wsdl:output>
 		</wsdl:operation>

Modified: cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl?rev=1075384&r1=1075383&r2=1075384&view=diff
==============================================================================
--- cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl
(original)
+++ cxf/trunk/systests/ws-specs/src/test/resources/wsdl_systest_wsspec/wssec11/WsSecurity11_restricted.wsdl
Mon Feb 28 15:40:00 2011
@@ -140,9 +140,9 @@
 			<soap12:address
 				location="http://localhost/Security_WsSecurity_Service_Indigo/WsSecurity11.svc/X-AES128"
/>
 		</wsdl:port>
-		<wsdl:port name="X-AES192_IPingService" binding="wssec11test:X-AES192_IPingService">
+		<wsdl:port name="X-AES256_IPingService" binding="wssec11test:X-AES256_IPingService">
 			<soap12:address
-				location="http://localhost/Security_WsSecurity_Service_Indigo/WsSecurity11.svc/X-AES192"
/>
+				location="http://localhost/Security_WsSecurity_Service_Indigo/WsSecurity11.svc/X-AES256"
/>
 		</wsdl:port>
 		<wsdl:port name="X-TripleDES_IPingService" binding="wssec11test:X-TripleDES_IPingService">
 			<soap12:address



Mime
View raw message