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