Author: dkulp
Date: Tue Jan 20 13:57:38 2009
New Revision: 736126
URL: http://svn.apache.org/viewvc?rev=736126&view=rev
Log:
Get ALL the WSSec11 tests working. Yea!
Modified:
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java
cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml
Modified:
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java?rev=736126&r1=736125&r2=736126&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
(original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/Client.java
Tue Jan 20 13:57:38 2009
@@ -57,11 +57,11 @@
"AD",
"A-ES",
"AD-ES",
- //"UX", //NOT WORKING YET
- //"UX-NoTimestamp", //NOT WORKING YET
- //"UXD", //NOT WORKING YET
- //"UX-SEES", //NOT WORKING YET
- //"UXD-SEES", //NOT WORKING YET
+ "UX",
+ "UX-NoTimestamp",
+ "UXD",
+ "UX-SEES",
+ "UXD-SEES",
"X",
"X-NoTimestamp",
"X-AES128",
@@ -72,6 +72,7 @@
"XD-SEES",
};
}
+ //argv = new String[] {argv[10]};
new SpringBusFactory().createBus("etc/client.xml");
List<String> results = new ArrayList<String>();
Modified:
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java?rev=736126&r1=736125&r2=736126&view=diff
==============================================================================
---
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java
(original)
+++
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/KeystorePasswordCallback.java
Tue Jan 20 13:57:38 2009
@@ -27,6 +27,7 @@
passwords.put("alice", "abcd!1234");
passwords.put("Bob", "abcd!1234");
passwords.put("bob", "abcd!1234");
+ passwords.put("abcd", "dcba");
}
/**
Modified:
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java?rev=736126&r1=736125&r2=736126&view=diff
==============================================================================
---
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
(original)
+++
cxf/sandbox/interopfest/wssec11/src/main/java/interop/client/UTPasswordCallback.java
Tue Jan 20 13:57:38 2009
@@ -26,6 +26,7 @@
public UTPasswordCallback() {
passwords.put("Alice", "ecilA");
passwords.put("Frank", "invalid-password");
+ passwords.put("abcd", "dcba");
}
/**
Modified:
cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java?rev=736126&r1=736125&r2=736126&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java
(original)
+++ cxf/sandbox/interopfest/wssec11/src/main/java/interop/server/Server.java
Tue Jan 20 13:57:38 2009
@@ -45,7 +45,7 @@
*/
// Scenario 4.2
- addProperties(Endpoint.publish("http://localhost:9001/UXPingService";,
+
addProperties(Endpoint.publish("http://home.mesa2.com:9001/UXPingService";,
new UXPingService()));
//argv = new String[] {"A-ES"}; //NOT WORKING YET
@@ -109,7 +109,7 @@
serviceName = "PingService11",
portName = "UX_IPingService",
endpointInterface =
"interopbaseaddress.interop.IPingService",
- wsdlLocation = "wsdl/WsSecurity11.wsdl")
+ wsdlLocation = "target/wsdl2/WsSecurity11.wsdl")
public static class UXPingService extends PingService {
}
}
Modified: cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml
URL:
http://svn.apache.org/viewvc/cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml?rev=736126&r1=736125&r2=736126&view=diff
==============================================================================
--- cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml (original)
+++ cxf/sandbox/interopfest/wssec11/src/main/resources/etc/client.xml Tue Jan
20 13:57:38 2009
@@ -60,35 +60,35 @@
<jaxws:client name="{http://InteropBaseAddress/interop}UX_IPingService";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}UX-NoTimestamp_IPingService";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client name="{http://InteropBaseAddress/interop}UXD_IPingService";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}UX-SEES_IPingService";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
</jaxws:client>
<jaxws:client
name="{http://InteropBaseAddress/interop}UXD-SEES_IPingService";
createdFromAPI="true">
<jaxws:properties>
- <entry key="ws-security.username" value="Alice"/>
+ <entry key="ws-security.username" value="abcd"/>
<entry key="ws-security.callback-handler"
value="interop.client.KeystorePasswordCallback"/>
<entry key="ws-security.encryption.properties"
value="etc/bob.properties"/>
</jaxws:properties>
