cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r727630 - in /cxf/sandbox/interopfest/wstrust13: ./ src/main/java/interop/client/ src/main/resources/etc/
Date Thu, 18 Dec 2008 03:41:15 GMT
Author: dkulp
Date: Wed Dec 17 19:41:14 2008
New Revision: 727630

URL: http://svn.apache.org/viewvc?rev=727630&view=rev
Log:
Add 4th scenario

Added:
    cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties   (with props)
Modified:
    cxf/sandbox/interopfest/wstrust13/pom.xml
    cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java
    cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/KeystorePasswordCallback.java
    cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties
    cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml

Modified: cxf/sandbox/interopfest/wstrust13/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/pom.xml?rev=727630&r1=727629&r2=727630&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/pom.xml (original)
+++ cxf/sandbox/interopfest/wstrust13/pom.xml Wed Dec 17 19:41:14 2008
@@ -143,7 +143,19 @@
         </profile>
     </profiles>
     
-
+    <repositories>
+        <repository>
+            <id>apache.snapshot</id>
+            <name>Apache Snapshot Repository</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+        </repository>
+    </repositories>
 
 
 
@@ -151,7 +163,7 @@
         <dependency>
             <groupId>org.apache.ws.security</groupId>
             <artifactId>wss4j</artifactId>
-            <version>SNAPSHOT</version>
+            <version>1.5.5-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.cxf</groupId>

Modified: cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java?rev=727630&r1=727629&r2=727630&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java Wed Dec 17
19:41:14 2008
@@ -69,7 +69,8 @@
         if (argv.length < 2) {
             //argv = new String[] {"CustomBinding_IPingServiceContract"};
             //argv = new String[] {"OasisScenario2Binding_IPingServiceContract"};  //NOT_WORKING
-            argv = new String[] {"CustomBinding_IPingServiceContract1"};
+            //argv = new String[] {"CustomBinding_IPingServiceContract1"};
+            argv = new String[] {"OasisScenario4Binding_IPingServiceContract"};
         }
 
         Bus b = new SpringBusFactory().createBus("etc/client.xml");

Modified: cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/KeystorePasswordCallback.java?rev=727630&r1=727629&r2=727630&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/KeystorePasswordCallback.java
(original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/KeystorePasswordCallback.java
Wed Dec 17 19:41:14 2008
@@ -42,6 +42,7 @@
                 pc.setPassword(pass);
                 return;
             }
+            pc.setPassword("abcd!1234");
         }
     }
     

Modified: cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties?rev=727630&r1=727629&r2=727630&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties (original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties Wed Dec 17 19:41:14
2008
@@ -1,4 +1,8 @@
 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
+# 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.file=certs/bob.pfx
+org.apache.ws.security.crypto.merlin.file=certs/WssIP.pfx

Modified: cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml?rev=727630&r1=727629&r2=727630&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml (original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml Wed Dec 17 19:41:14
2008
@@ -63,6 +63,19 @@
     		</map>
     	</property>
     </bean>
+    <bean id="OasisScenario4Binding_IPingServiceContract" 
+    	class="org.apache.cxf.ws.security.trust.STSClient" abstract="true">
+    	<property name="wsdlLocation" value="target/wsdl2/trust.wsdl"/>
+    	<property name="serviceName" value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}SecurityTokenService"/>
+    	<property name="endpointName" value="{http://schemas.microsoft.com/ws/2008/06/identity/securitytokenservice}CustomBinding_IWSTrust13Sync3"/>
+    	<property name="properties">
+    		<map>
+            	<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"/>

+    		</map>
+    	</property>
+    </bean>
     
     
     
@@ -73,6 +86,11 @@
             <entry key="ws-security.encryption.properties" value="etc/bob.properties"/>

         </jaxws:properties>
     </jaxws:client>
+    <jaxws:client name="{http://tempuri.org/}OasisScenario4Binding_IPingServiceContract"
createdFromAPI="true">
+        <jaxws:properties>
+            <entry key="ws-security.callback-handler" value="interop.client.KeystorePasswordCallback"/>
+        </jaxws:properties>
+    </jaxws:client>
     
     
      

Added: cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties?rev=727630&view=auto
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties (added)
+++ cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties Wed Dec 17 19:41:14
2008
@@ -0,0 +1,6 @@
+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
+# 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

Propchange: cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/wssip.properties
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message