| 1 |
tomwij 13/10/02 23:02:51 |
| 2 |
|
| 3 |
Added: struts-2.3.15.2-build.xml-remove-apps-portlet.patch |
| 4 |
struts-2.3.15.2-build.xml-remove-core-and-plugins.patch |
| 5 |
struts-2.3.15.2-build.xml-apps-package.patch |
| 6 |
struts-2.3.15.2-build.xml-classpath.patch |
| 7 |
struts-2.3.15.2-build.xml-manifest.patch |
| 8 |
Log: |
| 9 |
Version bump to 2.3.15.2; for bug #152352, bug #237146, bug #405931 and bug #486752. |
| 10 |
|
| 11 |
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
| 12 |
|
| 13 |
Revision Changes Path |
| 14 |
1.1 dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch |
| 15 |
|
| 16 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch?rev=1.1&view=markup |
| 17 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch?rev=1.1&content-type=text/plain |
| 18 |
|
| 19 |
Index: struts-2.3.15.2-build.xml-remove-apps-portlet.patch |
| 20 |
=================================================================== |
| 21 |
--- a/apps/maven-build.xml |
| 22 |
+++ b/apps/maven-build.xml |
| 23 |
@@ -24,7 +24,6 @@ |
| 24 |
<target name="clean" description="Clean the output directory"> |
| 25 |
<ant antfile="build.xml" dir="blank" target="clean"/> |
| 26 |
<ant antfile="build.xml" dir="mailreader" target="clean"/> |
| 27 |
- <ant antfile="build.xml" dir="portlet" target="clean"/> |
| 28 |
<ant antfile="build.xml" dir="showcase" target="clean"/> |
| 29 |
<ant antfile="build.xml" dir="rest-showcase" target="clean"/> |
| 30 |
</target> |
| 31 |
@@ -36,7 +35,6 @@ |
| 32 |
<target name="compile" description="Compile the code"> |
| 33 |
<ant antfile="build.xml" dir="blank" target="compile"/> |
| 34 |
<ant antfile="build.xml" dir="mailreader" target="compile"/> |
| 35 |
- <ant antfile="build.xml" dir="portlet" target="compile"/> |
| 36 |
<ant antfile="build.xml" dir="showcase" target="compile"/> |
| 37 |
<ant antfile="build.xml" dir="rest-showcase" target="compile"/> |
| 38 |
</target> |
| 39 |
@@ -48,7 +46,6 @@ |
| 40 |
<target name="compile-tests" description="Compile the test code"> |
| 41 |
<ant antfile="build.xml" dir="blank" target="compile-tests"/> |
| 42 |
<ant antfile="build.xml" dir="mailreader" target="compile-tests"/> |
| 43 |
- <ant antfile="build.xml" dir="portlet" target="compile-tests"/> |
| 44 |
<ant antfile="build.xml" dir="showcase" target="compile-tests"/> |
| 45 |
<ant antfile="build.xml" dir="rest-showcase" target="compile-tests"/> |
| 46 |
</target> |
| 47 |
@@ -60,7 +57,6 @@ |
| 48 |
<target name="test" description="Run the test cases"> |
| 49 |
<ant antfile="build.xml" dir="blank" target="test"/> |
| 50 |
<ant antfile="build.xml" dir="mailreader" target="test"/> |
| 51 |
- <ant antfile="build.xml" dir="portlet" target="test"/> |
| 52 |
<ant antfile="build.xml" dir="showcase" target="test"/> |
| 53 |
<ant antfile="build.xml" dir="rest-showcase" target="test"/> |
| 54 |
</target> |
| 55 |
@@ -72,7 +68,6 @@ |
| 56 |
<target name="javadoc" description="Generates the Javadoc of the application"> |
| 57 |
<ant antfile="build.xml" dir="blank" target="javadoc"/> |
| 58 |
<ant antfile="build.xml" dir="mailreader" target="javadoc"/> |
| 59 |
- <ant antfile="build.xml" dir="portlet" target="javadoc"/> |
| 60 |
<ant antfile="build.xml" dir="showcase" target="javadoc"/> |
| 61 |
<ant antfile="build.xml" dir="rest-showcase" target="javadoc"/> |
| 62 |
</target> |
| 63 |
@@ -84,7 +79,6 @@ |
| 64 |
<target name="package" description="Package the application"> |
| 65 |
<ant antfile="build.xml" dir="blank" target="package"/> |
| 66 |
<ant antfile="build.xml" dir="mailreader" target="package"/> |
| 67 |
- <ant antfile="build.xml" dir="portlet" target="package"/> |
| 68 |
<ant antfile="build.xml" dir="showcase" target="package"/> |
| 69 |
<ant antfile="build.xml" dir="rest-showcase" target="package"/> |
| 70 |
</target> |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.1 dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch?rev=1.1&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch?rev=1.1&content-type=text/plain |
| 78 |
|
| 79 |
Index: struts-2.3.15.2-build.xml-remove-core-and-plugins.patch |
| 80 |
=================================================================== |
| 81 |
--- a/maven-build.xml |
| 82 |
+++ b/maven-build.xml |
| 83 |
@@ -22,8 +22,5 @@ |
| 84 |
<!-- ====================================================================== --> |
| 85 |
|
| 86 |
<target name="clean" description="Clean the output directory"> |
| 87 |
- <ant antfile="build.xml" dir="xwork-core" target="clean"/> |
| 88 |
- <ant antfile="build.xml" dir="core" target="clean"/> |
| 89 |
<ant antfile="build.xml" dir="apps" target="clean"/> |
| 90 |
- <ant antfile="build.xml" dir="plugins" target="clean"/> |
| 91 |
<ant antfile="build.xml" dir="bundles" target="clean"/> |
| 92 |
@@ -35,8 +33,5 @@ |
| 93 |
<!-- ====================================================================== --> |
| 94 |
|
| 95 |
<target name="compile" description="Compile the code"> |
| 96 |
- <ant antfile="build.xml" dir="xwork-core" target="compile"/> |
| 97 |
- <ant antfile="build.xml" dir="core" target="compile"/> |
| 98 |
<ant antfile="build.xml" dir="apps" target="compile"/> |
| 99 |
- <ant antfile="build.xml" dir="plugins" target="compile"/> |
| 100 |
<ant antfile="build.xml" dir="bundles" target="compile"/> |
| 101 |
@@ -48,8 +44,5 @@ |
| 102 |
<!-- ====================================================================== --> |
| 103 |
|
| 104 |
<target name="compile-tests" description="Compile the test code"> |
| 105 |
- <ant antfile="build.xml" dir="xwork-core" target="compile-tests"/> |
| 106 |
- <ant antfile="build.xml" dir="core" target="compile-tests"/> |
| 107 |
<ant antfile="build.xml" dir="apps" target="compile-tests"/> |
| 108 |
- <ant antfile="build.xml" dir="plugins" target="compile-tests"/> |
| 109 |
<ant antfile="build.xml" dir="bundles" target="compile-tests"/> |
| 110 |
@@ -61,8 +55,5 @@ |
| 111 |
<!-- ====================================================================== --> |
| 112 |
|
| 113 |
<target name="test" description="Run the test cases"> |
| 114 |
- <ant antfile="build.xml" dir="xwork-core" target="test"/> |
| 115 |
- <ant antfile="build.xml" dir="core" target="test"/> |
| 116 |
<ant antfile="build.xml" dir="apps" target="test"/> |
| 117 |
- <ant antfile="build.xml" dir="plugins" target="test"/> |
| 118 |
<ant antfile="build.xml" dir="bundles" target="test"/> |
| 119 |
@@ -74,8 +66,5 @@ |
| 120 |
<!-- ====================================================================== --> |
| 121 |
|
| 122 |
<target name="javadoc" description="Generates the Javadoc of the application"> |
| 123 |
- <ant antfile="build.xml" dir="xwork-core" target="javadoc"/> |
| 124 |
- <ant antfile="build.xml" dir="core" target="javadoc"/> |
| 125 |
<ant antfile="build.xml" dir="apps" target="javadoc"/> |
| 126 |
- <ant antfile="build.xml" dir="plugins" target="javadoc"/> |
| 127 |
<ant antfile="build.xml" dir="bundles" target="javadoc"/> |
| 128 |
@@ -87,8 +77,5 @@ |
| 129 |
<!-- ====================================================================== --> |
| 130 |
|
| 131 |
<target name="package" description="Package the application"> |
| 132 |
- <ant antfile="build.xml" dir="xwork-core" target="package"/> |
| 133 |
- <ant antfile="build.xml" dir="core" target="package"/> |
| 134 |
<ant antfile="build.xml" dir="apps" target="package"/> |
| 135 |
- <ant antfile="build.xml" dir="plugins" target="package"/> |
| 136 |
<ant antfile="build.xml" dir="bundles" target="package"/> |
| 137 |
|
| 138 |
|
| 139 |
|
| 140 |
1.1 dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch |
| 141 |
|
| 142 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch?rev=1.1&view=markup |
| 143 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch?rev=1.1&content-type=text/plain |
| 144 |
|
| 145 |
Index: struts-2.3.15.2-build.xml-apps-package.patch |
| 146 |
=================================================================== |
| 147 |
diff -urN a/apps/blank/maven-build.xml b/apps/blank/maven-build.xml |
| 148 |
--- a/apps/blank/maven-build.xml 2013-10-02 15:52:07.637985555 +0200 |
| 149 |
+++ b/apps/blank/maven-build.xml 2013-10-02 15:52:29.756985531 +0200 |
| 150 |
@@ -243,32 +243,6 @@ |
| 151 |
|
| 152 |
<target name="package" depends="compile,test" description="Package the application"> |
| 153 |
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 154 |
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" |
| 155 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 156 |
- <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" |
| 157 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 158 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" |
| 159 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 160 |
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" |
| 161 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 162 |
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" |
| 163 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 164 |
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" |
| 165 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 166 |
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" |
| 167 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 168 |
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" |
| 169 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 170 |
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" |
| 171 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 172 |
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" |
| 173 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 174 |
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" |
| 175 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 176 |
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" |
| 177 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 178 |
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" |
| 179 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 180 |
<war destfile="${maven.build.dir}/${maven.build.finalName}.war" |
| 181 |
compress="true" |
| 182 |
webxml="src/main/webapp/WEB-INF/web.xml"> |
| 183 |
--- a/apps/mailreader/maven-build.xml |
| 184 |
+++ b/apps/mailreader/maven-build.xml |
| 185 |
@@ -198,36 +198,6 @@ |
| 186 |
|
| 187 |
<target name="package" depends="compile,test" description="Package the application"> |
| 188 |
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 189 |
- <copy file="${maven.repo.local}/org/apache/struts/struts-mailreader-dao/1.3.5/struts-mailreader-dao-1.3.5.jar" |
| 190 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 191 |
- <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar" |
| 192 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 193 |
- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" |
| 194 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 195 |
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" |
| 196 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 197 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" |
| 198 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 199 |
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" |
| 200 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 201 |
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" |
| 202 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 203 |
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" |
| 204 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 205 |
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" |
| 206 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 207 |
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" |
| 208 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 209 |
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" |
| 210 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 211 |
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" |
| 212 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 213 |
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" |
| 214 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 215 |
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" |
| 216 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 217 |
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" |
| 218 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 219 |
<war destfile="${maven.build.dir}/${maven.build.finalName}.war" |
| 220 |
compress="true" |
| 221 |
webxml="src/main/webapp/WEB-INF/web.xml"> |
| 222 |
--- a/apps/showcase/maven-build.xml |
| 223 |
+++ b/apps/showcase/maven-build.xml |
| 224 |
@@ -334,112 +334,6 @@ |
| 225 |
|
| 226 |
<target name="package" depends="compile,test" description="Package the application"> |
| 227 |
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 228 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-struts1-plugin/2.3.15.2/struts2-struts1-plugin-2.3.15.2.jar" |
| 229 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 230 |
- <copy file="${maven.repo.local}/org/apache/struts/struts-core/1.3.10/struts-core-1.3.10.jar" |
| 231 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 232 |
- <copy file="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar" |
| 233 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 234 |
- <copy file="${maven.repo.local}/commons-chain/commons-chain/1.2/commons-chain-1.2.jar" |
| 235 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 236 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-dojo-plugin/2.3.15.2/struts2-dojo-plugin-2.3.15.2.jar" |
| 237 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 238 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-jsf-plugin/2.3.15.2/struts2-jsf-plugin-2.3.15.2.jar" |
| 239 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 240 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-config-browser-plugin/2.3.15.2/struts2-config-browser-plugin-2.3.15.2.jar" |
| 241 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 242 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-sitemesh-plugin/2.3.15.2/struts2-sitemesh-plugin-2.3.15.2.jar" |
| 243 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 244 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-tiles-plugin/2.3.15.2/struts2-tiles-plugin-2.3.15.2.jar" |
| 245 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 246 |
- <copy file="${maven.repo.local}/org/apache/tiles/tiles-core/2.0.6/tiles-core-2.0.6.jar" |
| 247 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 248 |
- <copy file="${maven.repo.local}/org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar" |
| 249 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 250 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-dwr-plugin/2.3.15.2/struts2-dwr-plugin-2.3.15.2.jar" |
| 251 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 252 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-json-plugin/2.3.15.2/struts2-json-plugin-2.3.15.2.jar" |
| 253 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 254 |
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" |
| 255 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 256 |
- <copy file="${maven.repo.local}/org/apache/tiles/tiles-jsp/2.0.6/tiles-jsp-2.0.6.jar" |
| 257 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 258 |
- <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar" |
| 259 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 260 |
- <copy file="${maven.repo.local}/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar" |
| 261 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 262 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar" |
| 263 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 264 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-spring-plugin/2.3.15.2/struts2-spring-plugin-2.3.15.2.jar" |
| 265 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 266 |
- <copy file="${maven.repo.local}/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" |
| 267 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 268 |
- <copy file="${maven.repo.local}/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" |
| 269 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 270 |
- <copy file="${maven.repo.local}/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" |
| 271 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 272 |
- <copy file="${maven.repo.local}/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" |
| 273 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 274 |
- <copy file="${maven.repo.local}/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" |
| 275 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 276 |
- <copy file="${maven.repo.local}/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" |
| 277 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 278 |
- <copy file="${maven.repo.local}/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" |
| 279 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 280 |
- <copy file="${maven.repo.local}/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" |
| 281 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 282 |
- <copy file="${maven.repo.local}/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.jar" |
| 283 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 284 |
- <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" |
| 285 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 286 |
- <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" |
| 287 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 288 |
- <copy file="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar" |
| 289 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 290 |
- <copy file="${maven.repo.local}/org/apache/velocity/velocity-tools/1.3/velocity-tools-1.3.jar" |
| 291 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 292 |
- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" |
| 293 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 294 |
- <copy file="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar" |
| 295 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 296 |
- <copy file="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar" |
| 297 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 298 |
- <copy file="${maven.repo.local}/opensymphony/sitemesh/2.4.2/sitemesh-2.4.2.jar" |
| 299 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 300 |
- <copy file="${maven.repo.local}/uk/ltd/getahead/dwr/1.1.1/dwr-1.1.1.jar" |
| 301 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 302 |
- <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" |
| 303 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 304 |
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" |
| 305 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 306 |
- <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-impl/1.1.2/myfaces-impl-1.1.2.jar" |
| 307 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 308 |
- <copy file="${maven.repo.local}/commons-el/commons-el/1.0/commons-el-1.0.jar" |
| 309 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 310 |
- <copy file="${maven.repo.local}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" |
| 311 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 312 |
- <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-api/1.1.2/myfaces-api-1.1.2.jar" |
| 313 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 314 |
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" |
| 315 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 316 |
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" |
| 317 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 318 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" |
| 319 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 320 |
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" |
| 321 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 322 |
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" |
| 323 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 324 |
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" |
| 325 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 326 |
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" |
| 327 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 328 |
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" |
| 329 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 330 |
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" |
| 331 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 332 |
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" |
| 333 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 334 |
<war destfile="${maven.build.dir}/${maven.build.finalName}.war" |
| 335 |
compress="true" |
| 336 |
webxml="src/main/webapp/WEB-INF/web.xml"> |
| 337 |
--- a/apps/rest-showcase/maven-build.xml |
| 338 |
+++ b/apps/rest-showcase/maven-build.xml |
| 339 |
@@ -273,56 +273,6 @@ |
| 340 |
|
| 341 |
<target name="package" depends="compile,test" description="Package the application"> |
| 342 |
<mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 343 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-rest-plugin/2.3.15.2/struts2-rest-plugin-2.3.15.2.jar" |
| 344 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 345 |
- <copy file="${maven.repo.local}/com/thoughtworks/xstream/xstream/1.4.2/xstream-1.4.2.jar" |
| 346 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 347 |
- <copy file="${maven.repo.local}/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar" |
| 348 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 349 |
- <copy file="${maven.repo.local}/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar" |
| 350 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 351 |
- <copy file="${maven.repo.local}/net/sf/json-lib/json-lib/2.3/json-lib-2.3-jdk15.jar" |
| 352 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 353 |
- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" |
| 354 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 355 |
- <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" |
| 356 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 357 |
- <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" |
| 358 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 359 |
- <copy file="${maven.repo.local}/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar" |
| 360 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 361 |
- <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar" |
| 362 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 363 |
- <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar" |
| 364 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 365 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar" |
| 366 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 367 |
- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" |
| 368 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 369 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-config-browser-plugin/2.3.15.2/struts2-config-browser-plugin-2.3.15.2.jar" |
| 370 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 371 |
- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" |
| 372 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 373 |
- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" |
| 374 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 375 |
- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" |
| 376 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 377 |
- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" |
| 378 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 379 |
- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" |
| 380 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 381 |
- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" |
| 382 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 383 |
- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" |
| 384 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 385 |
- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" |
| 386 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 387 |
- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" |
| 388 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 389 |
- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" |
| 390 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 391 |
- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" |
| 392 |
- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> |
| 393 |
<war destfile="${maven.build.dir}/${maven.build.finalName}.war" |
| 394 |
compress="true" |
| 395 |
webxml="src/main/webapp/WEB-INF/web.xml"> |
| 396 |
|
| 397 |
|
| 398 |
|
| 399 |
1.1 dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch |
| 400 |
|
| 401 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch?rev=1.1&view=markup |
| 402 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch?rev=1.1&content-type=text/plain |
| 403 |
|
| 404 |
Index: struts-2.3.15.2-build.xml-classpath.patch |
| 405 |
=================================================================== |
| 406 |
--- a/apps/blank/maven-build.xml |
| 407 |
+++ b/apps/blank/maven-build.xml |
| 408 |
@@ -125,7 +125,7 @@ |
| 409 |
|
| 410 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 411 |
<mkdir dir="${maven.build.outputDir}"/> |
| 412 |
- <javac destdir="${maven.build.outputDir}" |
| 413 |
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" |
| 414 |
nowarn="false" |
| 415 |
debug="true" |
| 416 |
optimize="false" |
| 417 |
@@ -153,7 +153,7 @@ |
| 418 |
description="Compile the test code" |
| 419 |
unless="maven.test.skip"> |
| 420 |
<mkdir dir="${maven.build.testOutputDir}"/> |
| 421 |
- <javac destdir="${maven.build.testOutputDir}" |
| 422 |
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" |
| 423 |
nowarn="false" |
| 424 |
debug="true" |
| 425 |
optimize="false" |
| 426 |
@@ -159,6 +159,7 @@ |
| 427 |
<path refid="build.test.classpath"/> |
| 428 |
<pathelement location="${maven.build.outputDir}"/> |
| 429 |
<pathelement location="${maven.build.testOutputDir}"/> |
| 430 |
+ <pathelement path="${gentoo.test.classpath}" /> |
| 431 |
</classpath> |
| 432 |
<batchtest todir="${maven.test.reports}" unless="test"> |
| 433 |
<fileset dir="${maven.build.testDir.0}"> |
| 434 |
--- a/apps/mailreader/maven-build.xml |
| 435 |
+++ b/apps/mailreader/maven-build.xml |
| 436 |
@@ -125,7 +125,7 @@ |
| 437 |
|
| 438 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 439 |
<mkdir dir="${maven.build.outputDir}"/> |
| 440 |
- <javac destdir="${maven.build.outputDir}" |
| 441 |
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" |
| 442 |
nowarn="false" |
| 443 |
debug="true" |
| 444 |
optimize="false" |
| 445 |
--- a/apps/portlet/maven-build.xml |
| 446 |
+++ b/apps/portlet/maven-build.xml |
| 447 |
@@ -125,7 +125,7 @@ |
| 448 |
|
| 449 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 450 |
<mkdir dir="${maven.build.outputDir}"/> |
| 451 |
- <javac destdir="${maven.build.outputDir}" |
| 452 |
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" |
| 453 |
nowarn="false" |
| 454 |
debug="true" |
| 455 |
optimize="false" |
| 456 |
@@ -153,7 +153,7 @@ |
| 457 |
description="Compile the test code" |
| 458 |
unless="maven.test.skip"> |
| 459 |
<mkdir dir="${maven.build.testOutputDir}"/> |
| 460 |
- <javac destdir="${maven.build.testOutputDir}" |
| 461 |
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" |
| 462 |
nowarn="false" |
| 463 |
debug="true" |
| 464 |
optimize="false" |
| 465 |
@@ -159,6 +159,7 @@ |
| 466 |
<path refid="build.test.classpath"/> |
| 467 |
<pathelement location="${maven.build.outputDir}"/> |
| 468 |
<pathelement location="${maven.build.testOutputDir}"/> |
| 469 |
+ <pathelement path="${gentoo.test.classpath}" /> |
| 470 |
</classpath> |
| 471 |
<batchtest todir="${maven.test.reports}" unless="test"> |
| 472 |
<fileset dir="${maven.build.testDir.0}"> |
| 473 |
--- a/apps/showcase/maven-build.xml |
| 474 |
+++ b/apps/showcase/maven-build.xml |
| 475 |
@@ -125,7 +125,7 @@ |
| 476 |
|
| 477 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 478 |
<mkdir dir="${maven.build.outputDir}"/> |
| 479 |
- <javac destdir="${maven.build.outputDir}" |
| 480 |
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" |
| 481 |
nowarn="false" |
| 482 |
debug="true" |
| 483 |
optimize="false" |
| 484 |
@@ -153,7 +153,7 @@ |
| 485 |
description="Compile the test code" |
| 486 |
unless="maven.test.skip"> |
| 487 |
<mkdir dir="${maven.build.testOutputDir}"/> |
| 488 |
- <javac destdir="${maven.build.testOutputDir}" |
| 489 |
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" |
| 490 |
nowarn="false" |
| 491 |
debug="true" |
| 492 |
optimize="false" |
| 493 |
@@ -159,6 +159,7 @@ |
| 494 |
<path refid="build.test.classpath"/> |
| 495 |
<pathelement location="${maven.build.outputDir}"/> |
| 496 |
<pathelement location="${maven.build.testOutputDir}"/> |
| 497 |
+ <pathelement path="${gentoo.test.classpath}" /> |
| 498 |
</classpath> |
| 499 |
<batchtest todir="${maven.test.reports}" unless="test"> |
| 500 |
<fileset dir="${maven.build.testDir.0}"> |
| 501 |
--- a/apps/rest-showcase/maven-build.xml |
| 502 |
+++ b/apps/rest-showcase/maven-build.xml |
| 503 |
@@ -125,7 +125,7 @@ |
| 504 |
|
| 505 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 506 |
<mkdir dir="${maven.build.outputDir}"/> |
| 507 |
- <javac destdir="${maven.build.outputDir}" |
| 508 |
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" |
| 509 |
nowarn="false" |
| 510 |
debug="true" |
| 511 |
optimize="false" |
| 512 |
@@ -153,7 +153,7 @@ |
| 513 |
description="Compile the test code" |
| 514 |
unless="maven.test.skip"> |
| 515 |
<mkdir dir="${maven.build.testOutputDir}"/> |
| 516 |
- <javac destdir="${maven.build.testOutputDir}" |
| 517 |
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" |
| 518 |
nowarn="false" |
| 519 |
debug="true" |
| 520 |
optimize="false" |
| 521 |
@@ -159,6 +159,7 @@ |
| 522 |
<path refid="build.test.classpath"/> |
| 523 |
<pathelement location="${maven.build.outputDir}"/> |
| 524 |
<pathelement location="${maven.build.testOutputDir}"/> |
| 525 |
+ <pathelement path="${gentoo.test.classpath}" /> |
| 526 |
</classpath> |
| 527 |
<batchtest todir="${maven.test.reports}" unless="test"> |
| 528 |
<fileset dir="${maven.build.testDir.0}"> |
| 529 |
--- a/bundles/admin/maven-build.xml |
| 530 |
+++ b/bundles/admin/maven-build.xml |
| 531 |
@@ -125,7 +125,7 @@ |
| 532 |
|
| 533 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 534 |
<mkdir dir="${maven.build.outputDir}"/> |
| 535 |
- <javac destdir="${maven.build.outputDir}" |
| 536 |
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" |
| 537 |
nowarn="false" |
| 538 |
debug="true" |
| 539 |
optimize="false" |
| 540 |
@@ -153,7 +153,7 @@ |
| 541 |
description="Compile the test code" |
| 542 |
unless="maven.test.skip"> |
| 543 |
<mkdir dir="${maven.build.testOutputDir}"/> |
| 544 |
- <javac destdir="${maven.build.testOutputDir}" |
| 545 |
+ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" |
| 546 |
nowarn="false" |
| 547 |
debug="true" |
| 548 |
optimize="false" |
| 549 |
@@ -159,6 +159,7 @@ |
| 550 |
<path refid="build.test.classpath"/> |
| 551 |
<pathelement location="${maven.build.outputDir}"/> |
| 552 |
<pathelement location="${maven.build.testOutputDir}"/> |
| 553 |
+ <pathelement path="${gentoo.test.classpath}" /> |
| 554 |
</classpath> |
| 555 |
<batchtest todir="${maven.test.reports}" unless="test"> |
| 556 |
<fileset dir="${maven.build.testDir.0}"> |
| 557 |
--- a/bundles/demo/maven-build.xml |
| 558 |
+++ b/bundles/demo/maven-build.xml |
| 559 |
@@ -125,7 +125,7 @@ |
| 560 |
|
| 561 |
<target name="compile" depends="get-deps" description="Compile the code"> |
| 562 |
<mkdir dir="${maven.build.outputDir}"/> |
| 563 |
- <javac destdir="${maven.build.outputDir}" |
| 564 |
+ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" |
| 565 |
nowarn="false" |
| 566 |
debug="true" |
| 567 |
optimize="false" |
| 568 |
|
| 569 |
|
| 570 |
|
| 571 |
1.1 dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch |
| 572 |
|
| 573 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch?rev=1.1&view=markup |
| 574 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch?rev=1.1&content-type=text/plain |
| 575 |
|
| 576 |
Index: struts-2.3.15.2-build.xml-manifest.patch |
| 577 |
=================================================================== |
| 578 |
--- a/bundles/admin/maven-build.xml |
| 579 |
+++ b/bundles/admin/maven-build.xml |
| 580 |
@@ -271,12 +271,8 @@ |
| 581 |
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" |
| 582 |
compress="true" |
| 583 |
index="false" |
| 584 |
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/bundles/admin/target/classes/META-INF/MANIFEST.MF" |
| 585 |
basedir="${maven.build.outputDir}" |
| 586 |
excludes="**/package.html"> |
| 587 |
- <manifest> |
| 588 |
- <attribute name="Main-Class"/> |
| 589 |
- </manifest> |
| 590 |
</jar> |
| 591 |
</target> |
| 592 |
|
| 593 |
--- a/bundles/demo/maven-build.xml |
| 594 |
+++ b/bundles/demo/maven-build.xml |
| 595 |
@@ -271,12 +271,8 @@ |
| 596 |
<jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" |
| 597 |
compress="true" |
| 598 |
index="false" |
| 599 |
- manifest="/var/tmp/portage/dev-java/struts-xwork-2.3.15.2/work/struts-2.3.15.2/src/bundles/demo/target/classes/META-INF/MANIFEST.MF" |
| 600 |
basedir="${maven.build.outputDir}" |
| 601 |
excludes="**/package.html"> |
| 602 |
- <manifest> |
| 603 |
- <attribute name="Main-Class"/> |
| 604 |
- </manifest> |
| 605 |
</jar> |
| 606 |
</target> |
Archives