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

[rsitze]

rsitze      02/05/09 11:13:01

  Modified:    java/src/org/apache/axis AxisEngine.java
  Log:
  New static (global) property and environment keys.
  Removed NLS from enter/exit log.debug
  Cleanup setting defaults.
  
  Revision  Changes    Path
  1.77      +11 -17    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.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- AxisEngine.java   6 May 2002 19:41:46 -0000       1.76
  +++ AxisEngine.java   9 May 2002 18:13:01 -0000       1.77
  @@ -95,8 +95,13 @@
       public static final String PROP_ATTACHMENT_DIR = "attachments.Directory";
       public static final String PROP_ATTACHMENT_IMPLEMENTATION  = 
"attachments.implementation" ;
       public static final String PROP_ATTACHMENT_CLEANUP = 
"attachment.DirectoryCleanUp";
  +    public static final String PROP_CONFIG_CLASS = "axis.engineConfigClass";
   
       public static final String 
DEFAULT_ATTACHMENT_IMPL="org.apache.axis.attachments.AttachmentsImpl";
  +    
  +    public static final String ENV_ATTACHMENT_DIR = "axis.attachments.Directory";
  +    public static final String ENV_SERVLET_REALPATH = "servlet.realpath";
  +    public static final String ENV_SERVLET_CONTEXT = "servletContext";
   
       // Default admin. password
       private static final String DEFAULT_ADMIN_PASSWORD = "admin";
  @@ -165,7 +170,7 @@
        */
       public void init() {
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("enter00", "AxisEngine::init"));
  +            log.debug("Enter: AxisEngine::init");
           }
   
           // The SOAP/XSD stuff is in the default TypeMapping of the 
TypeMappingRegistry.
  @@ -178,22 +183,13 @@
           }
   
           /*Set the default attachment implementation */
  +        setOptionDefault(PROP_ATTACHMENT_IMPLEMENTATION,
  +                         System.getProperty("axis." + 
PROP_ATTACHMENT_IMPLEMENTATION  ));
   
  -        String attachmentsImp= null;
  -        try{
  -            attachmentsImp=System.getProperty("axis." + 
PROP_ATTACHMENT_IMPLEMENTATION  );
  -            if(null!=attachmentsImp)
  -                setOption(PROP_ATTACHMENT_IMPLEMENTATION, attachmentsImp);
  -        } catch(Throwable t){attachmentsImp= null;} 
  -
  -        if(attachmentsImp == null ){
  -            if((attachmentsImp= (String) getOption(PROP_ATTACHMENT_IMPLEMENTATION)) 
== null){
  -                  setOption(PROP_ATTACHMENT_IMPLEMENTATION, 
DEFAULT_ATTACHMENT_IMPL);
  -            }
  -        }
  +        setOptionDefault(PROP_ATTACHMENT_IMPLEMENTATION, DEFAULT_ATTACHMENT_IMPL);
   
           if (log.isDebugEnabled()) {
  -            log.debug(JavaUtils.getMessage("exit00", "AxisEngine::init"));
  +            log.debug("Exit: AxisEngine::init");
           }
   
       }
  @@ -374,9 +370,7 @@
           }
   
           // Deal with admin password's default value.
  -        if (getOption(PROP_PASSWORD) == null) {
  -            setOption(PROP_PASSWORD, DEFAULT_ADMIN_PASSWORD);
  -        } else {
  +        if (!setOptionDefault(PROP_PASSWORD, DEFAULT_ADMIN_PASSWORD)) {
               setAdminPassword((String)getOption(PROP_PASSWORD));
           }
       }