axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rsi...@apache.org
Subject cvs commit: xml-axis/java/src/org/apache/axis/components/net SocketFactoryFactory.java
Date Fri, 23 Aug 2002 22:22:31 GMT
rsitze      2002/08/23 15:22:30

  Modified:    java/src/org/apache/axis/components/image
                        ImageIOFactory.java
               java/lib commons-discovery.jar
               java/src/org/apache/axis/components/logger LogFactory.java
               java/src/org/apache/axis/components/compiler
                        CompilerFactory.java
               java/src/org/apache/axis AxisProperties.java
               java/src/org/apache/axis/configuration
                        EngineConfigurationFactoryFinder.java
               java/src/org/apache/axis/components/net
                        SocketFactoryFactory.java
  Log:
  New and improved discovery.  Functions to be used in AXIS in near future...
  
  Revision  Changes    Path
  1.3       +2 -2      xml-axis/java/src/org/apache/axis/components/image/ImageIOFactory.java
  
  Index: ImageIOFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/image/ImageIOFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ImageIOFactory.java	21 Aug 2002 00:32:18 -0000	1.2
  +++ ImageIOFactory.java	23 Aug 2002 22:22:30 -0000	1.3
  @@ -59,7 +59,7 @@
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
   
  -import org.apache.commons.discovery.base.SPInterface;
  +import org.apache.commons.discovery.tools.SPInterface;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  
  
  
  1.8       +113 -149  xml-axis/java/lib/commons-discovery.jar
  
  	<<Binary file>>
  
  
  1.3       +2 -3      xml-axis/java/src/org/apache/axis/components/logger/LogFactory.java
  
  Index: LogFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/logger/LogFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- LogFactory.java	9 Aug 2002 19:14:36 -0000	1.2
  +++ LogFactory.java	23 Aug 2002 22:22:30 -0000	1.3
  @@ -56,7 +56,7 @@
   package org.apache.axis.components.logger;
   
   import org.apache.axis.AxisProperties;
  -import org.apache.commons.discovery.DiscoverSingleton;
  +import org.apache.commons.discovery.tools.DiscoverSingleton;
   import org.apache.commons.logging.Log;
   
   
  @@ -69,8 +69,7 @@
        */
       private static final org.apache.commons.logging.LogFactory logFactory =
           (org.apache.commons.logging.LogFactory)
  -            DiscoverSingleton.find(AxisProperties.getCommonsGroupContext(),
  -                                   org.apache.commons.logging.LogFactory.class,
  +            DiscoverSingleton.find(org.apache.commons.logging.LogFactory.class,
                                      org.apache.commons.logging.LogFactory.FACTORY_PROPERTIES,
                                      org.apache.commons.logging.LogFactory.FACTORY_DEFAULT);
   
  
  
  
  1.4       +1 -1      xml-axis/java/src/org/apache/axis/components/compiler/CompilerFactory.java
  
  Index: CompilerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/compiler/CompilerFactory.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompilerFactory.java	20 Aug 2002 23:23:27 -0000	1.3
  +++ CompilerFactory.java	23 Aug 2002 22:22:30 -0000	1.4
  @@ -59,7 +59,7 @@
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
   
  -import org.apache.commons.discovery.base.SPInterface;
  +import org.apache.commons.discovery.tools.SPInterface;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
  
  
  
  1.13      +16 -36    xml-axis/java/src/org/apache/axis/AxisProperties.java
  
  Index: AxisProperties.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisProperties.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- AxisProperties.java	21 Aug 2002 00:32:18 -0000	1.12
  +++ AxisProperties.java	23 Aug 2002 22:22:30 -0000	1.13
  @@ -55,27 +55,22 @@
   
   package org.apache.axis;
   
  +import java.security.AccessController;
  +import java.security.PrivilegedAction;
   import java.util.Enumeration;
   import java.util.Map;
   import java.util.Properties;
   
  -import java.lang.reflect.InvocationTargetException;
  -
  -import org.apache.commons.discovery.DiscoverClass;
  -import org.apache.commons.discovery.DiscoveryException;
  -import org.apache.commons.discovery.base.Environment;
  -import org.apache.commons.discovery.base.SPInterface;
  -import org.apache.commons.discovery.base.ImplClass;
  +import org.apache.axis.utils.JavaUtils;
  +import org.apache.commons.discovery.tools.DefaultClassHolder;
  +import org.apache.commons.discovery.tools.DiscoverClass;
   import org.apache.commons.discovery.tools.ManagedProperties;
  -
  -import java.security.AccessController;
  -import java.security.PrivilegedAction;
  +import org.apache.commons.discovery.tools.PropertiesHolder;
  +import org.apache.commons.discovery.tools.SPInterface;
   
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
   
  -import org.apache.axis.utils.JavaUtils;
  -
   
   /**
    * <p>Configuration properties for AXIS.
  @@ -110,40 +105,25 @@
   public class AxisProperties {
       protected static Log log =
           LogFactory.getLog(AxisProperties.class.getName());
  -
  -    public static Environment getDiscoverEnvironment() {
  -        return new Environment(getCommonsGroupContext());
  -    }
       
       public static Object newInstance(Class spiClass, String defaultClass)
       {
  -        return newInstance(new SPInterface(spiClass), defaultClass);
  +        return newInstance(new SPInterface(spiClass), new DefaultClassHolder(defaultClass));
       }
       
       public static Object newInstance(Class spiClass, Class defaultClass)
       {
  -        return newInstance(new SPInterface(spiClass), defaultClass);
  +        return newInstance(new SPInterface(spiClass), new DefaultClassHolder(defaultClass));
       }
  -
  +    
       public static Object newInstance(SPInterface spi, String defaultClass)
       {
  -        return newInstance(spi, spi.createImplClass(defaultClass));
  +        return newInstance(spi, new DefaultClassHolder(defaultClass));
       }
  -
  +    
       public static Object newInstance(SPInterface spi, Class defaultClass)
       {
  -        return newInstance(spi, spi.createImplClass(defaultClass));
  -    }
  -    
  -
  -    private static String commonsGroupContext = null;
  -    
  -    public static void setCommonsGroupContext(String groupContext) {
  -        commonsGroupContext  = groupContext;
  -    }
  -    
  -    public static String getCommonsGroupContext() {
  -        return commonsGroupContext ;
  +        return newInstance(spi, new DefaultClassHolder(defaultClass));
       }
           
       /**
  @@ -251,15 +231,15 @@
        * where we can reasonably rearchitect for security.
        */
       private static final Object newInstance(final SPInterface spi,
  -                                            final ImplClass defaultClass)
  +                                            final DefaultClassHolder defaultClass)
       {
           return AccessController.doPrivileged(
               new PrivilegedAction() {
                   public Object run() {
                       try {
  -                        return DiscoverClass.newInstance(getDiscoverEnvironment(),
  +                        return DiscoverClass.newInstance(null,
                                                            spi,
  -                                                         (String)null,
  +                                                         (PropertiesHolder)null,
                                                            defaultClass);
                       } catch (Exception e) {
                           log.error(JavaUtils.getMessage("exception00"), e);
  
  
  
  1.2       +1 -1      xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java
  
  Index: EngineConfigurationFactoryFinder.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/configuration/EngineConfigurationFactoryFinder.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- EngineConfigurationFactoryFinder.java	23 Aug 2002 15:05:14 -0000	1.1
  +++ EngineConfigurationFactoryFinder.java	23 Aug 2002 22:22:30 -0000	1.2
  @@ -59,7 +59,7 @@
   import org.apache.axis.AxisProperties;
   import org.apache.axis.EngineConfigurationFactory;
   import org.apache.axis.components.logger.LogFactory;
  -import org.apache.commons.discovery.base.SPInterface;
  +import org.apache.commons.discovery.tools.SPInterface;
   import org.apache.commons.logging.Log;
   
   
  
  
  
  1.6       +1 -1      xml-axis/java/src/org/apache/axis/components/net/SocketFactoryFactory.java
  
  Index: SocketFactoryFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/net/SocketFactoryFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- SocketFactoryFactory.java	20 Aug 2002 23:23:28 -0000	1.5
  +++ SocketFactoryFactory.java	23 Aug 2002 22:22:30 -0000	1.6
  @@ -61,7 +61,7 @@
   import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
   
  -import org.apache.commons.discovery.base.SPInterface;
  +import org.apache.commons.discovery.tools.SPInterface;
   
   import java.lang.reflect.Constructor;
   import java.util.Hashtable;
  
  
  

Mime
View raw message