owenb 2002/06/11 10:04:03
Modified: java/test/jms JmsTest.java Jms.wsdl TestNativeJms.java
java/test/jrom JROMTests.java
Log:
Fixed incorrect namespaces and packages for addressbook classes
Revision Changes Path
1.3 +1 -1 xml-axis-wsif/java/test/jms/JmsTest.java
Index: JmsTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/jms/JmsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JmsTest.java 10 Jun 2002 17:03:54 -0000 1.2
+++ JmsTest.java 11 Jun 2002 17:04:03 -0000 1.3
@@ -474,7 +474,7 @@
"AddressBook");
service.mapType(
- new QName("http://www.ibm.com/namespace/wsif/samples/ab/types";,
"integer"),
+ new QName("http://wsiftypes.addressbook/";, "integer"),
Integer.class);
AddressBookWithAttrs stub =
1.3 +30 -30 xml-axis-wsif/java/test/jms/Jms.wsdl
Index: Jms.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/jms/Jms.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Jms.wsdl 10 Jun 2002 17:03:54 -0000 1.2
+++ Jms.wsdl 11 Jun 2002 17:04:03 -0000 1.3
@@ -1,8 +1,8 @@
<?xml version="1.0" ?>
-<definitions targetNamespace="http://www.ibm.com/namespace/wsif/samples/ab";
- xmlns:tns="http://www.ibm.com/namespace/wsif/samples/ab";
- xmlns:typens="http://www.ibm.com/namespace/wsif/samples/ab/types";
+<definitions targetNamespace="http://wsifservice.addressbook/";
+ xmlns:tns="http://wsifservice.addressbook/";
+ xmlns:typens="http://wsiftypes.addressbook/";
xmlns:xsd="http://www.w3.org/1999/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:jms="http://schemas.xmlsoap.org/wsdl/jms";
@@ -13,7 +13,7 @@
<!-- type defs -->
<types>
<xsd:schema
- targetNamespace="http://www.ibm.com/namespace/wsif/samples/ab/types";
+ targetNamespace="http://wsiftypes.addressbook/";
xmlns:xsd="http://www.w3.org/1999/XMLSchema";>
<xsd:complexType name="phone">
<xsd:element name="areaCode" type="xsd:int"/>
@@ -108,13 +108,13 @@
<soap:operation soapAction=""/>
<input name="AddEntryRequest">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
parts="name address" />
</input>
<output name="AddEntryResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -122,13 +122,13 @@
<soap:operation soapAction=""/>
<input name="AddEntryJmsPropRequest">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
parts="name address" />
</input>
<output name="AddEntryJmsPropResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -136,13 +136,13 @@
<soap:operation soapAction=""/>
<input name="AddEntryUserPropRequest">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
parts="name address" />
</input>
<output name="AddEntryUserPropResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -150,13 +150,13 @@
<soap:operation soapAction=""/>
<input name="GetAddressFromNameRequest">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/";
parts="name" />
</input>
<output name="GetAddressFromNameResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</output>
</operation>
@@ -165,7 +165,7 @@
<binding name="JavaBinding" type="tns:AddressBook">
<java:binding/>
<format:typeMapping encoding="Java" style="Java">
- <format:typeMap typeName="typens:address"
formatType="com.ibm.www.namespace.wsif.samples.ab.types.Address" />
+ <format:typeMap typeName="typens:address"
formatType="addressbook.wsiftypes.Address" />
<format:typeMap typeName="xsd:string" formatType="java.lang.String" />
</format:typeMapping>
<operation name="addEntry">
@@ -195,12 +195,12 @@
<input name="AddEntryRequest">
<jms:property name="JMSDeliveryMode" part="requestDeliveryMode" />
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</input>
<output name="AddEntryResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -212,12 +212,12 @@
<jms:property name="JMSDeliveryMode" part="requestDeliveryMode" />
<jms:property name="JMSTimeToLive" part="requestTimeToLive" />
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</input>
<output name="AddEntryJmsPropResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -235,12 +235,12 @@
<jms:property name="MyStringProperty" part="requestUPString" />
<jms:property name="MyObjectProperty" part="requestUPObject" />
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</input>
<output name="AddEntryUserPropResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -249,12 +249,12 @@
<input name="GetAddressFromNameRequest">
<jms:property name="JMSDeliveryMode" part="requestDeliveryMode" />
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</input>
<output name="GetAddressFromNameResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</output>
</operation>
@@ -269,12 +269,12 @@
<jms:property name="JMSDeliveryMode" part="requestDeliveryMode" />
<jms:propertyValue name="JMSReplyTo" type="xsd:string"
value="AddressBookReplyTo"/>
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</input>
<output name="AddEntryResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -286,12 +286,12 @@
<jms:property name="JMSDeliveryMode" part="requestDeliveryMode" />
<jms:property name="JMSTimeToLive" part="requestTimeToLive" />
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</input>
<output name="AddEntryJmsPropResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -309,12 +309,12 @@
<jms:property name="MyStringProperty" part="requestUPString" />
<jms:property name="MyObjectProperty" part="requestUPObject" />
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</input>
<output name="AddEntryUserPropResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"; />
</output>
</operation>
@@ -324,12 +324,12 @@
<jms:property name="JMSDeliveryMode" part="requestDeliveryMode" />
<jms:propertyValue name="JMSReplyTo" type="xsd:string"
value="AddressBookReplyTo"/>
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</input>
<output name="GetAddressFromNameResponse">
<soap:body use="encoded"
- namespace="http://www.ibm.com/namespace/wsif/samples/ab";
+ namespace="http://wsifservice.addressbook/";
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</output>
</operation>
@@ -494,7 +494,7 @@
<soap:address location="http://localhost:8080/soap/servlet/rpcrouter"/>
</port>
<port name="java-noattrs" binding="tns:JavaBinding">
- <java:address className="services.addressbook.AddressBook"/>
+ <java:address className="addressbook.wsiftypes.AddressBook"/>
</port>
<port name="bad-persist" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
1.2 +3 -3 xml-axis-wsif/java/test/jms/TestNativeJms.java
Index: TestNativeJms.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/jms/TestNativeJms.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TestNativeJms.java 6 Jun 2002 08:28:57 -0000 1.1
+++ TestNativeJms.java 11 Jun 2002 17:04:03 -0000 1.2
@@ -135,7 +135,7 @@
String operationName = "getQuote";
String wsdlLocation =
- TestUtilities.getWsdlPath("samples\\services\\stockquote") +
"StockQuote.wsdl";
+ TestUtilities.getWsdlPath("java\\samples\\stockquote\\wsifservice") +
"Stockquote.wsdl";
System.out.println("\n=== StockQuote");
try {
@@ -242,7 +242,7 @@
String operationName = "addEntry";
String wsdlLocation =
- TestUtilities.getWsdlPath("samples\\services\\addressbook")
+ TestUtilities.getWsdlPath("java\\samples\\addressbook\\wsifservice")
+ "AddressBook.wsdl";
System.out.println("\n=== AddressBook_addEntry");
@@ -327,7 +327,7 @@
String operationName = "getAddressFromName";
String wsdlLocation =
- TestUtilities.getWsdlPath("samples\\services\\addressbook")
+ TestUtilities.getWsdlPath("java\\samples\\addressbook\\wsifservice")
+ "AddressBook.wsdl";
System.out.println("\n=== AddressBook_getAddressFromName");
1.3 +4 -4 xml-axis-wsif/java/test/jrom/JROMTests.java
Index: JROMTests.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/jrom/JROMTests.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JROMTests.java 7 Jun 2002 08:43:08 -0000 1.2
+++ JROMTests.java 11 Jun 2002 17:04:03 -0000 1.3
@@ -139,11 +139,11 @@
service.mapType(
new javax.wsdl.QName("http://wsiftypes.addressbook/";, "address"),
-
Class.forName("com.ibm.www.namespace.wsif.samples.ab.types.Address"));
+ Class.forName("addressbook.wsiftypes.Address"));
service.mapType(
new javax.wsdl.QName("http://wsiftypes.addressbook/";, "phone"),
- Class.forName("com.ibm.www.namespace.wsif.samples.ab.types.Phone"));
+ Class.forName("addressbook.wsiftypes.Phone"));
WSIFPort port = service.getPort(portName);
@@ -290,11 +290,11 @@
service.mapType(
new javax.wsdl.QName("http://wsiftypes.addressbook/";, "address"),
-
Class.forName("com.ibm.www.namespace.wsif.samples.ab.types.Address"));
+ Class.forName("addressbook.types.Address"));
service.mapType(
new javax.wsdl.QName("http://wsiftypes.addressbook/";, "phone"),
- Class.forName("com.ibm.www.namespace.wsif.samples.ab.types.Phone"));
+ Class.forName("addressbook.types.Phone"));
WSIFPort port = service.getPort(portName);
