Clean up build scripts. Patch provided by Paul Shemansky.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@610157 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index ce8f87d..0c45aad 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -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"/>

diff --git a/dist.xml b/dist.xml
index 47dc7d1..cab2c66 100644 (file)
--- a/dist.xml
+++ b/dist.xml
@@ -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"/>

diff --git a/extras.xml b/extras.xml
index 81ee99b..900a539 100644 (file)
--- a/extras.xml
+++ b/extras.xml
@@ -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"/>

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
index 4c3ded3..5ec6c45 100644 (file)
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
@@ -34,7 +34,6 @@ import org.apache.tools.ant.taskdefs.condition.Condition;
  *   <path id="catalina_ant">
  *       <fileset dir="${catalina.home}/server/lib">
  *           <include name="catalina-ant.jar"/>
- *           <include name="catalina-ant-jmx.jar"/>
  *       </fileset>
  *   </path>
  *

diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
index 4913767..c6a3c87 100644 (file)
--- a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
+++ b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
@@ -34,7 +34,6 @@ import org.apache.tools.ant.taskdefs.condition.Condition;
  *   <path id="catalina_ant">
  *       <fileset dir="${catalina.home}/server/lib">
  *           <include name="catalina-ant.jar"/>
- *           <include name="catalina-ant-jmx.jar"/>
  *       </fileset>
  *   </path>
  *