On 20/02/2014 09:26, Mark Thomas wrote: > On 20/02/2014 09:10, Konstantin Kolinko wrote: >> 2014-02-20 13:04 GMT+04:00 <ma...@apache.org>: >>> 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" /> >> >> I do not like these *.class patterns. >> >> I think occasionally having an empty package is less evil than missing >> a *.properties file. > > Empty packages might cause issues when we start signing JARs. I know you > can't have classes from the same package in different signed JARs. I'm > not sure about empty packages. > > We can always add a *.properties pattern to those patternsets. > > What is bothering me more right now, is why the servlet-api.jar didn't > have any *.properties files in it before this change. I'm looking into > this now but any hints welcome.
Scratch that. I'm blind. The properties file was there. I'll get the patterns fixed. Mark --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
