1 |
nelchael 10/04/19 22:41:27 |
2 |
|
3 |
Added: resin-4.0.6-Makefile.patch resin-4.0.6-build.patch |
4 |
resin-4.0.6-classpath.patch |
5 |
Log: |
6 |
Add patches for resin 4.0.6. |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 src/patchsets/resin/4.0.6/resin-4.0.6-Makefile.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/4.0.6/resin-4.0.6-Makefile.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/4.0.6/resin-4.0.6-Makefile.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: resin-4.0.6-Makefile.patch |
15 |
=================================================================== |
16 |
diff -Nru resin-4.0.6.vanilla/Makefile.am resin-4.0.6/Makefile.am |
17 |
--- resin-4.0.6.vanilla/Makefile.am 2010-04-19 21:47:34.101392177 +0100 |
18 |
+++ resin-4.0.6/Makefile.am 2010-04-19 21:48:41.873410546 +0100 |
19 |
@@ -20,35 +20,35 @@ |
20 |
- rm -r $(LIBEXEC) |
21 |
|
22 |
install : |
23 |
- if test $(resin_home) != `pwd`; then \ |
24 |
- mkdir -p $(resin_home)/bin; \ |
25 |
- mkdir -p $(resin_home)/keys; \ |
26 |
- mkdir -p $(resin_home)/licenses; \ |
27 |
- mkdir -p $(resin_home)/lib; \ |
28 |
- mkdir -p $(resin_home)/$(LIBEXEC); \ |
29 |
- cp lib/*.jar $(resin_home)/lib; \ |
30 |
- cp bin/* $(resin_home)/bin; \ |
31 |
+ if test $(DESTDIR)/$(resin_home) != `pwd`; then \ |
32 |
+ mkdir -p $(DESTDIR)/$(resin_home)/bin; \ |
33 |
+ mkdir -p $(DESTDIR)/$(resin_home)/keys; \ |
34 |
+ mkdir -p $(DESTDIR)/$(resin_home)/licenses; \ |
35 |
+ mkdir -p $(DESTDIR)/$(resin_home)/lib; \ |
36 |
+ mkdir -p $(DESTDIR)/$(resin_home)/$(LIBEXEC); \ |
37 |
+ cp lib/*.jar $(DESTDIR)/$(resin_home)/lib; \ |
38 |
+ cp bin/* $(DESTDIR)/$(resin_home)/bin; \ |
39 |
fi; \ |
40 |
- if test $(resin_root) != `pwd`; then \ |
41 |
- mkdir -p $(resin_root)/webapps; \ |
42 |
- cp -r $(CP_U_FLAG) webapps/* $(resin_root)/webapps; \ |
43 |
- mkdir -p $(resin_root)/doc; \ |
44 |
- cp -r $(CP_U_FLAG) doc/* $(resin_root)/doc; \ |
45 |
- mkdir -p $(resin_log); \ |
46 |
+ if test $(DESTDIR)/$(resin_root) != `pwd`; then \ |
47 |
+ mkdir -p $(DESTDIR)/$(resin_root)/webapps; \ |
48 |
+ cp -r $(CP_U_FLAG) webapps/* $(DESTDIR)/$(resin_root)/webapps; \ |
49 |
+ mkdir -p $(DESTDIR)/$(resin_root)/doc; \ |
50 |
+ cp -r $(CP_U_FLAG) doc/* $(DESTDIR)/$(resin_root)/doc; \ |
51 |
+ mkdir -p $(DESTDIR)/$(resin_log); \ |
52 |
fi; \ |
53 |
- if test $(resin_conf) != `pwd`/conf; then \ |
54 |
- mkdir -p $(resin_conf); \ |
55 |
- cp $(CP_U_FLAG) conf/app-default.xml $(resin_conf)/app-default.xml; \ |
56 |
- cp $(CP_U_FLAG) conf/resin.xml $(resin_conf)/resin.xml; \ |
57 |
+ if test $(DESTDIR)/$(resin_conf) != `pwd`/conf; then \ |
58 |
+ mkdir -p $(DESTDIR)/$(resin_conf); \ |
59 |
+ cp $(CP_U_FLAG) conf/app-default.xml $(DESTDIR)/$(resin_conf)/app-default.xml; \ |
60 |
+ cp $(CP_U_FLAG) conf/resin.xml $(DESTDIR)/$(resin_conf)/resin.xml; \ |
61 |
fi; \ |
62 |
(cd modules/c/src; $(MAKE) install) |
63 |
- if test -r $(resin_pro)/modules/c/src/Makefile; then \ |
64 |
- cd $(resin_pro)/modules/c/src; $(MAKE) install; \ |
65 |
+ if test -r $(DESTDIR)/$(resin_pro)/modules/c/src/Makefile; then \ |
66 |
+ cd $(DESTDIR)/$(resin_pro)/modules/c/src; $(MAKE) install; \ |
67 |
fi; \ |
68 |
- if test -n "${resin_init_d}"; then \ |
69 |
+ if test -n "${resin_init_d}" && false; then \ |
70 |
if test -w "${resin_init_d}"; then \ |
71 |
- cp $(CP_U_FLAG) init.d/resin $(resin_init_d); \ |
72 |
- chmod +x $(resin_init_d); \ |
73 |
+ cp $(CP_U_FLAG) init.d/resin $(DESTDIR)/$(resin_init_d); \ |
74 |
+ chmod +x $(DESTDIR)/$(resin_init_d); \ |
75 |
else \ |
76 |
echo ;\ |
77 |
echo ;\ |
78 |
diff -Nru resin-4.0.6.vanilla/modules/c/src/resin_os/Makefile.in resin-4.0.6/modules/c/src/resin_os/Makefile.in |
79 |
--- resin-4.0.6.vanilla/modules/c/src/resin_os/Makefile.in 2010-04-19 21:47:33.465392666 +0100 |
80 |
+++ resin-4.0.6/modules/c/src/resin_os/Makefile.in 2010-04-19 21:48:41.873410546 +0100 |
81 |
@@ -39,8 +39,8 @@ |
82 |
|
83 |
install : libresin_os.$(SO) |
84 |
# cp resin $(resin_home)/bin |
85 |
- - mkdir -p $(resin_home)/$(LIBEXEC) |
86 |
- cp libresin_os.$(SO) $(resin_home)/$(LIBEXEC) |
87 |
+ - mkdir -p $(DESTDIR)/$(resin_home)/$(LIBEXEC) |
88 |
+ cp libresin_os.$(SO) $(DESTDIR)/$(resin_home)/$(LIBEXEC) |
89 |
|
90 |
|
91 |
|
92 |
|
93 |
|
94 |
|
95 |
1.1 src/patchsets/resin/4.0.6/resin-4.0.6-build.patch |
96 |
|
97 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/4.0.6/resin-4.0.6-build.patch?rev=1.1&view=markup |
98 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/4.0.6/resin-4.0.6-build.patch?rev=1.1&content-type=text/plain |
99 |
|
100 |
Index: resin-4.0.6-build.patch |
101 |
=================================================================== |
102 |
diff -Nru resin-4.0.6.vanilla/build-common.xml resin-4.0.6/build-common.xml |
103 |
--- resin-4.0.6.vanilla/build-common.xml 2010-04-19 21:47:32.817393435 +0100 |
104 |
+++ resin-4.0.6/build-common.xml 2010-04-19 21:51:20.125465789 +0100 |
105 |
@@ -37,15 +37,12 @@ |
106 |
<property name="resin.dist" location="${resin.install}/dist"/> |
107 |
|
108 |
<property name="javac.verbose" value="off"/> |
109 |
- <property name="javac.debug" value="on"/> |
110 |
- <property name="javac.optimize" value="off"/> |
111 |
+ <property name="javac.debug" value="off"/> |
112 |
+ <property name="javac.optimize" value="on"/> |
113 |
<property name="javac.deprecation" value="off"/> |
114 |
<property name="javac.nowarn" value="on"/> |
115 |
<property name="javac.memoryMaximumSize" value="512m"/> |
116 |
|
117 |
- <property name="javac.source" value="1.5"/> |
118 |
- <property name="javac.target" value="1.5"/> |
119 |
- |
120 |
<property name="jar.compress" value="false"/> |
121 |
<!-- |
122 |
<property name="jar.index" value="true"/> |
123 |
@@ -193,6 +190,9 @@ |
124 |
<fileset dir="${maven.lib}"> |
125 |
<include name="**/*.jar"/> |
126 |
</fileset> |
127 |
+ <fileset dir="${basedir}/gentoo-deps"> |
128 |
+ <include name="**/*.jar"/> |
129 |
+ </fileset> |
130 |
</classpath> |
131 |
</javac> |
132 |
|
133 |
@@ -273,6 +273,9 @@ |
134 |
<fileset dir="${maven.lib}"> |
135 |
<include name="**/*.jar"/> |
136 |
</fileset> |
137 |
+ <fileset dir="${basedir}/gentoo-deps"> |
138 |
+ <include name="**/*.jar"/> |
139 |
+ </fileset> |
140 |
</classpath> |
141 |
</javac> |
142 |
|
143 |
@@ -434,10 +437,6 @@ |
144 |
|
145 |
<property file="${artifact.src}/module.properties"/> |
146 |
|
147 |
- <mkdir dir="${resin.dist}/${dist.name}/project-jars"/> |
148 |
- |
149 |
- <copy tofile="${resin.dist}/${dist.name}/project-jars/resin-${artifact.name}-${version}.jar" |
150 |
- file="${artifact.dist}/${artifact.jar}"/> |
151 |
</target> |
152 |
|
153 |
<target name="resin.dist.jar" |
154 |
diff -Nru resin-4.0.6.vanilla/build.xml resin-4.0.6/build.xml |
155 |
--- resin-4.0.6.vanilla/build.xml 2010-04-19 21:47:34.101392177 +0100 |
156 |
+++ resin-4.0.6/build.xml 2010-04-19 21:51:36.901397626 +0100 |
157 |
@@ -10,7 +10,7 @@ |
158 |
<property name="debian.component" value="universe"/> |
159 |
|
160 |
<target name="compile" |
161 |
- depends="init, hessian, javaee, jaxstream, jcache, portlet, script, resin-kernel, quercus, resin, ecmascript, inject, webutil, conf, ext, j2ee-management, j2ee-deploy"> |
162 |
+ depends="init, hessian, javaee, jaxstream, jcache, portlet, script, resin-kernel, quercus, resin, ecmascript, inject, webutil, conf, j2ee-management, j2ee-deploy"> |
163 |
</target> |
164 |
|
165 |
<!-- |
166 |
@@ -197,7 +197,7 @@ |
167 |
</antcall> |
168 |
</target> |
169 |
|
170 |
- <target name="hessian" depends="init, servlet16"> |
171 |
+ <target name="hessian" depends="init"> |
172 |
<antcall target="module" inheritRefs="true"> |
173 |
<param name="module.name" value="hessian"/> |
174 |
<param name="module.jar" value="hessian.jar"/> |
175 |
@@ -221,7 +221,7 @@ |
176 |
</antcall> |
177 |
</target> |
178 |
|
179 |
- <target name="jaxrpc" depends="init,saaj,servlet16"> |
180 |
+ <target name="jaxrpc" depends="init,saaj"> |
181 |
<antcall target="module" inheritRefs="true"> |
182 |
<param name="module.name" value="jaxrpc"/> |
183 |
<param name="module.jar" value="jaxrpc-15.jar"/> |
184 |
@@ -268,13 +268,6 @@ |
185 |
</antcall> |
186 |
</target> |
187 |
|
188 |
- <target name="servlet16" depends="init"> |
189 |
- <antcall target="module" inheritRefs="true"> |
190 |
- <param name="module.name" value="servlet16"/> |
191 |
- <param name="module.jar" value="servlet-16.jar"/> |
192 |
- </antcall> |
193 |
- </target> |
194 |
- |
195 |
<!-- |
196 |
We now ship Sun's jsf-api.jar and jsf-impl.jar in modules/ext/ |
197 |
<target name="jsf" depends="init"> |
198 |
@@ -285,7 +278,7 @@ |
199 |
</antcall> |
200 |
</target--> |
201 |
|
202 |
- <target name="jstl" depends="init, servlet16"> |
203 |
+ <target name="jstl" depends="init"> |
204 |
<antcall target="module" inheritRefs="true"> |
205 |
<param name="module.name" value="jstl"/> |
206 |
<param name="module.jar" value="jstl-11.jar"/> |
207 |
@@ -384,7 +377,7 @@ |
208 |
</antcall> |
209 |
</target> |
210 |
|
211 |
- <target name="resin-kernel" depends="init, inject, servlet16, version"> |
212 |
+ <target name="resin-kernel" depends="init, inject, version"> |
213 |
<antcall target="module" inheritRefs="true"> |
214 |
<param name="module.name" value="kernel"/> |
215 |
<param name="module.dist" value="${lib}"/> |
216 |
@@ -496,7 +489,7 @@ |
217 |
</copy> |
218 |
</target> |
219 |
|
220 |
- <target name="javaee" depends="ejb, jca, jms, jpa, servlet16, jcache, jstl, jta, jws, inject"> |
221 |
+ <target name="javaee" depends="ejb, jca, jms, jpa, jcache, jstl, jta, jws, inject"> |
222 |
<!-- |
223 |
- javaee-16.jar |
224 |
--> |
225 |
@@ -539,10 +532,6 @@ |
226 |
<exclude name="**/.*"/> |
227 |
</fileset> |
228 |
|
229 |
- <fileset dir="${resin.modules}/servlet16/classes"> |
230 |
- <exclude name="**/.*"/> |
231 |
- </fileset> |
232 |
- |
233 |
<fileset dir="${resin.modules}/webbeans/classes"> |
234 |
<exclude name="**/.*"/> |
235 |
</fileset> |
236 |
@@ -683,20 +672,12 @@ |
237 |
</copy> |
238 |
</target> |
239 |
|
240 |
- <target name="ext" depends="init, resin"> |
241 |
- <copy todir="${install}/lib" preservelastmodified="true"> |
242 |
- <fileset dir="${ext}"> |
243 |
- </fileset> |
244 |
- </copy> |
245 |
- </target> |
246 |
- |
247 |
<target name="webapps" depends="init, doc, quercus"> |
248 |
</target> |
249 |
|
250 |
<target name="doc" depends="init"> |
251 |
<mkdir dir="${install}/webapps"/> |
252 |
|
253 |
- <!-- |
254 |
<jar jarfile="${install}/webapps/resin-doc.war" |
255 |
compress="true" index="${jar.index}" update="${jar.update}"> |
256 |
|
257 |
@@ -710,7 +691,6 @@ |
258 |
<exclude name="**/.svnignore"/> |
259 |
</fileset> |
260 |
</jar> |
261 |
- --> |
262 |
</target> |
263 |
|
264 |
<target name="javadoc" depends="init"> |
265 |
@@ -732,7 +712,6 @@ |
266 |
|
267 |
<packageset dir="${modules}/ejb/src"/> |
268 |
<packageset dir="${modules}/hessian/src"/> |
269 |
- <packageset dir="${modules}/servlet16/src"/> |
270 |
<packageset dir="${modules}/jcache/src"/> |
271 |
<packageset dir="${modules}/jpa/src"/> |
272 |
<packageset dir="${modules}/jaxstream/src"/> |
273 |
|
274 |
|
275 |
|
276 |
1.1 src/patchsets/resin/4.0.6/resin-4.0.6-classpath.patch |
277 |
|
278 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/4.0.6/resin-4.0.6-classpath.patch?rev=1.1&view=markup |
279 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/resin/4.0.6/resin-4.0.6-classpath.patch?rev=1.1&content-type=text/plain |
280 |
|
281 |
Index: resin-4.0.6-classpath.patch |
282 |
=================================================================== |
283 |
diff -Nru resin-4.0.6.vanilla/modules/resin/src/boot-manifest resin-4.0.6/modules/resin/src/boot-manifest |
284 |
--- resin-4.0.6.vanilla/modules/resin/src/boot-manifest 2010-04-19 21:47:32.837392736 +0100 |
285 |
+++ resin-4.0.6/modules/resin/src/boot-manifest 2010-04-19 21:49:59.417465510 +0100 |
286 |
@@ -1,5 +1,5 @@ |
287 |
Main-Class: com.caucho.server.bootstrap.ResinBoot |
288 |
-Class-Path: resin.jar jta-101.jar isorelax.jar jsdk-24.jar jmx-12.jar jca-15.jar jstl-11.jar |
289 |
+Class-Path: resin.jar jta-101.jar isorelax.jar resin-servlet-api.jar jmx-12.jar jca-15.jar jstl-11.jar |
290 |
Extension-Name: com.caucho.server.bootstrap |
291 |
Implementation-Vendor: Caucho Technology, Inc. |
292 |
Implementation-Version: 3.0.1 |
293 |
diff -Nru resin-4.0.6.vanilla/modules/resin/src/manifest resin-4.0.6/modules/resin/src/manifest |
294 |
--- resin-4.0.6.vanilla/modules/resin/src/manifest 2010-04-19 21:47:33.421393155 +0100 |
295 |
+++ resin-4.0.6/modules/resin/src/manifest 2010-04-19 21:49:59.417465510 +0100 |
296 |
@@ -1,4 +1,4 @@ |
297 |
-Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar |
298 |
+Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar resin-servlet-api.jar |
299 |
Implementation-Vendor: Caucho Technology, Inc. |
300 |
Implementation-Version: 4.0.6 |
301 |
J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl |
302 |
diff -Nru resin-4.0.6.vanilla/modules/resin/src/manifest.in resin-4.0.6/modules/resin/src/manifest.in |
303 |
--- resin-4.0.6.vanilla/modules/resin/src/manifest.in 2010-04-19 21:47:33.421393155 +0100 |
304 |
+++ resin-4.0.6/modules/resin/src/manifest.in 2010-04-19 21:49:59.417465510 +0100 |
305 |
@@ -1,4 +1,4 @@ |
306 |
-Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar |
307 |
+Class-Path: javaee-16.jar javaee-15.jar pro.jar license.jar hessian.jar quercus.jar resin-kernel.jar jcache-16.jar webservices-api.jar resin-servlet-api.jar |
308 |
Implementation-Vendor: Caucho Technology, Inc. |
309 |
Implementation-Version: @VERSION@ |
310 |
J2EE-DeploymentFactory-Implementation-Class: com.caucho.j2ee.deployclient.DeploymentFactoryImpl |