Return-Path: 
 <dev-return-129339-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
X-Original-To: apmail-tomcat-dev-archive@www.apache.org
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 761F7C6DD
	for <apmail-tomcat-dev-archive@www.apache.org>;
 Sun, 24 Jun 2012 12:59:02 +0000 (UTC)
Received: (qmail 78923 invoked by uid 500); 24 Jun 2012 12:59:01 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 78723 invoked by uid 500); 24 Jun 2012 12:59:01 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 78701 invoked by uid 99); 24 Jun 2012 12:59:00 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jun 2012 12:59:00 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Jun 2012 12:58:58 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id C20EB23889FA
	for <dev@tomcat.apache.org>; Sun, 24 Jun 2012 12:58:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1353261 - /tomcat/trunk/bin/catalina-tasks.xml
Date: Sun, 24 Jun 2012 12:58:37 -0000
To: dev@tomcat.apache.org
From: kkolinko@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120624125837.C20EB23889FA@eris.apache.org>

Author: kkolinko
Date: Sun Jun 24 12:58:37 2012
New Revision: 1353261

URL: http://svn.apache.org/viewvc?rev=1353261&view=rev
Log:
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/trunk/bin/catalina-tasks.xml

Modified: tomcat/trunk/bin/catalina-tasks.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/bin/catalina-tasks.xml?rev=1353261&r1=1353260&r2=1353261&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Sun Jun 24 12:58:37 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>



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