You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2015/02/10 21:32:46 UTC

svn commit: r1658799 - /tomcat/trunk/bin/catalina-tasks.xml

Author: markt
Date: Tue Feb 10 20:32:45 2015
New Revision: 1658799

URL: http://svn.apache.org/r1658799
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
Add missing JARs
JARs in alpha order

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=1658799&r1=1658798&r2=1658799&view=diff
==============================================================================
--- tomcat/trunk/bin/catalina-tasks.xml (original)
+++ tomcat/trunk/bin/catalina-tasks.xml Tue Feb 10 20:32:45 2015
@@ -28,16 +28,20 @@
   <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"/>
-      <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
-      <fileset file="${catalina.home}/lib/tomcat-util-scan.jar"/>
+      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+      <fileset file="${catalina.home}/lib/catalina.jar"/>
+      <fileset file="${catalina.home}/lib/el-api.jar"/>
       <fileset file="${catalina.home}/lib/jasper.jar"/>
       <fileset file="${catalina.home}/lib/jasper-el.jar"/>
-      <fileset file="${catalina.home}/lib/el-api.jar"/>
       <fileset file="${catalina.home}/lib/jsp-api.jar"/>
       <fileset file="${catalina.home}/lib/servlet-api.jar"/>
-      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-api.jar"/>
       <fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-i18n-es.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-i18n-fr.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-i18n-ja.jar"/>
+      <fileset file="${catalina.home}/lib/tomcat-util-scan.jar"/>
     </classpath>
   </typedef>
   <typedef resource="org/apache/catalina/ant/jmx/jmxaccessor.tasks">



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


Re: svn commit: r1658799 - /tomcat/trunk/bin/catalina-tasks.xml

Posted by Mark Thomas <ma...@apache.org>.
On 10/02/2015 20:36, Konstantin Kolinko wrote:
> 2015-02-10 23:32 GMT+03:00  <ma...@apache.org>:
>> Author: markt
>> Date: Tue Feb 10 20:32:45 2015
>> New Revision: 1658799
>>
>> URL: http://svn.apache.org/r1658799
>> Log:
>> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
>> Add missing JARs
>> JARs in alpha order
>>
>> 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=1658799&r1=1658798&r2=1658799&view=diff
>> ==============================================================================
>> --- tomcat/trunk/bin/catalina-tasks.xml (original)
>> +++ tomcat/trunk/bin/catalina-tasks.xml Tue Feb 10 20:32:45 2015
>> @@ -28,16 +28,20 @@
>>    <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"/>
>> -      <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
>> -      <fileset file="${catalina.home}/lib/tomcat-util-scan.jar"/>
>> +      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
>> +      <fileset file="${catalina.home}/lib/catalina.jar"/>
>> +      <fileset file="${catalina.home}/lib/el-api.jar"/>
>>        <fileset file="${catalina.home}/lib/jasper.jar"/>
>>        <fileset file="${catalina.home}/lib/jasper-el.jar"/>
>> -      <fileset file="${catalina.home}/lib/el-api.jar"/>
>>        <fileset file="${catalina.home}/lib/jsp-api.jar"/>
>>        <fileset file="${catalina.home}/lib/servlet-api.jar"/>
>> -      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
>> +      <fileset file="${catalina.home}/lib/tomcat-api.jar"/>
>>        <fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
>> +      <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
>> +      <fileset file="${catalina.home}/lib/tomcat-i18n-es.jar"/>
>> +      <fileset file="${catalina.home}/lib/tomcat-i18n-fr.jar"/>
>> +      <fileset file="${catalina.home}/lib/tomcat-i18n-ja.jar"/>
>> +      <fileset file="${catalina.home}/lib/tomcat-util-scan.jar"/>
>>      </classpath>
>>    </typedef>
> 
> 
> I suspect that the above will fail if *i18n* jars are not present. I
> think one should be allowed to remove them from an installation.

See r1658802

The downside of r1658802 is if a JAR is missing it isn't immediately
obvious which one it is.

Mark


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


Re: svn commit: r1658799 - /tomcat/trunk/bin/catalina-tasks.xml

Posted by Konstantin Kolinko <kn...@gmail.com>.
2015-02-10 23:32 GMT+03:00  <ma...@apache.org>:
> Author: markt
> Date: Tue Feb 10 20:32:45 2015
> New Revision: 1658799
>
> URL: http://svn.apache.org/r1658799
> Log:
> Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=57558
> Add missing JARs
> JARs in alpha order
>
> 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=1658799&r1=1658798&r2=1658799&view=diff
> ==============================================================================
> --- tomcat/trunk/bin/catalina-tasks.xml (original)
> +++ tomcat/trunk/bin/catalina-tasks.xml Tue Feb 10 20:32:45 2015
> @@ -28,16 +28,20 @@
>    <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"/>
> -      <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
> -      <fileset file="${catalina.home}/lib/tomcat-util-scan.jar"/>
> +      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
> +      <fileset file="${catalina.home}/lib/catalina.jar"/>
> +      <fileset file="${catalina.home}/lib/el-api.jar"/>
>        <fileset file="${catalina.home}/lib/jasper.jar"/>
>        <fileset file="${catalina.home}/lib/jasper-el.jar"/>
> -      <fileset file="${catalina.home}/lib/el-api.jar"/>
>        <fileset file="${catalina.home}/lib/jsp-api.jar"/>
>        <fileset file="${catalina.home}/lib/servlet-api.jar"/>
> -      <fileset file="${catalina.home}/lib/catalina-ant.jar"/>
> +      <fileset file="${catalina.home}/lib/tomcat-api.jar"/>
>        <fileset file="${catalina.home}/lib/tomcat-coyote.jar"/>
> +      <fileset file="${catalina.home}/lib/tomcat-util.jar"/>
> +      <fileset file="${catalina.home}/lib/tomcat-i18n-es.jar"/>
> +      <fileset file="${catalina.home}/lib/tomcat-i18n-fr.jar"/>
> +      <fileset file="${catalina.home}/lib/tomcat-i18n-ja.jar"/>
> +      <fileset file="${catalina.home}/lib/tomcat-util-scan.jar"/>
>      </classpath>
>    </typedef>


I suspect that the above will fail if *i18n* jars are not present. I
think one should be allowed to remove them from an installation.

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