You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2009/02/17 17:53:16 UTC
svn commit: r745146 - in /cxf/sandbox/interopfest/wssc: ./
src/main/java/interop/client/ src/main/java/interop/server/
src/main/resources/etc/ src/style/
Author: dkulp
Date: Tue Feb 17 16:53:15 2009
New Revision: 745146
URL: http://svn.apache.org/viewvc?rev=745146&view=rev
Log:
Commit some changes to use the signed endpoint instead of the signed+encrypted to help debug
Removed:
cxf/sandbox/interopfest/wssc/src/main/java/interop/server/
Modified:
cxf/sandbox/interopfest/wssc/build.xml
cxf/sandbox/interopfest/wssc/pom.xml
cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java
cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java
cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
cxf/sandbox/interopfest/wssc/src/main/resources/etc/client.xml
cxf/sandbox/interopfest/wssc/src/style/makelocal.xsl
Modified: cxf/sandbox/interopfest/wssc/build.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/build.xml?rev=745146&r1=745145&r2=745146&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/build.xml (original)
+++ cxf/sandbox/interopfest/wssc/build.xml Tue Feb 17 16:53:15 2009
@@ -4,12 +4,12 @@
<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.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?wsdl" dest="${build.dir}/wsdl/WSSecureConversation.wsdl"/>
- <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?wsdl=wsdl0" dest="${build.dir}/wsdl/WSSecureConversation_policy.wsdl"/>
- <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd0" dest="${build.dir}/wsdl/WSSecureConversation_0.xsd"/>
- <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd1" dest="${build.dir}/wsdl/WSSecureConversation_1.xsd"/>
- <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd2" dest="${build.dir}/wsdl/WSSecureConversation_2.xsd"/>
- <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd3" dest="${build.dir}/wsdl/WSSecureConversation_3.xsd"/>
+ <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?wsdl" dest="${build.dir}/wsdl/WSSecureConversation.wsdl"/>
+ <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?wsdl=wsdl0" dest="${build.dir}/wsdl/WSSecureConversation_policy.wsdl"/>
+ <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd0" dest="${build.dir}/wsdl/WSSecureConversation_0.xsd"/>
+ <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd1" dest="${build.dir}/wsdl/WSSecureConversation_1.xsd"/>
+ <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd2" dest="${build.dir}/wsdl/WSSecureConversation_2.xsd"/>
+ <get src="http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd3" dest="${build.dir}/wsdl/WSSecureConversation_3.xsd"/>
<antcall target="transform"/>
<unzip src="${build.dir}/Certs.zip" dest="${build.dir}/generated/src/main/resources/certs"/>
</target>
Modified: cxf/sandbox/interopfest/wssc/pom.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/pom.xml?rev=745146&r1=745145&r2=745146&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/pom.xml (original)
+++ cxf/sandbox/interopfest/wssc/pom.xml Tue Feb 17 16:53:15 2009
@@ -148,6 +148,7 @@
<dependencies>
+
<dependency>
<groupId>org.apache.cxf</groupId>
<artifactId>cxf-rt-frontend-jaxws</artifactId>
Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java?rev=745146&r1=745145&r2=745146&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/client/Client.java Tue Feb 17 16:53:15 2009
@@ -32,10 +32,10 @@
import org.apache.cxf.bus.spring.SpringBusFactory;
import org.xmlsoap.ping.Ping;
-import interopbaseaddress.interop.IPingService;
+import interopbaseaddress.interop.IPingServiceSign;
import interopbaseaddress.interop.PingRequest;
import interopbaseaddress.interop.PingResponse;
-import interopbaseaddress.interop.PingService;
+import interopbaseaddress.interop.PingServiceSign;
public final class Client {
@@ -56,7 +56,7 @@
if (argv.length < 1) {
argv = new String[] {
"SecureConversation_UserNameOverTransport_IPingService", //Not getting token, not sure why
- "SecureConversation_MutualCertificate10SignEncrypt_IPingService",
+ "SecureConversation_MutualCertificate10Sign_IPingServiceSign",
"AC_IPingService",
"ADC_IPingService",
"ADC-ES_IPingService",
@@ -90,7 +90,7 @@
"_KD-SEES_IPingService",
};
}
- argv = new String[] {argv[1]};
+ argv = new String[] {argv[0]};
//argv = new String[] {"UXC_IPingService"};
new SpringBusFactory().createBus("etc/client.xml");
@@ -98,19 +98,21 @@
for (String portPrefix : argv) {
try {
- final PingService svc = new PingService();
- final IPingService port =
+ final PingServiceSign svc = new PingServiceSign();
+ final IPingServiceSign port =
svc.getPort(
new QName(
"http://InteropBaseAddress/interop",
portPrefix
),
- IPingService.class
+ IPingServiceSign.class
);
+ /*
((BindingProvider)port).getRequestContext()
.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
"http://131.107.153.205/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc/SecureConversation_MutualCertificate10Sign");
+ */
PingRequest params = new PingRequest();
Ping ping = new Ping();
ping.setOrigin("CXF");
Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java?rev=745146&r1=745145&r2=745146&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/client/KeystorePasswordCallback.java Tue Feb 17 16:53:15 2009
@@ -37,7 +37,7 @@
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String pass = passwords.get(pc.getIdentifier());
+ String pass = passwords.get(pc.getIdentifer());
if (pass != null) {
pc.setPassword(pass);
return;
Modified: cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java?rev=745146&r1=745145&r2=745146&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java (original)
+++ cxf/sandbox/interopfest/wssc/src/main/java/interop/client/UTPasswordCallback.java Tue Feb 17 16:53:15 2009
@@ -36,7 +36,7 @@
for (int i = 0; i < callbacks.length; i++) {
WSPasswordCallback pc = (WSPasswordCallback)callbacks[i];
- String pass = passwords.get(pc.getIdentifier());
+ String pass = passwords.get(pc.getIdentifer());
if (pass != null) {
pc.setPassword(pass);
return;
Modified: cxf/sandbox/interopfest/wssc/src/main/resources/etc/client.xml
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/main/resources/etc/client.xml?rev=745146&r1=745145&r2=745146&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/main/resources/etc/client.xml (original)
+++ cxf/sandbox/interopfest/wssc/src/main/resources/etc/client.xml Tue Feb 17 16:53:15 2009
@@ -40,6 +40,13 @@
<entry key="ws-security.encryption.properties.sct" value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
+ <jaxws:client name="{http://InteropBaseAddress/interop}SecureConversation_MutualCertificate10Sign_IPingServiceSign" createdFromAPI="true">
+ <jaxws: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"/>
+ </jaxws:properties>
+ </jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}AC_IPingService" createdFromAPI="true">
<jaxws:properties>
<entry key="ws-security.callback-handler.sct" value="interop.client.KeystorePasswordCallback"/>
@@ -54,7 +61,12 @@
</jaxws:properties>
</jaxws:client>
-
+ <http:conduit name="http://131.107.72.15/.*">
+ <http:client AllowChunking="false"/>
+ </http:conduit>
+ <http:conduit name="http://131.107.153.205/.*">
+ <http:client AllowChunking="false"/>
+ </http:conduit>
<http:conduit name="https://131.107.72.15/.*">
<http:tlsClientParameters disableCNCheck="true">
<sec:keyManagers keyPassword="password">
@@ -64,6 +76,7 @@
<sec:keyStore type="pkcs12" password="password" resource="certs/bob.pfx"/>
</sec:trustManagers>
</http:tlsClientParameters>
+ <http:client AllowChunking="false"/>
</http:conduit>
<http:conduit name="https://131.107.153.205/.*">
<http:tlsClientParameters disableCNCheck="true">
Modified: cxf/sandbox/interopfest/wssc/src/style/makelocal.xsl
URL: http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssc/src/style/makelocal.xsl?rev=745146&r1=745145&r2=745146&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssc/src/style/makelocal.xsl (original)
+++ cxf/sandbox/interopfest/wssc/src/style/makelocal.xsl Tue Feb 17 16:53:15 2009
@@ -12,15 +12,27 @@
<xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd0'">
<xsl:attribute name="schemaLocation">WSSecureConversation_0.xsd</xsl:attribute>
</xsl:when>
+ <xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd0'">
+ <xsl:attribute name="schemaLocation">WSSecureConversation_0.xsd</xsl:attribute>
+ </xsl:when>
<xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd1'">
<xsl:attribute name="schemaLocation">WSSecureConversation_1.xsd</xsl:attribute>
</xsl:when>
+ <xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd1'">
+ <xsl:attribute name="schemaLocation">WSSecureConversation_1.xsd</xsl:attribute>
+ </xsl:when>
<xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd2'">
<xsl:attribute name="schemaLocation">WSSecureConversation_2.xsd</xsl:attribute>
</xsl:when>
+ <xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd2'">
+ <xsl:attribute name="schemaLocation">WSSecureConversation_2.xsd</xsl:attribute>
+ </xsl:when>
<xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?xsd=xsd3'">
<xsl:attribute name="schemaLocation">WSSecureConversation_3.xsd</xsl:attribute>
</xsl:when>
+ <xsl:when test="@schemaLocation='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?xsd=xsd3'">
+ <xsl:attribute name="schemaLocation">WSSecureConversation_3.xsd</xsl:attribute>
+ </xsl:when>
<xsl:otherwise>
<xsl:attribute name="schemaLocation"><xsl:value-of select="@schemaLocation"/></xsl:attribute>
</xsl:otherwise>
@@ -35,6 +47,9 @@
<xsl:when test="@location='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversation.svc?wsdl'">
<xsl:attribute name="location">WSSecureConversation.wsdl</xsl:attribute>
</xsl:when>
+ <xsl:when test="@location='http://ndgo-introp-s24/Security_WsSecurity_Service_Indigo/WSSecureConversationSign.svc?wsdl'">
+ <xsl:attribute name="location">WSSecureConversation.wsdl</xsl:attribute>
+ </xsl:when>
<xsl:otherwise>
<xsl:attribute name="location">WSSecureConversation_policy.wsdl</xsl:attribute>
</xsl:otherwise>