tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1353423 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ant/antlib.xml webapps/docs/changelog.xml
Date Mon, 25 Jun 2012 08:18:07 GMT
Author: kkolinko
Date: Mon Jun 25 08:18:05 2012
New Revision: 1353423

URL: http://svn.apache.org/viewvc?rev=1353423&view=rev
Log:
Revert most of changes in ant/antlib.xml per user's comment on dev@.
http://markmail.org/message/izcghp5z6hv3dp6j

It is merge of revision 1353414 from tomcat/trunk.

Modified:
    tomcat/tc7.0.x/trunk/   (props changed)
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
  Merged /tomcat/trunk:r1353414

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml?rev=1353423&r1=1353422&r2=1353423&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/antlib.xml Mon Jun 25 08:18:05 2012
@@ -41,9 +41,6 @@
   <typedef
         name="sessions"
         classname="org.apache.catalina.ant.SessionsTask" />
-  <typedef
-        name="validator"
-        classname="org.apache.catalina.ant.ValidatorTask" />
   <!-- Jk Task -->
   <typedef
         name="jkstatus"
@@ -61,11 +58,18 @@
   <typedef
         name="jmxManagerQuery"
         classname="org.apache.catalina.ant.JMXQueryTask" />
-  <!-- Jasper -->
+  <!-- Other -->
+<!-- These tasks are deliberately omitted here,
+  because they depend on other Tomcat components besides catalina-ant.jar
+  and thus are hard to use with antlib.
+  <typedef
+        name="validator"
+        classname="org.apache.catalina.ant.ValidatorTask" />
   <typedef
         name="jasper"
         classname="org.apache.jasper.JspC" />
   <typedef
         name="jasper2"
         classname="org.apache.jasper.JspC" />
+-->
 </antlib>
\ No newline at end of file

Modified: tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml?rev=1353423&r1=1353422&r2=1353423&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Mon Jun 25 08:18:05 2012
@@ -116,12 +116,15 @@
         Add manifest files to the set of files for which the line-ending is
         changed to match the OS defaults in the source distributions. (markt)
       </fix>
-      <fix>
-        Align Ant tasks definitions in *.tasks files and in antlib.xml files.
-        Some tasks were defined only in one of them. Replace
-        <code>taskdef</code> with <code>typedef</code> in
-        <code>bin/catalina-tasks.xml</code>. (kkolinko)
-      </fix>
+      <scode>
+        Align Jk Ant tasks definitions between antlib.xml and catalina.tasks
+        files, introducing <code>jkupdate</code> as synonym for
+        <code>jkstatus</code>. The latter one is deprecated.
+        Simplify <code>bin/catalina-tasks.xml</code>, replacing
+        <code>taskdef</code> with <code>typedef</code> and adding
Ant condition
+        implementations used with JMX to <code>jmxaccessor.tasks</code> file.
+        (kkolinko)
+      </scode>
     </changelog>
   </subsection>
 </section>



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


Mime
View raw message