cvs commit: xml-axis-wsif/java/src/org/apache/wsif WSIFServiceFactory.java

[nmukhi]

nmukhi      2002/12/19 12:13:22

  Modified:    java/src/org/apache/wsif WSIFServiceFactory.java
  Log:
  Reverting to 1.8 version of abstract service factory until we agree that
  looking for alternative factory implementations is a change that is
  needed
  
  Revision  Changes    Path
  1.10      +2 -24     xml-axis-wsif/java/src/org/apache/wsif/WSIFServiceFactory.java
  
  Index: WSIFServiceFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis-wsif/java/src/org/apache/wsif/WSIFServiceFactory.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- WSIFServiceFactory.java   18 Dec 2002 21:19:16 -0000      1.9
  +++ WSIFServiceFactory.java   19 Dec 2002 20:13:22 -0000      1.10
  @@ -64,7 +64,6 @@
   import org.apache.wsif.base.WSIFServiceFactoryImpl;
   import org.apache.wsif.logging.Trc;
   import org.apache.wsif.util.WSIFUtils;
  -import org.apache.wsif.util.WSIFProperties;
   
   /**
    * Abstract factory class to create instances of WSIFService. Call newInstance
  @@ -74,7 +73,6 @@
    * @author Owen Burroughs
    */
   public abstract class WSIFServiceFactory {
  -    public static String FACTORY_PROPERTY_NAME="wsif.servicefactory";
   
       /** 
        * Creates a new instance of an implementation the abstract
  @@ -83,28 +81,8 @@
       public static WSIFServiceFactory newInstance() {
           Trc.entry(null);
   
  -     String desiredFactory = WSIFProperties.getProperty(FACTORY_PROPERTY_NAME);
  -     WSIFServiceFactory wsf = null;
  -     if (desiredFactory!=null) {
  -         try {
  -             Class factoryClass = 
Class.forName(desiredFactory,true,Thread.currentThread().getContextClassLoader());
  -             wsf = (WSIFServiceFactory) factoryClass.newInstance();
  -         } catch (ClassNotFoundException exception) {
  -             Trc.exception(exception);
  -             // ignore the exception and instantiate default factory
  -             wsf = new WSIFServiceFactoryImpl();
  -         } catch (InstantiationException exception) {
  -             Trc.exception(exception);
  -             // ignore the exception and instantiate default factory
  -             wsf = new WSIFServiceFactoryImpl();
  -         } catch (IllegalAccessException exception) {
  -             Trc.exception(exception);
  -             // ignore the exception and instantiate default factory
  -             wsf = new WSIFServiceFactoryImpl();
  -         } 
  -     } else {
  -         wsf = new WSIFServiceFactoryImpl();
  -     }
  +        WSIFServiceFactoryImpl wsf = new WSIFServiceFactoryImpl();
  +
           // Create the simple types map for use by other WSIF classes
           WSIFUtils.createSimpleTypesMap();