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/configuration DefaultEngineConfigurationFactory.java
Date Fri, 02 Aug 2002 17:27:43 GMT
rsitze      2002/08/02 10:27:43

  Modified:    java/src/org/apache/axis/utils XMLUtils.java JavaUtils.java
                        DOM2Writer.java DefaultAuthenticator.java
                        CLUtil.java
               java/src/org/apache/axis/server
                        DefaultAxisServerFactory.java AxisServer.java
               java/src/org/apache/axis/components/compiler
                        CompilerFactory.java
               java/src/org/apache/axis AxisEngine.java MessageContext.java
                        AxisProperties.java AxisFault.java
               java/src/org/apache/axis/wsdl/toJava JavaTestCaseWriter.java
                        JavaServiceIfaceWriter.java
                        JavaServiceImplWriter.java
               java/src/org/apache/axis/client Call.java
               java/src/org/apache/axis/transport/http
                        CommonsHTTPSender.java AxisServlet.java
               java/src/org/apache/axis/components/net
                        DefaultSocketFactory.java SocketFactoryFactory.java
                        JSSESocketFactory.java
               java/src/org/apache/axis/components/bytecode
                        ExtractorFactory.java
               java/src/org/apache/axis/handlers JWSProcessor.java
                        BasicHandler.java
               java/src/org/apache/axis/deployment/wsdd
                        WSDDDeployableItem.java
               java/src/org/apache/axis/attachments MimeUtils.java
               java/src/org/apache/axis/configuration
                        DefaultEngineConfigurationFactory.java
  Log:
  Sweep through and ensure that all get/set Property calls are via AxisProperties and not
System.
  
  Revision  Changes    Path
  1.60      +2 -1      xml-axis/java/src/org/apache/axis/utils/XMLUtils.java
  
  Index: XMLUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/XMLUtils.java,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- XMLUtils.java	9 Jul 2002 19:45:24 -0000	1.59
  +++ XMLUtils.java	2 Aug 2002 17:27:40 -0000	1.60
  @@ -161,9 +161,10 @@
   
       /** Initialize the SAX parser factory.
        *
  -     * @param factoryClassName The class name of the desired SAXParserFactory
  +     * @param factoryClassName The (optional) class name of the desired SAXParserFactory
        *                         implementation.  Will be assigned to the system
        *                         property <b>javax.xml.parsers.SAXParserFactory</b>.
  +     *                         If <code>null</code>, leaves current setting
alone.
        * @param namespaceAware true if we want a namespace-aware parser (which we do)
        * @param validating true if we want a validating parser
        *
  
  
  
  1.63      +0 -2      xml-axis/java/src/org/apache/axis/utils/JavaUtils.java
  
  Index: JavaUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/JavaUtils.java,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- JavaUtils.java	2 Aug 2002 12:55:33 -0000	1.62
  +++ JavaUtils.java	2 Aug 2002 17:27:40 -0000	1.63
  @@ -94,8 +94,6 @@
    */
   public class JavaUtils
   {
  -    public static final String LS = System.getProperty("line.separator");
  -
       protected static Log log =
           LogFactory.getLog(JavaUtils.class.getName());
       
  
  
  
  1.10      +12 -19    xml-axis/java/src/org/apache/axis/utils/DOM2Writer.java
  
  Index: DOM2Writer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/DOM2Writer.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DOM2Writer.java	18 Jun 2002 18:01:25 -0000	1.9
  +++ DOM2Writer.java	2 Aug 2002 17:27:40 -0000	1.10
  @@ -67,6 +67,8 @@
   import java.io.StringWriter;
   import java.io.Writer;
   
  +import org.apache.axis.AxisProperties;
  +
   /**
    * This class is a utility to serialize a DOM node as XML. This class
    * uses the <code>DOM Level 2</code> APIs.
  @@ -84,15 +86,6 @@
       private static String NS_URI_XMLNS = "http://www.w3.org/2000/xmlns/";
       private static String NS_URI_XML = "http://www.w3.org/XML/1998/namespace";
   
  -    private static final char NL = '\n';
  -    private static final char CR = '\r';
  -    
  -    /**
  -     * The prefered line separator
  -     */
  -    private static final String LS = System.getProperty("line.separator",
  -                                                        (new Character(NL)).toString());
  -
       /**
        * Return a string containing this node serialized as XML.
        */
  @@ -249,7 +242,7 @@
                       {
                           out.print('>');
                           if (pretty)
  -                            out.print(LS);
  +                            out.print(AxisProperties.LS);
                       }
   
                       for (int i = 0; i < numChildren; i++)
  @@ -267,7 +260,7 @@
                   {
                       out.print("/>");
                       if (pretty)
  -                        out.print(LS);
  +                        out.print(AxisProperties.LS);
                   }
                   break;
               }
  @@ -300,7 +293,7 @@
                   out.print(node.getNodeValue());
                   out.print("-->");
                   if (pretty)
  -                    out.print(LS);
  +                    out.print(AxisProperties.LS);
                   break;
               }
   
  @@ -319,7 +312,7 @@
   
                   out.println("?>");
                   if (pretty)
  -                    out.print(LS);
  +                    out.print(AxisProperties.LS);
                   break;
               }
           }
  @@ -334,7 +327,7 @@
               out.print(node.getNodeName());
               out.print('>');
               if (pretty)
  -                out.print(LS);
  +                out.print(AxisProperties.LS);
               hasChildren = false;
           }
       }
  @@ -415,24 +408,24 @@
                       str.append("&quot;");
                       break;
                   }
  -            case NL :
  +            case AxisProperties.NL :
                   {
                       if (i > 0)
                       {
                           char lastChar = str.charAt(str.length() - 1);
   
  -                        if (lastChar != CR)
  +                        if (lastChar != AxisProperties.CR)
                           {
  -                            str.append(LS);
  +                            str.append(AxisProperties.LS);
                           }
                           else
                           {
  -                            str.append(NL);
  +                            str.append(AxisProperties.NL);
                           }
                       }
                       else
                       {
  -                        str.append(LS);
  +                        str.append(AxisProperties.LS);
                       }
                       break;
                   }
  
  
  
  1.2       +5 -2      xml-axis/java/src/org/apache/axis/utils/DefaultAuthenticator.java
  
  Index: DefaultAuthenticator.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/DefaultAuthenticator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultAuthenticator.java	3 Jun 2002 17:57:01 -0000	1.1
  +++ DefaultAuthenticator.java	2 Aug 2002 17:27:40 -0000	1.2
  @@ -54,6 +54,9 @@
   
   package org.apache.axis.utils;
   
  +import org.apache.axis.AxisProperties;
  +
  +
   /**
    * This class is used by WSDL2javaAntTask and WSDL2.
    * Supports the http.proxyUser and http.proxyPassword properties.
  @@ -70,10 +73,10 @@
       protected java.net.PasswordAuthentication getPasswordAuthentication() {
           // if user and password weren't provided, check the system properties
           if (user == null) {
  -            user = System.getProperty("http.proxyUser", "");
  +            user = AxisProperties.getProperty("http.proxyUser", "");
           }
           if (password == null) {
  -            password = System.getProperty("http.proxyPassword", "");
  +            password = AxisProperties.getProperty("http.proxyPassword", "");
           }
           return new java.net.PasswordAuthentication(user, password.toCharArray());
       }
  
  
  
  1.3       +5 -5      xml-axis/java/src/org/apache/axis/utils/CLUtil.java
  
  Index: CLUtil.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/utils/CLUtil.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CLUtil.java	4 Jun 2002 22:07:59 -0000	1.2
  +++ CLUtil.java	2 Aug 2002 17:27:41 -0000	1.3
  @@ -9,6 +9,8 @@
   // version 4.1 (Jan 30, 2002).  Only the package name has been changed.
   package org.apache.axis.utils;
   
  +import org.apache.axis.AxisProperties;
  +
   /**
    * CLUtil offers basic utility operations for use both internal and external to package.
    *
  @@ -18,8 +20,6 @@
   public final class CLUtil
   {
       private final static int        MAX_DESCRIPTION_COLUMN_LENGTH = 60;
  -    
  -    private static final String     LS = System.getProperty( "line.separator" );
   
       /**
        * Format options into StringBuffer and return. This is typically used to
  @@ -74,7 +74,7 @@
                   {
                       sb.append("=<value>");
                   }
  -                sb.append( LS );
  +                sb.append( AxisProperties.LS );
               }
   
               if( null != description )
  @@ -87,12 +87,12 @@
                           description.substring( MAX_DESCRIPTION_COLUMN_LENGTH );
                       sb.append( "\t\t" );
                       sb.append( descriptionPart );
  -                    sb.append( LS );
  +                    sb.append( AxisProperties.LS );
                   }
   
                   sb.append( "\t\t" );
                   sb.append( description );
  -                sb.append( LS );
  +                sb.append( AxisProperties.LS );
               }
           }
           return sb;
  
  
  
  1.14      +3 -3      xml-axis/java/src/org/apache/axis/server/DefaultAxisServerFactory.java
  
  Index: DefaultAxisServerFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/DefaultAxisServerFactory.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- DefaultAxisServerFactory.java	3 Jul 2002 17:50:35 -0000	1.13
  +++ DefaultAxisServerFactory.java	2 Aug 2002 17:27:41 -0000	1.14
  @@ -87,7 +87,7 @@
        * a) EngineConfiguration instance, keyed to
        *    EngineConfiguration.PROPERTY_NAME in 'environment', or
        * b) EngineConfiguration class name, keyed to
  -     *    AxisEngine.PROP_CONFIG_CLASS in System Properties.
  +     *    AxisEngine.PROP_CONFIG_CLASS in AxisProperties.
        *    Class is instantiated if found.
        * <p>
        * If an EngineConfiguration cannot be located, the default
  @@ -156,7 +156,7 @@
        * a) EngineConfiguration instance, keyed to
        *    EngineConfiguration.PROPERTY_NAME in 'environment', or
        * b) EngineConfiguration class name, keyed to
  -     *    AxisEngine.PROP_CONFIG_CLASS in System Properties.
  +     *    AxisEngine.PROP_CONFIG_CLASS in AxisProperties.
        *    Class is instantiated if found.
        */
       private static EngineConfiguration getEngineConfiguration(Map environment)
  @@ -177,7 +177,7 @@
           if (config == null) {
               // A default engine configuration class may be set in a system
               // property. If so, try creating an engine configuration.
  -            String configClass = AxisProperties.getGlobalProperty(AxisEngine.PROP_CONFIG_CLASS);
  +            String configClass = AxisProperties.getProperty(AxisEngine.PROP_CONFIG_CLASS);
               if (configClass != null) {
                   try {
                       // Got one - so try to make it (which means it had better have
  
  
  
  1.76      +1 -1      xml-axis/java/src/org/apache/axis/server/AxisServer.java
  
  Index: AxisServer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/server/AxisServer.java,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- AxisServer.java	11 Jul 2002 12:46:35 -0000	1.75
  +++ AxisServer.java	2 Aug 2002 17:27:41 -0000	1.76
  @@ -89,7 +89,7 @@
       public static AxisServer getServer(Map environment) throws AxisFault
       {
           if (factory == null) {
  -            String factoryClassName = getGlobalProperty("axis.ServerFactory");
  +            String factoryClassName = getProperty("axis.ServerFactory");
               if (factoryClassName != null) {
                   try {
                       Class factoryClass = ClassUtils.forName(factoryClassName);
  
  
  
  1.2       +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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CompilerFactory.java	3 Jul 2002 17:50:27 -0000	1.1
  +++ CompilerFactory.java	2 Aug 2002 17:27:41 -0000	1.2
  @@ -76,7 +76,7 @@
   
           public static Compiler getCompiler()
           {
  -            String compilerClassName = System.getProperty("axis.Compiler");
  +            String compilerClassName = AxisProperties.getProperty("axis.Compiler");
               log.debug("axis.Compiler:" + compilerClassName);
               if (compilerClassName != null) {
                   try {
  
  
  
  1.91      +1 -1      xml-axis/java/src/org/apache/axis/AxisEngine.java
  
  Index: AxisEngine.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisEngine.java,v
  retrieving revision 1.90
  retrieving revision 1.91
  diff -u -r1.90 -r1.91
  --- AxisEngine.java	15 Jul 2002 20:45:29 -0000	1.90
  +++ AxisEngine.java	2 Aug 2002 17:27:41 -0000	1.91
  @@ -186,7 +186,7 @@
   
           /*Set the default attachment implementation */
           setOptionDefault(PROP_ATTACHMENT_IMPLEMENTATION,
  -                         getGlobalProperty("axis." + PROP_ATTACHMENT_IMPLEMENTATION  ));
  +                         getProperty("axis." + PROP_ATTACHMENT_IMPLEMENTATION  ));
   
           setOptionDefault(PROP_ATTACHMENT_IMPLEMENTATION, DEFAULT_ATTACHMENT_IMPL);
   
  
  
  
  1.112     +1 -1      xml-axis/java/src/org/apache/axis/MessageContext.java
  
  Index: MessageContext.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/MessageContext.java,v
  retrieving revision 1.111
  retrieving revision 1.112
  diff -u -r1.111 -r1.112
  --- MessageContext.java	10 Jul 2002 03:36:59 -0000	1.111
  +++ MessageContext.java	2 Aug 2002 17:27:41 -0000	1.112
  @@ -265,7 +265,7 @@
       protected static String systemTempDir= null;
       static {
           try {
  -            systemTempDir=AxisProperties.getGlobalProperty(AxisEngine.ENV_ATTACHMENT_DIR);
  +            systemTempDir=AxisProperties.getProperty(AxisEngine.ENV_ATTACHMENT_DIR);
           } catch(Throwable t) {
               systemTempDir= null;
           }
  
  
  
  1.2       +29 -2     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.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AxisProperties.java	3 Jul 2002 17:50:30 -0000	1.1
  +++ AxisProperties.java	2 Aug 2002 17:27:41 -0000	1.2
  @@ -55,16 +55,43 @@
   
   package org.apache.axis;
   
  +import java.util.Properties;
  +
   
   /**
    * @author Richard A. Sitze
    */
   public class AxisProperties {
  +    public static final char NL = '\n';
  +    public static final char CR = '\r';
  +    
  +    /**
  +     * The prefered line separator
  +     */
  +    public static final String LS = System.getProperty("line.separator",
  +                                                        (new Character(NL)).toString());
  +
       /**
  -     * Central access point for AXIS to obtain "global" configuration properties.
  +     * Central access point for AXIS to obtain configuration properties.
        * To be extended in the future... or replaced with non-global properties.
        */
  -    public static String getGlobalProperty(String property) {
  +    public static String getProperty(String property) {
           return System.getProperty(property);
  +    }
  +    
  +    public static String getProperty(String property, String dephault) {
  +        return System.getProperty(property, dephault);
  +    }
  +
  +    /**
  +     * Central access point for AXIS to set configuration properties.
  +     * To be extended in the future... or replaced with non-global properties.
  +     */
  +    public static Object setProperty(String property, String value) {
  +        return System.setProperty(property, value);
  +    }
  +    
  +    public static Properties getProperties() {
  +        return System.getProperties();
       }
   }
  
  
  
  1.56      +8 -8      xml-axis/java/src/org/apache/axis/AxisFault.java
  
  Index: AxisFault.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/AxisFault.java,v
  retrieving revision 1.55
  retrieving revision 1.56
  diff -u -r1.55 -r1.56
  --- AxisFault.java	3 Jul 2002 17:50:30 -0000	1.55
  +++ AxisFault.java	2 Aug 2002 17:27:41 -0000	1.56
  @@ -87,8 +87,6 @@
       protected static Log log =
           LogFactory.getLog(AxisFault.class.getName());
   
  -    private static final String LS = System.getProperty("line.separator");
  -
       protected QName     faultCode ;
       protected String    faultString = "";
       protected String    faultActor ;
  @@ -227,15 +225,17 @@
           if (faultDetails != null) {
               for (int i=0; i < faultDetails.size(); i++) {
                   Element e = (Element) faultDetails.get(i);
  -                details += LS + "\t" +  e.getLocalName() + ": " + XMLUtils.getInnerXMLString(e);
  +                details += AxisProperties.LS
  +                          + "\t" +  e.getLocalName() + ": "
  +                          + XMLUtils.getInnerXMLString(e);
               }
           }
           
  -        return "AxisFault" + LS
  -            + " faultCode: " + faultCode + LS
  -            + " faultString: " + faultString + LS
  -            + " faultActor: " + faultActor + LS
  -            + " faultDetail: " + details + LS
  +        return "AxisFault" + AxisProperties.LS
  +            + " faultCode: " + faultCode + AxisProperties.LS
  +            + " faultString: " + faultString + AxisProperties.LS
  +            + " faultActor: " + faultActor + AxisProperties.LS
  +            + " faultDetail: " + details + AxisProperties.LS
               ;
       }
   
  
  
  
  1.35      +2 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java
  
  Index: JavaTestCaseWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaTestCaseWriter.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- JavaTestCaseWriter.java	2 Aug 2002 16:41:41 -0000	1.34
  +++ JavaTestCaseWriter.java	2 Aug 2002 17:27:41 -0000	1.35
  @@ -341,8 +341,8 @@
           pw.print("            binding = new " + sEntry.getName());
           pw.println("Locator" + "().get" + portName + "();");
           pw.println("        }");
  -        pw.println("        catch (javax.xml.rpc.ServiceException jre) {");
  -        pw.println("            throw new junit.framework.AssertionFailedError(\"JAX-RPC
ServiceException caught: \" + jre);");
  +        pw.println("        catch (javax.xml.rpc.DiscoveryException jre) {");
  +        pw.println("            throw new junit.framework.AssertionFailedError(\"JAX-RPCDiscoveryExceptionn
caught: \" + jre);");
           pw.println("        }");
   
           pw.println("        assertTrue(\"" +
  
  
  
  1.8       +2 -2      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java
  
  Index: JavaServiceIfaceWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceIfaceWriter.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- JavaServiceIfaceWriter.java	22 Jul 2002 19:15:58 -0000	1.7
  +++ JavaServiceIfaceWriter.java	2 Aug 2002 17:27:41 -0000	1.8
  @@ -166,10 +166,10 @@
               pw.println("    public String get" + portName + "Address();");
               pw.println();
               pw.println("    public " + bindingType + " get" + portName
  -                    + "() throws javax.xml.rpc.ServiceException;");
  +                    + "() throws javax.xml.rpc.DiscoveryException;");
               pw.println();
               pw.println("    public " + bindingType + " get" + portName
  -                    + "(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;");
  +                    + "(java.net.URL portAddress) throws javax.xml.rpc.DiscoveryException;");
           }
       } // writeFileBody
   
  
  
  
  1.17      +6 -6      xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java
  
  Index: JavaServiceImplWriter.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/wsdl/toJava/JavaServiceImplWriter.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- JavaServiceImplWriter.java	22 Jul 2002 19:15:58 -0000	1.16
  +++ JavaServiceImplWriter.java	2 Aug 2002 17:27:41 -0000	1.17
  @@ -211,7 +211,7 @@
               pw.println("    }" );
               pw.println("" );
   
  -            pw.println("    public " + bindingType + " get" + portName + "() throws javax.xml.rpc.ServiceException
{");
  +            pw.println("    public " + bindingType + " get" + portName + "() throws javax.xml.rpc.DiscoveryException
{");
               pw.println("       java.net.URL endpoint;");
               pw.println("        try {");
               pw.println("            endpoint = new java.net.URL(" + portName + "_address);");
  @@ -223,7 +223,7 @@
               pw.println("        return get" + portName + "(endpoint);");
               pw.println("    }");
               pw.println();
  -            pw.println("    public " + bindingType + " get" + portName + "(java.net.URL
portAddress) throws javax.xml.rpc.ServiceException {");
  +            pw.println("    public " + bindingType + " get" + portName + "(java.net.URL
portAddress) throws javax.xml.rpc.DiscoveryException {");
               pw.println("        try {");
               pw.println("            return new " + stubClass + "(portAddress, this);");
               pw.println("        }");
  @@ -244,9 +244,9 @@
               pw.println("     * " + JavaUtils.getMessage("getPortDoc04"));
           }
           pw.println("     */");
  -        pw.println("    public java.rmi.Remote getPort(Class serviceEndpointInterface)
throws javax.xml.rpc.ServiceException {");
  +        pw.println("    public java.rmi.Remote getPort(Class serviceEndpointInterface)
throws javax.xml.rpc.DiscoveryException {");
           if (getPortIfaces.size() == 0) {
  -            pw.println("        throw new javax.xml.rpc.ServiceException(\""
  +            pw.println("        throw new javax.xml.rpc.DiscoveryException(\""
                       + JavaUtils.getMessage("noStub") + "  \" + (serviceEndpointInterface
== null ? \"null\" : serviceEndpointInterface.getName()));");
           }
           else {
  @@ -261,9 +261,9 @@
               }
               pw.println("        }");
               pw.println("        catch (Throwable t) {");
  -            pw.println("            throw new javax.xml.rpc.ServiceException(t);");
  +            pw.println("            throw new javax.xml.rpc.DiscoveryException(t);");
               pw.println("        }");
  -            pw.println("        throw new javax.xml.rpc.ServiceException(\""
  +            pw.println("        throw new javax.xml.rpc.DiscoveryException(\""
                       + JavaUtils.getMessage("noStub") + "  \" + (serviceEndpointInterface
== null ? \"null\" : serviceEndpointInterface.getName()));");
           }
           pw.println("    }");
  
  
  
  1.165     +2 -2      xml-axis/java/src/org/apache/axis/client/Call.java
  
  Index: Call.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/client/Call.java,v
  retrieving revision 1.164
  retrieving revision 1.165
  diff -u -r1.164 -r1.165
  --- Call.java	31 Jul 2002 19:04:50 -0000	1.164
  +++ Call.java	2 Aug 2002 17:27:41 -0000	1.165
  @@ -1444,7 +1444,7 @@
       public static synchronized void addTransportPackage(String packageName) {
           if (transportPackages == null) {
               transportPackages = new ArrayList();
  -            String currentPackages = AxisProperties.getGlobalProperty(TRANSPORT_PROPERTY);
  +            String currentPackages = AxisProperties.getProperty(TRANSPORT_PROPERTY);
               if (currentPackages != null) {
                   StringTokenizer tok = new StringTokenizer(currentPackages,
                                                             "|");
  @@ -1466,7 +1466,7 @@
               currentPackages.append('|');
           }
   
  -        System.setProperty(TRANSPORT_PROPERTY, currentPackages.toString());
  +        AxisProperties.setProperty(TRANSPORT_PROPERTY, currentPackages.toString());
       }
   
       /**
  
  
  
  1.2       +15 -15    xml-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java
  
  Index: CommonsHTTPSender.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/CommonsHTTPSender.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CommonsHTTPSender.java	17 Jul 2002 20:28:07 -0000	1.1
  +++ CommonsHTTPSender.java	2 Aug 2002 17:27:42 -0000	1.2
  @@ -239,19 +239,19 @@
           }
   
           // Get https.proxyXXX settings
  -        String tunnelHost = getGlobalProperty("https.proxyHost");
  -        String tunnelPortStr = getGlobalProperty("https.proxyPort");
  -        String nonProxyHosts = getGlobalProperty("https.nonProxyHosts");
  +        String tunnelHost = getProperty("https.proxyHost");
  +        String tunnelPortStr = getProperty("https.proxyPort");
  +        String nonProxyHosts = getProperty("https.nonProxyHosts");
   
           // Use http.proxyXXX settings if https.proxyXXX is not set
           if (tunnelHost == null) {
  -            tunnelHost = getGlobalProperty("http.proxyHost");
  +            tunnelHost = getProperty("http.proxyHost");
           }
           if (tunnelPortStr == null) {
  -            tunnelPortStr = getGlobalProperty("http.proxyPort");
  +            tunnelPortStr = getProperty("http.proxyPort");
           }
           if (nonProxyHosts == null) {
  -            nonProxyHosts = getGlobalProperty("http.nonProxyHosts");
  +            nonProxyHosts = getProperty("http.nonProxyHosts");
           }
           boolean hostInNonProxyList =
                   isHostInNonProxyList(host, nonProxyHosts);
  @@ -267,14 +267,14 @@
                       ? 80
                       : Integer.parseInt(tunnelPortStr))
                       : 80);
  -            String tunnelUser = getGlobalProperty("https.proxyUser");
  -            String tunnelPassword = getGlobalProperty("https.proxyPassword");
  +            String tunnelUser = getProperty("https.proxyUser");
  +            String tunnelPassword = getProperty("https.proxyPassword");
   
               if (tunnelUser == null) {
  -                tunnelUser = getGlobalProperty("http.proxyUser");
  +                tunnelUser = getProperty("http.proxyUser");
               }
               if (tunnelPassword == null) {
  -                tunnelPassword = getGlobalProperty("http.proxyPassword");
  +                tunnelPassword = getProperty("http.proxyPassword");
               }
               if (tunnelUser != null) {
                   Credentials proxyCred =
  @@ -300,13 +300,13 @@
       private HttpConnection getConnection(HttpState state, String host, int port)
               throws Exception {
   
  -        String proxyHost = getGlobalProperty("http.proxyHost");
  -        String proxyPort = getGlobalProperty("http.proxyPort");
  -        String nonProxyHosts = getGlobalProperty("http.nonProxyHosts");
  +        String proxyHost = getProperty("http.proxyHost");
  +        String proxyPort = getProperty("http.proxyPort");
  +        String nonProxyHosts = getProperty("http.nonProxyHosts");
           boolean hostInNonProxyList =
                   isHostInNonProxyList(host, nonProxyHosts);
  -        String proxyUsername = getGlobalProperty("http.proxyUser");
  -        String proxyPassword = getGlobalProperty("http.proxyPassword");
  +        String proxyUsername = getProperty("http.proxyUser");
  +        String proxyPassword = getProperty("http.proxyPassword");
   
           if (port == -1) {
               port = 80;
  
  
  
  1.130     +1 -1      xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java
  
  Index: AxisServlet.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/transport/http/AxisServlet.java,v
  retrieving revision 1.129
  retrieving revision 1.130
  diff -u -r1.129 -r1.130
  --- AxisServlet.java	29 Jul 2002 15:43:18 -0000	1.129
  +++ AxisServlet.java	2 Aug 2002 17:27:42 -0000	1.130
  @@ -823,7 +823,7 @@
                                String param,
                                String dephault)
       {
  -        String value = AxisProperties.getGlobalProperty(param);
  +        String value = AxisProperties.getProperty(param);
   
           if (value == null)
               value = getInitParameter(param);
  
  
  
  1.2       +1 -1      xml-axis/java/src/org/apache/axis/components/net/DefaultSocketFactory.java
  
  Index: DefaultSocketFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/net/DefaultSocketFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultSocketFactory.java	9 Jul 2002 12:54:53 -0000	1.1
  +++ DefaultSocketFactory.java	2 Aug 2002 17:27:42 -0000	1.2
  @@ -152,7 +152,7 @@
        * @return
        */
       protected String getGlobalProperty(String property) {
  -        return AxisProperties.getGlobalProperty(property);
  +        return AxisProperties.getProperty(property);
       }
   
       /**
  
  
  
  1.3       +5 -3      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SocketFactoryFactory.java	9 Jul 2002 15:27:48 -0000	1.2
  +++ SocketFactoryFactory.java	2 Aug 2002 17:27:42 -0000	1.3
  @@ -54,9 +54,11 @@
    */
   package org.apache.axis.components.net;
   
  -import org.apache.axis.components.logger.LogFactory;
  +import org.apache.axis.AxisProperties;
   import org.apache.axis.utils.ClassUtils;
   import org.apache.axis.utils.JavaUtils;
  +
  +import org.apache.axis.components.logger.LogFactory;
   import org.apache.commons.logging.Log;
   
   import java.lang.reflect.Constructor;
  @@ -90,7 +92,7 @@
       public static synchronized SocketFactory getFactory(Hashtable attributes) {
   
           String socketFactoryClassName =
  -                System.getProperty("axis.socketFactory",
  +                AxisProperties.getProperty("axis.socketFactory",
                           "org.apache.axis.components.net.DefaultSocketFactory");
   
           log.debug("axis.socketFactory:" + socketFactoryClassName);
  @@ -135,7 +137,7 @@
               Hashtable attributes) {
   
           String socketFactoryClassName =
  -                System.getProperty("axis.socketSecureFactory",
  +                AxisProperties.getProperty("axis.socketSecureFactory",
                           "org.apache.axis.components.net.JSSESocketFactory");
   
           log.debug("axis.socketSecureFactory:" + socketFactoryClassName);
  
  
  
  1.2       +2 -1      xml-axis/java/src/org/apache/axis/components/net/JSSESocketFactory.java
  
  Index: JSSESocketFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/net/JSSESocketFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JSSESocketFactory.java	9 Jul 2002 12:54:53 -0000	1.1
  +++ JSSESocketFactory.java	2 Aug 2002 17:27:42 -0000	1.2
  @@ -55,6 +55,7 @@
   package org.apache.axis.components.net;
   
   import com.sun.net.ssl.SSLContext;
  +import org.apache.axis.AxisProperties;
   import org.apache.axis.utils.JavaUtils;
   import org.apache.axis.utils.XMLUtils;
   
  @@ -103,7 +104,7 @@
       private SSLSocketFactory sslFactory = null;
   
       /** Field defaultKeystoreFile           */
  -    static String defaultKeystoreFile = System.getProperty("user.home")
  +    static String defaultKeystoreFile = AxisProperties.getProperty("user.home")
               + "/.keystore";
   
       /** Field defaultKeyPass           */
  
  
  
  1.3       +1 -1      xml-axis/java/src/org/apache/axis/components/bytecode/ExtractorFactory.java
  
  Index: ExtractorFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/components/bytecode/ExtractorFactory.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ExtractorFactory.java	29 Jul 2002 15:07:59 -0000	1.2
  +++ ExtractorFactory.java	2 Aug 2002 17:27:42 -0000	1.3
  @@ -77,7 +77,7 @@
   
       public static Extractor getExtractor() {
           String extractorClassName =
  -                System.getProperty("axis.Extractor", defaultExtractor);
  +                AxisProperties.getProperty("axis.Extractor", defaultExtractor);
           
           log.debug("axis.Extractor:" + extractorClassName);
           Extractor extractor = null;
  
  
  
  1.58      +2 -2      xml-axis/java/src/org/apache/axis/handlers/JWSProcessor.java
  
  Index: JWSProcessor.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/JWSProcessor.java,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- JWSProcessor.java	24 Jul 2002 18:01:05 -0000	1.57
  +++ JWSProcessor.java	2 Aug 2002 17:27:42 -0000	1.58
  @@ -430,8 +430,8 @@
           }
   
           // boot classpath isn't found in above search
  -        if(System.getProperty("sun.boot.class.path") != null) {
  -            classpath.append(System.getProperty("sun.boot.class.path"));
  +        if(AxisProperties.getProperty("sun.boot.class.path") != null) {
  +            classpath.append(AxisProperties.getProperty("sun.boot.class.path"));
           }
   
           return classpath.toString();
  
  
  
  1.36      +2 -2      xml-axis/java/src/org/apache/axis/handlers/BasicHandler.java
  
  Index: BasicHandler.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/handlers/BasicHandler.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- BasicHandler.java	3 Jul 2002 17:50:24 -0000	1.35
  +++ BasicHandler.java	2 Aug 2002 17:27:42 -0000	1.36
  @@ -224,7 +224,7 @@
       /**
        * Hook to axis service... for now hardwire
        */
  -    protected static final String getGlobalProperty(String property) {
  -        return AxisProperties.getGlobalProperty(property);
  +    protected static final String getProperty(String property) {
  +        return AxisProperties.getProperty(property);
       }
   }
  
  
  
  1.44      +2 -2      xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java
  
  Index: WSDDDeployableItem.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/deployment/wsdd/WSDDDeployableItem.java,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- WSDDDeployableItem.java	3 Jul 2002 20:21:43 -0000	1.43
  +++ WSDDDeployableItem.java	2 Aug 2002 17:27:42 -0000	1.44
  @@ -350,11 +350,11 @@
                   try{
                     h.init();
                   }catch(Exception e){
  -                    String msg=e + JavaUtils.LS + JavaUtils.stackToString(e);
  +                    String msg=e + AxisProperties.LS + JavaUtils.stackToString(e);
                       log.debug(msg);
                       throw new ConfigurationException(e);
                   }catch(Error e){
  -                    String msg=e + JavaUtils.LS + JavaUtils.stackToString(e);
  +                    String msg=e + AxisProperties.LS + JavaUtils.stackToString(e);
                       log.debug(msg);
                       throw new ConfigurationException(msg);
                   }
  
  
  
  1.28      +2 -4      xml-axis/java/src/org/apache/axis/attachments/MimeUtils.java
  
  Index: MimeUtils.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/attachments/MimeUtils.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- MimeUtils.java	17 Jul 2002 20:28:07 -0000	1.27
  +++ MimeUtils.java	2 Aug 2002 17:27:43 -0000	1.28
  @@ -223,14 +223,12 @@
               java.io.OutputStream os, javax.mail.internet.MimeMultipart mp) {
   
           try {
  -            java.util.Properties props = System.getProperties();
  -
  -            props.put(
  +            AxisProperties.setProperty(
                       "mail.smtp.host",
                       "localhost");    // this is a bogus since we will never mail it.
   
               javax.mail.Session session =
  -                    javax.mail.Session.getInstance(props, null);
  +                    javax.mail.Session.getInstance(AxisProperties.getProperties(), null);
               javax.mail.internet.MimeMessage message =
                       new javax.mail.internet.MimeMessage(session);
   
  
  
  
  1.17      +3 -3      xml-axis/java/src/org/apache/axis/configuration/DefaultEngineConfigurationFactory.java
  
  Index: DefaultEngineConfigurationFactory.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/configuration/DefaultEngineConfigurationFactory.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- DefaultEngineConfigurationFactory.java	3 Jul 2002 17:50:33 -0000	1.16
  +++ DefaultEngineConfigurationFactory.java	2 Aug 2002 17:27:43 -0000	1.17
  @@ -99,7 +99,7 @@
        */
       public DefaultEngineConfigurationFactory() {
           String fClassName =
  -            AxisProperties.getGlobalProperty(EngineConfigurationFactory.SYSTEM_PROPERTY_NAME);
  +            AxisProperties.getProperty(EngineConfigurationFactory.SYSTEM_PROPERTY_NAME);
   
           if (fClassName != null) {
               try {
  @@ -111,12 +111,12 @@
               }
           }
   
  -        clientConfigFile = AxisProperties.getGlobalProperty("axis.ClientConfigFile");
  +        clientConfigFile = AxisProperties.getProperty("axis.ClientConfigFile");
           if (clientConfigFile == null) {
               clientConfigFile = CLIENT_CONFIG_FILE;
           }
   
  -        serverConfigFile = AxisProperties.getGlobalProperty("axis.ServerConfigFile");
  +        serverConfigFile = AxisProperties.getProperty("axis.ServerConfigFile");
           if (serverConfigFile == null) {
               serverConfigFile = SERVER_CONFIG_FILE;
           }
  
  
  

Mime
View raw message