Author: dkulp
Date: Mon Dec 15 13:09:01 2008
New Revision: 726803
URL: http://svn.apache.org/viewvc?rev=726803&view=rev
Log:
First ws-trust13 scenario now works
Added:
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
(contents, props changed)
- copied, changed from r726798,
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingService.java
Removed:
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingService.java
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/java/interop/server/Server.java
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=726803&r1=726802&r2=726803&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/build.xml (original)
+++ cxf/sandbox/interopfest/wstrust13/build.xml Mon Dec 15 13:09:01 2008
@@ -4,16 +4,14 @@
<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/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl";
dest="${build.dir}/wsdl/WsTrustSym.wsdl"/>
- <get
src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Symmetric.svc?wsdl=wsdl0";
dest="${build.dir}/wsdl/WsTrustSym_policy.wsdl"/>
+ <get src="http://131.107.72.15/PingService?wsdl";
dest="${build.dir}/wsdl/PingService.wsdl"/>
- <get
src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl";
dest="${build.dir}/wsdl/WsTrustAsym.wsdl"/>
- <get
src="http://131.107.72.15/Security_Federation_FederatedService_Indigo/Asymmetric.svc?wsdl=wsdl0";
dest="${build.dir}/wsdl/WsTrustAsym_policy.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.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd0";
dest="${build.dir}/wsdl/WsSecurity11_0.xsd"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd1";
dest="${build.dir}/wsdl/WsSecurity11_1.xsd"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd2";
dest="${build.dir}/wsdl/WsSecurity11_2.xsd"/>
- <get
src="http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd3";
dest="${build.dir}/wsdl/WsSecurity11_3.xsd"/-->
<antcall target="transform"/>
<unzip src="${build.dir}/Certs.zip"
dest="${build.dir}/generated/src/main/resources/certs"/>
</target>
Modified: cxf/sandbox/interopfest/wstrust13/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/pom.xml?rev=726803&r1=726802&r2=726803&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/pom.xml (original)
+++ cxf/sandbox/interopfest/wstrust13/pom.xml Mon Dec 15 13:09:01 2008
@@ -2,7 +2,7 @@
<project>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.cxf.interopfest</groupId>
- <artifactId>ws-trust10</artifactId>
+ <artifactId>ws-trust13</artifactId>
<version>1.0</version>
<properties>
<cxf.version>2.2-SNAPSHOT</cxf.version>
@@ -78,10 +78,7 @@
<configuration>
<wsdlOptions>
<wsdlOption>
-
<wsdl>${basedir}/target/wsdl2/WsTrustSym.wsdl</wsdl>
- </wsdlOption>
- <wsdlOption>
-
<wsdl>${basedir}/target/wsdl2/WsTrustAsym.wsdl</wsdl>
+
<wsdl>${basedir}/target/wsdl2/PingService.wsdl</wsdl>
</wsdlOption>
</wsdlOptions>
</configuration>
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=726803&r1=726802&r2=726803&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
Mon Dec 15 13:09:01 2008
@@ -28,7 +28,6 @@
import org.tempuri.IPingServiceContract;
import org.tempuri.PingService;
-import org.tempuri.SymmetricFederatedService;
import org.apache.cxf.Bus;
import org.apache.cxf.bus.spring.SpringBusFactory;
@@ -50,8 +49,6 @@
import org.apache.cxf.ws.security.trust.STSClient;
import org.apache.neethi.Policy;
-import interopbaseaddress.interop.IPingService;
-
public final class Client {
private static final String INPUT = "foo";
@@ -70,14 +67,6 @@
public static void main(String argv[])
throws Exception {
if (argv.length < 2) {
- /*
- argv = new String[]
{"Scenario_1_IssuedTokenOverTransport_UsernameOverTransport",
- "/etc/sts_policy_ut.xml",
-
"https://131.107.72.15/Scenario_1_IssuedTokenOverTransport_UsernameOverTransport"};
- argv = new String[] {"Scenario_2_IssuedToken_MutualCertificate10",
- "/etc/sts_policy_mc10.xml",
-
"http://131.107.72.15/Scenario_2_IssuedToken_MutualCertificate10"};
- */
argv = new String[] {"CustomBinding_IPingServiceContract"};
}
Copied:
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
(from r726798,
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingService.java)
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java?p2=cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java&p1=cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingService.java&r1=726798&r2=726803&rev=726803&view=diff
==============================================================================
---
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingService.java
(original)
+++
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
Mon Dec 15 13:09:01 2008
@@ -21,35 +21,22 @@
import javax.xml.ws.Holder;
-import interopbaseaddress.interop.IPingService;
+import org.tempuri.IPingServiceContract;
+
/**
*
*/
-public class PingService implements IPingService {
+public class PingServiceImpl implements IPingServiceContract {
/** {...@inheritdoc}*/
- public String echo(String request) {
+ public String ping(String request) {
System.out.println("echo: " + request);
return request;
}
- /** {...@inheritdoc}*/
- public String fault(String request) {
- return request;
- }
-
- /** {...@inheritdoc}*/
- public String header(String request) {
- return request;
- }
-
- public void ping(Holder<String> scenario, Holder<String> origin,
Holder<String> text) {
- // TODO Auto-generated method stub
-
- }
}
Propchange:
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Propchange:
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/PingServiceImpl.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified:
cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/Server.java?rev=726803&r1=726802&r2=726803&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/Server.java
(original)
+++ cxf/sandbox/interopfest/wstrust13/src/main/java/interop/server/Server.java
Mon Dec 15 13:09:01 2008
@@ -89,27 +89,27 @@
portName = "A_IPingService",
endpointInterface =
"interopbaseaddress.interop.IPingService",
wsdlLocation = "wsdl/WsSecurity11.wsdl")
- public static class APingService extends PingService {
+ public static class APingService extends PingServiceImpl {
}
@javax.jws.WebService(targetNamespace =
"http://InteropBaseAddress/interop";,
serviceName = "PingService11",
portName = "A-NoTimestamp_IPingService",
endpointInterface =
"interopbaseaddress.interop.IPingService",
wsdlLocation = "wsdl/WsSecurity11.wsdl")
- public static class ANoTimestampPingService extends PingService {
+ public static class ANoTimestampPingService extends PingServiceImpl {
}
@javax.jws.WebService(targetNamespace =
"http://InteropBaseAddress/interop";,
serviceName = "PingService11",
portName = "AD_IPingService",
endpointInterface =
"interopbaseaddress.interop.IPingService",
wsdlLocation = "wsdl/WsSecurity11.wsdl")
- public static class ADPingService extends PingService {
+ public static class ADPingService extends PingServiceImpl {
}
@javax.jws.WebService(targetNamespace =
"http://InteropBaseAddress/interop";,
serviceName = "PingService11",
portName = "UX_IPingService",
endpointInterface =
"interopbaseaddress.interop.IPingService",
wsdlLocation = "wsdl/WsSecurity11.wsdl")
- public static class UXPingService extends PingService {
+ public static class UXPingService extends PingServiceImpl {
}
}
Modified: cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl?rev=726803&r1=726802&r2=726803&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl (original)
+++ cxf/sandbox/interopfest/wstrust13/src/style/makelocal.xsl Mon Dec 15
13:09:01 2008
@@ -1,23 +1,22 @@
<?xml version="1.0"?>
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
- xmlns:xs="http://www.w3.org/2001/XMLSchema";>
+ xmlns:xs="http://www.w3.org/2001/XMLSchema";
+ xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/";
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"; >
<xsl:output method="xml"/>
- <!--xsl:template match="xs:import">
+ <xsl:template match="xs:import">
<xsl:copy>
<xsl:choose>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd0'">
- <xsl:attribute
name="schemaLocation">WsSecurity11_0.xsd</xsl:attribute>
+ <xsl:when
test="@schemaLocation='http://localhost/trust?xsd=xsd0'">
+ <xsl:attribute
name="schemaLocation">trust0.xsd</xsl:attribute>
</xsl:when>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd1'">
- <xsl:attribute
name="schemaLocation">WsSecurity11_1.xsd</xsl:attribute>
+ <xsl:when
test="@schemaLocation='http://localhost/trust?xsd=xsd1'">
+ <xsl:attribute
name="schemaLocation">trust1.xsd</xsl:attribute>
</xsl:when>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd2'">
- <xsl:attribute
name="schemaLocation">WsSecurity11_2.xsd</xsl:attribute>
- </xsl:when>
- <xsl:when
test="@schemaLocation='http://131.107.72.15/Security_WsSecurity_Service_Indigo/WsSecurity11.svc?xsd=xsd3'">
- <xsl:attribute
name="schemaLocation">WsSecurity11_3.xsd</xsl:attribute>
+ <xsl:when
test="@schemaLocation='http://localhost/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>
@@ -26,7 +25,45 @@
<xsl:apply-templates select="@namespace"/>
<xsl:apply-templates/>
</xsl:copy>
- </xsl:template-->
+ </xsl:template>
+ <xsl:template match="soap12: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: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:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="@location"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:apply-templates/>
+ </xsl:copy>
+ </xsl:template>
+ <xsl:template match="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: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:when>
+ <xsl:otherwise>
+ <xsl:apply-templates select="@location"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:apply-templates/>
+ </xsl:copy>
+ </xsl:template>
<xsl:template match="wsdl:import">
<xsl:copy>
<xsl:choose>
@@ -42,6 +79,12 @@
<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:otherwise>
<xsl:attribute
name="location">WsTrustSym_policy.wsdl</xsl:attribute>
</xsl:otherwise>
