whitlock 2003/01/21 09:12:04
Modified: java/test/util WSIFTestRunner.java
java/test/simpletypes SOAPENCTest.wsdl SOAPENCTest.java
java/test/invocation DynamicInvokerTest.java
java/test/serialization SerializationTest.java
java/test/mime MimeBadMixSoapMime.wsdl
MimeBadSoapBodyType.wsdl MimeBadPart.wsdl
MimeBadMultipleSoapBodies.wsdl MimeBadNoPart.wsdl
MimeBadNested.wsdl MimeTest.java
MimeBadNoSoapBody.wsdl Mime.wsdl
java/test/translated/messages
TranslatedMessagesUtilities.java
java/test/stockquote StockquoteTest.java
java/test/headers HeadersTest.java
java/test/faults Stockquote.wsdl FaultMsgTest.java
java/test/soap MissingInputPartTest.java InputPartsTest.java
java/test/stockquote/wsifservice Stockquote.wsdl
java/test/docStyle/wsifservice Mime.wsdl
java/test/jms Jms.wsdl JmsTest.java
java/test/wsdl WsdlLoadingTest.java
java/test/docStyle MessagingAttachmentsTest.java
Added: java/test/mime deploy.wsdd
java/test/simpletypes/wsifservice deploy.wsdd
java/test/stockquote/wsifservice deploy.wsdd
Log:
Support testing against an axis server
Revision Changes Path
1.30 +8 -2 xml-axis-wsif/java/test/util/WSIFTestRunner.java
Index: WSIFTestRunner.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/util/WSIFTestRunner.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- WSIFTestRunner.java 7 Jan 2003 17:39:45 -0000 1.29
+++ WSIFTestRunner.java 21 Jan 2003 17:12:01 -0000 1.30
@@ -73,17 +73,19 @@
import mime.MimeTest;
import providers.PlugableProvidersTest;
import providers.ProvidersInitialisationTest;
-//import shop.ShoppingCartTest;
+import serialization.SerializationTest;
+import simpletypes.SOAPENCTest;
import soap.InputPartsTest;
+import soap.MissingInputPartTest;
import soap.OutputPartsTest;
import soapinterop.InteropTest;
import stockquote.StockquoteTest;
-import tests.interop.Interop;
import wsdl.WsdlLoadingTest;
import zipcode.ZIPCodeTest;
import addressbook.AddressBookTest;
import async.AsyncTests;
+import chartype.CharTest;
import docStyle.MessagingAttachmentsTest;
import docStyle.NWBankTest;
import docStyle.ZipCodeAxisTest;
@@ -139,6 +141,10 @@
suite.addTest(new TestSuite(InteropDocTest.class));
suite.addTest(new TestSuite(InteropDocWrappedTest.class));
suite.addTest(new TestSuite(MessagingAttachmentsTest.class));
+ suite.addTest(new TestSuite(SerializationTest.class));
+ suite.addTest(new TestSuite(CharTest.class));
+ suite.addTest(new TestSuite(SOAPENCTest.class));
+ suite.addTest(new TestSuite(MissingInputPartTest.class));
if (TestUtilities.areWeTesting("mime"))
suite.addTest(new TestSuite(MimeTest.class));
1.3 +3 -0 xml-axis-wsif/java/test/simpletypes/SOAPENCTest.wsdl
Index: SOAPENCTest.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/simpletypes/SOAPENCTest.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SOAPENCTest.wsdl 7 Dec 2002 12:34:02 -0000 1.2
+++ SOAPENCTest.wsdl 21 Jan 2003 17:12:02 -0000 1.3
@@ -263,6 +263,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/SOAPENCSimpleTypes"/>
+ </port>
</service>
</definitions>
1.4 +6 -5 xml-axis-wsif/java/test/simpletypes/SOAPENCTest.java
Index: SOAPENCTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/simpletypes/SOAPENCTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SOAPENCTest.java 7 Dec 2002 12:34:02 -0000 1.3
+++ SOAPENCTest.java 21 Jan 2003 17:12:02 -0000 1.4
@@ -79,15 +79,16 @@
public class SOAPENCTest extends TestCase {
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\simpletypes") + "SOAPENCTest.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
public SOAPENCTest(String name) {
super(name);
}
public static void main(String[] args) {
- TestUtilities.startListeners();
+// TestUtilities.startListeners();
junit.textui.TestRunner.run(suite());
- TestUtilities.stopListeners();
+// TestUtilities.stopListeners();
}
public static Test suite() {
@@ -99,10 +100,10 @@
}
public void testAxis() {
- doit("SOAPPort", "axis");
+ doit(server+"Port", "axis");
}
public void testSoap() {
- doit("SOAPPort", "soap");
+ doit(server+"Port", "soap");
}
private void doit(String portName, String protocol) {
@@ -116,7 +117,7 @@
"http://wsifservice.simpletypes/";, // portTypeNS
"SimplePT"); // portTypeName
- WSIFPort port = service.getPort("SOAPPort");
+ WSIFPort port = service.getPort(portName);
int i = 10;
byte b = (byte) i;
1.6 +14 -9 xml-axis-wsif/java/test/invocation/DynamicInvokerTest.java
Index: DynamicInvokerTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/invocation/DynamicInvokerTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DynamicInvokerTest.java 12 Dec 2002 11:51:03 -0000 1.5
+++ DynamicInvokerTest.java 21 Jan 2003 17:12:02 -0000 1.6
@@ -62,7 +62,7 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
+
import util.TestUtilities;
import clients.DynamicInvoker;
@@ -75,15 +75,20 @@
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\stockquote\\wsifservice")
+ "Stockquote.wsdl";
-
+ static String server = TestUtilities.getSoapServer().toUpperCase();
+
public DynamicInvokerTest(String name) {
super(name);
}
- public static void main(String[] args) {
- TestUtilities.startListeners();
- junit.textui.TestRunner.run(suite());
- TestUtilities.stopListeners();
+ public static void main(String[] args)
+ {
+ TestUtilities.startListeners(
+ TestUtilities.STOCKQUOTE_LISTENER
+ | TestUtilities.NATIVEJMS_LISTENER);
+
+ junit.textui.TestRunner.run(suite());
+ TestUtilities.stopListeners();
}
public static Test suite() {
@@ -98,10 +103,10 @@
doit(null, null);
}
public void testAxis() {
- doit("SOAPPort", "axis");
+ doit(server+"Port", "axis");
}
public void testSoap() {
- doit("SOAPPort", "soap");
+ doit(server+"Port", "soap");
}
public void testJava() {
doit("JavaPort", "java");
@@ -139,7 +144,7 @@
assertTrue(quote == -1.0F);
} catch (Exception e) {
if (portName != null) {
- System.err.println("AddressBookTest(" + portName + ") caught
exception " + e);
+ System.err.println("DynamicInvokerTest(" + portName + ") caught
exception " + e);
e.printStackTrace();
assertTrue(false);
} else {
1.5 +4 -3 xml-axis-wsif/java/test/serialization/SerializationTest.java
Index: SerializationTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/serialization/SerializationTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SerializationTest.java 12 Dec 2002 11:51:03 -0000 1.4
+++ SerializationTest.java 21 Jan 2003 17:12:02 -0000 1.5
@@ -90,7 +90,8 @@
* @author Owen Burroughs <[EMAIL PROTECTED]>
*/
public class SerializationTest extends TestCase {
-
+ static String server = TestUtilities.getSoapServer().toUpperCase();
+
public SerializationTest(String name) {
super(name);
}
@@ -221,7 +222,7 @@
"http://wsiftypes.addressbook/";,
"phone"),
Class.forName("addressbook.wsiftypes.Phone"));
- WSIFPort port = service.getPort("SOAPPort");
+ WSIFPort port = service.getPort(server+"Port");
WSIFOperation op = port.createOperation("addEntry",
"AddEntryWholeNameRequest", null);
doItPort(port, "WSIFPort_ApacheSOAP");
WSIFOperation op2 = port.createOperation("addEntry",
"AddEntryWholeNameRequest", null);
@@ -267,7 +268,7 @@
null,
"http://wsifservice.addressbook/";,
"AddressBook");
- WSIFPort port = service.getPort("SOAPPort");
+ WSIFPort port = service.getPort(server+"Port");
WSIFOperation op = port.createOperation("addEntry",
"AddEntryWholeNameRequest", null);
doItPort(port, "WSIFPort_ApacheAxis");
} catch (Exception e) {
1.3 +3 -0 xml-axis-wsif/java/test/mime/MimeBadMixSoapMime.wsdl
Index: MimeBadMixSoapMime.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeBadMixSoapMime.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MimeBadMixSoapMime.wsdl 7 Dec 2002 12:33:49 -0000 1.2
+++ MimeBadMixSoapMime.wsdl 21 Jan 2003 17:12:02 -0000 1.3
@@ -57,6 +57,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/Mime"/>
+ </port>
</service>
</definitions>
1.4 +3 -0 xml-axis-wsif/java/test/mime/MimeBadSoapBodyType.wsdl
Index: MimeBadSoapBodyType.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeBadSoapBodyType.wsdl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MimeBadSoapBodyType.wsdl 20 Jan 2003 14:34:09 -0000 1.3
+++ MimeBadSoapBodyType.wsdl 21 Jan 2003 17:12:02 -0000 1.4
@@ -60,6 +60,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/Mime"/>
+ </port>
</service>
</definitions>
1.3 +3 -0 xml-axis-wsif/java/test/mime/MimeBadPart.wsdl
Index: MimeBadPart.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeBadPart.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MimeBadPart.wsdl 7 Dec 2002 12:33:49 -0000 1.2
+++ MimeBadPart.wsdl 21 Jan 2003 17:12:02 -0000 1.3
@@ -57,6 +57,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/Mime"/>
+ </port>
</service>
</definitions>
1.3 +3 -0 xml-axis-wsif/java/test/mime/MimeBadMultipleSoapBodies.wsdl
Index: MimeBadMultipleSoapBodies.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeBadMultipleSoapBodies.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MimeBadMultipleSoapBodies.wsdl 7 Dec 2002 12:33:49 -0000 1.2
+++ MimeBadMultipleSoapBodies.wsdl 21 Jan 2003 17:12:02 -0000 1.3
@@ -63,6 +63,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/Mime"/>
+ </port>
</service>
</definitions>
1.3 +3 -0 xml-axis-wsif/java/test/mime/MimeBadNoPart.wsdl
Index: MimeBadNoPart.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeBadNoPart.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MimeBadNoPart.wsdl 7 Dec 2002 12:33:49 -0000 1.2
+++ MimeBadNoPart.wsdl 21 Jan 2003 17:12:02 -0000 1.3
@@ -57,6 +57,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/Mime"/>
+ </port>
</service>
</definitions>
1.3 +3 -0 xml-axis-wsif/java/test/mime/MimeBadNested.wsdl
Index: MimeBadNested.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeBadNested.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MimeBadNested.wsdl 7 Dec 2002 12:33:49 -0000 1.2
+++ MimeBadNested.wsdl 21 Jan 2003 17:12:02 -0000 1.3
@@ -62,6 +62,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/Mime"/>
+ </port>
</service>
</definitions>
1.10 +2 -1 xml-axis-wsif/java/test/mime/MimeTest.java
Index: MimeTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- MimeTest.java 20 Jan 2003 14:34:09 -0000 1.9
+++ MimeTest.java 21 Jan 2003 17:12:02 -0000 1.10
@@ -111,7 +111,8 @@
private final static String imageLocation = wsdlPath + "axis.jpg";
private final static String flatfileLocation = wsdlPath + "test.txt";
private final static String flatfileLocation2 = wsdlPath + "test2.txt";
- private final static String portName = "SOAPPort";
+ private final static String portName =
+ TestUtilities.getSoapServer().toUpperCase() + "Port";
private final static String SEND_DH = "SEND-DH";
private final static String RECEIVE_DH = "RECEIVE-DH";
1.3 +3 -0 xml-axis-wsif/java/test/mime/MimeBadNoSoapBody.wsdl
Index: MimeBadNoSoapBody.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/MimeBadNoSoapBody.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MimeBadNoSoapBody.wsdl 7 Dec 2002 12:33:49 -0000 1.2
+++ MimeBadNoSoapBody.wsdl 21 Jan 2003 17:12:02 -0000 1.3
@@ -51,6 +51,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/Mime"/>
+ </port>
</service>
</definitions>
1.9 +6 -1 xml-axis-wsif/java/test/mime/Mime.wsdl
Index: Mime.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/mime/Mime.wsdl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Mime.wsdl 20 Jan 2003 14:34:08 -0000 1.8
+++ Mime.wsdl 21 Jan 2003 17:12:02 -0000 1.9
@@ -579,12 +579,17 @@
<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/Mime"/>
+ </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"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port -->
</service>
1.1 xml-axis-wsif/java/test/mime/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="Mime" provider="java:RPC">
<parameter name="className" value="mime.MimeImpl"/>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="Application"/>
<typeMapping
qname="ns:datahandler"
xmlns:ns="http://mime/";
languageSpecificType="java:javax.activation.DataHandler"
serializer="org.apache.axis.encoding.ser.JAFDataHandlerSerializerFactory"
deserializer="org.apache.axis.encoding.ser.JAFDataHandlerDeserializerFactory"
encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
</service>
</deployment>
1.4 +2 -1
xml-axis-wsif/java/test/translated/messages/TranslatedMessagesUtilities.java
Index: TranslatedMessagesUtilities.java
===================================================================
RCS file:
/home/cvs/xml-axis-wsif/java/test/translated/messages/TranslatedMessagesUtilities.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TranslatedMessagesUtilities.java 12 Dec 2002 11:51:03 -0000 1.3
+++ TranslatedMessagesUtilities.java 21 Jan 2003 17:12:03 -0000 1.4
@@ -70,6 +70,7 @@
static String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\stockquote\\wsifservice")
+ "Stockquote.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
static void doit(Locale name) {
try {
@@ -85,7 +86,7 @@
System.err.println("\nUsing locale '" + name + "'");
StockquotePT stub =
- (StockquotePT) service.getStub("SOAPPort", StockquotePT.class);
+ (StockquotePT) service.getStub(server+"Port", StockquotePT.class);
float quote = stub.getQuote("");
System.err.println(">> Received quote " + quote + " for ''");
1.10 +18 -10 xml-axis-wsif/java/test/stockquote/StockquoteTest.java
Index: StockquoteTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/stockquote/StockquoteTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- StockquoteTest.java 12 Dec 2002 11:51:03 -0000 1.9
+++ StockquoteTest.java 21 Jan 2003 17:12:03 -0000 1.10
@@ -78,15 +78,20 @@
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\stockquote\\wsifservice")
+ "Stockquote.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
public StockquoteTest(String name) {
super(name);
}
- public static void main(String[] args) {
- TestUtilities.startListeners();
- junit.textui.TestRunner.run (suite());
- TestUtilities.stopListeners();
+ public static void main(String[] args)
+ {
+ TestUtilities.startListeners(
+ TestUtilities.STOCKQUOTE_LISTENER
+ | TestUtilities.NATIVEJMS_LISTENER);
+
+ junit.textui.TestRunner.run(suite());
+ TestUtilities.stopListeners();
}
public static Test suite() {
@@ -98,10 +103,10 @@
}
public void testAxis() {
- doit("SOAPPort", "axis");
+ doit(server+"Port", "axis");
}
public void testSoap() {
- doit("SOAPPort", "soap");
+ doit(server+"Port", "soap");
}
public void testJava() {
doit("JavaPort", "java");
@@ -125,10 +130,13 @@
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
- WSIFService service = factory.getService(wsdlLocation, null, //
serviceNS
- null, // serviceName
- "http://wsifservice.stockquote/";, // portTypeNS
- "StockquotePT"); // portTypeName
+ WSIFService service =
+ factory.getService(
+ wsdlLocation,
+ null,
+ null,
+ "http://wsifservice.stockquote/";,
+ "StockquotePT");
System.err.println("\n\nUsing '" + portName + "' port:");
StockquotePT stub =
1.11 +3 -2 xml-axis-wsif/java/test/headers/HeadersTest.java
Index: HeadersTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/headers/HeadersTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- HeadersTest.java 12 Dec 2002 11:51:03 -0000 1.10
+++ HeadersTest.java 21 Jan 2003 17:12:03 -0000 1.11
@@ -89,6 +89,7 @@
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\stockquote\\wsifservice") +
"Stockquote.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
public HeadersTest(String name) {
super(name);
@@ -107,10 +108,10 @@
}
public void testAxis() {
- doit("SOAPPort", "axis");
+ doit(server+"Port", "axis");
}
public void testSoap() {
- doit("SOAPPort" ,"soap");
+ doit(server+"Port" ,"soap");
}
//public void testJava () { doit("JavaPort" ,"java"); }
//public void testSoapJms () { if (TestUtilities.areWeTesting("jms"))
doit("SOAPJMSPort","soap"); }
1.5 +6 -1 xml-axis-wsif/java/test/faults/Stockquote.wsdl
Index: Stockquote.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/faults/Stockquote.wsdl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Stockquote.wsdl 7 Dec 2002 12:34:01 -0000 1.4
+++ Stockquote.wsdl 21 Jan 2003 17:12:03 -0000 1.5
@@ -138,6 +138,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/Stockquote"/>
+ </port>
<port name="JavaPort" binding="tns:JavaBinding">
<java:address className="stockquote.wsiftypes.StockQuote"/>
</port>
@@ -146,7 +149,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="NativeJmsPort" binding="tns:NativeJmsBinding">
<jms:address jndiDestinationName="JmsStockQuoteQueue"
1.10 +5 -10 xml-axis-wsif/java/test/faults/FaultMsgTest.java
Index: FaultMsgTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/faults/FaultMsgTest.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FaultMsgTest.java 7 Dec 2002 12:34:01 -0000 1.9
+++ FaultMsgTest.java 21 Jan 2003 17:12:03 -0000 1.10
@@ -58,25 +58,19 @@
package faults;
import javax.wsdl.Definition;
-import javax.wsdl.Fault;
import javax.wsdl.PortType;
import javax.wsdl.Service;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-//import org.apache.axis.AxisFault;
+
import org.apache.wsif.WSIFConstants;
import org.apache.wsif.WSIFMessage;
import org.apache.wsif.WSIFOperation;
import org.apache.wsif.WSIFPort;
import org.apache.wsif.WSIFService;
import org.apache.wsif.WSIFServiceFactory;
-import org.apache.wsif.base.WSIFServiceImpl;
-import org.apache.wsif.providers.soap.apacheaxis.WSIFDynamicProvider_ApacheAxis;
-import org.apache.wsif.util.WSIFPluggableProviders;
import org.apache.wsif.util.WSIFUtils;
-
import util.TestUtilities;
/**
@@ -86,13 +80,14 @@
public class FaultMsgTest extends TestCase {
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\faults") + "Stockquote.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
public FaultMsgTest(String name) {
super(name);
}
public static void main(String[] args) {
- TestUtilities.startListeners();
+ TestUtilities.startListeners(TestUtilities.STOCKQUOTE_LISTENER);
junit.textui.TestRunner.run (suite());
TestUtilities.stopListeners();
}
@@ -107,10 +102,10 @@
//public void testJava () { doit("JavaPort" ,"java"); }
public void testAxis() {
- doit("SOAPPort", "axis");
+ doit(server+"Port", "axis");
}
public void testSoap() {
- doit("SOAPPort", "soap");
+ doit(server+"Port", "soap");
}
public void testSoapJms() {
if (TestUtilities.areWeTesting("jms"))
1.5 +7 -3 xml-axis-wsif/java/test/soap/MissingInputPartTest.java
Index: MissingInputPartTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/soap/MissingInputPartTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- MissingInputPartTest.java 12 Dec 2002 11:51:02 -0000 1.4
+++ MissingInputPartTest.java 21 Jan 2003 17:12:03 -0000 1.5
@@ -82,13 +82,17 @@
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\addressbook\\wsifservice")
+ "AddressBook.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
public MissingInputPartTest(String name) {
super(name);
}
public static void main(String[] args) {
- TestUtilities.startListeners();
+ TestUtilities.startListeners(
+ TestUtilities.ADDRESSBOOK_LISTENER
+ | TestUtilities.NATIVEJMS_LISTENER);
+
junit.textui.TestRunner.run (suite());
TestUtilities.stopListeners();
}
@@ -102,7 +106,7 @@
}
public void testDynamicSOAP() {
- doitDyn("SOAPPort", "soap");
+ doitDyn(server+"Port", "soap");
}
public void testDynamicJava() {
doitDyn("JavaPort", "java");
@@ -113,7 +117,7 @@
// TODO Axis doesn't work as we don't have an axis service
// the soap service doesn't understand the axis nil value
// public void testDynamicAxis() {
-// doitDyn("SOAPPort", "axis");
+// doitDyn(server+"Port", "axis");
// }
// public void testDynamicAxisJms() {
// doitDyn("SOAPJMSPort", "axis");
1.5 +12 -7 xml-axis-wsif/java/test/soap/InputPartsTest.java
Index: InputPartsTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/soap/InputPartsTest.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InputPartsTest.java 12 Dec 2002 11:51:02 -0000 1.4
+++ InputPartsTest.java 21 Jan 2003 17:12:03 -0000 1.5
@@ -89,16 +89,21 @@
static final String WSDL_LOCATION =
TestUtilities.getWsdlPath("java\\test\\addressbook\\wsifservice") +
"AddressBook.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
public InputPartsTest(String name) {
super(name);
}
- public static void main(String[] args) {
- TestUtilities.startListeners();
- junit.textui.TestRunner.run (suite());
- TestUtilities.stopListeners();
- }
+ public static void main(String[] args)
+ {
+ TestUtilities.startListeners(
+ TestUtilities.ADDRESSBOOK_LISTENER
+ | TestUtilities.NATIVEJMS_LISTENER);
+
+ junit.textui.TestRunner.run(suite());
+ TestUtilities.stopListeners();
+ }
public static Test suite() {
return new TestSuite(InputPartsTest.class);
@@ -109,7 +114,7 @@
}
public void testSoap() {
- doit("SOAPPort", "soap");
+ doit(server+"Port", "soap");
}
public void testJava() {
doit("JavaPort", "java");
@@ -119,7 +124,7 @@
}
//TODO the SOAP service doesn't work with AXIS nulls
// public void testAxis() {
-// doit("SOAPPort", "axis");
+// doit(server+"Port", "axis");
// }
// public void testAxisJms() {
// doit("SOAPJMSPort", "axis");
1.1 xml-axis-wsif/java/test/simpletypes/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="SOAPENCSimpleTypes" provider="java:RPC">
<parameter name="className" value="simpletypes.wsifservice.SOAPENCSimpleTypes"/>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="Application"/>
</service>
</deployment>
1.2 +6 -1 xml-axis-wsif/java/test/stockquote/wsifservice/Stockquote.wsdl
Index: Stockquote.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/stockquote/wsifservice/Stockquote.wsdl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Stockquote.wsdl 12 Dec 2002 11:51:02 -0000 1.1
+++ Stockquote.wsdl 21 Jan 2003 17:12:03 -0000 1.2
@@ -97,6 +97,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/Stockquote"/>
+ </port>
<port name="JavaPort" binding="tns:JavaBinding">
<java:address className="stockquote.wsiftypes.StockQuote"/>
</port>
@@ -105,7 +108,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="NativeJmsPort" binding="tns:NativeJmsBinding">
<jms:address jndiDestinationName="NativeJmsRequestQueue"
1.1 xml-axis-wsif/java/test/stockquote/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="Stockquote" provider="java:RPC">
<parameter name="className" value="stockquote.wsiftypes.StockQuote"/>
<parameter name="allowedMethods" value="*"/>
<parameter name="scope" value="Application"/>
</service>
</deployment>
1.3 +3 -0 xml-axis-wsif/java/test/docStyle/wsifservice/Mime.wsdl
Index: Mime.wsdl
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/docStyle/wsifservice/Mime.wsdl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Mime.wsdl 7 Jan 2003 17:39:45 -0000 1.2
+++ Mime.wsdl 21 Jan 2003 17:12:03 -0000 1.3
@@ -505,6 +505,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/Mime"/>
+ </port>
<!-- port name="SOAPJMSPort" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="queue"
1.9 +83 -26 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Jms.wsdl 7 Dec 2002 12:34:00 -0000 1.8
+++ Jms.wsdl 21 Jan 2003 17:12:03 -0000 1.9
@@ -441,7 +441,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="baddefault" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
@@ -449,7 +451,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="default-alt" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
@@ -457,96 +461,124 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-qcfmixq" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="WSIFSampleQCF"
destinationStyle="queue"
jndiConnectionFactoryName="SoapJmsAddressBookQueue"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-mixq" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="WSIFSampleQCF"
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-mixicf" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.ibm.wsif.test.WSIFTestRunner"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-qcf" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="queue"
jndiConnectionFactoryName="trash"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-queue" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="trash"
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-altqueue" binding="tns:SOAPJmsBinding">
<jms:address jmsProviderDestinationName="trash"
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-style" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="trash"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-icf" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="trash"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-jurl" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="trash"/>
+ jndiProviderURL="trash">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-noq" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-nostyle" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
jndiDestinationName="SoapJmsAddressBookQueue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-noqcf" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="queue"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-noicfjurl" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
destinationStyle="queue"
- jndiConnectionFactoryName="WSIFSampleQCF"/>
+ jndiConnectionFactoryName="WSIFSampleQCF">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-altandq" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
@@ -555,7 +587,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-topic" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
@@ -563,10 +597,14 @@
destinationStyle="topic"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-implspec" binding="tns:SOAPJmsBinding">
- <jms:address jmsImplementationSpecificURI="mq://qmgr/qname"/>
+ <jms:address jmsImplementationSpecificURI="mq://qmgr/qname">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-mqandjndi" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
@@ -575,10 +613,14 @@
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
jndiProviderURL="file:///JNDI-Directory"
- jmsImplementationSpecificURI="mq://qmgr/qname"/>
+ jmsImplementationSpecificURI="mq://qmgr/qname">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-nothing" binding="tns:SOAPJmsBinding">
- <jms:address />
+ <jms:address >
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="bad-nobinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
@@ -586,11 +628,16 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
- <port name="http-noattrs" binding="tns:SOAPHttpBinding">
+ <port name="SOAP-http-noattrs" binding="tns:SOAPHttpBinding">
<soap:address location="http://localhost:8080/soap/servlet/rpcrouter"/>
</port>
+ <port name="AXIS-http-noattrs" binding="tns:SOAPHttpBinding">
+ <soap:address location="http://localhost:8080/axis/services/AddressBook"/>
+ </port>
<port name="java-noattrs" binding="tns:JavaBinding">
<java:address className="addressbook.wsiftypes.AddressBook"/>
</port>
@@ -600,7 +647,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="TempQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="nonpersist" binding="tns:SOAPJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
@@ -608,7 +657,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="TempQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="addrpv" binding="tns:SOAPJmsBinding">
<jms:address jndiDestinationName="SoapJmsAddressBookQueue"
@@ -617,6 +668,7 @@
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
jndiProviderURL="file:///JNDI-Directory">
<jms:propertyValue name="JMSReplyTo" type="xsd:string"
value="AddressBookReplyTo"/>
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
</jms:address>
</port>
<port name="bindpv" binding="tns:BindPV">
@@ -625,6 +677,7 @@
jndiConnectionFactoryName="TempQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
</jms:address>
</port>
<port name="adbipv" binding="tns:BindPV">
@@ -634,6 +687,7 @@
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
jndiProviderURL="file:///JNDI-Directory">
<jms:propertyValue name="JMSReplyTo" type="xsd:string" value="trash"/>
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
</jms:address>
</port>
<port name="ovpv" binding="tns:SOAPJmsBinding">
@@ -643,6 +697,7 @@
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
jndiProviderURL="file:///JNDI-Directory">
<jms:propertyValue name="JMSReplyTo" type="xsd:string" value="trash"/>
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
</jms:address>
</port>
<port name="timeout" binding="tns:SOAPJmsBinding">
@@ -650,7 +705,9 @@
destinationStyle="queue"
jndiConnectionFactoryName="WSIFSampleQCF"
initialContextFactory="com.sun.jndi.fscontext.RefFSContextFactory"
- jndiProviderURL="file:///JNDI-Directory"/>
+ jndiProviderURL="file:///JNDI-Directory">
+ <jms:propertyValue name="SOAPAction" type="xsd:string" value=" "/>
+ </jms:address>
</port>
<port name="NJdefault" binding="tns:NativeJmsBinding">
<jms:address jmsVendorURI="http://ibm.com/ns/mqseries";
1.15 +4 -3 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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- JmsTest.java 7 Dec 2002 12:34:00 -0000 1.14
+++ JmsTest.java 21 Jan 2003 17:12:03 -0000 1.15
@@ -84,7 +84,8 @@
*/
public class JmsTest extends TestCase {
String wsdlLocation = TestUtilities.getWsdlPath("java\\test\\jms") + "jms.wsdl";
-
+ static String server = TestUtilities.getSoapServer().toUpperCase();
+
static String name = "Purdue Boilermaker";
static Address addr =
new Address(
@@ -251,7 +252,7 @@
}
public void testSoapHttpNoAttrs() {
- doit("http-noattrs", SOAP, REPLYTOQ, 3, NPERS, 0, null);
+ doit(server+"-http-noattrs", SOAP, REPLYTOQ, 3, NPERS, 0, null);
}
public void testSoapNullReplyTo() {
@@ -406,7 +407,7 @@
}
public void testAxisHttpNoAttrs() {
- doit("http-noattrs", AXIS, REPLYTOQ, 3, NPERS, 0, null);
+ doit(server+"-http-noattrs", AXIS, REPLYTOQ, 3, NPERS, 0, null);
}
public void testAxisNullReplyTo() {
1.4 +2 -1 xml-axis-wsif/java/test/wsdl/WsdlLoadingTest.java
Index: WsdlLoadingTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/wsdl/WsdlLoadingTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WsdlLoadingTest.java 12 Dec 2002 11:51:03 -0000 1.3
+++ WsdlLoadingTest.java 21 Jan 2003 17:12:04 -0000 1.4
@@ -83,6 +83,7 @@
String fileWsdl =
TestUtilities.getWsdlPath("java\\test\\addressbook\\wsifservice") +
"AddressBook.wsdl";
+ static String server = TestUtilities.getSoapServer().toUpperCase();
static String name1 = "Purdue Boilermaker";
static Address addr1 = new Address (1, "University Drive",
@@ -141,7 +142,7 @@
"http://wsifservice.addressbook/";, // portTypeNS
"AddressBook"); // portTypeName
- AddressBook stub=(AddressBook)service.getStub("SOAPPort",
AddressBook.class);
+ AddressBook stub=(AddressBook)service.getStub(server+"Port",
AddressBook.class);
stub.addEntry(name1, addr1);
Address resp1 = stub.getAddressFromName (name1);
1.2 +4 -3 xml-axis-wsif/java/test/docStyle/MessagingAttachmentsTest.java
Index: MessagingAttachmentsTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/docStyle/MessagingAttachmentsTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MessagingAttachmentsTest.java 7 Jan 2003 17:39:45 -0000 1.1
+++ MessagingAttachmentsTest.java 21 Jan 2003 17:12:04 -0000 1.2
@@ -95,7 +95,8 @@
String wsdlLocation =
TestUtilities.getWsdlPath("java\\test\\docStyle\\wsifservice")
+ "mime.wsdl";
-
+ static String server = TestUtilities.getSoapServer().toUpperCase();
+
private final static String IMAGE_LOCATION =
TestUtilities.getWsdlPath("java\\test\\mime")
+ "axis.jpg";
@@ -122,10 +123,10 @@
}
public void testMsgAxisRcvAtt() {
- doitMsgRcvAtt("SOAPPort", "axis");
+ doitMsgRcvAtt(server+"Port", "axis");
}
public void testMsgAxisSendAtt() {
- doitMsgSendAtt("SOAPPort", "axis");
+ doitMsgSendAtt(server+"Port", "axis");
}
private void doitMsgRcvAtt(String portName, String protocol) {
