Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: axis-dev@xml.apache.org
Date: 29 Jul 2002 13:38:08 -0000
Message-ID: <20020729133808.39836.qmail@icarus.apache.org>
From: antelder@apache.org
To: xml-axis-wsif-cvs@apache.org
Subject: cvs commit: xml-axis-wsif/java/test/jms JmsTest.java

antelder    2002/07/29 06:38:07

  Modified:    java/test/zipcode ZIPCodeTest.java
               java/test/stockquote StockquoteTest.java
               java/test/inout InoutTest.java
               java/test/faults FaultMsgTest.java
               java/test/async AsyncTests.java
               java/test/soapinterop InteropTestServiceProxy.java
               java/test/performance SpeedTest.java
               java/test/buy BuyTest.java
               java/test/addressbook AddressBookTest.java
               java/test/headers HeadersTest.java
               java/test/jms JmsTest.java
  Log:
  Change testcases to use WSIFPluggableProviders class when overriding the default provider
  
  Revision  Changes    Path
  1.3       +2 -1      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ZIPCodeTest.java	12 Jun 2002 10:27:25 -0000	1.2
  +++ ZIPCodeTest.java	29 Jul 2002 13:38:07 -0000	1.3
  @@ -63,6 +63,7 @@
   import junit.textui.TestRunner;
   
   import org.apache.wsif.base.WSIFServiceImpl;
  +import org.apache.wsif.util.WSIFPluggableProviders;
   
   import util.TestUtilities;
   
  @@ -120,7 +121,7 @@
           System.out.println(response.getShortZipCodeResult());
           assertTrue(response.getShortZipCodeResult().equals(expectedZipCode));
           // reset back to default soap provider
  -        WSIFServiceImpl.setDynamicWSIFProvider(
  +        WSIFPluggableProviders.overrideDefaultProvider(
               "http://schemas.xmlsoap.org/wsdl/soap/",
               null);
   
  
  
  
  1.6       +4 -2      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- StockquoteTest.java	10 Jul 2002 13:26:50 -0000	1.5
  +++ StockquoteTest.java	29 Jul 2002 13:38:07 -0000	1.6
  @@ -65,6 +65,8 @@
   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 stockquote.wsifservice.StockquotePT;
   import util.TestUtilities;
   
  @@ -120,7 +122,7 @@
               return;
   
           if (protocol.equals("axis")) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  @@ -147,7 +149,7 @@
           } finally {
               if (protocol.equals("axis")) // remove apache soap provider
                   {
  -                WSIFServiceImpl.setDynamicWSIFProvider(
  +                WSIFPluggableProviders.overrideDefaultProvider(
                       "http://schemas.xmlsoap.org/wsdl/soap/",
                       null);
               }
  
  
  
  1.8       +5 -3      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- InoutTest.java	10 Jul 2002 13:26:50 -0000	1.7
  +++ InoutTest.java	29 Jul 2002 13:38:07 -0000	1.8
  @@ -72,6 +72,8 @@
   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.util.WSIFPluggableProviders;
  +
   import addressbook.wsiftypes.Address;
   import addressbook.wsiftypes.Phone;
   import inout.wsifservice.Inout;
  @@ -278,14 +280,14 @@
               if (style.equals(DOC))
                   provider.setPartSerializerName("services.inout.InoutLiteralSerializer");
   
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   provider);
           }
           if (protocol.equals(AXIS)) {
               WSIFDynamicProvider_ApacheAxis provider = new WSIFDynamicProvider_ApacheAxis();
   
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   provider);
           }
  @@ -330,7 +332,7 @@
               assertTrue(false);
           } finally {
               if (protocol.equals(SOAP) || protocol.equals(AXIS)) {
  -                WSIFServiceImpl.setDynamicWSIFProvider(
  +                WSIFPluggableProviders.overrideDefaultProvider(
                       "http://schemas.xmlsoap.org/wsdl/soap/",
                       null);
               }
  
  
  
  1.7       +3 -2      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- FaultMsgTest.java	10 Jul 2002 13:39:09 -0000	1.6
  +++ FaultMsgTest.java	29 Jul 2002 13:38:07 -0000	1.7
  @@ -74,6 +74,7 @@
   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;
  @@ -158,7 +159,7 @@
           String portTypeName = null;
   
           if ("axis".equals(protocol)) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  @@ -215,7 +216,7 @@
               assertTrue(false);
           } finally {
               if ("axis".equals(protocol)) {
  -                WSIFServiceImpl.setDynamicWSIFProvider(
  +                WSIFPluggableProviders.overrideDefaultProvider(
                       "http://schemas.xmlsoap.org/wsdl/soap/",
                       null);
               }
  
  
  
  1.8       +5 -5      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- AsyncTests.java	10 Jul 2002 13:26:49 -0000	1.7
  +++ AsyncTests.java	29 Jul 2002 13:38:07 -0000	1.8
  @@ -78,13 +78,13 @@
   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.WSIFCorrelationServiceLocator;
  +import org.apache.wsif.util.WSIFPluggableProviders;
   import org.apache.wsif.util.WSIFProperties;
  -import org.apache.wsif.util.jms.WSIFJMSFinderForJndi;
   import org.apache.wsif.util.jms.WSIFJMSFinder;
  +import org.apache.wsif.util.jms.WSIFJMSFinderForJndi;
   import util.TestUtilities;
   
   import addressbook.wsiftypes.Address;
  @@ -160,7 +160,7 @@
       }
   
       if ( protocol.equals("axis") ) {
  -       WSIFServiceImpl.setDynamicWSIFProvider(
  +       WSIFPluggableProviders.overrideDefaultProvider(
             "http://schemas.xmlsoap.org/wsdl/soap/", 
             new WSIFDynamicProvider_ApacheAxis());
       }
  @@ -249,7 +249,7 @@
       }
   
       if ( protocol.equals("axis") ) {
  -       WSIFServiceImpl.setDynamicWSIFProvider(
  +       WSIFPluggableProviders.overrideDefaultProvider(
             "http://schemas.xmlsoap.org/wsdl/soap/", 
             new WSIFDynamicProvider_ApacheAxis());
       }
  @@ -308,7 +308,7 @@
       }
   
       if ( protocol.equals("axis") ) {
  -       WSIFServiceImpl.setDynamicWSIFProvider(
  +        WSIFPluggableProviders.overrideDefaultProvider(
             "http://schemas.xmlsoap.org/wsdl/soap/", 
             new WSIFDynamicProvider_ApacheAxis());
       }
  
  
  
  1.4       +4 -2      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- InteropTestServiceProxy.java	24 Jun 2002 13:11:20 -0000	1.3
  +++ InteropTestServiceProxy.java	29 Jul 2002 13:38:07 -0000	1.4
  @@ -70,6 +70,8 @@
   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;
   
   /**
  @@ -515,7 +517,7 @@
   
           this.factory = WSIFServiceFactory.newInstance();
   
  -        WSIFServiceImpl.setDynamicWSIFProvider(
  +        WSIFPluggableProviders.overrideDefaultProvider(
               "http://schemas.xmlsoap.org/wsdl/soap/",
               new WSIFDynamicProvider_ApacheSOAP());
   
  @@ -544,7 +546,7 @@
               new QName("http://soapinterop.org/xsd", "ArrayOffloat"),
               float[].class);
   
  -        WSIFServiceImpl.setDynamicWSIFProvider(
  +        WSIFPluggableProviders.overrideDefaultProvider(
               "http://schemas.xmlsoap.org/wsdl/soap/",
               null);
   
  
  
  
  1.5       +3 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- SpeedTest.java	16 Jul 2002 15:41:14 -0000	1.4
  +++ SpeedTest.java	29 Jul 2002 13:38:07 -0000	1.5
  @@ -75,6 +75,8 @@
   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;
   
   import addressbook.wsiftypes.Address;
  @@ -205,7 +207,7 @@
               return;
   
           if (protocol.equals("axis")) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  
  
  
  1.3       +4 -2      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BuyTest.java	12 Jun 2002 10:27:23 -0000	1.2
  +++ BuyTest.java	29 Jul 2002 13:38:07 -0000	1.3
  @@ -65,6 +65,8 @@
   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;
   
   /**
  @@ -103,7 +105,7 @@
               return;
   
           if (protocol.equals("axis")) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  @@ -128,7 +130,7 @@
   
           if (protocol.equals("axis")) // remove apache soap provider
               {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   null);
           }
  
  
  
  1.13      +11 -10    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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AddressBookTest.java	22 Jul 2002 12:11:43 -0000	1.12
  +++ AddressBookTest.java	29 Jul 2002 13:38:07 -0000	1.13
  @@ -60,23 +60,24 @@
   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.WSIFCorrelationId;
   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.WSIFConstants;
  -import org.apache.wsif.WSIFCorrelationId;
  -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 util.AddressUtility;
  +import util.TestUtilities;
  +
   import addressbook.wsifservice.AddressBook;
   import addressbook.wsiftypes.Address;
   import addressbook.wsiftypes.Phone;
   import async.AsyncResponseHandler;
  -import util.AddressUtility;
  -import util.TestUtilities;
   
   /**
    * Junit test to test out the AddressBook sample.
  @@ -169,7 +170,7 @@
               return;
   
           if (protocol.equals("axis")) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  @@ -203,7 +204,7 @@
               assertTrue(false);
           } finally {
               if (protocol.equals("axis")) {
  -                WSIFServiceImpl.setDynamicWSIFProvider(
  +               WSIFPluggableProviders.overrideDefaultProvider(
                       "http://schemas.xmlsoap.org/wsdl/soap/",
                       null);
               }
  @@ -215,7 +216,7 @@
               return;
   
           if (protocol.equals("axis")) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  @@ -319,7 +320,7 @@
               assertTrue(false);
           } finally {
               if (protocol.equals("axis")) {
  -                WSIFServiceImpl.setDynamicWSIFProvider(
  +               WSIFPluggableProviders.overrideDefaultProvider(
                       "http://schemas.xmlsoap.org/wsdl/soap/",
                       null);
               }
  
  
  
  1.7       +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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- HeadersTest.java	9 Jul 2002 12:11:43 -0000	1.6
  +++ HeadersTest.java	29 Jul 2002 13:38:07 -0000	1.7
  @@ -73,6 +73,7 @@
   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,7 +158,7 @@
           String portTypeName = null;
   
           if ("axis".equals(protocol)) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  @@ -214,7 +215,7 @@
           }
   
           if ("axis".equals(protocol)) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   null);
           }
  
  
  
  1.8       +4 -2      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JmsTest.java	25 Jun 2002 08:35:07 -0000	1.7
  +++ JmsTest.java	29 Jul 2002 13:38:07 -0000	1.8
  @@ -71,6 +71,8 @@
   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 addressbook.wsifservice.AddressBook;
   import addressbook.wsiftypes.Address;
   import addressbook.wsiftypes.Phone;
  @@ -561,7 +563,7 @@
               return;
   
           if (protocol.equals(AXIS)) {
  -            WSIFServiceImpl.setDynamicWSIFProvider(
  +            WSIFPluggableProviders.overrideDefaultProvider(
                   "http://schemas.xmlsoap.org/wsdl/soap/",
                   new WSIFDynamicProvider_ApacheAxis());
           }
  @@ -606,7 +608,7 @@
               assertTrue(ExceptionExpected && e instanceof WSIFException);
           } finally {
               if (protocol.equals(AXIS)) {
  -                WSIFServiceImpl.setDynamicWSIFProvider(
  +                WSIFPluggableProviders.overrideDefaultProvider(
                       "http://schemas.xmlsoap.org/wsdl/soap/",
                       null);
               }