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/11 15:23:50 UTC
cvs commit: ws-fx/wss4j/interop/org/apache/ws/axis/oasis/ping PingBindingImpl.java
dims 2004/03/11 06:23:50
Modified: wss4j/interop ping.wsdl
wss4j/interop/org/apache/ws/axis/oasis Scenario1.java
Scenario2.java Scenario3.java Scenario4.java
Scenario5.java Scenario6.java Scenario7.java
Tester.java
wss4j/interop/org/apache/ws/axis/oasis/ping
PingBindingImpl.java
Log:
Updated WSDL (based off of MSFT's endpoint). I had removed TicketType by mistake. sorry.
Revision Changes Path
1.4 +85 -97 ws-fx/wss4j/interop/ping.wsdl
Index: ping.wsdl
===================================================================
RCS file: /home/cvs/ws-fx/wss4j/interop/ping.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ping.wsdl 9 Mar 2004 16:45:41 -0000 1.3
+++ ping.wsdl 11 Mar 2004 14:23:49 -0000 1.4
@@ -1,98 +1,86 @@
-<definitions xmlns:tns="http://xmlsoap.org/Ping"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<definitions xmlns:s1="http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"
+ xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:wsu="http://schemas.xmlsoap.org/ws/2003/06/utility"
- targetNamespace="http://xmlsoap.org/Ping" name="Ping">
- <types>
- <schema targetNamespace="http://xmlsoap.org/Ping" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <import namespace="http://schemas.xmlsoap.org/ws/2003/06/utility" schemaLocation="utility.xsd"/>
- <!--
- <complexType name="ticketType">
- <sequence>
- <element name="ticket" type="xsd:string"/>
- </sequence>
- <attribute ref="wsu:Id"/>
- </complexType>
- -->
- <!--
- <complexType name="ticketType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute ref="wsu:Id" />
- </xsd:extension>
- </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">
- <sequence>
- <element ref="tns:text" />
- </sequence>
- </complexType>
- <element name="Ping" type="tns:ping"/>
- <element name="PingResponse" type="tns:pingResponse"/>
- </schema>
- </types>
-
- <message name="PingRequest">
- <part name="ping" element="tns:Ping"/>
- </message>
- <message name="PingResponse">
- <part name="pingResponse" element="tns:PingResponse"/>
- </message>
-
- <portType name="PingPort">
- <operation name="Ping">
- <input message="tns:PingRequest"/>
- <output message="tns:PingResponse"/>
- </operation>
- </portType>
-
- <binding name="PingBinding" type="tns:PingPort">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="Ping">
- <soap:operation soapAction="Ping"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
- <service name="PingService">
- <port name="Ping1" binding="tns:PingBinding">
- <soap:address location="http://localhost:9080/pingservice/Ping1"/>
- </port>
- <port name="Ping2" binding="tns:PingBinding">
- <soap:address location="http://localhost:9080/pingservice/Ping2"/>
- </port>
- <port name="Ping3" binding="tns:PingBinding">
- <soap:address location="http://localhost:9080/pingservice/Ping3"/>
- </port>
- <port name="Ping4" binding="tns:PingBinding">
- <soap:address location="http://localhost:9080/pingservice/Ping4"/>
- </port>
- <port name="Ping5" binding="tns:PingBinding">
- <soap:address location="http://localhost:9080/pingservice/Ping5"/>
- </port>
- <port name="Ping6" binding="tns:PingBinding">
- <soap:address location="http://localhost:9080/pingservice/Ping6"/>
- </port>
- <port name="Ping7" binding="tns:PingBinding">
- <soap:address location="http://localhost:9080/pingservice/Ping7"/>
- </port>
- </service>
-</definitions>
-
+ xmlns:s="http://www.w3.org/2001/XMLSchema"
+ xmlns:tns="http://xmlsoap.org/Ping"
+ xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
+ xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/"
+ xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/"
+ targetNamespace="http://xmlsoap.org/Ping"
+ xmlns="http://schemas.xmlsoap.org/wsdl/">
+ <types>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://xmlsoap.org/Ping">
+ <s:import namespace="http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"/>
+ <s:element name="Ping" nillable="true" type="tns:ping"/>
+ <s:complexType name="ping">
+ <s:sequence>
+ <s:element minOccurs="0" maxOccurs="1" name="ticket" type="tns:ticketType"/>
+ <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true" type="s:string"/>
+ </s:sequence>
+ </s:complexType>
+ <s:complexType name="ticketType">
+ <s:simpleContent>
+ <s:extension base="s:string">
+ <s:attribute ref="s1:Id"/>
+ </s:extension>
+ </s:simpleContent>
+ </s:complexType>
+ <s:element name="PingResponse" nillable="true" type="tns:pingResponse"/>
+ <s:complexType name="pingResponse">
+ <s:sequence>
+ <s:element minOccurs="1" maxOccurs="1" name="text" nillable="true" type="s:string"/>
+ </s:sequence>
+ </s:complexType>
+ </s:schema>
+ <s:schema elementFormDefault="qualified" targetNamespace="http://www.docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+ <s:attribute name="Id" type="s:string"/>
+ </s:schema>
+ </types>
+ <message name="PingRequest">
+ <part name="ping" element="tns:Ping"/>
+ </message>
+ <message name="PingResponse">
+ <part name="pingResponse" element="tns:PingResponse"/>
+ </message>
+ <portType name="PingPort">
+ <operation name="Ping">
+ <input message="tns:PingRequest"/>
+ <output message="tns:PingResponse"/>
+ </operation>
+ </portType>
+ <binding name="PingBinding" type="tns:PingPort">
+ <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+ <operation name="Ping">
+ <soap:operation soapAction="Ping" style="document"/>
+ <input>
+ <soap:body use="literal"/>
+ </input>
+ <output>
+ <soap:body use="literal"/>
+ </output>
+ </operation>
+ </binding>
+ <service name="PingService">
+ <port name="Ping1" binding="tns:PingBinding">
+ <soap:address location="http://localhost:9080/pingservice/Ping1"/>
+ </port>
+ <port name="Ping2" binding="tns:PingBinding">
+ <soap:address location="http://localhost:9080/pingservice/Ping2"/>
+ </port>
+ <port name="Ping3" binding="tns:PingBinding">
+ <soap:address location="http://localhost:9080/pingservice/Ping3"/>
+ </port>
+ <port name="Ping4" binding="tns:PingBinding">
+ <soap:address location="http://localhost:9080/pingservice/Ping4"/>
+ </port>
+ <port name="Ping5" binding="tns:PingBinding">
+ <soap:address location="http://localhost:9080/pingservice/Ping5"/>
+ </port>
+ <port name="Ping6" binding="tns:PingBinding">
+ <soap:address location="http://localhost:9080/pingservice/Ping6"/>
+ </port>
+ <port name="Ping7" binding="tns:PingBinding">
+ <soap:address location="http://localhost:9080/pingservice/Ping7"/>
+ </port>
+ </service>
+</definitions>
\ No newline at end of file
1.5 +7 -6 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Scenario1.java 9 Mar 2004 19:56:19 -0000 1.4
+++ Scenario1.java 11 Mar 2004 14:23:49 -0000 1.5
@@ -23,6 +23,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Scenario1
*/
@@ -81,17 +83,16 @@
*/
// perform call
- String text =
- new String("WSS4J");
-
- // port.ping(text);
- System.out.println(port.ping(text));
+ StringHolder text =
+ new StringHolder("WSS4J - Scenario 1 text");
+ port.ping(null, text);
+ System.out.println(text.value);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.4 +7 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Scenario2.java 9 Mar 2004 19:56:19 -0000 1.3
+++ Scenario2.java 11 Mar 2004 14:23:49 -0000 1.4
@@ -21,6 +21,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Scenario2
*/
@@ -79,16 +81,16 @@
*/
// perform call
- String text =
- new String("Scenario 2 text");
-
- System.out.println(port.ping(text));
+ StringHolder text =
+ new StringHolder("WSS4J - Scenario 2 text");
+ port.ping(null, text);
+ System.out.println(text.value);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.4 +7 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Scenario3.java 9 Mar 2004 19:56:19 -0000 1.3
+++ Scenario3.java 11 Mar 2004 14:23:49 -0000 1.4
@@ -21,6 +21,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Scenario3
*/
@@ -79,15 +81,16 @@
*/
// perform call
- String text =
- new String("Scenario 3 text");
+ StringHolder text =
+ new StringHolder("WSS4J - Scenario 3 text");
+ port.ping(null, text);
+ System.out.println(text.value);
- System.out.println(port.ping(text));
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.4 +7 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Scenario4.java 9 Mar 2004 19:56:19 -0000 1.3
+++ Scenario4.java 11 Mar 2004 14:23:49 -0000 1.4
@@ -21,6 +21,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Scenario4
*/
@@ -79,16 +81,16 @@
*/
// perform call
- String text =
- new String("Scenario 4 text");
-
- System.out.println(port.ping(text));
+ StringHolder text =
+ new StringHolder("WSS4J - Scenario 4 text");
+ port.ping(null, text);
+ System.out.println(text.value);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.4 +7 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Scenario5.java 9 Mar 2004 19:56:19 -0000 1.3
+++ Scenario5.java 11 Mar 2004 14:23:49 -0000 1.4
@@ -21,6 +21,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Scenario5
*/
@@ -79,16 +81,16 @@
*/
// perform call
- String text =
- new String("Scenario 5 text");
-
- System.out.println(port.ping(text));
+ StringHolder text =
+ new StringHolder("WSS4J - Scenario 5 text");
+ port.ping(null, text);
+ System.out.println(text.value);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.4 +7 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Scenario6.java 9 Mar 2004 19:56:19 -0000 1.3
+++ Scenario6.java 11 Mar 2004 14:23:49 -0000 1.4
@@ -21,6 +21,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Scenario6
*/
@@ -79,16 +81,16 @@
*/
// perform call
- String text =
- new String("Scenario 6 text");
-
- System.out.println(port.ping(text));
+ StringHolder text =
+ new StringHolder("WSS4J - Scenario 6 text");
+ port.ping(null, text);
+ System.out.println(text.value);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.4 +7 -5 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Scenario7.java 9 Mar 2004 19:56:19 -0000 1.3
+++ Scenario7.java 11 Mar 2004 14:23:49 -0000 1.4
@@ -21,6 +21,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Scenario6
*/
@@ -79,16 +81,16 @@
*/
// perform call
- String text =
- new String("Scenario 7 text");
-
- System.out.println(port.ping(text));
+ StringHolder text =
+ new StringHolder("WSS4J - Scenario 7 text");
+ port.ping(null, text);
+ System.out.println(text.value);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.3 +7 -6 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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Tester.java 9 Mar 2004 16:45:41 -0000 1.2
+++ Tester.java 11 Mar 2004 14:23:49 -0000 1.3
@@ -21,6 +21,8 @@
import org.apache.ws.axis.oasis.ping.PingPort;
import org.apache.ws.axis.oasis.ping.PingServiceLocator;
+import javax.xml.rpc.holders.StringHolder;
+
/**
* Class Tester
*/
@@ -79,17 +81,16 @@
*/
// perform call
- String text =
- new String("Scenario 1 text");
-
- port.ping(text);
- System.out.println(text);
+ StringHolder text =
+ new StringHolder("WSS4J - Tester text");
+ port.ping(null, text);
+ System.out.println(text.value);
if (opts.isFlagSet('t') > 0) {
long startTime = System.currentTimeMillis();
for (int i = 0; i < 20; i++) {
- port.ping(text);
+ port.ping(null, text);
}
long endTime = System.currentTimeMillis();
1.4 +5 -4 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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PingBindingImpl.java 9 Mar 2004 16:45:42 -0000 1.3
+++ PingBindingImpl.java 11 Mar 2004 14:23:50 -0000 1.4
@@ -30,15 +30,17 @@
import org.apache.ws.axis.security.WSDoAllReceiverResult;
import org.apache.ws.security.WSConstants;
+import javax.xml.rpc.holders.StringHolder;
import java.security.Principal;
import java.util.Vector;
public class PingBindingImpl
implements org.apache.ws.axis.oasis.ping.PingPort {
- public String ping(
- String text)
+ public void ping(
+ org.apache.ws.axis.oasis.ping.TicketType pingTicket,
+ StringHolder text)
throws java.rmi.RemoteException {
- text = "Echo " + text;
+ text.value = "Echo " + text;
MessageContext msgContext = MessageContext.getCurrentContext();
Message reqMsg = msgContext.getRequestMessage();
@@ -63,7 +65,6 @@
}
}
}
- return text;
}
}