tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ivan <xhh...@gmail.com>
Subject Re: svn commit: r1144690 - in /tomcat/trunk: java/org/apache/catalina/startup/Catalina.java java/org/apache/catalina/startup/ClusterRuleSetFactory.java webapps/docs/changelog.xml
Date Mon, 11 Jul 2011 07:23:31 GMT
Hi, this changes brought a cycle dependency between the tomcat-catalina and
tomcat-catalina-ha module, could you please help to fix it.
Thanks.

2011/7/10 <markt@apache.org>

> Author: markt
> Date: Sat Jul  9 16:05:42 2011
> New Revision: 1144690
>
> URL: http://svn.apache.org/viewvc?rev=1144690&view=rev
> Log:
> Remove some more unnecessary code
>
> Removed:
>    tomcat/trunk/java/org/apache/catalina/startup/ClusterRuleSetFactory.java
> Modified:
>    tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
>    tomcat/trunk/webapps/docs/changelog.xml
>
> Modified: tomcat/trunk/java/org/apache/catalina/startup/Catalina.java
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/startup/Catalina.java?rev=1144690&r1=1144689&r2=1144690&view=diff
>
> ==============================================================================
> --- tomcat/trunk/java/org/apache/catalina/startup/Catalina.java (original)
> +++ tomcat/trunk/java/org/apache/catalina/startup/Catalina.java Sat Jul  9
> 16:05:42 2011
> @@ -36,6 +36,7 @@ import org.apache.catalina.LifecycleExce
>  import org.apache.catalina.LifecycleState;
>  import org.apache.catalina.Server;
>  import org.apache.catalina.core.StandardServer;
> +import org.apache.catalina.ha.ClusterRuleSet;
>  import org.apache.catalina.security.SecurityConfig;
>  import org.apache.juli.ClassLoaderLogManager;
>  import org.apache.tomcat.util.ExceptionUtils;
> @@ -373,13 +374,13 @@ public class Catalina {
>         digester.addRuleSet(new EngineRuleSet("Server/Service/"));
>         digester.addRuleSet(new HostRuleSet("Server/Service/Engine/"));
>         digester.addRuleSet(new
> ContextRuleSet("Server/Service/Engine/Host/"));
> -
>  digester.addRuleSet(ClusterRuleSetFactory.getClusterRuleSet("Server/Service/Engine/Host/Cluster/"));
> +        digester.addRuleSet(new
> ClusterRuleSet("Server/Service/Engine/Host/Cluster/"));
>         digester.addRuleSet(new
> NamingRuleSet("Server/Service/Engine/Host/Context/"));
>
>         // When the 'engine' is found, set the parentClassLoader.
>         digester.addRule("Server/Service/Engine",
>                          new SetParentClassLoaderRule(parentClassLoader));
> -
>  digester.addRuleSet(ClusterRuleSetFactory.getClusterRuleSet("Server/Service/Engine/Cluster/"));
> +        digester.addRuleSet(new
> ClusterRuleSet("Server/Service/Engine/Cluster/"));
>
>         long t2=System.currentTimeMillis();
>         if (log.isDebugEnabled())
>
> Modified: tomcat/trunk/webapps/docs/changelog.xml
> URL:
> http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1144690&r1=1144689&r2=1144690&view=diff
>
> ==============================================================================
> --- tomcat/trunk/webapps/docs/changelog.xml (original)
> +++ tomcat/trunk/webapps/docs/changelog.xml Sat Jul  9 16:05:42 2011
> @@ -66,6 +66,14 @@
>       </fix>
>     </changelog>
>   </subsection>
> +  <subsection name="Cluster">
> +    <changelog>
> +      <update>
> +        Remove unnecessary serverl.xml parsing code for old cluster
> +        implementation that does not ship as part of Tomcat 7. (markt)
> +      </update>
> +    </changelog>
> +  </subsection>
>  </section>
>  <section name="Tomcat 7.0.18 (markt)" rtext="TBD">
>   <subsection name="Catalina">
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>


-- 
Ivan

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message