cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1083772 - in /cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main: java/interop/client/ resources/etc/
Date Mon, 21 Mar 2011 13:18:18 GMT
Author: coheigea
Date: Mon Mar 21 13:18:18 2011
New Revision: 1083772

URL: http://svn.apache.org/viewvc?rev=1083772&view=rev
Log:
All WS-Trust 1.3 tests are now passing.

Modified:
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml
    cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java?rev=1083772&r1=1083771&r2=1083772&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/java/interop/client/UTPasswordCallback.java
Mon Mar 21 13:18:18 2011
@@ -55,11 +55,6 @@ public class UTPasswordCallback implemen
                 return;
             }
         }
-        
-        //
-        // Password not found
-        //
-        throw new IOException();
     }
     
     /**

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties?rev=1083772&r1=1083771&r2=1083772&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/alice.properties
Mon Mar 21 13:18:18 2011
@@ -17,4 +17,4 @@
 org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
 org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
 org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.file=certs/alice.pfx
+org.apache.ws.security.crypto.merlin.keystore.file=certs/alice.pfx

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties?rev=1083772&r1=1083771&r2=1083772&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/bob.properties
Mon Mar 21 13:18:18 2011
@@ -19,4 +19,4 @@ org.apache.ws.security.crypto.merlin.key
 org.apache.ws.security.crypto.merlin.keystore.password=password
 # for some reason, bouncycastle has issues with bob.pfx
 org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
-org.apache.ws.security.crypto.merlin.file=certs/bob.pfx
+org.apache.ws.security.crypto.merlin.keystore.file=certs/bob.pfx

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml?rev=1083772&r1=1083771&r2=1083772&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/client.xml
Mon Mar 21 13:18:18 2011
@@ -53,6 +53,7 @@
             	<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
             	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

             	<entry key="ws-security.encryption.properties" value="etc/wssip.properties"/>

+            	<entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
     		</map>
     	</property>
     </bean>
@@ -73,7 +74,8 @@
 			    			<entry key="ws-security.password" value="eoj"/>
 							<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
 				        	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

-				        	<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
		    			
+				        	<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+				        	<entry key="ws-security.timestamp.futureTimeToLive" value="60"/>			  
 			
 			    		</map>
 			    	</property>
 			    </bean>            
@@ -97,7 +99,8 @@
 			    			<entry key="ws-security.password" value="eoj"/>
 							<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
 				        	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

-				        	<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
		    			
+				        	<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+				        	<entry key="ws-security.timestamp.futureTimeToLive" value="60"/>			  
 			
 			    		</map>
 			    	</property>
 			    </bean>            
@@ -122,7 +125,9 @@
 			    			<entry key="ws-security.password" value="eoj"/>
 							<entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
 				        	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

-				        	<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
		    			
+				        	<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>
+				        	<entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
+				        	<entry key="ws-security.is-bsp-compliant" value="false"/>			    			
 			    		</map>
 			    	</property>
 			    </bean>            
@@ -149,6 +154,7 @@
 				        	<entry key="ws-security.signature.properties" value="etc/alice.properties"/>

 				        	<entry key="ws-security.encryption.properties" value="etc/bob.properties"/>

 				        	<entry key="ws-security.sts.token.properties" value="etc/bob.properties"/>
+				        	<entry key="ws-security.timestamp.futureTimeToLive" value="60"/>
 			    		</map>
 			    	</property>
 			    </bean>            
@@ -164,7 +170,9 @@
             <entry key="ws-security.encryption.properties" value="etc/bob.properties"/>

             <entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
             <entry key="ws-security.signature.properties.sct" value="etc/alice.properties"/>
-            <entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
           
+            <entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
 
+            <entry key="ws-security.timestamp.futureTimeToLive.sct" value="60"/>  
      
+            <entry key="ws-security.is-bsp-compliant.sct" value="false"/> 
         </jaxws:properties>
     </jaxws:client>
     

Modified: cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties
URL: http://svn.apache.org/viewvc/cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties?rev=1083772&r1=1083771&r2=1083772&view=diff
==============================================================================
--- cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties
(original)
+++ cxf/trunk/distribution/src/main/release/samples/ws_security/interopfest/wstrust13/src/main/resources/etc/wssip.properties
Mon Mar 21 13:18:18 2011
@@ -19,4 +19,4 @@ org.apache.ws.security.crypto.merlin.key
 org.apache.ws.security.crypto.merlin.keystore.password=password
 # for some reason, bouncycastle has issues with WssIP.pfx
 org.apache.ws.security.crypto.merlin.keystore.provider=SunJSSE
-org.apache.ws.security.crypto.merlin.file=certs/WssIP.pfx
+org.apache.ws.security.crypto.merlin.keystore.file=certs/WssIP.pfx



Mime
View raw message