Author: kkolinko
Date: Sun Jun 24 13:07:02 2012
New Revision: 1353262
URL: http://svn.apache.org/viewvc?rev=1353262&view=rev
Log:
Merged revision 1353261 from tomcat/trunk:
s/taskdef/typedef/ in catalina-tasks.xml
1. For Catalina/Jasper tasks, the taskdef is no longer needed,
as JspC now explicitly implements Task (BZ 53032) and so does not need a
TaskAdapter,
and all other tasks implement Task.
2. For JMX tasks using typedef here allows to load
jmxEquals and jmxCondition conditions from "jmxaccessor.tasks" file and
remove explicit definitions from catalina-tasks.xml.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1353261
Modified: tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml?rev=1353262&r1=1353261&r2=1353262&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/tc7.0.x/trunk/bin/catalina-tasks.xml Sun Jun 24 13:07:02 2012
@@ -25,7 +25,7 @@
<!-- set catalina.home if it's not already set -->
<dirname property="catalina.home.bin.dir" file="${ant.file.catalina-tasks}"/>
<property name="catalina.home" value="${catalina.home.bin.dir}/.."/>
- <taskdef resource="org/apache/catalina/ant/catalina.tasks">
+ <typedef resource="org/apache/catalina/ant/catalina.tasks">
<classpath>
<fileset file="${catalina.home}/bin/tomcat-juli.jar"/>
<fileset file="${catalina.home}/lib/tomcat-api.jar"/>
@@ -38,22 +38,8 @@
<fileset file="${catalina.home}/lib/catalina-ant.jar"/>
<fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
</classpath>
- </taskdef>
- <taskdef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">
- <classpath>
- <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
- </classpath>
- </taskdef>
- <typedef
- name="jmxEquals"
- classname="org.apache.catalina.ant.jmx.JMXAccessorEqualsCondition">
- <classpath>
- <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
- </classpath>
</typedef>
- <typedef
- name="jmxCondition"
- classname="org.apache.catalina.ant.jmx.JMXAccessorCondition">
+ <typedef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">
<classpath>
<fileset file="${catalina.home}/lib/catalina-ant.jar"/>
</classpath>
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=1353262&r1=1353261&r2=1353262&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jun 24 13:07:02 2012
@@ -118,7 +118,9 @@
</fix>
<fix>
Align Ant tasks definitions in *.tasks files and in antlib.xml files.
- Some tasks were defined only in one of them. (kkolinko)
+ 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>
</changelog>
</subsection>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
