1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
diff -Nru resin-4.0.22.vanilla/build-common.xml resin-4.0.22/build-common.xml
--- resin-4.0.22.vanilla/build-common.xml 2012-02-23 22:58:11.190427094 +0100
+++ resin-4.0.22/build-common.xml 2012-02-23 23:04:05.990130700 +0100
@@ -37,15 +37,12 @@
<property name="resin.dist" location="${resindir}/dist"/>
<property name="javac.verbose" value="off"/>
- <property name="javac.debug" value="on"/>
- <property name="javac.optimize" value="off"/>
+ <property name="javac.debug" value="off"/>
+ <property name="javac.optimize" value="on"/>
<property name="javac.deprecation" value="off"/>
<property name="javac.nowarn" value="on"/>
<property name="javac.memoryMaximumSize" value="512m"/>
- <property name="javac.source" value="1.5"/>
- <property name="javac.target" value="1.5"/>
-
<property name="jar.compress" value="false"/>
<!--
<property name="jar.index" value="true"/>
@@ -210,6 +207,9 @@
<include name="**/*.jar"/>
<exclude name="ant-1.6.5.jar"/>
</fileset>
+ <fileset dir="${basedir}/gentoo-deps">
+ <include name="**/*.jar"/>
+ </fileset>
</classpath>
</javac>
@@ -290,6 +290,9 @@
<fileset dir="${maven.lib}">
<include name="**/*.jar"/>
</fileset>
+ <fileset dir="${basedir}/gentoo-deps">
+ <include name="**/*.jar"/>
+ </fileset>
</classpath>
</javac>
@@ -496,10 +499,6 @@
<property file="${artifact.src}/module.properties"/>
- <mkdir dir="${dist.build}/project-jars"/>
-
- <copy tofile="${dist.build}/project-jars/resin-${artifact.name}-${version}.jar"
- file="${artifact.dist}/${artifact.jar}"/>
</target>
<target name="resin.dist.jar"
diff -Nru resin-4.0.22.vanilla/build.xml resin-4.0.22/build.xml
--- resin-4.0.22.vanilla/build.xml 2012-02-23 22:58:11.190427094 +0100
+++ resin-4.0.22/build.xml 2012-02-23 23:06:09.160928351 +0100
@@ -12,7 +12,7 @@
<property name="eclipse.home" value="${user.home}/eclipse"/>
<target name="compile"
- depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus, resin, ecmascript, cdi, webutil, conf, ext, j2ee-management, resin-eclipselink">
+ depends="init, hessian, javaee, jaxstream, portlet, script, resin-kernel, quercus, resin, ecmascript, cdi, webutil, conf, j2ee-management">
</target>
<!--
@@ -155,7 +155,7 @@
</antcall>
</target>
- <target name="hessian" depends="init, servlet16">
+ <target name="hessian" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="hessian"/>
<param name="module.jar" value="hessian.jar"/>
@@ -179,7 +179,7 @@
</antcall>
</target>
- <target name="jaxrpc" depends="init,saaj,servlet16">
+ <target name="jaxrpc" depends="init,saaj">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="jaxrpc"/>
<param name="module.jar" value="jaxrpc-15.jar"/>
@@ -227,13 +227,6 @@
</antcall>
</target>
- <target name="servlet16" depends="init">
- <antcall target="module" inheritRefs="true">
- <param name="module.name" value="servlet16"/>
- <param name="module.jar" value="servlet-16.jar"/>
- </antcall>
- </target>
-
<!--
We now ship Sun's jsf-api.jar and jsf-impl.jar in modules/ext/
<target name="jsf" depends="init">
@@ -244,7 +237,7 @@
</antcall>
</target-->
- <target name="jstl" depends="init, servlet16">
+ <target name="jstl" depends="init">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="jstl"/>
<param name="module.jar" value="jstl-11.jar"/>
@@ -343,7 +336,7 @@
</antcall>
</target>
- <target name="resin-kernel" depends="init, cdi, servlet16, version">
+ <target name="resin-kernel" depends="init, cdi, version">
<antcall target="module" inheritRefs="true">
<param name="module.name" value="kernel"/>
<param name="module.dist" value="${lib}"/>
@@ -468,7 +461,7 @@
</copy>
</target>
- <target name="javaee" depends="ejb, jca, jms, jpa, servlet16, cdi, jcache, jstl, jta">
+ <target name="javaee" depends="ejb, jca, jms, jpa, cdi, jcache, jstl, jta">
<!--
- javaee-16.jar
-->
@@ -513,10 +506,6 @@
</fileset>
-->
- <fileset dir="${resin.modules}/servlet16/classes">
- <exclude name="**/.*"/>
- </fileset>
-
<fileset dir="${resin.modules}/webbeans/classes">
<exclude name="**/.*"/>
</fileset>
@@ -657,20 +646,12 @@
</copy>
</target>
- <target name="ext" depends="init, resin">
- <copy todir="${install}/lib" preservelastmodified="true">
- <fileset dir="${ext}">
- </fileset>
- </copy>
- </target>
-
<target name="webapps" depends="init, doc, quercus">
</target>
<target name="doc" depends="init">
<mkdir dir="${install}/webapps"/>
- <!--
<jar jarfile="${install}/webapps/resin-doc.war"
compress="true" index="${jar.index}" update="${jar.update}">
@@ -684,7 +665,6 @@
<exclude name="**/.svnignore"/>
</fileset>
</jar>
- -->
</target>
<target name="javadoc" depends="init">
@@ -706,7 +686,6 @@
<packageset dir="${modules}/ejb/src"/>
<packageset dir="${modules}/hessian/src"/>
- <packageset dir="${modules}/servlet16/src"/>
<packageset dir="${modules}/jcache/src"/>
<packageset dir="${modules}/jpa/src"/>
<packageset dir="${modules}/jaxstream/src"/>
@@ -832,7 +811,7 @@
<delete dir="${dist}/${dist.name}"/>
</target>
- <target name="dist" depends="dist.clean, configure, compile, update, junit, eclipselink, artifacts, resin.dist.build, dist.package, quercus.war"/>
+ <target name="dist" depends="dist.clean, configure, compile, update, junit, artifacts, resin.dist.build, dist.package, quercus.war"/>
<target name="configure">
<copy tofile="modules/c/src/resin/Makefile.in"
|
GitWeb