tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1030783 - /tomcat/trunk/build.xml
Date Thu, 04 Nov 2010 00:50:41 GMT
Author: markt
Date: Thu Nov  4 00:50:41 2010
New Revision: 1030783

URL: http://svn.apache.org/viewvc?rev=1030783&view=rev
Log:
Ensure embedded jars contain all the necessary classes
Re-order things so it is easier to check all are present

Modified:
    tomcat/trunk/build.xml

Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1030783&r1=1030782&r2=1030783&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Thu Nov  4 00:50:41 2010
@@ -334,18 +334,26 @@
   <!-- 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.servlet-api" />
-    <patternset refid="files.el-api" />
     <patternset refid="files.bootstrap" />
-    <patternset refid="files.tomcat-api" />
     <patternset refid="files.catalina" />
-    <patternset refid="files.tomcat-coyote" />
+    <patternset refid="files.el-api" />
+    <patternset refid="files.servlet-api" />
+    <patternset refid="files.tomcat-api" />
+    <!-- These pattern sets conflict so include files directly
+      <patternset refid="files.tomcat-coyote" />
+      <patternset refid="files.tomcat-util" />
+    -->
+    <include name="org/apache/coyote/**" />
+    <include name="org/apache/tomcat/jni/**" />
+    <include name="org/apache/jk/**" />
+    <include name="org/apache/tomcat/util/**" />
+
   </patternset>
 
   <patternset id="files.tomcat-embed-jasper" >
-    <patternset refid="files.jsp-api" />
     <patternset refid="files.jasper" />
     <patternset refid="files.jasper-el" />
+    <patternset refid="files.jsp-api" />
   </patternset>
 
   <!-- Pattern sets used directly -->



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


Mime
View raw message