Author: markt
Date: Fri Feb 21 16:43:31 2014
New Revision: 1570632
URL: http://svn.apache.org/r1570632
Log:
Alternative fix to the empty dir in JAR file issue
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1570629
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1570632&r1=1570631&r2=1570632&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Fri Feb 21 16:43:31 2014
@@ -284,8 +284,7 @@
</patternset>
<patternset id="files.servlet-api">
- <include name="javax/servlet/*.class" />
- <include name="javax/servlet/*.properties" />
+ <include name="javax/servlet/*" />
<include name="javax/servlet/annotation/**" />
<include name="javax/servlet/descriptor/**" />
<include name="javax/servlet/http/**" />
@@ -327,7 +326,7 @@
</patternset>
<patternset id="files.tomcat-api">
- <include name="org/apache/tomcat/*.class" />
+ <include name="org/apache/tomcat/*" />
</patternset>
<patternset id="files.tomcat-util">
@@ -764,7 +763,7 @@
<!-- i18n JARs -->
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-es.jar"
- manifest="${tomcat.manifests}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" filesonly="true">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_es.properties" />
</fileset>
@@ -774,7 +773,7 @@
fullpath="META-INF/LICENSE" />
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-fr.jar"
- manifest="${tomcat.manifests}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" filesonly="true">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_fr.properties" />
</fileset>
@@ -784,7 +783,7 @@
fullpath="META-INF/LICENSE" />
</jar>
<jar jarfile="${tomcat.build}/lib/tomcat-i18n-ja.jar"
- manifest="${tomcat.manifests}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest" filesonly="true">
<fileset dir="${tomcat.classes}">
<include name="**/LocalStrings_ja.properties" />
</fileset>
@@ -1521,9 +1520,10 @@
target="compile" />
<jar jarfile="${tomcat-juli-extras.jar}"
- manifest="${tomcat.manifests}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest"
+ filesonly="true">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes">
- <include name="org/apache/juli/logging/*.class" />
+ <include name="org/apache/juli/logging/*" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.class" />
<include name="org/apache/juli/logging/impl/WeakHashtable*.class" />
<include name="org/apache/juli/logging/impl/SimpleLog*.class" />
@@ -1557,7 +1557,8 @@
<!-- Source JARs -->
<jar jarfile="${tomcat-juli-extras-src.jar}"
- manifest="${tomcat.manifests}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest"
+ filesonly="true">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/LogFactoryImpl*.java" />
@@ -1664,10 +1665,11 @@
description="Embedded packaging for those extras that can use it">
<jar jarfile="${tomcat-embed-log4j.jar}"
- manifest="${tomcat.manifests}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest"
+ filesonly="true">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/target/classes">
- <include name="org/apache/juli/logging/*.class" />
- <include name="org/apache/juli/logging/impl/*.class" />
+ <include name="org/apache/juli/logging/*" />
+ <include name="org/apache/juli/logging/impl/*" />
<!-- Javadoc and i18n exclusions -->
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
@@ -1685,7 +1687,8 @@
</jar>
<jar jarfile="${tomcat-embed-log4j-src.jar}"
- manifest="${tomcat.manifests}/default.manifest" >
+ manifest="${tomcat.manifests}/default.manifest"
+ filesonly="true">
<fileset
dir="${tomcat.extras}/logging/commons-logging-${commons-logging.version}-src/src/main/java">
<include name="org/apache/juli/logging/*.java" />
<include name="org/apache/juli/logging/impl/*.java" />
@@ -1990,13 +1993,13 @@ Apache Tomcat ${version} native binaries
</copy>
<!-- Digester and dependencies -->
- <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar">
+ <jar jarfile="${tomcat.deployer}/lib/catalina-deployer.jar"
+ filesonly="true">
<fileset dir="${tomcat.classes}">
<include name="org/apache/catalina/startup/DigesterFactory.class" />
<include name="org/apache/catalina/util/SchemaResolver.class" />
<include name="org/apache/catalina/util/StringManager.class" />
- <include name="org/apache/tomcat/util/*.class" />
- <include name="org/apache/tomcat/util/*.properties" />
+ <include name="org/apache/tomcat/util/*" />
<include name="org/apache/tomcat/util/digester/**" />
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
@@ -2933,7 +2936,7 @@ Read the Building page on the Apache Tom
<attribute name="meta-inf" description="additional contents for META-INF"
default="${tomcat.manifests}/default" />
<sequential>
- <jar jarfile="@{jarfile}" manifest="@{manifest}">
+ <jar jarfile="@{jarfile}" manifest="@{manifest}" filesonly="true">
<fileset dir="@{filesDir}">
<patternset refid="@{filesId}"/>
<!-- Javadoc and i18n exclusions -->
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
