whitlock 2003/01/20 07:56:36
Modified: java/test/inout InoutTest.java
java/test/addressbook/wsifservice deploy.wsdd
java/test/inout/wsifservice Inout.wsdl
Added: java/test/inout/wsifservice deploy.wsdd
Log:
Support testing against an axis server
Revision Changes Path
1.10 +16 -15 xml-axis-wsif/java/test/inout/InoutTest.java
Index: InoutTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/inout/InoutTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- InoutTest.java 7 Dec 2002 12:34:06 -0000 1.9
+++ InoutTest.java 20 Jan 2003 15:56:35 -0000 1.10
@@ -88,7 +88,8 @@
public class InoutTest extends TestCase {
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\inout\\wsifservice") + "Inout.wsdl";
-
+ static String server = TestUtilities.getSoapServer().toUpperCase();
+
static String name1 = "Purdue Boilermaker";
static Address addr1 =
new Address(
@@ -149,10 +150,10 @@
}
public void testAxis() {
- doit("SOAPPort", AXIS, RPC, ADDRESS);
+ doit(server+"Port", AXIS, RPC, ADDRESS);
}
public void testSoap() {
- doit("SOAPPort", SOAP, RPC, ADDRESS);
+ doit(server+"Port", SOAP, RPC, ADDRESS);
}
public void testJava() {
doit("JavaPort", JAVA, RPC, ADDRESS);
@@ -172,8 +173,8 @@
//public void testAxisJmsDoc () { doit("SOAPJMSDocPort",AXIS,DOC, ADDRESS );
} FAILS
//public void testNativeJmsDoc () { doit("NativeJMSPort" ,NJMS,DOC, ADDRESS );
} FAILS
- //public void testNNAxis () { doit("SOAPPort" ,AXIS,RPC, NULLNAME);
} FAILS
- //public void testNNSoap () { doit("SOAPPort" ,SOAP,RPC, NULLNAME);
} FAILS
+ //public void testNNAxis () { doit(server+"Port" ,AXIS,RPC,
NULLNAME); } FAILS
+ //public void testNNSoap () { doit(server+"Port" ,SOAP,RPC,
NULLNAME); } FAILS
public void testNNJava() {
doit("JavaPort", JAVA, RPC, NULLNAME);
}
@@ -181,9 +182,9 @@
//public void testNNAxisJms () { doit("SOAPJMSPort" ,AXIS,RPC, NULLNAME);
} FAILS
//public void testNNNativeJms () { doit("NativeJMSPort" ,NJMS,RPC, NULLNAME);
}
- //public void testAddAxis () { doit("SOAPPort" ,AXIS,RPC, ADD );
} FAILS
+ //public void testAddAxis () { doit(server+"Port" ,AXIS,RPC, ADD
); } FAILS
public void testAddSoap() {
- doit("SOAPPort", SOAP, RPC, ADD);
+ doit(server+"Port", SOAP, RPC, ADD);
}
public void testAddJava() {
doit("JavaPort", JAVA, RPC, ADD);
@@ -196,9 +197,9 @@
doit("NativeJMSPort" , NJMS, RPC, ADD );
}
- //public void testDateAxis () { doit("SOAPPort" ,AXIS,RPC, DATE );
} FAILS
+ //public void testDateAxis () { doit(server+"Port" ,AXIS,RPC, DATE
); } FAILS
public void testDateSoap() {
- doit("SOAPPort", SOAP, RPC, DATE);
+ doit(server+"Port", SOAP, RPC, DATE);
}
public void testDateJava() {
doit("JavaPort", JAVA, RPC, DATE);
@@ -212,10 +213,10 @@
}
public void testSupCAxis() {
- doit("SOAPPort", AXIS, RPC, SUPC);
+ doit(server+"Port", AXIS, RPC, SUPC);
}
public void testSupCSoap() {
- doit("SOAPPort", SOAP, RPC, SUPC);
+ doit(server+"Port", SOAP, RPC, SUPC);
}
public void testSupCJava() {
doit("JavaPort", JAVA, RPC, SUPC);
@@ -230,10 +231,10 @@
doit("NativeJMSPort" , NJMS, RPC, SUPC );
}
public void testGenCAxis() {
- doit("SOAPPort", AXIS, RPC, GENC);
+ doit(server+"Port", AXIS, RPC, GENC);
}
public void testGenCSoap() {
- doit("SOAPPort", SOAP, RPC, GENC);
+ doit(server+"Port", SOAP, RPC, GENC);
}
public void testGenCJava() {
doit("JavaPort", JAVA, RPC, GENC);
@@ -248,9 +249,9 @@
doit("NativeJMSPort" , NJMS, RPC, GENC );
}
- //public void testWhoAxis () { doit("SOAPPort" ,AXIS,RPC, WHOAMI );
} FAILS
+ //public void testWhoAxis () { doit(server+"Port" ,AXIS,RPC, WHOAMI
); } FAILS
public void testWhoSoap() {
- doit("SOAPPort", SOAP, RPC, WHOAMI);
+ doit(server+"Port", SOAP, RPC, WHOAMI);
}
public void testWhoJava() {
doit("JavaPort", JAVA, RPC, WHOAMI);
1.2 +10 -4 xml-axis-wsif/java/test/addressbook/wsifservice/deploy.wsdd
Index: deploy.wsdd
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/addressbook/wsifservice/deploy.wsdd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- deploy.wsdd 14 Jan 2003 16:43:19 -0000 1.1
+++ deploy.wsdd 20 Jan 2003 15:56:35 -0000 1.2
@@ -5,10 +5,16 @@
<parameter name="className" value="addressbook.wsiftypes.AddressBook"/>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="Application"/>
- <beanMapping qname="ns:address" xmlns:ns="http://wsiftypes.addressbook/";
- languageSpecificType="java:addressbook.wsiftypes.Address"/>
- <beanMapping qname="ns:phone" xmlns:ns="http://wsiftypes.addressbook/";
- languageSpecificType="java:addressbook.wsiftypes.Phone"/>
+
+ <beanMapping
+ qname="ns1:address"
+ xmlns:ns1="http://wsiftypes.addressbook/";
+ languageSpecificType="java:addressbook.wsiftypes.Address"/>
+
+ <beanMapping
+ qname="ns2:phone"
+ xmlns:ns2="http://wsiftypes.addressbook/";
+ languageSpecificType="java:addressbook.wsiftypes.Phone"/>
</service>
</deployment>
1.8 +11 -5 xml-axis-wsif/java/test/inout/wsifservice/Inout.wsdl
Index: Inout.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/inout/wsifservice/Inout.wsdl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- Inout.wsdl 7 Dec 2002 12:34:04 -0000 1.7
+++ Inout.wsdl 20 Jan 2003 15:56:36 -0000 1.8
@@ -872,6 +872,9 @@
<port name="SOAPPort" binding="tns:SOAPHttpBinding">
<soap:address location="http://localhost:8080/soap/servlet/rpcrouter"/>
</port>
+ <port name="AXISPort" binding="tns:SOAPHttpBinding">
+ <soap:address location="http://localhost:8080/axis/services/Inout"/>
+ </port>
<port name="SOAPDocPort" binding="tns:SOAPHttpDocBinding">
<soap:address location="http://localhost:8080/soap/servlet/messagerouter"/>
</port>
@@ -879,11 +882,14 @@
<java:address className="inout.wsiftypes.InoutImpl"/>
</port>
<port name="SOAPJMSPort" binding="tns:SOAPJmsBinding">
- <jms:address jndiDestinationName="SoapJmsAddressBookQueue"
- destinationStyle="queue"
- jndiConnectionFactoryName="WSIFSampleQCF"
-
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ <jms:address
+ jndiDestinationName="SoapJmsAddressBookQueue"
+ destinationStyle="queue"
+ jndiConnectionFactoryName="WSIFSampleQCF"
+ initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" " />
+ </jms:address>
</port>
<port name="SOAPJMSDocPort" binding="tns:SOAPJmsDocBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
1.1 xml-axis-wsif/java/test/inout/wsifservice/deploy.wsdd
Index: deploy.wsdd
===================================================================
<deployment xmlns="http://xml.apache.org/axis/wsdd/";
xmlns:java="http://xml.apache.org/axis/wsdd/providers/java";>
<service name="Inout" provider="java:RPC">
<parameter name="className" value="inout.wsiftypes.InoutImpl"/>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="Application"/>
<beanMapping
qname="ns1:address"
xmlns:ns1="http://wsiftypes.addressbook/";
languageSpecificType="java:addressbook.wsiftypes.Address"/>
<beanMapping
qname="ns2:phone"
xmlns:ns2="http://wsiftypes.addressbook/";
languageSpecificType="java:addressbook.wsiftypes.Phone"/>
<beanMapping
qname="ns3:mutablestring"
xmlns:ns3="http://wsiftypes.inout/";
languageSpecificType="java:inout.wsiftypes.Mutablestring"/>
<typeMapping
qname="ns4:arrayofint"
xmlns:ns4="http://wsiftypes.inout/";
languageSpecificType="java:[I"
serializer="org.apache.axis.encoding.ser.ArraySerializerFactory"
deserializer="org.apache.axis.encoding.ser.ArrayDeserializerFactory"
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</service>
</deployment>
