Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "William Thomson (wltjr)" <wltjr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-servers/tomcat/files/5.5: 26-main_tomcat_catalina_jasper_build_xml.patch
Date: Tue, 05 Feb 2008 19:40:12
Message-Id: E1JMTeH-0008R5-Eo@stork.gentoo.org
1 wltjr 08/02/05 19:40:05
2
3 Added: 26-main_tomcat_catalina_jasper_build_xml.patch
4 Log:
5 Bumped 5.5 to latest release
6 (Portage version: 2.1.4.1)
7
8 Revision Changes Path
9 1.1 www-servers/tomcat/files/5.5/26-main_tomcat_catalina_jasper_build_xml.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/26-main_tomcat_catalina_jasper_build_xml.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/www-servers/tomcat/files/5.5/26-main_tomcat_catalina_jasper_build_xml.patch?rev=1.1&content-type=text/plain
13
14 Index: 26-main_tomcat_catalina_jasper_build_xml.patch
15 ===================================================================
16 diff -Naur apache-tomcat-5.5.26-src_orig/build/build.xml apache-tomcat-5.5.26-src/build/build.xml
17 --- apache-tomcat-5.5.26-src_orig/build/build.xml 2008-02-05 12:47:08.000000000 -0500
18 +++ apache-tomcat-5.5.26-src/build/build.xml 2008-02-05 13:06:06.000000000 -0500
19 @@ -161,6 +161,7 @@
20
21 <!-- ====================== DEPLOY: Copy Static Files =================== -->
22 <target name="deploy-static" depends="init">
23 +<!--
24 <copy file="${jsp-api.jar}" todir="${tomcat.build}/common/lib"/>
25 <copy file="${servlet-api.jar}" todir="${tomcat.build}/common/lib"/>
26
27 @@ -179,9 +180,10 @@
28 <copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz"
29 file="${tomcat-native.tar.gz}" />
30
31 - <!-- <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
32 - <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/> -->
33 + <copy todir="${tomcat.build}/common/lib" file="${ant.jar}"/>
34 + <copy todir="${tomcat.build}/common/lib" file="${ant-launcher.jar}"/>
35 <copy todir="${tomcat.build}/common/lib" file="${jasper-compiler-jdt.jar}"/>
36 +-->
37 </target>
38
39 <!-- ====================== Build all components =================== -->
40 @@ -413,15 +415,14 @@
41 <target name="build-webapps-precompile"
42 depends="init" description="Precompile webapps" >
43
44 + <antcall target="build-webapp-precompile-admin" />
45 + <antcall target="build-webapp-precompile-examples" />
46 +
47 <!-- JSPC -->
48 - <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
49 <property name="ROOT.base" location="${tomcat.build}/webapps/ROOT" />
50 - <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
51
52 - <mkdir dir="${admin.base}/WEB-INF/src/admin" />
53 <mkdir dir="${ROOT.base}/WEB-INF/src" />
54 <mkdir dir="${ROOT.base}/WEB-INF/classes" />
55 - <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
56
57 <path id="jspc.classpath">
58 <pathelement location="${java.home}/../lib/tools.jar"/>
59 @@ -455,23 +456,6 @@
60 addWebXmlMappings="true"
61 outputDir="${ROOT.base}/WEB-INF/src" />
62
63 - <jasper2
64 - compile="false"
65 - validateXml="false"
66 - uriroot="${jsp-examples.base}"
67 - webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
68 - addWebXmlMappings="true"
69 - outputDir="${jsp-examples.base}/WEB-INF/src" />
70 -
71 - <jasper2
72 - package="admin"
73 - compile="false"
74 - validateXml="false"
75 - uriroot="${admin.base}"
76 - webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
77 - addWebXmlMappings="true"
78 - outputDir="${admin.base}/WEB-INF/src/admin" />
79 -
80 <javac destdir="${ROOT.base}/WEB-INF/classes"
81 optimize="off"
82 debug="${compile.debug}"
83 @@ -492,64 +476,92 @@
84 </classpath>
85 <include name="**" />
86 </javac>
87 + </target>
88 +
89 + <target name="build-webapp-precompile-admin" unless="admin.precompile.notrequired">
90 + <property name="admin.base" location="${tomcat.build}/server/webapps/admin" />
91 + <mkdir dir="${admin.base}/WEB-INF/src/admin" />
92 + <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
93 + <classpath refid="jspc.classpath"/>
94 + </taskdef>
95 + <jasper2
96 + package="admin"
97 + compile="false"
98 + validateXml="false"
99 + uriroot="${admin.base}"
100 + webXmlFragment="${admin.base}/WEB-INF/generated_web.xml"
101 + addWebXmlMappings="true"
102 + outputDir="${admin.base}/WEB-INF/src/admin" />
103 + <javac destdir="${admin.base}/WEB-INF/classes"
104 + optimize="off"
105 + debug="${compile.debug}"
106 + deprecation="${compile.deprecation}"
107 + source="${compile.source}"
108 + failonerror="false"
109 + srcdir="${admin.base}/WEB-INF/src"
110 + excludes="**/*.smap">
111 + <classpath>
112 + <pathelement location="${java.home}/../lib/tools.jar"/>
113 + <fileset dir="${tomcat.build}/server/lib">
114 + <include name="*.jar"/>
115 + </fileset>
116 + <fileset dir="${admin.base}/WEB-INF/lib">
117 + <include name="*.jar"/>
118 + </fileset>
119 + <fileset dir="${tomcat.build}/common/lib">
120 + <include name="*.jar"/>
121 + </fileset>
122 + <pathelement location="${tomcat.build}/classes"/>
123 + </classpath>
124 + <include name="admin/**" />
125 + </javac>
126 + </target>
127
128 + <target name="build-webapp-precompile-examples" unless="examples.precompile.notrequired">
129 + <property name="jsp-examples.base" location="${tomcat.build}/webapps/jsp-examples" />
130 + <mkdir dir="${jsp-examples.base}/WEB-INF/src" />
131 + <taskdef classname="org.apache.jasper.JspC" name="jasper2" >
132 + <classpath refid="jspc.classpath"/>
133 + </taskdef>
134 + <jasper2
135 + compile="false"
136 + validateXml="false"
137 + uriroot="${jsp-examples.base}"
138 + webXmlFragment="${jsp-examples.base}/WEB-INF/generated_web.xml"
139 + addWebXmlMappings="true"
140 + outputDir="${jsp-examples.base}/WEB-INF/src" />
141 <mkdir dir="${jsp-examples.base}/WEB-INF/src/tags"/>
142 <copy todir="${jsp-examples.base}/WEB-INF/classes">
143 <fileset dir="${jsp-examples.base}/WEB-INF/src">
144 <include name="**/*.class" />
145 </fileset>
146 </copy>
147 -
148 <javac destdir="${jsp-examples.base}/WEB-INF/classes"
149 - optimize="off"
150 - debug="${compile.debug}"
151 - deprecation="${compile.deprecation}"
152 - source="${compile.source}"
153 - failonerror="false"
154 + optimize="off"
155 + debug="${compile.debug}"
156 + deprecation="${compile.deprecation}"
157 + source="${compile.source}"
158 + failonerror="false"
159 srcdir="${jsp-examples.base}/WEB-INF/src"
160 - excludes="**/*.smap">
161 - <classpath>
162 - <pathelement location="${java.home}/../lib/tools.jar"/>
163 - <fileset dir="${tomcat.build}/server/lib">
164 - <include name="*.jar"/>
165 - </fileset>
166 + excludes="**/*.smap">
167 + <classpath>
168 + <pathelement location="${java.home}/../lib/tools.jar"/>
169 + <fileset dir="${tomcat.build}/server/lib">
170 + <include name="*.jar"/>
171 + </fileset>
172 <fileset dir="${jsp-examples.base}/WEB-INF/lib">
173 - <include name="*.jar"/>
174 - </fileset>
175 - <fileset dir="${tomcat.build}/common/lib">
176 - <include name="*.jar"/>
177 - </fileset>
178 - <pathelement location="${tomcat.build}/classes"/>
179 + <include name="*.jar"/>
180 + </fileset>
181 + <fileset dir="${tomcat.build}/common/lib">
182 + <include name="*.jar"/>
183 + </fileset>
184 + <pathelement location="${tomcat.build}/classes"/>
185 <pathelement location="${jsp-examples.base}/WEB-INF/classes"/>
186 - </classpath>
187 + </classpath>
188 <include name="**" />
189 <exclude name="tags/**" />
190 - </javac>
191 -
192 - <javac destdir="${admin.base}/WEB-INF/classes"
193 - optimize="off"
194 - debug="${compile.debug}"
195 - deprecation="${compile.deprecation}"
196 - source="${compile.source}"
197 - failonerror="false"
198 - srcdir="${admin.base}/WEB-INF/src"
199 - excludes="**/*.smap">
200 - <classpath>
201 - <pathelement location="${java.home}/../lib/tools.jar"/>
202 - <fileset dir="${tomcat.build}/server/lib">
203 - <include name="*.jar"/>
204 - </fileset>
205 - <fileset dir="${admin.base}/WEB-INF/lib">
206 - <include name="*.jar"/>
207 - </fileset>
208 - <fileset dir="${tomcat.build}/common/lib">
209 - <include name="*.jar"/>
210 - </fileset>
211 - <pathelement location="${tomcat.build}/classes"/>
212 - </classpath>
213 - <include name="admin/**" />
214 - </javac>
215 - </target>
216 + </javac>
217 + </target>
218
219 <target name="build-catalina" depends="init"
220 description="Builds catalina">
221 @@ -676,7 +688,7 @@
222 <param name="sourcefile" value="${commons-collections-src.loc}"/>
223 <param name="destfile" value="${tomcat-dbcp.jar}" />
224 </antcall>
225 - -->
226 +
227 <antcall target="downloadgz">
228 <param name="sourcefile" value="${commons-pool-src.loc}"/>
229 <param name="destfile" value="${tomcat-dbcp.jar}" />
230 @@ -694,6 +706,7 @@
231 <param name="destdir" value="${base.path}"/>
232 </antcall>
233 <antcall target="build-jasper-compiler-jdt" />
234 +-->
235 </target>
236
237 <target name="build-tomcat-dbcp">
238 @@ -773,14 +786,7 @@
239 </jar>
240 </target>
241
242 - <target name="build-webapps" depends="init"
243 - description="build webapps">
244 -
245 - <echo>========== Building: webapps </echo>
246 -
247 - <mkdir dir="${tomcat.build}/webapps" />
248 - <mkdir dir="${tomcat.build}/server/webapps" />
249 -
250 + <target name="build-examples" unless="examples.build.notrequired">
251 <!-- The build files are far too difficult to hack - just build it and copy -->
252 <ant dir="${api.home}/jsr154" target="dist">
253 </ant>
254 @@ -798,6 +804,17 @@
255 <exclude name="WEB-INF/tagPlugins.xml" />
256 </fileset>
257 </copy>
258 + </target>
259 +
260 + <target name="build-webapps" depends="init"
261 + description="build webapps">
262 +
263 + <echo>========== Building: webapps </echo>
264 +
265 + <mkdir dir="${tomcat.build}/webapps" />
266 + <mkdir dir="${tomcat.build}/server/webapps" />
267 +
268 + <antcall target="build-examples" />
269
270 <ant dir="${catalina.home}/webapps/ROOT" target="build-main">
271 <property name="webapps.build" value="${tomcat.build}/webapps" />
272 @@ -869,14 +886,7 @@
273 filtering="true" />
274
275 <!-- Build JARs for webapps classes -->
276 - <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
277 - <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
278 - index="true">
279 - <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
280 - <include name="**/*.class" />
281 - <include name="**/*.properties" />
282 - </fileset>
283 - </jar>
284 + <antcall target="fix-admin-webapp" />
285 <mkdir dir="${tomcat.build}/server/webapps/manager/WEB-INF/lib" />
286 <jar jarfile="${tomcat.build}/server/webapps/manager/WEB-INF/lib/catalina-manager.jar"
287 index="true">
288 @@ -915,9 +925,19 @@
289 todir="${tomcat.build}/conf/Catalina/localhost" />
290 <copy file="${tomcat.build}/server/webapps/host-manager/host-manager.xml"
291 todir="${tomcat.build}/conf/Catalina/localhost" />
292 + </target>
293 +
294 + <target name="fix-admin-webapp" unless="admin.build.notrequired">
295 + <mkdir dir="${tomcat.build}/server/webapps/admin/WEB-INF/lib" />
296 + <jar jarfile="${tomcat.build}/server/webapps/admin/WEB-INF/lib/catalina-admin.jar"
297 + index="true">
298 + <fileset dir="${tomcat.build}/server/webapps/admin/WEB-INF/classes">
299 + <include name="**/*.class" />
300 + <include name="**/*.properties" />
301 + </fileset>
302 + </jar>
303 <copy file="${tomcat.build}/server/webapps/admin/admin.xml"
304 todir="${tomcat.build}/conf/Catalina/localhost" />
305 -
306 </target>
307
308 <!-- ====================== Embed target =================== -->
309 @@ -1060,11 +1080,11 @@
310 <!-- ====================== Compat target =================== -->
311
312 <target name="compat" description="Create compatibility binaries for JREs before 1.5" >
313 -
314 +<!--
315 <copy todir="${tomcat.compat}/common/endorsed" file="${xercesImpl.jar}"/>
316 <copy todir="${tomcat.compat}/common/endorsed" file="${xml-apis.jar}"/>
317 <copy tofile="${tomcat.compat}/bin/jmx.jar" file="${jmx.jar}"/>
318 -
319 +-->
320 </target>
321
322 <!-- ====================== DEPLOY: Deploy Components =================== -->
323 @@ -1108,11 +1128,11 @@
324 <fileset dir="${api.home}/jsr154/build/examples"/>
325 </copy>
326
327 - <!-- Copy Unix JSVC from commons-daemon -->
328 + <!-- Copy Unix JSVC from commons-daemon
329 <copy file="${commons-daemon.jsvc.tar.gz}"
330 tofile="${tomcat.dist}/bin/jsvc.tar.gz" />
331 <copy todir="${tomcat.build}/bin" file="${commons-daemon.jar}" />
332 -
333 + -->
334 <echo>Target: Webapps precompilation ...</echo>
335
336 <antcall target="build-admin"/>
337 @@ -1213,11 +1233,11 @@
338 <target name="run-tester"
339 description="Catalina Tests" depends="dist-tester">
340
341 - <!-- For Java 1.4 -->
342 + <!-- For Java 1.4
343 <copy file="${jmx.jar}" tofile="${tomcat.build}/bin/jmx.jar" />
344 <copy todir="${tomcat.build}/common/endorsed" file="${xercesImpl.jar}"/>
345 <copy todir="${tomcat.build}/common/endorsed" file="${xml-apis.jar}"/>
346 -
347 + -->
348 <parallel>
349
350 <java classname="LauncherBootstrap" fork="yes">
351 @@ -1898,7 +1918,7 @@
352 description="Download binary packages" >
353 <mkdir dir="${base.path}" />
354
355 - <!-- Download any sub package or tools needed. -->
356 + <!-- Download any sub package or tools needed.
357 <antcall target="downloadgz">
358 <param name="sourcefile" value="${commons-beanutils.loc}"/>
359 <param name="destfile" value="${commons-beanutils.jar}"/>
360 @@ -1935,7 +1955,6 @@
361 </antcall>
362
363 <antcall target="downloadgz">
364 - <!-- xerces2 brings 2 files, test for one of them -->
365 <param name="sourcefile" value="${xerces.loc}"/>
366 <param name="destfile" value="${xml-apis.jar}"/>
367 </antcall>
368 @@ -1977,7 +1996,7 @@
369 <param name="destfile" value="${tomcat-native.tar.gz}"/>
370 <param name="destdir" value="${tomcat-native.home}"/>
371 </antcall>
372 -
373 + -->
374 <!-- Build the dependencies that are not yet released -->
375 <antcall target="build-depends"/>
376
377 diff -Naur apache-tomcat-5.5.26-src_orig/build.xml apache-tomcat-5.5.26-src/build.xml
378 --- apache-tomcat-5.5.26-src_orig/build.xml 2008-02-05 12:47:07.000000000 -0500
379 +++ apache-tomcat-5.5.26-src/build.xml 2008-02-05 13:06:35.000000000 -0500
380 @@ -81,13 +81,10 @@
381
382 <target name="checkout"
383 description="Update or checkout required sources from SVN">
384 -
385 +<!--
386 <echo level="info"
387 message="If the checkout fails, see http://tomcat.apache.org/svn.html and http://subversion.tigris.org/faq.html#proxy" />
388
389 - <!-- Bugzilla 37977: http://issues.apache.org/bugzilla/show_bug.cgi?id=37977 -->
390 - <!-- hackish: inputstring="t${line.separator}" is t+<enter> for svn -->
391 - <!-- to temporarily accept the certificate of svn.apache.org. -->
392 <exec dir="${basedir}"
393 executable="svn"
394 inputstring="t${line.separator}"
395 @@ -96,7 +93,7 @@
396 <arg value="${svnroot}/${current.loc}" />
397 <arg value="${basedir}" />
398 </exec>
399 -
400 +-->
401 </target>
402
403 <!-- *************** UTILITY TARGETS *************** -->
404 diff -Naur apache-tomcat-5.5.26-src_orig/container/catalina/build.xml apache-tomcat-5.5.26-src/container/catalina/build.xml
405 --- apache-tomcat-5.5.26-src_orig/container/catalina/build.xml 2008-02-05 12:47:08.000000000 -0500
406 +++ apache-tomcat-5.5.26-src/container/catalina/build.xml 2008-02-05 13:14:29.000000000 -0500
407 @@ -77,6 +77,7 @@
408 <pathelement location="${jaas.jar}"/>
409 <pathelement location="${javagroups.jar}"/>
410 <pathelement location="${jcert.jar}"/>
411 + <pathelement location="${jdt.jar}"/>
412 <pathelement location="${jmx.jar}"/>
413 <pathelement location="${jmx-remote.jar}"/>
414 <pathelement location="${jndi.jar}"/>
415 @@ -108,6 +109,7 @@
416 <pathelement location="${commons-modeler.jar}"/>
417 <pathelement location="${jaas.jar}"/>
418 <pathelement location="${jcert.jar}"/>
419 + <pathelement location="${jdt.jar}"/>
420 <pathelement location="${jmx.jar}"/>
421 <pathelement location="${jndi.jar}"/>
422 <pathelement location="${jnet.jar}"/>
423 @@ -565,9 +567,9 @@
424 file="${commons-logging-api.jar}"/>
425 <!--
426 <copy todir="${catalina.build}/common/lib" file="${servlet-api.jar}"/>
427 --->
428 <copy todir="${catalina.build}/common/lib"
429 file="${tomcat-dbcp.jar}" />
430 +-->
431
432 <!-- Configuration Files -->
433 <copy todir="${catalina.build}/conf">
434 diff -Naur apache-tomcat-5.5.26-src_orig/jasper/build.xml apache-tomcat-5.5.26-src/jasper/build.xml
435 --- apache-tomcat-5.5.26-src_orig/jasper/build.xml 2008-02-05 12:47:07.000000000 -0500
436 +++ apache-tomcat-5.5.26-src/jasper/build.xml 2008-02-05 13:14:58.000000000 -0500
437 @@ -47,6 +47,7 @@
438 <pathelement location="${jsp-api.jar}"/>
439 <pathelement location="${tools.jar}"/>
440 <pathelement location="${jasper-compiler-jdt.jar}"/>
441 + <pathelement location="${jdt.jar}"/>
442 <pathelement location="${xerces.jar}"/>
443 <pathelement location="${xercesImpl.jar}"/>
444 <pathelement location="${xml-apis.jar}"/>
445
446
447
448 --
449 gentoo-commits@l.g.o mailing list
Report Message
Find on MARC Find on Google Groups