tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kkoli...@apache.org
Subject svn commit: r1353240 - in /tomcat/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/jasper-howto.xml webapps/docs/monitoring.xml
Date Sun, 24 Jun 2012 10:48:19 GMT
Author: kkolinko
Date: Sun Jun 24 10:48:18 2012
New Revision: 1353240

URL: http://svn.apache.org/viewvc?rev=1353240&view=rev
Log:
Align jmx/jmxaccessor.tasks and jmx/antlib.xml.
Some tasks were missing from jmxaccessor.tasks even though they were documented in monitoring.html.

Align catalina.tasks and antlib.xml.
Some tasks were missing from antlib.xml
jkstatus task had a different name. I think jkupdate is a better name for it.
(Neither one of jk* tasks is documented, and mod_jk has a different set of Ant tasks with
it).

Correct typos in documentation.

Modified:
    tomcat/trunk/java/org/apache/catalina/ant/antlib.xml
    tomcat/trunk/java/org/apache/catalina/ant/catalina.tasks
    tomcat/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks
    tomcat/trunk/webapps/docs/jasper-howto.xml
    tomcat/trunk/webapps/docs/monitoring.xml

Modified: tomcat/trunk/java/org/apache/catalina/ant/antlib.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/antlib.xml?rev=1353240&r1=1353239&r2=1353240&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/antlib.xml (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/antlib.xml Sun Jun 24 10:48:18 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/trunk/java/org/apache/catalina/ant/catalina.tasks
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/catalina.tasks?rev=1353240&r1=1353239&r2=1353240&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/catalina.tasks (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/catalina.tasks Sun Jun 24 10:48:18 2012
@@ -14,18 +14,19 @@
 # limitations under the License.
 
 # Pure catalina tasks
-deploy=org.apache.catalina.ant.DeployTask
 list=org.apache.catalina.ant.ListTask
-reload=org.apache.catalina.ant.ReloadTask
-sessions=org.apache.catalina.ant.SessionsTask
-resources=org.apache.catalina.ant.ResourcesTask
+deploy=org.apache.catalina.ant.DeployTask
 start=org.apache.catalina.ant.StartTask
+reload=org.apache.catalina.ant.ReloadTask
 stop=org.apache.catalina.ant.StopTask
 undeploy=org.apache.catalina.ant.UndeployTask
+resources=org.apache.catalina.ant.ResourcesTask
+sessions=org.apache.catalina.ant.SessionsTask
 validator=org.apache.catalina.ant.ValidatorTask
 
 #Jk Task
 jkstatus=org.apache.catalina.ant.JKStatusUpdateTask
+jkupdate=org.apache.catalina.ant.JKStatusUpdateTask
 
 # Manager JMX
 jmxManagerSet=org.apache.catalina.ant.JMXSetTask

Modified: tomcat/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks?rev=1353240&r1=1353239&r2=1353240&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks (original)
+++ tomcat/trunk/java/org/apache/catalina/ant/jmx/jmxaccessor.tasks Sun Jun 24 10:48:18 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/trunk/webapps/docs/jasper-howto.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/jasper-howto.xml?rev=1353240&r1=1353239&r2=1353240&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/trunk/webapps/docs/jasper-howto.xml Sun Jun 24 10:48:18 2012
@@ -342,7 +342,7 @@ are automatically compiled as part of th
 </p>
 
 <p>
-At the jasper2 task you can use the option <code>addWebXmlMappings</code> for
+At the jasper task you can use the option <code>addWebXmlMappings</code> for
 automatic merge the <code>${webapp.path}/WEB-INF/generated_web.xml</code>
 with the current web application deployment descriptor at
 <code>${webapp.path}/WEB-INF/web.xml</code>. When you want to use Java 6

Modified: tomcat/trunk/webapps/docs/monitoring.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/monitoring.xml?rev=1353240&r1=1353239&r2=1353240&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/monitoring.xml (original)
+++ tomcat/trunk/webapps/docs/monitoring.xml Sun Jun 24 10:48:18 2012
@@ -90,7 +90,7 @@ controlRole tomcat
   <section name="Manage Tomcat with JMX remote Ant Tasks">
    <p>To simplify JMX usage with Ant 1.6.x, a set of tasks is provided that may
    be used with antlib.</p>
-   <p><b>antlib</b>Copy your catalina-ant.jar from $CATALINA_HOME/lib to
$ANT_HOME/lib.</p>
+   <p><b>antlib</b>: Copy your catalina-ant.jar from $CATALINA_HOME/lib
to $ANT_HOME/lib.</p>
    <p>The following example shows the JMX Accessor usage:</p>
    <table border="1">
    <tr><td><p><pre>
@@ -193,7 +193,7 @@ controlRole tomcat
    <p><b>import:</b> Import the JMX Accessor Project with
    <em>&lt;import file="${CATALINA.HOME}/bin/catalina-tasks.xml" /&gt;</em>
and
    reference the tasks with <em>jmxOpen</em>, <em>jmxSet</em>, <em>jmxGet</em>,
-    <em>jmxQuery</em>, <em>jmxInvoke</em>,<em>jmxEquals</em>
and <em>jmxCondition</em>. </p>
+   <em>jmxQuery</em>, <em>jmxInvoke</em>, <em>jmxEquals</em>
and <em>jmxCondition</em>.</p>
 
   </section>
 



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


Mime
View raw message