whitlock 2003/01/21 05:49:09 Modified: java/test/jndi JndiAddressBook.wsdl JNDIAddressBookTest.java Log: Support testing against an axis server Revision Changes Path 1.4 +6 -1 xml-axis-wsif/java/test/jndi/JndiAddressBook.wsdl Index: JndiAddressBook.wsdl =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/jndi/JndiAddressBook.wsdl,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JndiAddressBook.wsdl 7 Dec 2002 12:34:03 -0000 1.3 +++ JndiAddressBook.wsdl 21 Jan 2003 13:49:08 -0000 1.4 @@ -171,6 +171,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/AddressBook"/> + </port> <port name="JavaPort" binding="tns:JavaBinding"> <java:address className="addressbook.wsiftypes.AddressBook"/> </port> @@ -179,7 +182,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> </service> 1.4 +11 -2 xml-axis-wsif/java/test/jndi/JNDIAddressBookTest.java Index: JNDIAddressBookTest.java =================================================================== RCS file: /home/cvs/xml-axis-wsif/java/test/jndi/JNDIAddressBookTest.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- JNDIAddressBookTest.java 12 Dec 2002 11:51:03 -0000 1.3 +++ JNDIAddressBookTest.java 21 Jan 2003 13:49:09 -0000 1.4 @@ -83,7 +83,8 @@ String wsdlLocation = TestUtilities.getWsdlPath("java\\test\\addressbook\\wsifservice") + "AddressBook.wsdl"; - + static String server = TestUtilities.getSoapServer().toUpperCase(); + static String name1 = "Purdue Boilermaker"; static Address addr1 = new Address( @@ -156,7 +157,7 @@ doit(); } public void testAxisStub() { - doitStub("SOAPPort"); + doitStub(server+"Port"); } private void doit() { @@ -181,6 +182,14 @@ System.out.println( " - Port is a JMS port and I don't like JMS so I refuse to use it!"); } else { + if (("SOAPPort".equals(p) || "AXISPort".equals(p)) + && !p.equals(server + "Port")) + { + System.out.println( + "- not configured to use " + server + " port "); + continue; + } + System.out.println(" - I like this port, I think I'll use it!"); AddressBook abStub = (AddressBook) service.getStub(p, AddressBook.class);