svn commit: r610157 - in /tomcat/trunk: build.xml dist.xml extras.xml java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java

[markt]

Author: markt
Date: Tue Jan  8 13:15:40 2008
New Revision: 610157

URL: http://svn.apache.org/viewvc?rev=610157&view=rev
Log:
Clean up build scripts. Patch provided by Paul Shemansky.

Modified:
    tomcat/trunk/build.xml
    tomcat/trunk/dist.xml
    tomcat/trunk/extras.xml
    tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
    
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java

Modified: tomcat/trunk/build.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=610157&r1=610156&r2=610157&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Tue Jan  8 13:15:40 2008
@@ -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"/>

Modified: tomcat/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/dist.xml?rev=610157&r1=610156&r2=610157&view=diff
==============================================================================
--- tomcat/trunk/dist.xml (original)
+++ tomcat/trunk/dist.xml Tue Jan  8 13:15:40 2008
@@ -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"/>

Modified: tomcat/trunk/extras.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/extras.xml?rev=610157&r1=610156&r2=610157&view=diff
==============================================================================
--- tomcat/trunk/extras.xml (original)
+++ tomcat/trunk/extras.xml Tue Jan  8 13:15:40 2008
@@ -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"/>

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java?rev=610157&r1=610156&r2=610157&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java Tue 
Jan  8 13:15:40 2008
@@ -34,7 +34,6 @@
  *   &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>
  *

Modified: 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java?rev=610157&r1=610156&r2=610157&view=diff
==============================================================================
--- 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java 
(original)
+++ 
tomcat/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java 
Tue Jan  8 13:15:40 2008
@@ -34,7 +34,6 @@
  *   &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>
  *



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]