1 |
fordfrog 11/01/30 17:50:03 |
2 |
|
3 |
Added: 7.0.6-build-xml.patch |
4 |
Log: |
5 |
www-servers/tomcat: version bump |
6 |
|
7 |
(Portage version: 2.1.9.35/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 www-servers/tomcat/files/7/7.0.6-build-xml.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-servers/tomcat/files/7/7.0.6-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.6-build-xml.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: 7.0.6-build-xml.patch |
16 |
=================================================================== |
17 |
diff -Naur apache-tomcat-7.0.6-src_orig/build.xml apache-tomcat-7.0.5-src/build.xml |
18 |
--- apache-tomcat-7.0.6-src_orig/build.xml 2010-12-06 17:20:48.777166339 -0500 |
19 |
+++ apache-tomcat-7.0.6-src/build.xml 2010-12-06 17:58:10.529303918 -0500 |
20 |
@@ -149,6 +149,7 @@ |
21 |
|
22 |
<!-- Classpaths --> |
23 |
<path id="compile.classpath"> |
24 |
+ <pathelement location="${ant.jar}"/> |
25 |
<pathelement location="${jdt.jar}"/> |
26 |
</path> |
27 |
|
28 |
@@ -291,6 +292,7 @@ |
29 |
<exclude name="org/apache/catalina/mbeans/JmxRemote*" /> |
30 |
<exclude name="org/apache/catalina/tribes/**" /> |
31 |
<exclude name="org/apache/naming/factory/webservices/**" /> |
32 |
+ <exclude name="javax/servlet/**" /> |
33 |
</patternset> |
34 |
|
35 |
<patternset id="files.catalina-tribes"> |
36 |
@@ -420,7 +422,7 @@ |
37 |
|
38 |
</target> |
39 |
|
40 |
- <target name="validate" depends="download-validate" if="${execute.validate}"> |
41 |
+ <target name="validate" if="${execute.validate}"> |
42 |
<taskdef resource="checkstyletask.properties" |
43 |
classpath="${checkstyle.jar}" /> |
44 |
<checkstyle config="checkstyle.xml"> |
45 |
@@ -437,7 +439,7 @@ |
46 |
</checkstyle> |
47 |
</target> |
48 |
|
49 |
- <target name="compile" depends="build-prepare,download-compile,validate"> |
50 |
+ <target name="compile" depends="build-prepare,validate"> |
51 |
|
52 |
<!-- Compile internal server components --> |
53 |
<javac srcdir="java" destdir="${tomcat.classes}" |
54 |
@@ -498,7 +500,7 @@ |
55 |
filesId="files.annotations-api" |
56 |
manifest="${tomcat.manifests}/annotations-api.jar.manifest" /> |
57 |
|
58 |
- <!-- Servlet 3.0 Implementation JAR File --> |
59 |
+<!-- Servlet 3.0 Implementation JAR File |
60 |
<jarIt jarfile="${servlet-api.jar}" |
61 |
filesDir="${tomcat.classes}" |
62 |
filesId="files.servlet-api" |
63 |
@@ -506,7 +508,7 @@ |
64 |
notice="${tomcat.manifests}/servlet-api.jar.notice" |
65 |
license="${tomcat.manifests}/servlet-api.jar.license" /> |
66 |
|
67 |
- <!-- JSP 2.2 Implementation JAR File --> |
68 |
+ JSP 2.2 Implementation JAR File |
69 |
<jarIt jarfile="${jsp-api.jar}" |
70 |
filesDir="${tomcat.classes}" |
71 |
filesId="files.jsp-api" |
72 |
@@ -514,12 +516,12 @@ |
73 |
notice="${tomcat.manifests}/jsp-api.jar.notice" |
74 |
license="${tomcat.manifests}/jsp-api.jar.license" /> |
75 |
|
76 |
- <!-- JSP 2.2 EL Implementation JAR File --> |
77 |
+ JSP 2.2 EL Implementation JAR File |
78 |
<jarIt jarfile="${el-api.jar}" |
79 |
filesDir="${tomcat.classes}" |
80 |
filesId="files.el-api" |
81 |
manifest="${tomcat.manifests}/el-api.jar.manifest" /> |
82 |
- |
83 |
+--> |
84 |
<!-- Bootstrap JAR File --> |
85 |
<jarIt jarfile="${bootstrap.jar}" |
86 |
filesDir="${tomcat.classes}" |
87 |
@@ -610,7 +612,7 @@ |
88 |
|
89 |
</target> |
90 |
|
91 |
- <target name="build-docs" description="Builds all documentation from XML sources"> |
92 |
+ <target name="build-docs" unless="nobuild.docs" description="Builds all documentation from XML sources"> |
93 |
|
94 |
<copy todir="${tomcat.build}/webapps"> |
95 |
<fileset dir="webapps"> |
96 |
@@ -718,14 +720,14 @@ |
97 |
|
98 |
<target name="deploy" depends="package,build-docs" |
99 |
description="Default. Builds a working Tomcat instance"> |
100 |
- |
101 |
+<!-- |
102 |
<copy tofile="${tomcat.build}/bin/tomcat-native.tar.gz" |
103 |
file="${tomcat-native.tar.gz}" /> |
104 |
<copy tofile="${tomcat.build}/bin/commons-daemon-native.tar.gz" |
105 |
file="${commons-daemon.native.src.tgz}" /> |
106 |
|
107 |
<copy tofile="${tomcat.build}/bin/commons-daemon.jar" file="${commons-daemon.jar}" /> |
108 |
- |
109 |
+--> |
110 |
<!-- Copy scripts --> |
111 |
<copy todir="${tomcat.build}/bin"> |
112 |
<fileset dir="bin"> |
113 |
@@ -782,7 +784,7 @@ |
114 |
source="${compile.source}" |
115 |
target="${compile.target}" |
116 |
optimize="${compile.optimize}" |
117 |
- classpath="${tomcat.classes}" |
118 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
119 |
excludes="**/CVS/**,**/.svn/**" |
120 |
encoding="ISO-8859-1" |
121 |
includeantruntime="false"> |
122 |
@@ -794,7 +796,7 @@ |
123 |
source="${compile.source}" |
124 |
target="${compile.target}" |
125 |
optimize="${compile.optimize}" |
126 |
- classpath="$tomcat.lcasses}" |
127 |
+ classpath="${tomcat.classes}:${jsp-api.jar}" |
128 |
excludes="**/CVS/**,**/.svn/**" |
129 |
encoding="ISO-8859-1" |
130 |
includeantruntime="false"> |
131 |
@@ -802,11 +804,11 @@ |
132 |
|
133 |
<!-- Add sources for examples --> |
134 |
<antcall target="examples-sources" /> |
135 |
- |
136 |
+<!-- |
137 |
<copy file="${tomcat-dbcp.jar}" todir="${tomcat.build}/lib" |
138 |
failonerror="false"/> |
139 |
<copy file="${jdt.jar}" todir="${tomcat.build}/lib" /> |
140 |
- |
141 |
+--> |
142 |
</target> |
143 |
|
144 |
<target name="examples-sources" description="Create examples sources" |
145 |
@@ -946,7 +948,7 @@ |
146 |
description="Creates the experimental embedded release" |
147 |
depends="embed,embed-sources,embed-extras" /> |
148 |
|
149 |
- <target name="test-compile" depends="compile,download-test-compile" > |
150 |
+ <target name="test-compile" depends="compile" > |
151 |
<mkdir dir="${test.classes}"/> |
152 |
<!-- Compile --> |
153 |
<javac srcdir="test" destdir="${test.classes}" |