pero 2005/06/30 06:04:46 Modified: catalina/src/share/org/apache/catalina/startup Catalina.java EngineRuleSet.java Log: Support Cluster as Engine Element Revision Changes Path 1.37 +6 -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.36 retrieving revision 1.37 diff -u -r1.36 -r1.37 --- Catalina.java 30 Mar 2005 17:04:08 -0000 1.36 +++ Catalina.java 30 Jun 2005 13:04:34 -0000 1.37 @@ -329,6 +329,7 @@ // When the 'engine' is found, set the parentClassLoader. digester.addRule("Server/Service/Engine", new SetParentClassLoaderRule(parentClassLoader)); + digester.addRuleSet(new ClusterRuleSet("Server/Service/Engine/Cluster/")); long t2=System.currentTimeMillis(); if (log.isDebugEnabled()) @@ -495,7 +496,8 @@ } long t2 = System.currentTimeMillis(); - log.info("Initialization processed in " + (t2 - t1) + " ms"); + if(log.isInfoEnabled()) + log.info("Initialization processed in " + (t2 - t1) + " ms"); } @@ -542,7 +544,8 @@ } long t2 = System.currentTimeMillis(); - log.info("Server startup in " + (t2 - t1) + " ms"); + if(log.isInfoEnabled()) + log.info("Server startup in " + (t2 - t1) + " ms"); try { // Register shutdown hook 1.6 +11 -1 jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java Index: EngineRuleSet.java =================================================================== RCS file: /home/cvs/jakarta-tomcat-catalina/catalina/src/share/org/apache/catalina/startup/EngineRuleSet.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- EngineRuleSet.java 26 Jun 2004 17:41:31 -0000 1.5 +++ EngineRuleSet.java 30 Jun 2005 13:04:38 -0000 1.6 @@ -101,6 +101,16 @@ "setContainer", "org.apache.catalina.Container"); + //Cluster configuration start + digester.addObjectCreate(prefix + "Engine/Cluster", + null, // MUST be specified in the element + "className"); + digester.addSetProperties(prefix + "Engine/Cluster"); + digester.addSetNext(prefix + "Engine/Cluster", + "setCluster", + "org.apache.catalina.Cluster"); + //Cluster configuration end + digester.addObjectCreate(prefix + "Engine/Listener", null, // MUST be specified in the element "className");
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]