You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fx-dev@ws.apache.org by di...@apache.org on 2004/03/09 17:45:42 UTC
cvs commit: ws-fx/wss4j/test/interop TestScenario2.java
dims 2004/03/09 08:45:42
Modified: wss4j/interop ping.wsdl
wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
Scenario1.java Scenario2.java Scenario3.java
Scenario4.java Scenario5.java Scenario6.java
Scenario7.java Server_deploy.wsdd Tester.java
wss4j/interop/org/apache/ws/axis/oasis/ping
PingBindingImpl.java deploy.wsdd
wss4j/test/interop TestScenario2.java
Log:
Fix Scenario1 interop with MSFT and SUN endpoints.
Revision Changes Path
1.3 +4 -0 ws-fx/wss4j/interop/ping.wsdl
Index: ping.wsdl
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/ping.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ping.wsdl 8 Mar 2004 16:05:06 -0000 1.2
+++ ping.wsdl 9 Mar 2004 16:45:41 -0000 1.3
@@ -15,6 +15,7 @@
<attribute ref="wsu:Id"/>
</complexType>
-->
+ <!--
<complexType name="ticketType">
<xsd:simpleContent>
<xsd:extension base="xsd:string">
@@ -23,11 +24,14 @@
</xsd:simpleContent>
</complexType>
<element name="ticket" type="tns:ticketType"/>
+ -->
<element name="text" type="xsd:string" nillable="true"/>
<complexType name="ping">
<sequence>
<element ref="tns:text" />
+ <!--
<element ref="tns:ticket" minOccurs="0" />
+ -->
</sequence>
</complexType>
<complexType name="pingResponse">
1.5 +1 -1 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
Index: Client_deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Client_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.4
+++ Client_deploy.wsdd 9 Mar 2004 16:45:41 -0000 1.5
@@ -89,7 +89,7 @@
value="org.apache.ws.axis.oasis.PWCallback"/>
<parameter name="signatureKeyIdentifier" value="DirectReference" />
<parameter name="signaturePropFile" value="crypto.properties" />
- <parameter name="signatureParts" value="{}{http://xmlsoap.org/Ping}ticket" />
+ <parameter name="signatureParts" value="{}{http://xmlsoap.org/Ping}text" />
</handler>
<handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
<parameter name="action" value="Signature"/>
1.3 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java
Index: Scenario1.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Scenario1.java 8 Mar 2004 16:05:06 -0000 1.2
+++ Scenario1.java 9 Mar 2004 16:45:41 -0000 1.3
@@ -22,7 +22,6 @@
import org.apache.axis.client.Call;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Scenario1
@@ -82,18 +81,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario1");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("WSS4J");
+ String text =
+ new String("WSS4J");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.2 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario2.java
Index: Scenario2.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scenario2.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Scenario2.java 9 Mar 2004 16:45:41 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.axis.utils.Options;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Scenario2
@@ -80,18 +79,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario2");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 2 text");
+ String text =
+ new String("Scenario 2 text");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.2 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario3.java
Index: Scenario3.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario3.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scenario3.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Scenario3.java 9 Mar 2004 16:45:41 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.axis.utils.Options;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Scenario3
@@ -80,18 +79,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario3");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 3 text");
+ String text =
+ new String("Scenario 3 text");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.2 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario4.java
Index: Scenario4.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario4.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scenario4.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Scenario4.java 9 Mar 2004 16:45:41 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.axis.utils.Options;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Scenario4
@@ -80,18 +79,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario4");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 4 text");
+ String text =
+ new String("Scenario 4 text");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.2 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario5.java
Index: Scenario5.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario5.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scenario5.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Scenario5.java 9 Mar 2004 16:45:41 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.axis.utils.Options;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Scenario5
@@ -80,18 +79,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario5");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 5 text");
+ String text =
+ new String("Scenario 5 text");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.2 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario6.java
Index: Scenario6.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario6.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scenario6.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Scenario6.java 9 Mar 2004 16:45:41 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.axis.utils.Options;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Scenario6
@@ -80,18 +79,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario6");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 6 text");
+ String text =
+ new String("Scenario 6 text");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.2 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario7.java
Index: Scenario7.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario7.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Scenario7.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Scenario7.java 9 Mar 2004 16:45:41 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.axis.utils.Options;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Scenario6
@@ -80,18 +79,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario7");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 7 text");
+ String text =
+ new String("Scenario 7 text");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.3 +0 -88 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd
Index: Server_deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Server_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
+++ Server_deploy.wsdd 9 Mar 2004 16:45:41 -0000 1.3
@@ -18,10 +18,6 @@
<parameter name="wsdlServicePort" value="Ping1"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -30,14 +26,6 @@
</handler>
</requestFlow>
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping1"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping2" provider="java:RPC" style="wrapped" use="literal">
@@ -46,10 +34,6 @@
<parameter name="wsdlServicePort" value="Ping2"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -59,14 +43,6 @@
</handler>
</requestFlow>
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping3" provider="java:RPC" style="wrapped" use="literal">
@@ -75,10 +51,6 @@
<parameter name="wsdlServicePort" value="Ping3"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
@@ -100,15 +72,6 @@
<parameter name="encryptionUser" value="16c73ab6-b892-458f-abf5-2f875f74882e" />
</handler>
</responseFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping4" provider="java:RPC" style="wrapped" use="literal">
<parameter name="wsdlTargetNamespace" value="http://xmlsoap.org/Ping"/>
@@ -116,10 +79,6 @@
<parameter name="wsdlServicePort" value="Ping4"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -141,15 +100,6 @@
value="org.apache.ws.axis.oasis.PWCallback" />
</handler>
</responseFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping5" provider="java:RPC" style="wrapped" use="literal">
@@ -158,10 +108,6 @@
<parameter name="wsdlServicePort" value="Ping5"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -170,15 +116,6 @@
<parameter name="signaturePropFile" value="crypto.properties" />
</handler>
</requestFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping6" provider="java:RPC" style="wrapped" use="literal">
@@ -187,10 +124,6 @@
<parameter name="wsdlServicePort" value="Ping6"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -212,14 +145,6 @@
</handler>
</responseFlow>
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping7" provider="java:RPC" style="wrapped" use="literal">
<parameter name="wsdlTargetNamespace" value="http://xmlsoap.org/Ping"/>
@@ -227,20 +152,7 @@
<parameter name="wsdlServicePort" value="Ping7"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
</deployment>
1.2 +5 -7 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Tester.java
Index: Tester.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Tester.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tester.java 13 Feb 2004 20:43:04 -0000 1.1
+++ Tester.java 9 Mar 2004 16:45:41 -0000 1.2
@@ -20,7 +20,6 @@
import org.apache.axis.utils.Options;
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
-import org.apache.ws.axis.oasis.ping.TicketType;
/**
* Class Tester
@@ -80,18 +79,17 @@
*/
// perform call
- TicketType ticket = new TicketType("scenario1");
- javax.xml.rpc.holders.StringHolder text =
- new javax.xml.rpc.holders.StringHolder("Scenario 1 text");
+ String text =
+ new String("Scenario 1 text");
- port.ping(text, ticket);
- System.out.println(text.value);
+ port.ping(text);
+ System.out.println(text);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text, ticket);
+ port.ping(text);
}
long endTime = System.currentTimeMillis();
1.3 +4 -5 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java
Index: PingBindingImpl.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PingBindingImpl.java 24 Feb 2004 13:24:54 -0000 1.2
+++ PingBindingImpl.java 9 Mar 2004 16:45:42 -0000 1.3
@@ -35,12 +35,10 @@
public class PingBindingImpl
implements org.apache.ws.axis.oasis.ping.PingPort {
- public void ping(
- javax.xml.rpc.holders.StringHolder text,
- org.apache.ws.axis.oasis.ping.TicketType ticket)
+ public String ping(
+ String text)
throws java.rmi.RemoteException {
- // text.value = "Echo " + text.value.trim();
- text.value = "Echo " + text.value;
+ text = "Echo " + text;
MessageContext msgContext = MessageContext.getCurrentContext();
Message reqMsg = msgContext.getRequestMessage();
@@ -65,6 +63,7 @@
}
}
}
+ return text;
}
}
1.3 +0 -91 ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd
Index: deploy.wsdd
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
+++ deploy.wsdd 9 Mar 2004 16:45:42 -0000 1.3
@@ -18,10 +18,6 @@
<parameter name="wsdlServicePort" value="Ping1"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -29,15 +25,6 @@
<parameter name="action" value="UsernameToken"/>
</handler>
</requestFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping1"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping2" provider="java:RPC" style="wrapped" use="literal">
@@ -46,10 +33,6 @@
<parameter name="wsdlServicePort" value="Ping2"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -58,15 +41,6 @@
<parameter name="decryptionPropFile" value="crypto.properties" />
</handler>
</requestFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping3" provider="java:RPC" style="wrapped" use="literal">
@@ -75,10 +49,6 @@
<parameter name="wsdlServicePort" value="Ping3"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
@@ -100,15 +70,6 @@
<parameter name="encryptionUser" value="16c73ab6-b892-458f-abf5-2f875f74882e" />
</handler>
</responseFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping4" provider="java:RPC" style="wrapped" use="literal">
<parameter name="wsdlTargetNamespace" value="http://xmlsoap.org/Ping"/>
@@ -116,10 +77,6 @@
<parameter name="wsdlServicePort" value="Ping4"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -141,15 +98,6 @@
value="org.apache.ws.axis.oasis.PWCallback" />
</handler>
</responseFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping5" provider="java:RPC" style="wrapped" use="literal">
@@ -158,10 +106,6 @@
<parameter name="wsdlServicePort" value="Ping5"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -170,15 +114,6 @@
<parameter name="signaturePropFile" value="crypto.properties" />
</handler>
</requestFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping6" provider="java:RPC" style="wrapped" use="literal">
@@ -187,10 +122,6 @@
<parameter name="wsdlServicePort" value="Ping6"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -211,15 +142,6 @@
<parameter name="encryptionUser" value="16c73ab6-b892-458f-abf5-2f875f74882e" />
</handler>
</responseFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
<service name="Ping7" provider="java:RPC" style="wrapped" use="literal">
<parameter name="wsdlTargetNamespace" value="http://xmlsoap.org/Ping"/>
@@ -227,10 +149,6 @@
<parameter name="wsdlServicePort" value="Ping7"/>
<parameter name="className" value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
<parameter name="wsdlPortType" value="PingPort"/>
- <operation name="ping" qname="operNS:Ping" xmlns:operNS="http://xmlsoap.org/Ping" >
- <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping" type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema" mode="INOUT"/>
- <parameter qname="pns:ticket" xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType" xmlns:tns="http://xmlsoap.org/Ping"/>
- </operation>
<parameter name="allowedMethods" value="ping"/>
<requestFlow>
<handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
@@ -251,15 +169,6 @@
<parameter name="encryptionUser" value="16c73ab6-b892-458f-abf5-2f875f74882e" />
</handler>
</responseFlow>
-
- <typeMapping
- xmlns:ns="http://xmlsoap.org/Ping"
- qname="ns:ticketType"
- type="java:org.apache.ws.axis.oasis.ping.TicketType"
- serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
- deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
- encodingStyle=""
- />
</service>
</deployment>
1.2 +2 -2 ws-fx/wss4j/test/interop/TestScenario2.java
Index: TestScenario2.java
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/test/interop/TestScenario2.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestScenario2.java 13 Feb 2004 20:43:08 -0000 1.1
+++ TestScenario2.java 9 Mar 2004 16:45:42 -0000 1.2
@@ -55,8 +55,8 @@
*
* @param args command line args
*/
- public static void main(String[] args) {
- junit.textui.TestRunner.run(suite());
+ public static void main(String[] args) throws Exception {
+ Scenario2.main(args);
}
public void testScenario2() throws Exception {
Re: cvs commit: ws-fx/wss4j/test/interop TestScenario2.java
Posted by Davanum Srinivas <di...@apache.org>.
Yes, our original one was wrong.
--- Werner Dittmann <We...@t-online.de> wrote:
> Dims,
>
> the WSDL of the interop tests was changed ? Does it work now with
> Sun/MSFT?
>
> Just modified the Scenarios a little bit to display the return value.
>
> Regards,
> Werner
>
> ----- Original Message -----
> From: <di...@apache.org>
> To: <ws...@apache.org>
> Sent: Tuesday, March 09, 2004 5:45 PM
> Subject: cvs commit: ws-fx/wss4j/test/interop TestScenario2.java
>
>
> > dims 2004/03/09 08:45:42
> >
> > Modified: wss4j/interop ping.wsdl
> > wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
> > Scenario1.java Scenario2.java Scenario3.java
> > Scenario4.java Scenario5.java Scenario6.java
> > Scenario7.java Server_deploy.wsdd Tester.java
> > wss4j/interop/org/apache/ws/axis/oasis/ping
> > PingBindingImpl.java deploy.wsdd
> > wss4j/test/interop TestScenario2.java
> > Log:
> > Fix Scenario1 interop with MSFT and SUN endpoints.
> >
> > Revision Changes Path
> > 1.3 +4 -0 ws-fx/wss4j/interop/ping.wsdl
> >
> > Index: ping.wsdl
> > ===================================================================
> > RCS file: /home/cvs/ws-fx/wss4j/interop/ping.wsdl,v
> > retrieving revision 1.2
> > retrieving revision 1.3
> > diff -u -r1.2 -r1.3
> > --- ping.wsdl 8 Mar 2004 16:05:06 -0000 1.2
> > +++ ping.wsdl 9 Mar 2004 16:45:41 -0000 1.3
> > @@ -15,6 +15,7 @@
> > <attribute ref="wsu:Id"/>
> > </complexType>
> > -->
> > + <!--
> > <complexType name="ticketType">
> > <xsd:simpleContent>
> > <xsd:extension base="xsd:string">
> > @@ -23,11 +24,14 @@
> > </xsd:simpleContent>
> > </complexType>
> > <element name="ticket" type="tns:ticketType"/>
> > + -->
> > <element name="text" type="xsd:string" nillable="true"/>
> > <complexType name="ping">
> > <sequence>
> > <element ref="tns:text" />
> > + <!--
> > <element ref="tns:ticket" minOccurs="0" />
> > + -->
> > </sequence>
> > </complexType>
> > <complexType name="pingResponse">
> >
> >
> >
> > 1.5 +1 -1
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
> >
> > Index: Client_deploy.wsdd
> > ===================================================================
> > RCS file:
> /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
> > retrieving revision 1.4
> > retrieving revision 1.5
> > diff -u -r1.4 -r1.5
> > --- Client_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.4
> > +++ Client_deploy.wsdd 9 Mar 2004 16:45:41 -0000 1.5
> > @@ -89,7 +89,7 @@
> > value="org.apache.ws.axis.oasis.PWCallback"/>
> > <parameter name="signatureKeyIdentifier" value="DirectReference" />
> > <parameter name="signaturePropFile" value="crypto.properties" />
> > - <parameter name="signatureParts"
> value="{}{http://xmlsoap.org/Ping}ticket" />
> > + <parameter name="signatureParts"
> value="{}{http://xmlsoap.org/Ping}text" />
> > </handler>
> > <handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
> > <parameter name="action" value="Signature"/>
> >
> >
> >
> > 1.3 +5 -7
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java
> >
> > Index: Scenario1.java
> > ===================================================================
> > RCS file:
> /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java,v
> > retrieving revision 1.2
> > retrieving revision 1.3
> > diff -u -r1.2 -r1.3
> > --- Scenario1.java 8 Mar 2004 16:05:06 -0000 1.2
> > +++ Scenario1.java 9 Mar 2004 16:45:41 -0000 1.3
> > @@ -22,7 +22,6 @@
> > import org.apache.axis.client.Call;
> > import org.apache.ws.axis.oasis.ping.PingPort;
> > import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> > -import org.apache.ws.axis.oasis.ping.TicketType;
> >
> > /**
> > * Class Scenario1
> > @@ -82,18 +81,17 @@
> > */
> >
> > // perform call
> > - TicketType ticket = new TicketType("scenario1");
> > - javax.xml.rpc.holders.StringHolder text =
> > - new javax.xml.rpc.holders.StringHolder("WSS4J");
> > + String text =
> > + new String("WSS4J");
> >
> > - port.ping(text, ticket);
> > - System.out.println(text.value);
> > + port.ping(text);
> > + System.out.println(text);
> >
> > if (opts.isFlagSet('t') > 0) {
> > long startTime = System.currentTimeMillis();
> >
> > for (int i = 0; i < 20; i++) {
> > - port.ping(text, ticket);
> > + port.ping(text);
> > }
> >
> > long endTime = System.currentTimeMillis();
> >
> >
> >
> > 1.2 +5 -7
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario2.java
> >
> > Index: Scenario2.java
> > ===================================================================
> > RCS file:
> /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario2.java,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- Scenario2.java 13 Feb 2004 20:43:04 -0000 1.1
> > +++ Scenario2.java 9 Mar 2004 16:45:41 -0000 1.2
> > @@ -20,7 +20,6 @@
> > import org.apache.axis.utils.Options;
> > import org.apache.ws.axis.oasis.ping.PingPort;
> > import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> > -import org.apache.ws.axis.oasis.ping.TicketType;
> >
> > /**
> > * Class Scenario2
> > @@ -80,18 +79,17 @@
> > */
> >
> > // perform call
> > - TicketType ticket = new TicketType("scenario2");
> > - javax.xml.rpc.holders.StringHolder text =
> > - new javax.xml.rpc.holders.StringHolder("Scenario 2
> text");
> > + String text =
> > + new String("Scenario 2 text");
> >
> > - port.ping(text, ticket);
> > - System.out.println(text.value);
> > + port.ping(text);
> > + System.out.println(text);
> >
> > if (opts.isFlagSet('t') > 0) {
> > long startTime = System.currentTimeMillis();
> >
> > for (int i = 0; i < 20; i++) {
> > - port.ping(text, ticket);
> > + port.ping(text);
> > }
> >
> > long endTime = System.currentTimeMillis();
> >
> >
> >
> > 1.2 +5 -7
> ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario3.java
> >
> > Index: Scenario3.java
> > ===================================================================
> > RCS file:
> /home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario3.java,v
> > retrieving revision 1.1
> > retrieving revision 1.2
> > diff -u -r1.1 -r1.2
> > --- Scenario3.java 13 Feb 2004 20:43:04 -0000 1.1
> > +++ Scenario3.java 9 Mar 2004 16:45:41 -0000 1.2
> > @@ -20,7 +20,6 @@
>
=== message truncated ===
=====
Davanum Srinivas - http://webservices.apache.org/~dims/
Re: cvs commit: ws-fx/wss4j/test/interop TestScenario2.java
Posted by Werner Dittmann <We...@t-online.de>.
Dims,
the WSDL of the interop tests was changed ? Does it work now with
Sun/MSFT?
Just modified the Scenarios a little bit to display the return value.
Regards,
Werner
----- Original Message -----
From: <di...@apache.org>
To: <ws...@apache.org>
Sent: Tuesday, March 09, 2004 5:45 PM
Subject: cvs commit: ws-fx/wss4j/test/interop TestScenario2.java
> dims 2004/03/09 08:45:42
>
> Modified: wss4j/interop ping.wsdl
> wss4j/interop/org/apache/ws/axis/oasis Client_deploy.wsdd
> Scenario1.java Scenario2.java Scenario3.java
> Scenario4.java Scenario5.java Scenario6.java
> Scenario7.java Server_deploy.wsdd Tester.java
> wss4j/interop/org/apache/ws/axis/oasis/ping
> PingBindingImpl.java deploy.wsdd
> wss4j/test/interop TestScenario2.java
> Log:
> Fix Scenario1 interop with MSFT and SUN endpoints.
>
> Revision Changes Path
> 1.3 +4 -0 ws-fx/wss4j/interop/ping.wsdl
>
> Index: ping.wsdl
> ===================================================================
> RCS file: /home/cvs/ws-fx/wss4j/interop/ping.wsdl,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- ping.wsdl 8 Mar 2004 16:05:06 -0000 1.2
> +++ ping.wsdl 9 Mar 2004 16:45:41 -0000 1.3
> @@ -15,6 +15,7 @@
> <attribute ref="wsu:Id"/>
> </complexType>
> -->
> + <!--
> <complexType name="ticketType">
> <xsd:simpleContent>
> <xsd:extension base="xsd:string">
> @@ -23,11 +24,14 @@
> </xsd:simpleContent>
> </complexType>
> <element name="ticket" type="tns:ticketType"/>
> + -->
> <element name="text" type="xsd:string" nillable="true"/>
> <complexType name="ping">
> <sequence>
> <element ref="tns:text" />
> + <!--
> <element ref="tns:ticket" minOccurs="0" />
> + -->
> </sequence>
> </complexType>
> <complexType name="pingResponse">
>
>
>
> 1.5 +1 -1
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
>
> Index: Client_deploy.wsdd
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd,v
> retrieving revision 1.4
> retrieving revision 1.5
> diff -u -r1.4 -r1.5
> --- Client_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.4
> +++ Client_deploy.wsdd 9 Mar 2004 16:45:41 -0000 1.5
> @@ -89,7 +89,7 @@
> value="org.apache.ws.axis.oasis.PWCallback"/>
> <parameter name="signatureKeyIdentifier" value="DirectReference" />
> <parameter name="signaturePropFile" value="crypto.properties" />
> - <parameter name="signatureParts"
value="{}{http://xmlsoap.org/Ping}ticket" />
> + <parameter name="signatureParts"
value="{}{http://xmlsoap.org/Ping}text" />
> </handler>
> <handler type="java:org.apache.ws.axis.security.WSDoAllSender" >
> <parameter name="action" value="Signature"/>
>
>
>
> 1.3 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java
>
> Index: Scenario1.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario1.java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- Scenario1.java 8 Mar 2004 16:05:06 -0000 1.2
> +++ Scenario1.java 9 Mar 2004 16:45:41 -0000 1.3
> @@ -22,7 +22,6 @@
> import org.apache.axis.client.Call;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Scenario1
> @@ -82,18 +81,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario1");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("WSS4J");
> + String text =
> + new String("WSS4J");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.2 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario2.java
>
> Index: Scenario2.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario2.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Scenario2.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Scenario2.java 9 Mar 2004 16:45:41 -0000 1.2
> @@ -20,7 +20,6 @@
> import org.apache.axis.utils.Options;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Scenario2
> @@ -80,18 +79,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario2");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 2
text");
> + String text =
> + new String("Scenario 2 text");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.2 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario3.java
>
> Index: Scenario3.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario3.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Scenario3.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Scenario3.java 9 Mar 2004 16:45:41 -0000 1.2
> @@ -20,7 +20,6 @@
> import org.apache.axis.utils.Options;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Scenario3
> @@ -80,18 +79,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario3");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 3
text");
> + String text =
> + new String("Scenario 3 text");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.2 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario4.java
>
> Index: Scenario4.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario4.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Scenario4.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Scenario4.java 9 Mar 2004 16:45:41 -0000 1.2
> @@ -20,7 +20,6 @@
> import org.apache.axis.utils.Options;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Scenario4
> @@ -80,18 +79,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario4");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 4
text");
> + String text =
> + new String("Scenario 4 text");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.2 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario5.java
>
> Index: Scenario5.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario5.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Scenario5.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Scenario5.java 9 Mar 2004 16:45:41 -0000 1.2
> @@ -20,7 +20,6 @@
> import org.apache.axis.utils.Options;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Scenario5
> @@ -80,18 +79,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario5");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 5
text");
> + String text =
> + new String("Scenario 5 text");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.2 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario6.java
>
> Index: Scenario6.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario6.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Scenario6.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Scenario6.java 9 Mar 2004 16:45:41 -0000 1.2
> @@ -20,7 +20,6 @@
> import org.apache.axis.utils.Options;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Scenario6
> @@ -80,18 +79,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario6");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 6
text");
> + String text =
> + new String("Scenario 6 text");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.2 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario7.java
>
> Index: Scenario7.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Scenario7.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Scenario7.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Scenario7.java 9 Mar 2004 16:45:41 -0000 1.2
> @@ -20,7 +20,6 @@
> import org.apache.axis.utils.Options;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Scenario6
> @@ -80,18 +79,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario7");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 7
text");
> + String text =
> + new String("Scenario 7 text");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.3 +0 -88
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd
>
> Index: Server_deploy.wsdd
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Server_deploy.wsdd,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- Server_deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
> +++ Server_deploy.wsdd 9 Mar 2004 16:45:41 -0000 1.3
> @@ -18,10 +18,6 @@
> <parameter name="wsdlServicePort" value="Ping1"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -30,14 +26,6 @@
> </handler>
> </requestFlow>
>
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping1"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping2" provider="java:RPC" style="wrapped"
use="literal">
> @@ -46,10 +34,6 @@
> <parameter name="wsdlServicePort" value="Ping2"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -59,14 +43,6 @@
> </handler>
> </requestFlow>
>
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping3" provider="java:RPC" style="wrapped"
use="literal">
> @@ -75,10 +51,6 @@
> <parameter name="wsdlServicePort" value="Ping3"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
>
> <requestFlow>
> @@ -100,15 +72,6 @@
> <parameter name="encryptionUser"
value="16c73ab6-b892-458f-abf5-2f875f74882e" />
> </handler>
> </responseFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
> <service name="Ping4" provider="java:RPC" style="wrapped"
use="literal">
> <parameter name="wsdlTargetNamespace"
value="http://xmlsoap.org/Ping"/>
> @@ -116,10 +79,6 @@
> <parameter name="wsdlServicePort" value="Ping4"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -141,15 +100,6 @@
> value="org.apache.ws.axis.oasis.PWCallback" />
> </handler>
> </responseFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping5" provider="java:RPC" style="wrapped"
use="literal">
> @@ -158,10 +108,6 @@
> <parameter name="wsdlServicePort" value="Ping5"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -170,15 +116,6 @@
> <parameter name="signaturePropFile" value="crypto.properties" />
> </handler>
> </requestFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping6" provider="java:RPC" style="wrapped"
use="literal">
> @@ -187,10 +124,6 @@
> <parameter name="wsdlServicePort" value="Ping6"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -212,14 +145,6 @@
> </handler>
> </responseFlow>
>
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
> <service name="Ping7" provider="java:RPC" style="wrapped"
use="literal">
> <parameter name="wsdlTargetNamespace"
value="http://xmlsoap.org/Ping"/>
> @@ -227,20 +152,7 @@
> <parameter name="wsdlServicePort" value="Ping7"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> </deployment>
>
>
>
> 1.2 +5 -7
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Tester.java
>
> Index: Tester.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/Tester.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- Tester.java 13 Feb 2004 20:43:04 -0000 1.1
> +++ Tester.java 9 Mar 2004 16:45:41 -0000 1.2
> @@ -20,7 +20,6 @@
> import org.apache.axis.utils.Options;
> import org.apache.ws.axis.oasis.ping.PingPort;
> import org.apache.ws.axis.oasis.ping.PingServiceLocator;
> -import org.apache.ws.axis.oasis.ping.TicketType;
>
> /**
> * Class Tester
> @@ -80,18 +79,17 @@
> */
>
> // perform call
> - TicketType ticket = new TicketType("scenario1");
> - javax.xml.rpc.holders.StringHolder text =
> - new javax.xml.rpc.holders.StringHolder("Scenario 1
text");
> + String text =
> + new String("Scenario 1 text");
>
> - port.ping(text, ticket);
> - System.out.println(text.value);
> + port.ping(text);
> + System.out.println(text);
>
> if (opts.isFlagSet('t') > 0) {
> long startTime = System.currentTimeMillis();
>
> for (int i = 0; i < 20; i++) {
> - port.ping(text, ticket);
> + port.ping(text);
> }
>
> long endTime = System.currentTimeMillis();
>
>
>
> 1.3 +4 -5
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.java
>
> Index: PingBindingImpl.java
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/PingBindingImpl.
java,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- PingBindingImpl.java 24 Feb 2004 13:24:54 -0000 1.2
> +++ PingBindingImpl.java 9 Mar 2004 16:45:42 -0000 1.3
> @@ -35,12 +35,10 @@
>
> public class PingBindingImpl
> implements org.apache.ws.axis.oasis.ping.PingPort {
> - public void ping(
> - javax.xml.rpc.holders.StringHolder text,
> - org.apache.ws.axis.oasis.ping.TicketType ticket)
> + public String ping(
> + String text)
> throws java.rmi.RemoteException {
> - // text.value = "Echo " + text.value.trim();
> - text.value = "Echo " + text.value;
> + text = "Echo " + text;
> MessageContext msgContext = MessageContext.getCurrentContext();
> Message reqMsg = msgContext.getRequestMessage();
>
> @@ -65,6 +63,7 @@
> }
> }
> }
> + return text;
> }
>
> }
>
>
>
> 1.3 +0 -91
ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd
>
> Index: deploy.wsdd
> ===================================================================
> RCS file:
/home/cvs/ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd,v
> retrieving revision 1.2
> retrieving revision 1.3
> diff -u -r1.2 -r1.3
> --- deploy.wsdd 8 Mar 2004 16:05:06 -0000 1.2
> +++ deploy.wsdd 9 Mar 2004 16:45:42 -0000 1.3
> @@ -18,10 +18,6 @@
> <parameter name="wsdlServicePort" value="Ping1"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -29,15 +25,6 @@
> <parameter name="action" value="UsernameToken"/>
> </handler>
> </requestFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping1"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping2" provider="java:RPC" style="wrapped"
use="literal">
> @@ -46,10 +33,6 @@
> <parameter name="wsdlServicePort" value="Ping2"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -58,15 +41,6 @@
> <parameter name="decryptionPropFile" value="crypto.properties" />
> </handler>
> </requestFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping3" provider="java:RPC" style="wrapped"
use="literal">
> @@ -75,10 +49,6 @@
> <parameter name="wsdlServicePort" value="Ping3"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
>
> <requestFlow>
> @@ -100,15 +70,6 @@
> <parameter name="encryptionUser"
value="16c73ab6-b892-458f-abf5-2f875f74882e" />
> </handler>
> </responseFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
> <service name="Ping4" provider="java:RPC" style="wrapped"
use="literal">
> <parameter name="wsdlTargetNamespace"
value="http://xmlsoap.org/Ping"/>
> @@ -116,10 +77,6 @@
> <parameter name="wsdlServicePort" value="Ping4"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -141,15 +98,6 @@
> value="org.apache.ws.axis.oasis.PWCallback" />
> </handler>
> </responseFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping5" provider="java:RPC" style="wrapped"
use="literal">
> @@ -158,10 +106,6 @@
> <parameter name="wsdlServicePort" value="Ping5"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -170,15 +114,6 @@
> <parameter name="signaturePropFile" value="crypto.properties" />
> </handler>
> </requestFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> <service name="Ping6" provider="java:RPC" style="wrapped"
use="literal">
> @@ -187,10 +122,6 @@
> <parameter name="wsdlServicePort" value="Ping6"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -211,15 +142,6 @@
> <parameter name="encryptionUser"
value="16c73ab6-b892-458f-abf5-2f875f74882e" />
> </handler>
> </responseFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
> <service name="Ping7" provider="java:RPC" style="wrapped"
use="literal">
> <parameter name="wsdlTargetNamespace"
value="http://xmlsoap.org/Ping"/>
> @@ -227,10 +149,6 @@
> <parameter name="wsdlServicePort" value="Ping7"/>
> <parameter name="className"
value="org.apache.ws.axis.oasis.ping.PingBindingImpl"/>
> <parameter name="wsdlPortType" value="PingPort"/>
> - <operation name="ping" qname="operNS:Ping"
xmlns:operNS="http://xmlsoap.org/Ping" >
> - <parameter qname="pns:text" xmlns:pns="http://xmlsoap.org/Ping"
type="tns:string" xmlns:tns="http://www.w3.org/2001/XMLSchema"
mode="INOUT"/>
> - <parameter qname="pns:ticket"
xmlns:pns="http://xmlsoap.org/Ping" type="tns:ticketType"
xmlns:tns="http://xmlsoap.org/Ping"/>
> - </operation>
> <parameter name="allowedMethods" value="ping"/>
> <requestFlow>
> <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
> @@ -251,15 +169,6 @@
> <parameter name="encryptionUser"
value="16c73ab6-b892-458f-abf5-2f875f74882e" />
> </handler>
> </responseFlow>
> -
> - <typeMapping
> - xmlns:ns="http://xmlsoap.org/Ping"
> - qname="ns:ticketType"
> - type="java:org.apache.ws.axis.oasis.ping.TicketType"
> -
serializer="org.apache.axis.encoding.ser.SimpleSerializerFactory"
> -
deserializer="org.apache.axis.encoding.ser.SimpleDeserializerFactory"
> - encodingStyle=""
> - />
> </service>
>
> </deployment>
>
>
>
> 1.2 +2 -2 ws-fx/wss4j/test/interop/TestScenario2.java
>
> Index: TestScenario2.java
> ===================================================================
> RCS file: /home/cvs/ws-fx/wss4j/test/interop/TestScenario2.java,v
> retrieving revision 1.1
> retrieving revision 1.2
> diff -u -r1.1 -r1.2
> --- TestScenario2.java 13 Feb 2004 20:43:08 -0000 1.1
> +++ TestScenario2.java 9 Mar 2004 16:45:42 -0000 1.2
> @@ -55,8 +55,8 @@
> *
> * @param args command line args
> */
> - public static void main(String[] args) {
> - junit.textui.TestRunner.run(suite());
> + public static void main(String[] args) throws Exception {
> + Scenario2.main(args);
> }
>
> public void testScenario2() throws Exception {
>
>
>