tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From p...@apache.org
Subject cvs commit: jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup HostConfig.java LocalStrings.properties
Date Wed, 01 Dec 2004 11:06:22 GMT
pero        2004/12/01 03:06:22

  Modified:    catalina/src/share/org/apache/catalina/startup
                        HostConfig.java LocalStrings.properties
  Log:
  Add some messages
  
  Revision  Changes    Path
  1.51      +8 -5      jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java
  
  Index: HostConfig.java
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/HostConfig.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- HostConfig.java	17 Nov 2004 23:21:13 -0000	1.50
  +++ HostConfig.java	1 Dec 2004 11:06:22 -0000	1.51
  @@ -928,7 +928,9 @@
   
       /**
        * Add watched resources to the specified Context.
  -     * @param app
  +     * @param app HostConfig deployed app
  +     * @param docBase web app docBase
  +     * @param context web application context
        */
       protected void addWatchedResources(DeployedApplication app, String docBase, Context
context) {
           // FIXME: Feature idea. Add support for patterns (ex: WEB-INF/*, WEB-INF/*.xml),
where
  @@ -1055,7 +1057,8 @@
               if ((!resource.exists() && lastModified != 0L) 
                   || (resource.lastModified() != lastModified)) {
                   // Reload application
  -                log.info(sm.getString("hostConfig.reload", app.name));
  +                if(log.isInfoEnabled())
  +                    log.info(sm.getString("hostConfig.reload", app.name));
                   Container context = host.findChild(app.name);
                   try {
                       ((Lifecycle) context).stop();
  @@ -1095,7 +1098,7 @@
               Registry.getRegistry(null, null).registerComponent
                   (this, oname, this.getClass().getName());
           } catch (Exception e) {
  -            log.error(sm.getString("hostConfig.jmx.register"), e);
  +            log.error(sm.getString("hostConfig.jmx.register", oname), e);
           }
           
           deployApps();
  @@ -1117,7 +1120,7 @@
               try {
                   Registry.getRegistry(null, null).unregisterComponent(oname);
               } catch (Exception e) {
  -                log.error(sm.getString("hostConfig.jmx.unregister"), e);
  +                log.error(sm.getString("hostConfig.jmx.unregister", oname), e);
               }
           }
           oname = null;
  
  
  
  1.10      +6 -2      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- LocalStrings.properties	17 Nov 2004 23:21:13 -0000	1.9
  +++ LocalStrings.properties	1 Dec 2004 11:06:22 -0000	1.10
  @@ -36,7 +36,10 @@
   engineConfig.start=EngineConfig: Processing START
   engineConfig.stop=EngineConfig: Processing STOP
   hostConfig.appBase=Application base directory {0} does not exist
  +hostConfig.canonicalizing=Error delete redeploy resources from context [{0}]
   hostConfig.cce=Lifecycle event data object {0} is not a Host
  +hostConfig.context.destroy=Error during context [{0}] destroy
  +hostConfig.context.restart=Error during context [{0}] restart
   hostConfig.deploy=Deploying web application directory {0}
   hostConfig.deployDescriptor=Deploying configuration descriptor {0}
   hostConfig.deployDescriptor.error=Error deploying configuration descriptor {0}
  @@ -49,9 +52,10 @@
   hostConfig.expand=Expanding web application archive {0}
   hostConfig.expand.error=Exception while expanding web application archive {0}
   hostConfig.expanding=Expanding discovered web application archives
  +hostConfig.jmx.register=Register context [{0}] failed
  +hostConfig.jmx.unregister=Unregister context [{0}] failed
   hostConfig.reload=Reloading context [{0}]
  -hostConfig.context.restart=Error during context {0} restart
  -hostConfig.removeXML=Context {0} is undeployed
  +hostConfig.removeXML=Context [{0}] is undeployed
   hostConfig.removeDIR=Directory {0} is undeployed
   hostConfig.removeWAR=War {0} is undeployedhostConfig.start=HostConfig: Processing START
   hostConfig.stop=HostConfig: Processing STOP
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message