Author: dkulp
Date: Tue Dec 16 12:48:58 2008
New Revision: 727142
URL: http://svn.apache.org/viewvc?rev=727142&view=rev
Log:
Switch to the updated server
Get scenario 3 working (SAML token for Certificate (Symmetric key))
Note: REQUIRES the the latest WSS4J snapshot code to fix a signature
confirmation issue
Removed:
cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/sts_policy_mut.xml
cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/sts_policy_ut.xml
Modified:
cxf/sandbox/interopfest/wstrust13/build.xml
cxf/sandbox/interopfest/wstrust13/pom.xml
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/client/Client.java
cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/alice.properties
cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties
cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml
cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl
Modified: cxf/sandbox/interopfest/wstrust13/build.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/build.xml?rev=727142&r1=727141&r2=727142&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/build.xml (original)
+++ cxf/sandbox/interopfest/wstrust13/build.xml Tue Dec 16 12:48:58 2008
@@ -4,13 +4,13 @@
<mkdir dir="${build.dir}/generated/src/main/resources/certs"/>
<mkdir dir="${build.dir}/wsdl"/>
<get src="http://131.107.72.15/ilab/Certs/Certs.zip";
dest="${build.dir}/Certs.zip"/>
- <get src="http://131.107.72.15/PingService?wsdl";
dest="${build.dir}/wsdl/PingService.wsdl"/>
+ <get src="http://131.107.153.205/PingService?wsdl";
dest="${build.dir}/wsdl/PingService.wsdl"/>
- <get src="http://131.107.72.15/trust?wsdl";
dest="${build.dir}/wsdl/trust.wsdl"/>
- <get src="http://131.107.72.15/trust?wsdl=wsdl0";
dest="${build.dir}/wsdl/trust2.wsdl"/>
- <get src="http://131.107.72.15/trust?xsd=xsd0";
dest="${build.dir}/wsdl/trust0.xsd"/>
- <get src="http://131.107.72.15/trust?xsd=xsd1";
dest="${build.dir}/wsdl/trust1.xsd"/>
- <get src="http://131.107.72.15/trust?xsd=xsd2";
dest="${build.dir}/wsdl/trust2.xsd"/>
+ <get src="http://131.107.153.205/trust?wsdl";
dest="${build.dir}/wsdl/trust.wsdl"/>
+ <get src="http://131.107.153.205/trust?wsdl=wsdl0";
dest="${build.dir}/wsdl/trust2.wsdl"/>
+ <get src="http://131.107.153.205/trust?xsd=xsd0";
dest="${build.dir}/wsdl/trust0.xsd"/>
+ <get src="http://131.107.153.205/trust?xsd=xsd1";
dest="${build.dir}/wsdl/trust1.xsd"/>
+ <get src="http://131.107.153.205/trust?xsd=xsd2";
dest="${build.dir}/wsdl/trust2.xsd"/>
<antcall target="transform"/>
<unzip src="${build.dir}/Certs.zip"
dest="${build.dir}/generated/src/main/resources/certs"/>
Modified: cxf/sandbox/interopfest/wstrust13/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/pom.xml?rev=727142&r1=727141&r2=727142&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/pom.xml (original)
+++ cxf/sandbox/interopfest/wstrust13/pom.xml Tue Dec 16 12:48:58 2008
@@ -149,6 +149,11 @@
<dependencies>
<dependency>
+ <groupId>org.apache.ws.security</groupId>
+ <artifactId>wss4j</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
<version>${cxf.version}</version>
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=727142&r1=727141&r2=727142&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
Tue Dec 16 12:48:58 2008
@@ -69,8 +69,7 @@
if (argv.length < 2) {
//argv = new String[] {"CustomBinding_IPingServiceContract"};
//argv = new String[]
{"OasisScenario2Binding_IPingServiceContract"}; //NOT_WORKING
-
-
+ argv = new String[] {"CustomBinding_IPingServiceContract1"};
}
Bus b = new SpringBusFactory().createBus("etc/client.xml");
Modified:
cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/alice.properties
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/alice.properties?rev=727142&r1=727141&r2=727142&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/alice.properties
(original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/alice.properties
Tue Dec 16 12:48:58 2008
@@ -1,5 +1,4 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=Alice
-org.apache.ws.security.crypto.merlin.file=keys/alice.jks
+org.apache.ws.security.crypto.merlin.file=certs/alice.pfx
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=727142&r1=727141&r2=727142&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties
(original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/bob.properties Tue
Dec 16 12:48:58 2008
@@ -1,5 +1,4 @@
org.apache.ws.security.crypto.provider=org.apache.ws.security.components.crypto.Merlin
-org.apache.ws.security.crypto.merlin.keystore.type=jks
+org.apache.ws.security.crypto.merlin.keystore.type=PKCS12
org.apache.ws.security.crypto.merlin.keystore.password=password
-org.apache.ws.security.crypto.merlin.keystore.alias=Bob
-org.apache.ws.security.crypto.merlin.file=keys/bob.jks
+org.apache.ws.security.crypto.merlin.file=certs/bob.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=727142&r1=727141&r2=727142&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml
(original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/resources/etc/client.xml Tue Dec
16 12:48:58 2008
@@ -50,8 +50,32 @@
</map>
</property>
</bean>
+ <bean id="CustomBinding_IPingServiceContract1"
+ 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_IWSTrust13Sync2"/>
+ <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/bob.properties"/>
+ </map>
+ </property>
+ </bean>
+
+
+
+
+ <jaxws:client
name="{http://tempuri.org/}CustomBinding_IPingServiceContract1";
createdFromAPI="true">
+ <jaxws:properties>
+ <entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
+ <entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
+ </jaxws:properties>
+ </jaxws:client>
+
+
-
<http:conduit name="https://131.107.72.15/.*";>
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
@@ -62,11 +86,14 @@
</sec:trustManagers>
</http:tlsClientParameters>
</http:conduit>
- <!-- jaxws:client name="{http://InteropBaseAddress/interop}A_IPingService";
createdFromAPI="true">
- <jaxws:properties>
- <entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
- <entry key="ws-security.encryption.username" value="Bob"/>
- <entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
- </jaxws:properties>
- </jaxws:client-->
+ <http:conduit name="https://131.107.153.205/.*";>
+ <http:tlsClientParameters disableCNCheck="true">
+ <sec:keyManagers keyPassword="password">
+ <sec:keyStore type="pkcs12" password="password"
resource="certs/alice.pfx"/>
+ </sec:keyManagers>
+ <sec:trustManagers>
+ <sec:keyStore type="pkcs12" password="password"
resource="certs/WssIP.pfx"/>
+ </sec:trustManagers>
+ </http:tlsClientParameters>
+ </http:conduit>
</beans>
Modified: cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl?rev=727142&r1=727141&r2=727142&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl (original)
+++ cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl Tue Dec 16
12:48:58 2008
@@ -18,8 +18,17 @@
<xsl:when
test="@schemaLocation='http://localhost/trust?xsd=xsd2'">
<xsl:attribute
name="schemaLocation">trust2.xsd</xsl:attribute>
</xsl:when>
+ <xsl:when
test="@schemaLocation='http://131.107.153.205/trust?xsd=xsd0'">
+ <xsl:attribute
name="schemaLocation">trust0.xsd</xsl:attribute>
+ </xsl:when>
+ <xsl:when
test="@schemaLocation='http://131.107.153.205/trust?xsd=xsd1'">
+ <xsl:attribute
name="schemaLocation">trust1.xsd</xsl:attribute>
+ </xsl:when>
+ <xsl:when
test="@schemaLocation='http://131.107.153.205/trust?xsd=xsd2'">
+ <xsl:attribute
name="schemaLocation">trust2.xsd</xsl:attribute>
+ </xsl:when>
<xsl:otherwise>
- <xsl:attribute name="schemaLocation"><xsl:value-of
select="@schemaLocation"/></xsl:attribute>
+ <xsl:apply-templates select="@schemaLocation"/>
</xsl:otherwise>
</xsl:choose>
<xsl:apply-templates select="@namespace"/>
@@ -29,21 +38,18 @@
<xsl:template match="soap12:address|soap:address">
<xsl:copy>
<xsl:choose>
- <xsl:when
test="@location='https://kirillgdev04/Security_Federation_FederatedService_Indigo/Symmetric.svc/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport'">
- <xsl:attribute
name="location">https://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport</xsl:attribute>
- </xsl:when>
<xsl:when test="starts-with(@location,'http://localhost/')">
- <xsl:attribute
name="location">http://131.107.72.15/<xsl:value-of
select="substring(@location,18)"/></xsl:attribute>
+ <xsl:attribute
name="location">http://131.107.153.205/<xsl:value-of
select="substring(@location,18)"/></xsl:attribute>
</xsl:when>
<xsl:when test="starts-with(@location,'https://localhost/')">
- <xsl:attribute
name="location">https://131.107.72.15/<xsl:value-of
select="substring(@location,19)"/></xsl:attribute>
+ <xsl:attribute
name="location">https://131.107.153.205/<xsl:value-of
select="substring(@location,19)"/></xsl:attribute>
</xsl:when>
- <xsl:when
test="starts-with(@location,'http://131.107.153.205/')">
+ <!--xsl:when
test="starts-with(@location,'http://131.107.153.205/')">
<xsl:attribute
name="location">http://131.107.72.15/<xsl:value-of
select="substring(@location,24)"/></xsl:attribute>
</xsl:when>
<xsl:when
test="starts-with(@location,'https://131.107.153.205/')">
<xsl:attribute
name="location">https://131.107.72.15/<xsl:value-of
select="substring(@location,25)"/></xsl:attribute>
- </xsl:when>
+ </xsl:when-->
<xsl:otherwise>
<xsl:apply-templates select="@location"/>
</xsl:otherwise>
@@ -54,26 +60,20 @@
<xsl:template match="wsdl:import">
<xsl:copy>
<xsl:choose>
- <xsl:when
test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl'">
- <xsl:attribute
name="location">WsTrustSym.wsdl</xsl:attribute>
- </xsl:when>
- <xsl:when
test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl=wsdl0'">
- <xsl:attribute
name="location">WsTrustSym_policy.wsdl</xsl:attribute>
- </xsl:when>
- <xsl:when
test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl'">
- <xsl:attribute
name="location">WsTrustAsym.wsdl</xsl:attribute>
- </xsl:when>
- <xsl:when
test="@location='http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl=wsdl0'">
- <xsl:attribute
name="location">WsTrustAsym_policy.wsdl</xsl:attribute>
- </xsl:when>
<xsl:when test="@location='http://localhost/trust?wsdl=wsdl0'">
<xsl:attribute name="location">trust2.wsdl</xsl:attribute>
</xsl:when>
<xsl:when test="@location='http://localhost/trust?wsdl'">
<xsl:attribute name="location">trust.wsdl</xsl:attribute>
</xsl:when>
+ <xsl:when
test="@location='http://131.107.153.205/trust?wsdl=wsdl0'">
+ <xsl:attribute name="location">trust2.wsdl</xsl:attribute>
+ </xsl:when>
+ <xsl:when test="@location='http://131.107.153.205/trust?wsdl'">
+ <xsl:attribute name="location">trust.wsdl</xsl:attribute>
+ </xsl:when>
<xsl:otherwise>
- <xsl:attribute
name="location">WsTrustSym_policy.wsdl</xsl:attribute>
+ <xsl:apply-templates select="@location"/>
</xsl:otherwise>
</xsl:choose>
<xsl:apply-templates select="@namespace"/>
