Author: markt
Date: Thu Feb 20 09:04:52 2014
New Revision: 1570115
URL: http://svn.apache.org/r1570115
Log:
Simplify patternsets where possible
Avoid pattern sets ending in "/*" as much as possible as they usually result in
JARs containing empty packages with the contents of the package in a different
JAR
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1570114
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1570115&r1=1570114&r2=1570115&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Thu Feb 20 09:04:52 2014
@@ -277,20 +277,18 @@
<!-- ========= Pattern sets used to control content of JAR files =========
-->
<!-- Pattern sets for jar files in standard distributions -->
<patternset id="files.annotations-api">
- <include name="javax/annotation/*" />
- <include name="javax/annotation/security/*" />
- <include name="javax/annotation/sql/*" />
- <include name="javax/ejb/*" />
- <include name="javax/persistence/*" />
- <include name="javax/xml/ws/*" />
+ <include name="javax/annotation/**" />
+ <include name="javax/ejb/**" />
+ <include name="javax/persistence/**" />
+ <include name="javax/xml/ws/**" />
</patternset>
<patternset id="files.servlet-api">
- <include name="javax/servlet/*" />
- <include name="javax/servlet/annotation/*" />
- <include name="javax/servlet/descriptor/*" />
- <include name="javax/servlet/http/*" />
- <include name="javax/servlet/resources/*" />
+ <include name="javax/servlet/*.class" />
+ <include name="javax/servlet/annotation/**" />
+ <include name="javax/servlet/descriptor/**" />
+ <include name="javax/servlet/http/**" />
+ <include name="javax/servlet/resources/**" />
</patternset>
<patternset id="files.jsp-api">
@@ -298,7 +296,7 @@
</patternset>
<patternset id="files.el-api">
- <include name="javax/el/*" />
+ <include name="javax/el/**" />
</patternset>
<patternset id="files.websocket-api">
@@ -328,7 +326,7 @@
</patternset>
<patternset id="files.tomcat-api">
- <include name="org/apache/tomcat/*" />
+ <include name="org/apache/tomcat/*.class" />
</patternset>
<patternset id="files.tomcat-util">
@@ -358,8 +356,7 @@
</patternset>
<patternset id="files.catalina-ant">
- <include name="org/apache/catalina/ant/*" />
- <include name="org/apache/catalina/ant/jmx/*" />
+ <include name="org/apache/catalina/ant/**" />
<include name="org/apache/catalina/util/Base64.*" />
</patternset>
@@ -1997,8 +1994,8 @@ Apache Tomcat ${version} native binaries
<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/*" />
- <include name="org/apache/tomcat/util/digester/*" />
+ <include name="org/apache/tomcat/util/*.class" />
+ <include name="org/apache/tomcat/util/digester/**" />
<exclude name="**/package.html" />
<exclude name="**/LocalStrings_*" />
</fileset>
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=1570115&r1=1570114&r2=1570115&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/changelog.xml Thu Feb 20 09:04:52 2014
@@ -120,6 +120,9 @@
<bug>56139</bug>: Avoid a web application class loader leak in some
unit
tests when running on Windows. (markt)
</fix>
+ <fix>
+ Correct build script to avoid building JARs with empty packages.
(markt)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
