Author: markt Date: Wed Oct 5 09:26:26 2016 New Revision: 1763370 URL: http://svn.apache.org/viewvc?rev=1763370&view=rev Log: Nice idea but excluding bootstrap classes from files.catalina just makes building files.tomcat-embed-core more complex
Modified: tomcat/trunk/build.xml Modified: tomcat/trunk/build.xml URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1763370&r1=1763369&r2=1763370&view=diff ============================================================================== --- tomcat/trunk/build.xml (original) +++ tomcat/trunk/build.xml Wed Oct 5 09:26:26 2016 @@ -325,6 +325,11 @@ <include name="org/apache/tomcat/websocket/**" /> </patternset> + <!-- This duplicates some classes in files.catalina --> + <!-- Duplicating a few classes in bootstrap.jar is simpler than excluding --> + <!-- them from files.catalina and having to manually add them to --> + <!-- files.tomcat-embed-core because of an include/exclude conflict --> + <!-- between files.catalina and files.bootstrap. --> <patternset id="files.bootstrap"> <include name="org/apache/catalina/startup/Bootstrap.*" /> <include name="org/apache/catalina/startup/catalina.properties" /> @@ -379,10 +384,6 @@ <patternset id="files.catalina"> <include name="org/apache/catalina/**" /> <include name="org/apache/naming/**" /> - <!-- Exclude classes included in bootstrap.jar --> - <invert> - <patternset refid="files.bootstrap"/> - </invert> <!-- Modules --> <exclude name="org/apache/catalina/ant/**" /> <exclude name="org/apache/catalina/ha/**" /> @@ -438,7 +439,6 @@ <!-- Every standard pattern set above should be included in an embedded JAR --> <patternset id="files.tomcat-embed-core" > <patternset refid="files.annotations-api" /> - <patternset refid="files.bootstrap" /> <patternset refid="files.catalina" /> <patternset refid="files.servlet-api" /> <patternset refid="files.jaspic-api" /> --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org