remm        2004/10/23 09:54:23

  Modified:    catalina/src/share/org/apache/catalina/startup
                        LocalStrings.properties Embedded.java Catalina.java
  Log:
  - Add explicit error message if temp dir does not exist.
  - Remove useless calls to Embedded.initDirs.
  
  Revision  Changes    Path
  1.8       +1 -0      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties
  
  Index: LocalStrings.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/LocalStrings.properties,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- LocalStrings.properties   17 Sep 2004 15:07:27 -0000      1.7
  +++ LocalStrings.properties   23 Oct 2004 16:54:23 -0000      1.8
  @@ -29,6 +29,7 @@
   contextConfig.unavailable=Marking this application unavailable due to previous 
error(s)
   embedded.alreadyStarted=Embedded service has already been started
   embedded.noEngines=No engines have been defined yet
  +embedded.notmp=Cannot find specified temporary folder at {0}
   embedded.notStarted=Embedded service has not yet been started
   embedded.authenticatorNotInstanceOfValve=Specified Authenticator is not a Valve
   engineConfig.cce=Lifecycle event data object {0} is not an Engine
  
  
  
  1.25      +7 -1      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java
  
  Index: Embedded.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Embedded.java,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Embedded.java     29 Sep 2004 09:55:38 -0000      1.24
  +++ Embedded.java     23 Oct 2004 16:54:23 -0000      1.25
  @@ -927,6 +927,12 @@
               }
               System.setProperty("catalina.base", catalinaBase);
           }
  +        
  +        String temp = System.getProperty("java.io.tmpdir");
  +        if (temp == null || (!(new File(temp)).exists())
  +                || (!(new File(temp)).isDirectory())) {
  +            log.error(sm.getString("embedded.notmp", temp));
  +        }
   
       }
   
  
  
  
  1.35      +2 -3      
jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java
  
  Index: Catalina.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/Catalina.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- Catalina.java     29 Sep 2004 09:55:39 -0000      1.34
  +++ Catalina.java     23 Oct 2004 16:54:23 -0000      1.35
  @@ -429,6 +429,7 @@
        * Start a new server instance.
        */
       public void load() {
  +
           initDirs();
   
           // Before digester - it may be needed
  @@ -503,8 +504,6 @@
        */
       public void load(String args[]) {
   
  -        setCatalinaHome();
  -        setCatalinaBase();
           try {
               if (arguments(args))
                   load();
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to