You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2008/01/16 23:37:38 UTC
svn commit: r612599 - in /tomcat/tc6.0.x/trunk: STATUS.txt build.xml dist.xml extras.xml java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java webapps/docs/changelog.xml

Author: markt
Date: Wed Jan 16 14:37:36 2008
New Revision: 612599

URL: http://svn.apache.org/viewvc?rev=612599&view=rev
Log:
Fix bug 43692. Clean up unused references. Patch provided by Paul Shemansky.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/build.xml
    tomcat/tc6.0.x/trunk/dist.xml
    tomcat/tc6.0.x/trunk/extras.xml
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
    tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=612599&r1=612598&r2=612599&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jan 16 14:37:36 2008
@@ -31,12 +31,6 @@
   +1: jfclere
   -1: fhanik - Can we add the 'package' directive to make the package match the dir structure
 
-  Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43692
-  Clean up build files. Patch by  Paul Shemansky
-  http://svn.apache.org/viewvc?rev=610157&view=rev
-  +1: markt, pero, fhanik
-  -1: 
-
   Fix http://issues.apache.org/bugzilla/show_bug.cgi?id=43344
   Fix typo in if.jsp example
   http://svn.apache.org/viewvc/tomcat/trunk/webapps/examples/jsp/tagplugin/if.jsp?r1=610946&r2=610945&pathrev=610946

Modified: tomcat/tc6.0.x/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/build.xml?rev=612599&r1=612598&r2=612599&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/build.xml (original)
+++ tomcat/tc6.0.x/trunk/build.xml Wed Jan 16 14:37:36 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/tc6.0.x/trunk/dist.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=612599&r1=612598&r2=612599&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Wed Jan 16 14:37:36 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/tc6.0.x/trunk/extras.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/extras.xml?rev=612599&r1=612598&r2=612599&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/extras.xml (original)
+++ tomcat/tc6.0.x/trunk/extras.xml Wed Jan 16 14:37:36 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/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java?rev=612599&r1=612598&r2=612599&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorCondition.java Wed Jan 16 14:37:36 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/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java?rev=612599&r1=612598&r2=612599&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ant/jmx/JMXAccessorEqualsCondition.java Wed Jan 16 14:37:36 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/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=612599&r1=612598&r2=612599&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Wed Jan 16 14:37:36 2008
@@ -57,6 +57,10 @@
         (markt/jim)
       </fix>
       <fix>
+        <bug>43692</bug>: Clean up unused entires from build scripts. Patch
+        provided by Paul Shemansky. (markt)
+      </fix>
+      <fix>
         <bug>43775</bug>: Don't try to change line endings of binary files in
         the source distribution. (markt)
       </fix>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org