While browsing the project, I noticed that there is an unused separation of Catalina Ant JMX resources. If this was unintended, a possible cleanup patch is attached.
Index: java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java =================================================================== --- java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java (revision 587502) +++ java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java (working copy) @@ -34,7 +34,6 @@ * <path id="catalina_ant"> * <fileset dir="${catalina.home}/server/lib"> * <include name="catalina-ant.jar"/> - * <include name="catalina-ant-jmx.jar"/> * </fileset> * </path> * Index: java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java =================================================================== --- java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java (revision 587502) +++ java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java (working copy) @@ -34,7 +34,6 @@ * <path id="catalina_ant"> * <fileset dir="${catalina.home}/server/lib"> * <include name="catalina-ant.jar"/> - * <include name="catalina-ant-jmx.jar"/> * </fileset> * </path> * Index: build.xml =================================================================== --- build.xml (revision 587502) +++ build.xml (working copy) @@ -63,7 +63,6 @@ <property name="catalina-tribes.jar" value="${tomcat.build}/lib/catalina-tribes.jar"/> <property name="catalina-ha.jar" value="${tomcat.build}/lib/catalina-ha.jar"/> <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/> - <property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/> <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/> <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/> Index: dist.xml =================================================================== --- dist.xml (revision 587502) +++ dist.xml (working copy) @@ -66,7 +66,6 @@ <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/> <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/> - <property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/> <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/> <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/> Index: extras.xml =================================================================== --- extras.xml (revision 587502) +++ extras.xml (working copy) @@ -63,7 +63,6 @@ <property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/> <property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/> <property name="catalina-ant.jar" value="${tomcat.build}/lib/catalina-ant.jar"/> - <property name="catalina-ant-jmx.jar" value="${tomcat.build}/lib/catalina-ant-jmx.jar"/> <property name="tomcat-coyote.jar" value="${tomcat.build}/lib/tomcat-coyote.jar"/> <property name="jasper.jar" value="${tomcat.build}/lib/jasper.jar"/>
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]