You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by an...@apache.org on 2002/09/16 10:18:56 UTC
cvs commit: xml-axis-wsif/java/test/faults FaultMsgTest.java
antelder 2002/09/16 01:18:56
Modified: java/test/async AsyncTests.java
java/test/zipcode ZIPCodeTest.java
java/test/stockquote StockquoteTest.java
java/test/addressbook AddressBookTest.java
java/src/org/apache/wsif/util WSIFPluggableProviders.java
java/test/soapinterop InteropTestServiceProxy.java
InteropTest.java
java/test/headers HeadersTest.java
java/test/providers PlugableProvidersTest.java
java/test/soap MissingInputPartTest.java InputPartsTest.java
OutputPartsTest.java
java/test/buy BuyTest.java
java/test/simpletypes SOAPENCTest.java
java/src/META-INF/services org.apache.wsif.spi.WSIFProvider
java/test/performance SpeedTest.java
java/test/jms JmsTest.java
java/test/faults FaultMsgTest.java
Log:
Change WSIF to use the axis provider as the defaut SOAP provider, if axis is available.
Revision Changes Path
1.12 +3 -16 xml-axis-wsif/java/test/async/AsyncTests.java
Index: AsyncTests.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/async/AsyncTests.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AsyncTests.java 4 Sep 2002 13:57:48 -0000 1.11
+++ AsyncTests.java 16 Sep 2002 08:18:55 -0000 1.12
@@ -155,11 +155,7 @@
return;
}
- if ( protocol.equals("axis") ) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
String portType = "StockquotePT";
String operationName = "getQuote";
@@ -244,11 +240,7 @@
return;
}
- if ( protocol.equals("axis") ) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
String portType = "AddressBook";
String operationName = "addEntry";
@@ -302,12 +294,7 @@
if ( portName.indexOf( "JMS" ) != -1 && !TestUtilities.areWeTesting("jms") ) {
return;
}
-
- if ( protocol.equals("axis") ) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
String portType = "AddressBook";
String operationName = "getAddressFromName";
1.4 +1 -6 xml-axis-wsif/java/test/zipcode/ZIPCodeTest.java
Index: ZIPCodeTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/zipcode/ZIPCodeTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ZIPCodeTest.java 29 Jul 2002 13:38:07 -0000 1.3
+++ ZIPCodeTest.java 16 Sep 2002 08:18:55 -0000 1.4
@@ -62,9 +62,6 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
-import org.apache.wsif.base.WSIFServiceImpl;
-import org.apache.wsif.util.WSIFPluggableProviders;
-
import util.TestUtilities;
import clients.zipcode.ShortZipCode;
@@ -121,9 +118,7 @@
System.out.println(response.getShortZipCodeResult());
assertTrue(response.getShortZipCodeResult().equals(expectedZipCode));
// reset back to default soap provider
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
+ TestUtilities.resetDefaultProviders();
}
}
1.7 +2 -11 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- StockquoteTest.java 29 Jul 2002 13:38:07 -0000 1.6
+++ StockquoteTest.java 16 Sep 2002 08:18:55 -0000 1.7
@@ -121,11 +121,7 @@
&& !TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
@@ -147,12 +143,7 @@
e.printStackTrace();
assertTrue(false);
} finally {
- if (protocol.equals("axis")) // remove apache soap provider
- {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
}
1.15 +4 -20 xml-axis-wsif/java/test/addressbook/AddressBookTest.java
Index: AddressBookTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/addressbook/AddressBookTest.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AddressBookTest.java 19 Aug 2002 09:19:32 -0000 1.14
+++ AddressBookTest.java 16 Sep 2002 08:18:55 -0000 1.15
@@ -169,11 +169,7 @@
&& !TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
@@ -203,11 +199,7 @@
e.printStackTrace();
assertTrue(false);
} finally {
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
}
@@ -215,11 +207,7 @@
if (portName.toUpperCase().indexOf("JMS") != -1 && !TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
@@ -333,11 +321,7 @@
e.printStackTrace();
assertTrue(false);
} finally {
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
}
1.4 +10 -1 xml-axis-wsif/java/src/org/apache/wsif/util/WSIFPluggableProviders.java
Index: WSIFPluggableProviders.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/util/WSIFPluggableProviders.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WSIFPluggableProviders.java 7 Aug 2002 15:10:26 -0000 1.3
+++ WSIFPluggableProviders.java 16 Sep 2002 08:18:55 -0000 1.4
@@ -68,6 +68,7 @@
import java.util.Iterator;
import org.apache.wsif.WSIFConstants;
+import org.apache.wsif.WSIFException;
import org.apache.wsif.logging.MessageLogger;
import org.apache.wsif.logging.Trc;
import org.apache.wsif.spi.WSIFProvider;
@@ -352,7 +353,15 @@
try {
o = Class.forName( (String) i.next(), true, loader ).newInstance();
if (o instanceof org.apache.wsif.spi.WSIFProvider) {
- providers.add( o );
+ WSIFProvider p = (org.apache.wsif.spi.WSIFProvider) o;
+ if ( p.getBindingNamespaceURIs().length > 0 ) {
+ providers.add( p );
+ } else {
+ WSIFException ex = new WSIFException(
+ "ignoring disabled WSIFProvider:" +
+ p.getClass().getName() );
+ Trc.exception( ex );
+ }
} else {
MessageLogger.log(
"WSIF.0003W",
1.5 +4 -13 xml-axis-wsif/java/test/soapinterop/InteropTestServiceProxy.java
Index: InteropTestServiceProxy.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/soapinterop/InteropTestServiceProxy.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- InteropTestServiceProxy.java 29 Jul 2002 13:38:07 -0000 1.4
+++ InteropTestServiceProxy.java 16 Sep 2002 08:18:55 -0000 1.5
@@ -57,9 +57,6 @@
package soapinterop;
-import java.math.BigDecimal;
-import java.sql.Date;
-
import javax.xml.namespace.QName;
import org.apache.wsif.WSIFException;
@@ -68,10 +65,8 @@
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.apachesoap.WSIFDynamicProvider_ApacheSOAP;
import org.apache.wsif.util.WSIFPluggableProviders;
-
import util.TestUtilities;
/**
@@ -523,10 +518,10 @@
this.svc = factory.getService(wsdlLocation,
//this.getClass().getClassLoader(),
- "http://soapinterop.org/",
- "interopLab",
- "http://soapinterop.org/",
- "InteropTestPortType");
+ "http://soapinterop.org/",
+ "interopLab",
+ "http://soapinterop.org/",
+ "InteropTestPortType");
if (this.svc == null)
throw new WSIFException("Failed to create WSIFDynamicPortFactory");
@@ -545,10 +540,6 @@
this.svc.mapType(
new QName("http://soapinterop.org/xsd", "ArrayOffloat"),
float[].class);
-
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
}
1.2 +14 -3 xml-axis-wsif/java/test/soapinterop/InteropTest.java
Index: InteropTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/soapinterop/InteropTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InteropTest.java 6 Jun 2002 08:29:00 -0000 1.1
+++ InteropTest.java 16 Sep 2002 08:18:55 -0000 1.2
@@ -57,11 +57,17 @@
package soapinterop;
-import junit.framework.*;
+import java.math.BigDecimal;
+import java.text.DateFormat;
import java.util.Date;
import java.util.Locale;
-import java.text.DateFormat;
-import java.math.BigDecimal;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+import org.apache.wsif.providers.soap.apachesoap.WSIFDynamicProvider_ApacheSOAP;
+import org.apache.wsif.util.WSIFPluggableProviders;
public class InteropTest extends TestCase {
@@ -84,6 +90,11 @@
public void testInterop() {
try
{
+ // only for soap not axis provider
+ WSIFPluggableProviders.overrideDefaultProvider(
+ "http://schemas.xmlsoap.org/wsdl/soap/",
+ new WSIFDynamicProvider_ApacheSOAP() );
+
InteropTestServiceProxy proxy = new InteropTestServiceProxy();
//echoString(String)
1.8 +3 -15 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- HeadersTest.java 29 Jul 2002 13:38:07 -0000 1.7
+++ HeadersTest.java 16 Sep 2002 08:18:55 -0000 1.8
@@ -63,19 +63,15 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
+
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.WSIFDefaultMessage;
-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;
/**
@@ -157,11 +153,7 @@
String portTypeNS = null;
String portTypeName = null;
- if ("axis".equals(protocol)) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
System.out.println("Reading WSDL document from '" + wsdlLocation + "'");
Definition def = WSIFUtils.readWSDL(null, wsdlLocation);
@@ -214,11 +206,7 @@
assertTrue(false);
}
- if ("axis".equals(protocol)) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
1.7 +62 -23 xml-axis-wsif/java/test/providers/PlugableProvidersTest.java
Index: PlugableProvidersTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/providers/PlugableProvidersTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- PlugableProvidersTest.java 31 Jul 2002 14:51:59 -0000 1.6
+++ PlugableProvidersTest.java 16 Sep 2002 08:18:55 -0000 1.7
@@ -60,19 +60,28 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-import org.apache.wsif.base.WSIFServiceImpl;
import org.apache.wsif.providers.soap.apacheaxis.WSIFDynamicProvider_ApacheAxis;
import org.apache.wsif.providers.soap.apachesoap.WSIFDynamicProvider_ApacheSOAP;
import org.apache.wsif.spi.WSIFProvider;
import org.apache.wsif.util.WSIFPluggableProviders;
+import util.TestUtilities;
/**
* Junit test to test the plugable providers facility for WSIFDynamicProviders
*/
public class PlugableProvidersTest extends TestCase {
+ private static final Class DEFAULT_SOAP_PROVIDER =
+ TestUtilities.DEFAULT_SOAP_PROVIDER_CLASS;
+ private static final Class NON_DEFAULT_SOAP_PROVIDER =
+ TestUtilities.NON_DEFAULT_SOAP_PROVIDER_CLASS;
+
+ private static final String DEFAULT_PROVIDER_NAME =
+ DEFAULT_SOAP_PROVIDER.getName();
+ private static final String NON_DEFAULT_PROVIDER_NAME =
+ NON_DEFAULT_SOAP_PROVIDER.getName();
+
public PlugableProvidersTest(String name) {
super(name);
}
@@ -86,43 +95,57 @@
}
public void testEJBProvider() {
- assertTrue( doit("http://schemas.xmlsoap.org/wsdl/ejb/",
+ reset();
+ assertTrue( "testEJBProvider doit failed!", doit("http://schemas.xmlsoap.org/wsdl/ejb/",
"org.apache.wsif.providers.ejb.WSIFDynamicProvider_EJB") );
}
public void testJavaProvider() {
- assertTrue( doit("http://schemas.xmlsoap.org/wsdl/java/",
+ reset();
+ assertTrue( "testJavaProvider doit failed!", doit("http://schemas.xmlsoap.org/wsdl/java/",
"org.apache.wsif.providers.java.WSIFDynamicProvider_Java") );
}
public void testDefaultSoapProvider() {
- assertTrue( doit("http://schemas.xmlsoap.org/wsdl/soap/",
- "org.apache.wsif.providers.soap.apachesoap.WSIFDynamicProvider_ApacheSOAP") );
+ reset();
+
+ assertTrue(
+ "testDefaultSoapProvider doit failed!",
+ doit(
+ "http://schemas.xmlsoap.org/wsdl/soap/",
+ DEFAULT_PROVIDER_NAME ) );
}
-
public void testSetDefaultSoapProvider() {
- WSIFPluggableProviders.overrideDefaultProvider( "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis()
- );
- assertTrue( doit("http://schemas.xmlsoap.org/wsdl/soap/",
- "org.apache.wsif.providers.soap.apacheaxis.WSIFDynamicProvider_ApacheAxis") );
+ reset();
+ WSIFProvider p = null;
+ try {
+ p = (WSIFProvider)NON_DEFAULT_SOAP_PROVIDER.newInstance();
+ } catch (Exception ex) {
+ assertTrue( "exception instantiating non default provider: " + ex.getMessage(), false );
+ }
+ WSIFPluggableProviders.overrideDefaultProvider(
+ "http://schemas.xmlsoap.org/wsdl/soap/",
+ p );
+ assertTrue(
+ "testSetDefaultSoapProvider",
+ doit(
+ "http://schemas.xmlsoap.org/wsdl/soap/",
+ NON_DEFAULT_PROVIDER_NAME ) );
// set null so uses default next time
WSIFPluggableProviders.overrideDefaultProvider(
"http://schemas.xmlsoap.org/wsdl/soap/", null );
}
-
+
//public void testSoapRMIProvider() {
// assertTrue( doit("http://schemas.xmlsoap.org/wsdl/soap/xxx",
// "org.apache.wsif.providers.soap.soaprmi.WSIFDynamicProvider_SoapRMI") );
//}
public void testPPMethods() {
-
- // reset and clear loaded providers
- WSIFPluggableProviders.setAutoLoadProviders( false );
- WSIFPluggableProviders.setAutoLoadProviders( true );
+
+ reset();
// test isProviderAvailable method
assertTrue( "isProviderAvailable 1",
@@ -152,18 +175,27 @@
!WSIFPluggableProviders.isProviderAvailable(
"http://schemas.xmlsoap.org/wsdl/xxx/") );
- // test changing the default provider
+ // test the default SOAP provider
WSIFProvider p1 = WSIFPluggableProviders.getProvider(
"http://schemas.xmlsoap.org/wsdl/soap/" );
Class c1 = p1.getClass();
+ assertTrue( "defaultprovider 0", DEFAULT_SOAP_PROVIDER.equals( c1 ) );
+ // test changing the default provider
+ WSIFProvider p = null;
+ try {
+ p = (WSIFProvider)NON_DEFAULT_SOAP_PROVIDER.newInstance();
+ } catch (Exception ex) {
+ assertTrue( "exception instantiating non default provider: " + ex.getMessage(), false );
+ }
WSIFPluggableProviders.overrideDefaultProvider(
"http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis() );
+ p );
+
WSIFProvider p2 = WSIFPluggableProviders.getProvider(
"http://schemas.xmlsoap.org/wsdl/soap/" );
Class c2 = p2.getClass();
- assertTrue( "defaultprovider 1", !c1.equals( c2 ) );
+ assertTrue( "defaultprovider 1", NON_DEFAULT_SOAP_PROVIDER.equals( c2 ) );
WSIFPluggableProviders.overrideDefaultProvider(
"http://schemas.xmlsoap.org/wsdl/soap/",
@@ -208,11 +240,12 @@
"http://schemas.xmlsoap.org/wsdl/soap/",
"http://schemas.xmlsoap.org/wsdl/soap/") );
WSIFPluggableProviders.setAutoLoadProviders( true );
- assertTrue( "AutoLoadProviders 1",
+ assertTrue( "AutoLoadProviders 4",
WSIFPluggableProviders.isAutoLoadProviders() );
- assertTrue( doit(
+
+ assertTrue( "AutoLoadProviders 5", doit(
"http://schemas.xmlsoap.org/wsdl/soap/",
- "org.apache.wsif.providers.soap.apachesoap.WSIFDynamicProvider_ApacheSOAP") );
+ DEFAULT_PROVIDER_NAME ) );
}
@@ -222,6 +255,12 @@
return pn.equals( providerClassName );
}
+ private void reset() {
+ // reset and clear loaded providers
+ WSIFPluggableProviders.setAutoLoadProviders( false );
+ WSIFPluggableProviders.setAutoLoadProviders( true );
+ }
+
}
1.2 +1 -5 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MissingInputPartTest.java 7 Aug 2002 12:04:43 -0000 1.1
+++ MissingInputPartTest.java 16 Sep 2002 08:18:55 -0000 1.2
@@ -128,11 +128,7 @@
&& !TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
1.2 +1 -5 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- InputPartsTest.java 7 Aug 2002 12:04:43 -0000 1.1
+++ InputPartsTest.java 16 Sep 2002 08:18:55 -0000 1.2
@@ -132,11 +132,7 @@
if (portName.toUpperCase().indexOf("JMS") != -1 && !TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
System.out.println(
"\n=== " + this.getClass().getName() + " " + portName + " " + protocol );
1.3 +1 -5 xml-axis-wsif/java/test/soap/OutputPartsTest.java
Index: OutputPartsTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/soap/OutputPartsTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OutputPartsTest.java 2 Sep 2002 10:53:50 -0000 1.2
+++ OutputPartsTest.java 16 Sep 2002 08:18:55 -0000 1.3
@@ -213,11 +213,7 @@
return;
}
- if ( protocol.equals("axis") ) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
System.out.println("\n=== StockQuote");
try {
1.4 +3 -15 xml-axis-wsif/java/test/buy/BuyTest.java
Index: BuyTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/buy/BuyTest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BuyTest.java 29 Jul 2002 13:38:07 -0000 1.3
+++ BuyTest.java 16 Sep 2002 08:18:56 -0000 1.4
@@ -60,13 +60,10 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
+
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 util.TestUtilities;
/**
@@ -104,11 +101,7 @@
if (portName.indexOf("JMS") != -1 && !TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
@@ -128,12 +121,7 @@
assertTrue(false);
}
- if (protocol.equals("axis")) // remove apache soap provider
- {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
1.2 +2 -11 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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SOAPENCTest.java 6 Aug 2002 09:56:59 -0000 1.1
+++ SOAPENCTest.java 16 Sep 2002 08:18:56 -0000 1.2
@@ -106,11 +106,7 @@
}
private void doit(String portName, String protocol) {
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
@@ -140,12 +136,7 @@
e.printStackTrace();
assertTrue(false);
} finally {
- if (protocol.equals("axis")) // remove apache soap provider
- {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
}
1.2 +3 -3 xml-axis-wsif/java/src/META-INF/services/org.apache.wsif.spi.WSIFProvider
Index: org.apache.wsif.spi.WSIFProvider
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/src/META-INF/services/org.apache.wsif.spi.WSIFProvider,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- org.apache.wsif.spi.WSIFProvider 6 Jun 2002 08:28:48 -0000 1.1
+++ org.apache.wsif.spi.WSIFProvider 16 Sep 2002 08:18:56 -0000 1.2
@@ -4,11 +4,11 @@
# Java provider
org.apache.wsif.providers.java.WSIFDynamicProvider_Java
+# SOAP Apache Axis provider
+org.apache.wsif.providers.soap.apacheaxis.WSIFDynamicProvider_ApacheAxis
+
# SOAP Apache SOAP provider
org.apache.wsif.providers.soap.apachesoap.WSIFDynamicProvider_ApacheSOAP
-
-# SOAP Apache Axis provider - not used by default now
-org.apache.wsif.providers.soap.apacheaxis.WSIFDynamicProvider_ApacheAxis
# Native JMS provider
org.apache.wsif.providers.jms.WSIFDynamicProvider_Jms
1.6 +1 -5 xml-axis-wsif/java/test/performance/SpeedTest.java
Index: SpeedTest.java
===================================================================
RCS file: /home/cvs/xml-axis-wsif/java/test/performance/SpeedTest.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SpeedTest.java 29 Jul 2002 13:38:07 -0000 1.5
+++ SpeedTest.java 16 Sep 2002 08:18:56 -0000 1.6
@@ -206,11 +206,7 @@
&& !TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals("axis")) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
WSIFServiceFactory factory = WSIFServiceFactory.newInstance();
1.9 +5 -16 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.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JmsTest.java 29 Jul 2002 13:38:07 -0000 1.8
+++ JmsTest.java 16 Sep 2002 08:18:56 -0000 1.9
@@ -61,23 +61,20 @@
import javax.jms.DeliveryMode;
import javax.xml.namespace.QName;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import junit.textui.TestRunner;
+
import org.apache.wsif.WSIFException;
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 util.AddressUtility;
+import util.TestUtilities;
import addressbook.wsifservice.AddressBook;
import addressbook.wsiftypes.Address;
import addressbook.wsiftypes.Phone;
-import util.AddressUtility;
-import util.TestUtilities;
/**
* Junit test to do various JMS tests
@@ -562,11 +559,7 @@
if (!TestUtilities.areWeTesting("jms"))
return;
- if (protocol.equals(AXIS)) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
boolean ExceptionExpected = (portName.indexOf("bad") != -1);
@@ -607,11 +600,7 @@
e.printStackTrace();
assertTrue(ExceptionExpected && e instanceof WSIFException);
} finally {
- if (protocol.equals(AXIS)) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
}
1.8 +4 -12 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- FaultMsgTest.java 29 Jul 2002 13:38:07 -0000 1.7
+++ FaultMsgTest.java 16 Sep 2002 08:18:56 -0000 1.8
@@ -158,11 +158,7 @@
String portTypeNS = null;
String portTypeName = null;
- if ("axis".equals(protocol)) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- new WSIFDynamicProvider_ApacheAxis());
- }
+ TestUtilities.setProviderForProtocol( protocol );
try {
System.out.println("Reading WSDL document from '" + wsdlLocation + "'");
@@ -202,10 +198,10 @@
assertEquals("fault message name", WSIFConstants.SOAP_FAULT_MSG_NAME, name);
if ("axis".equals(protocol)) {
assertTrue("fault obj type", fobject instanceof org.apache.axis.AxisFault);
- System.out.println( "AxisFault=" + fobject );
+ //System.out.println( "AxisFault=" + fobject );
} else {
assertTrue("fault obj type", fobject instanceof org.apache.soap.Fault);
- System.out.println( "SOAPFault=" + fobject );
+ //System.out.println( "SOAPFault=" + fobject );
}
// now a call where the remote service returns a fault;
@@ -215,11 +211,7 @@
ex.printStackTrace();
assertTrue(false);
} finally {
- if ("axis".equals(protocol)) {
- WSIFPluggableProviders.overrideDefaultProvider(
- "http://schemas.xmlsoap.org/wsdl/soap/",
- null);
- }
+ TestUtilities.resetDefaultProviders();
}
}