tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1353246 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/ant/antlib.xml java/org/apache/catalina/ant/catalina.tasks java/org/apache/catalina/ant/jmx/jmxaccessor.tasks webapps/docs/changelog.xml
Date Sun, 24 Jun 2012 11:25:22 GMT
Author: kkolinko
Date: Sun Jun 24 11:25:21 2012
New Revision: 1353246

URL: http://svn.apache.org/viewvc?rev=1353246&view=rev
Log:
Align Ant tasks definitions in *.tasks files and in antlib.xml files.
Some tasks were defined only in one of them.
It is backport of r1353240

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/java/org/apache/catalina/ant/catalina.tasks
    tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks
    tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml

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

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=1353246&r1=1353245&r2=1353246&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 Sun Jun 24 11:25:21 2012
@@ -16,6 +16,7 @@
   limitations under the License.
 -->
 <antlib>
+  <!-- Pure Catalina tasks -->
   <typedef
         name="list"
         classname="org.apache.catalina.ant.ListTask" />
@@ -41,8 +42,16 @@
         name="sessions"
         classname="org.apache.catalina.ant.SessionsTask" />
   <typedef
+        name="validator"
+        classname="org.apache.catalina.ant.ValidatorTask" />
+  <!-- Jk Task -->
+  <typedef
+        name="jkstatus"
+        classname="org.apache.catalina.ant.JKStatusUpdateTask" />
+  <typedef
         name="jkupdate"
         classname="org.apache.catalina.ant.JKStatusUpdateTask" />
+  <!-- Manager JMX -->
   <typedef
         name="jmxManagerSet"
         classname="org.apache.catalina.ant.JMXSetTask" />
@@ -52,4 +61,11 @@
   <typedef
         name="jmxManagerQuery"
         classname="org.apache.catalina.ant.JMXQueryTask" />
+  <!-- Jasper -->
+  <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/java/org/apache/catalina/ant/catalina.tasks
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/catalina.tasks?rev=1353246&r1=1353245&r2=1353246&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/catalina.tasks (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/catalina.tasks Sun Jun 24 11:25:21 2012
@@ -26,6 +26,7 @@ validator=org.apache.catalina.ant.Valida
 
 #Jk Task
 jkstatus=org.apache.catalina.ant.JKStatusUpdateTask
+jkupdate=org.apache.catalina.ant.JKStatusUpdateTask
 
 # Manager JMX
 jmxManagerSet=org.apache.catalina.ant.JMXSetTask

Modified: tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks?rev=1353246&r1=1353245&r2=1353246&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks Sun Jun 24 11:25:21
2012
@@ -21,3 +21,5 @@ jmxInvoke=org.apache.catalina.ant.jmx.JM
 jmxQuery=org.apache.catalina.ant.jmx.JMXAccessorQueryTask
 jmxCreate=org.apache.catalina.ant.jmx.JMXAccessorCreateTask
 jmxUnregister=org.apache.catalina.ant.jmx.JMXAccessorUnregisterTask
+jmxEquals=org.apache.catalina.ant.jmx.JMXAccessorEqualsCondition
+jmxCondition=org.apache.catalina.ant.jmx.JMXAccessorCondition

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=1353246&r1=1353245&r2=1353246&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Sun Jun 24 11:25:21 2012
@@ -116,6 +116,10 @@
         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. (kkolinko)
+      </fix>
     </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