diff options
Diffstat (limited to 'www-servers/tomcat/files/6/build-xml.patch')
| -rw-r--r-- | www-servers/tomcat/files/6/build-xml.patch | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/www-servers/tomcat/files/6/build-xml.patch b/www-servers/tomcat/files/6/build-xml.patch index fce017234234..e3a627469608 100644 --- a/www-servers/tomcat/files/6/build-xml.patch +++ b/www-servers/tomcat/files/6/build-xml.patch @@ -1,14 +1,14 @@ ---- ../build.xml 2007-01-28 17:08:59.000000000 -0500 -+++ build.xml 2007-01-28 17:15:32.000000000 -0500 -@@ -94,6 +94,7 @@ - excludes="**/CVS/**,**/.svn/**"> +--- build.xml 2007-05-15 11:29:45.000000000 -0400 ++++ portage/www-servers/tomcat-6.0.13/work/apache-tomcat-6.0.13-src/build.xml 2007-05-15 11:41:46.000000000 -0400 +@@ -96,6 +96,7 @@ <classpath refid="tomcat.classpath" /> <exclude name="org/apache/tomcat/util/net/puretls/**" /> + <exclude name="org/apache/naming/factory/webservices/**" /> + <exclude name="javax/servlet/**" /> </javac> <tstamp> <format property="TODAY" pattern="MMM d yyyy" locale="en"/> -@@ -133,27 +134,27 @@ +@@ -135,27 +136,27 @@ </fileset> </jar> @@ -24,7 +24,7 @@ <exclude name="**/LocalStrings_*" /> </fileset> </jar> -+ --> ++ --> - <!-- JSP 2.1 Implementation JAR File --> + <!-- JSP 2.1 Implementation JAR File @@ -36,11 +36,11 @@ <exclude name="**/LocalStrings_*" /> </fileset> </jar> -+ --> ++ --> <!-- JSP 2.1 EL Implementation JAR File --> <jar jarfile="${el-api.jar}"> -@@ -299,7 +300,7 @@ +@@ -302,7 +303,7 @@ </target> @@ -49,7 +49,7 @@ <copy todir="${tomcat.build}/webapps"> <fileset dir="webapps"> -@@ -447,11 +448,16 @@ +@@ -453,11 +454,16 @@ <target name="deploy" depends="build-only,build-docs"> @@ -66,7 +66,7 @@ <!-- Copy scripts --> <copy todir="${tomcat.build}/bin"> -@@ -488,12 +494,14 @@ +@@ -494,7 +500,7 @@ destdir="${tomcat.build}/webapps/examples/WEB-INF/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" @@ -74,6 +74,10 @@ + classpath="${tomcat.classes}:${jsp-api.jar}" excludes="**/CVS/**,**/.svn/**"> </javac> + +@@ -506,8 +512,10 @@ + excludes="**/CVS/**,**/.svn/**"> + </javac> +<!-- <copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" /> @@ -81,4 +85,4 @@ +--> </target> - + |