| 1 |
fordfrog 11/09/02 10:50:01 |
| 2 |
|
| 3 |
Added: 7.0.21-build-xml.patch |
| 4 |
Log: |
| 5 |
www-servers/tomcat: version bump |
| 6 |
|
| 7 |
(Portage version: 2.1.10.11/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 www-servers/tomcat/files/7/7.0.21-build-xml.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/7/7.0.21-build-xml.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/7/7.0.21-build-xml.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: 7.0.21-build-xml.patch |
| 16 |
=================================================================== |
| 17 |
--- build.xml.orig 2011-03-05 14:11:01.000000000 +0100 |
| 18 |
+++ build.xml 2011-03-08 17:39:53.752257789 +0100 |
| 19 |
@@ -147,6 +147,7 @@ |
| 20 |
|
| 21 |
<!-- Classpaths --> |
| 22 |
<path id="compile.classpath"> |
| 23 |
+ <pathelement location="${ant.jar}"/> |
| 24 |
<pathelement location="${jdt.jar}"/> |
| 25 |
</path> |
| 26 |
|
| 27 |
@@ -291,6 +292,7 @@ |
| 28 |
<exclude name="org/apache/catalina/mbeans/JmxRemote*" /> |
| 29 |
<exclude name="org/apache/catalina/tribes/**" /> |
| 30 |
<exclude name="org/apache/naming/factory/webservices/**" /> |
| 31 |
+ <exclude name="javax/servlet/**" /> |
| 32 |
</patternset> |
| 33 |
|
| 34 |
<patternset id="files.catalina-tribes"> |
| 35 |
@@ -420,7 +422,7 @@ |
| 36 |
|
| 37 |
</target> |
| 38 |
|
| 39 |
- <target name="validate" depends="download-validate" if="${execute.validate}"> |
| 40 |
+ <target name="validate" if="${execute.validate}"> |
| 41 |
<!-- Required so we can cache checkstyle results --> |
| 42 |
<mkdir dir="${tomcat.output}/res/checkstyle"/> |
| 43 |
|
| 44 |
@@ -464,7 +466,7 @@ |
| 45 |
</checkstyle> |
| 46 |
</target> |
| 47 |
|
| 48 |
- <target name="compile" depends="build-prepare,download-compile,validate"> |
| 49 |
+ <target name="compile" depends="build-prepare,validate"> |
| 50 |
|
| 51 |
<!-- Compile internal server components --> |
| 52 |
<javac srcdir="java" destdir="${tomcat.classes}" |
| 53 |
@@ -525,7 +527,7 @@ |
| 54 |
filesId="files.annotations-api" |
| 55 |
manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
| 56 |
|
| 57 |
- <!-- Servlet 3.0 Implementation JAR File --> |
| 58 |
+<!-- Servlet 3.0 Implementation JAR File |
| 59 |
<jarIt jarfile="${servlet-api.jar}" |
| 60 |
filesDir="${tomcat.classes}" |
| 61 |
filesId="files.servlet-api" |
| 62 |
@@ -533,7 +535,7 @@ |
| 63 |
notice="${tomcat.manifests}/servlet-api.jar.notice" |
| 64 |
license="${tomcat.manifests}/servlet-api.jar.license" /> |
| 65 |
|
| 66 |
- <!-- JSP 2.2 Implementation JAR File --> |
| 67 |
+ JSP 2.2 Implementation JAR File |
| 68 |
<jarIt jarfile="${jsp-api.jar}" |
| 69 |
filesDir="${tomcat.classes}" |
| 70 |
filesId="files.jsp-api" |
| 71 |
@@ -541,12 +543,12 @@ |
| 72 |
notice="${tomcat.manifests}/jsp-api.jar.notice" |
| 73 |
license="${tomcat.manifests}/jsp-api.jar.license" /> |
| 74 |
|
| 75 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
| 76 |
+ JSP 2.2 EL Implementation JAR File |
| 77 |
<jarIt jarfile="${el-api.jar}" |
| 78 |
filesDir="${tomcat.classes}" |
| 79 |
filesId="files.el-api" |
| 80 |
manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
| 81 |
- |
| 82 |
+--> |
| 83 |
<!-- Bootstrap JAR File --> |
| 84 |
<jarIt jarfile="${bootstrap.jar}" |
| 85 |
filesDir="${tomcat.classes}" |
| 86 |
@@ -637,7 +639,7 @@ |
| 87 |
|
| 88 |
</target> |
| 89 |
|
| 90 |
- <target name="build-docs" description="Builds all documentation from XML sources"> |
| 91 |
+ <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources"> |
| 92 |
|
| 93 |
<copy todir="${tomcat.build}/webapps"> |
| 94 |
<fileset dir="webapps"> |
| 95 |
@@ -745,14 +747,14 @@ |
| 96 |
|
| 97 |
<target name="deploy" depends="package,build-docs" |
| 98 |
description="Default. Builds a working Tomcat instance"> |
| 99 |
- |
| 100 |
+<!-- |
| 101 |
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
| 102 |
file="${tomcat-native.tar.gz}" /> |
| 103 |
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
| 104 |
file="${commons-daemon.native.src.tgz}" /> |
| 105 |
|
| 106 |
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
| 107 |
- |
| 108 |
+--> |
| 109 |
<!-- Copy scripts --> |
| 110 |
<copy todir="${tomcat.build}/bin"> |
| 111 |
<fileset dir="bin"> |
| 112 |
@@ -809,7 +811,7 @@ |
| 113 |
source="${compile.source}" |
| 114 |
target="${compile.target}" |
| 115 |
optimize="${compile.optimize}" |
| 116 |
- classpath="${tomcat.classes}" |
| 117 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
| 118 |
excludes="**/CVS/**,**/.svn/**" |
| 119 |
encoding="ISO-8859-1" |
| 120 |
includeantruntime="false"> |
| 121 |
@@ -821,7 +823,7 @@ |
| 122 |
source="${compile.source}" |
| 123 |
target="${compile.target}" |
| 124 |
optimize="${compile.optimize}" |
| 125 |
- classpath="$tomcat.lcasses}" |
| 126 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
| 127 |
excludes="**/CVS/**,**/.svn/**" |
| 128 |
encoding="ISO-8859-1" |
| 129 |
includeantruntime="false"> |
| 130 |
@@ -829,11 +831,11 @@ |
| 131 |
|
| 132 |
<!-- Add sources for examples --> |
| 133 |
<antcall target="examples-sources" /> |
| 134 |
- |
| 135 |
+<!-- |
| 136 |
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
| 137 |
failonerror="false"/> |
| 138 |
<copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> |
| 139 |
- |
| 140 |
+--> |
| 141 |
<!-- build the jdbc-pool jar and source jar--> |
| 142 |
<echo message="Building Tomcat JDBC pool libraries"/> |
| 143 |
<ant antfile="${tomcat.jdbc.dir}/build.xml" dir="${tomcat.jdbc.dir}" inheritall="false" target="build"> |
| 144 |
@@ -1008,7 +1010,7 @@ |
| 145 |
|
| 146 |
</target> |
| 147 |
|
| 148 |
- <target name="test-compile" depends="compile,download-test-compile" > |
| 149 |
+ <target name="test-compile" depends="compile" > |
| 150 |
<mkdir dir="${test.classes}"/> |
| 151 |
<!-- Compile --> |
| 152 |
<javac srcdir="test" destdir="${test.classes}" |
Archives