From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 8 Jan 2008 21:15:40 +0000 (+0000)
Subject: Clean up build scripts. Patch provided by Paul Shemansky.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=1d4f55af9f2f1623dfbb697efab5acf665c80ce8;p=tomcat7.0

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 ce8f87dbd..0c45aadbb 100644
--- 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 47dc7d11d..cab2c6608 100644
--- 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 81ee99b4c..900a53996 100644
--- 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 4c3ded3b0..5ec6c45d1 100644
--- 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;
  *   &lt;path id="catalina_ant">
  *       &lt;fileset dir="${catalina.home}/server/lib">
  *           &lt;include name="catalina-ant.jar"/>
- *           &lt;include name="catalina-ant-jmx.jar"/>
  *       &lt;/fileset>
  *   &lt;/path>
  *
diff --git a/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java b/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
index 491376765..c6a3c87b7 100644
--- 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;
  *   &lt;path id="catalina_ant">
  *       &lt;fileset dir="${catalina.home}/server/lib">
  *           &lt;include name="catalina-ant.jar"/>
- *           &lt;include name="catalina-ant-jmx.jar"/>
  *       &lt;/fileset>
  *   &lt;/path>
  *