diff options
| author |   Tom Wijsman <tomwij@gentoo.org> | 2013-10-02 23:02:51 +0000 |
|---|---|---|
| committer | Tom Wijsman <tomwij@gentoo.org> | 2013-10-02 23:02:51 +0000 |
| commit | 11baf40c192922ca78c30dc24ad36b12f4216f83 (patch) | |
| tree | e63ac0aa4e8def315fbe0946c30fe349c5c5b91b /dev-java | |
| parent | initial commit (diff) | |
| download | gentoo-2-11baf40c192922ca78c30dc24ad36b12f4216f83.tar.gz gentoo-2-11baf40c192922ca78c30dc24ad36b12f4216f83.tar.bz2 gentoo-2-11baf40c192922ca78c30dc24ad36b12f4216f83.zip | |
Version bump to 2.3.15.2; for bug #152352, bug #237146, bug #405931 and bug #486752.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'dev-java')
7 files changed, 666 insertions, 3 deletions
diff --git a/dev-java/struts/ChangeLog b/dev-java/struts/ChangeLog index 972281332932..5d2f0c2891bc 100644 --- a/dev-java/struts/ChangeLog +++ b/dev-java/struts/ChangeLog @@ -1,6 +1,18 @@ # ChangeLog for dev-java/struts -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.49 2011/12/19 11:01:26 sera Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/ChangeLog,v 1.50 2013/10/02 23:02:51 tomwij Exp $ + +*struts-2.3.15.2 (02 Oct 2013) + + 02 Oct 2013; Tom Wijsman <TomWij@gentoo.org> + +files/struts-2.3.15.2-build.xml-apps-package.patch, + +files/struts-2.3.15.2-build.xml-classpath.patch, + +files/struts-2.3.15.2-build.xml-manifest.patch, + +files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch, + +files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch, + +struts-2.3.15.2.ebuild: + Version bump to 2.3.15.2; for bug #152352, bug #237146, bug #405931 and bug + #486752. 19 Dec 2011; Ralph Sennhauser <sera@gentoo.org> struts-1.2.9-r2.ebuild, struts-1.2.9-r3.ebuild: @@ -209,4 +221,3 @@ struts-1.1.ebuild: Initial Import. Thanks to Pavel <hlobil@sympatico.ca> for input. Closes #43253, #14382, #21930 - diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch new file mode 100644 index 000000000000..d1e414414320 --- /dev/null +++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch @@ -0,0 +1,249 @@ +diff -urN a/apps/blank/maven-build.xml b/apps/blank/maven-build.xml +--- a/apps/blank/maven-build.xml 2013-10-02 15:52:07.637985555 +0200 ++++ b/apps/blank/maven-build.xml 2013-10-02 15:52:29.756985531 +0200 +@@ -243,32 +243,6 @@ + + <target name="package" depends="compile,test" description="Package the application"> + <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> + <war destfile="${maven.build.dir}/${maven.build.finalName}.war" + compress="true" + webxml="src/main/webapp/WEB-INF/web.xml"> +--- a/apps/mailreader/maven-build.xml ++++ b/apps/mailreader/maven-build.xml +@@ -198,36 +198,6 @@ + + <target name="package" depends="compile,test" description="Package the application"> + <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts-mailreader-dao/1.3.5/struts-mailreader-dao-1.3.5.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> + <war destfile="${maven.build.dir}/${maven.build.finalName}.war" + compress="true" + webxml="src/main/webapp/WEB-INF/web.xml"> +--- a/apps/showcase/maven-build.xml ++++ b/apps/showcase/maven-build.xml +@@ -334,112 +334,6 @@ + + <target name="package" depends="compile,test" description="Package the application"> + <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-struts1-plugin/2.3.15.2/struts2-struts1-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts-core/1.3.10/struts-core-1.3.10.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/antlr/antlr/2.7.2/antlr-2.7.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-chain/commons-chain/1.2/commons-chain-1.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-dojo-plugin/2.3.15.2/struts2-dojo-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-jsf-plugin/2.3.15.2/struts2-jsf-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <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" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-sitemesh-plugin/2.3.15.2/struts2-sitemesh-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-tiles-plugin/2.3.15.2/struts2-tiles-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/tiles/tiles-core/2.0.6/tiles-core-2.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/tiles/tiles-api/2.0.6/tiles-api-2.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-dwr-plugin/2.3.15.2/struts2-dwr-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-json-plugin/2.3.15.2/struts2-json-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/tiles/tiles-jsp/2.0.6/tiles-jsp-2.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-digester/commons-digester/2.0/commons-digester-2.0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-logging/commons-logging-api/1.1/commons-logging-api-1.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-spring-plugin/2.3.15.2/struts2-spring-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/springframework/spring-beans/3.0.5.RELEASE/spring-beans-3.0.5.RELEASE.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/springframework/spring-core/3.0.5.RELEASE/spring-core-3.0.5.RELEASE.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/springframework/spring-asm/3.0.5.RELEASE/spring-asm-3.0.5.RELEASE.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/springframework/spring-context/3.0.5.RELEASE/spring-context-3.0.5.RELEASE.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/springframework/spring-aop/3.0.5.RELEASE/spring-aop-3.0.5.RELEASE.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/springframework/spring-expression/3.0.5.RELEASE/spring-expression-3.0.5.RELEASE.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/springframework/spring-web/3.0.5.RELEASE/spring-web-3.0.5.RELEASE.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/aopalliance/aopalliance/1.0/aopalliance-1.0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/velocity/velocity/1.6.4/velocity-1.6.4.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/oro/oro/2.0.8/oro-2.0.8.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/velocity/velocity-tools/1.3/velocity-tools-1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-validator/commons-validator/1.3.1/commons-validator-1.3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/sslext/sslext/1.2-0/sslext-1.2-0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/opensymphony/sitemesh/2.4.2/sitemesh-2.4.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/uk/ltd/getahead/dwr/1.1.1/dwr-1.1.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/log4j/log4j/1.2.17/log4j-1.2.17.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-impl/1.1.2/myfaces-impl-1.1.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-el/commons-el/1.0/commons-el-1.0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-codec/commons-codec/1.3/commons-codec-1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/myfaces/core/myfaces-api/1.1.2/myfaces-api-1.1.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> + <war destfile="${maven.build.dir}/${maven.build.finalName}.war" + compress="true" + webxml="src/main/webapp/WEB-INF/web.xml"> +--- a/apps/rest-showcase/maven-build.xml ++++ b/apps/rest-showcase/maven-build.xml +@@ -273,56 +273,6 @@ + + <target name="package" depends="compile,test" description="Package the application"> + <mkdir dir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-rest-plugin/2.3.15.2/struts2-rest-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/com/thoughtworks/xstream/xstream/1.4.2/xstream-1.4.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/xmlpull/xmlpull/1.1.3.1/xmlpull-1.1.3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/xpp3/xpp3_min/1.1.4c/xpp3_min-1.1.4c.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/net/sf/json-lib/json-lib/2.3/json-lib-2.3-jdk15.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-beanutils/commons-beanutils/1.8.0/commons-beanutils-1.8.0.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-collections/commons-collections/3.1/commons-collections-3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-core-asl/1.9.2/jackson-core-asl-1.9.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/codehaus/jackson/jackson-mapper-asl/1.9.2/jackson-mapper-asl-1.9.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-convention-plugin/2.3.15.2/struts2-convention-plugin-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/commons/commons-lang3/3.1/commons-lang3-3.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <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" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-logging/commons-logging/1.1.3/commons-logging-1.1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/struts2-core/2.3.15.2/struts2-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/apache/struts/xwork/xwork-core/2.3.15.2/xwork-core-2.3.15.2.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm/3.3/asm-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-commons/3.3/asm-commons-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/asm/asm-tree/3.3/asm-tree-3.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/org/freemarker/freemarker/2.3.19/freemarker-2.3.19.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/ognl/ognl/3.0.6/ognl-3.0.6.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/javassist/javassist/3.11.0.GA/javassist-3.11.0.GA.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-fileupload/commons-fileupload/1.3/commons-fileupload-1.3.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> +- <copy file="${maven.repo.local}/commons-io/commons-io/2.0.1/commons-io-2.0.1.jar" +- todir="${maven.build.dir}/${maven.build.finalName}/WEB-INF/lib"/> + <war destfile="${maven.build.dir}/${maven.build.finalName}.war" + compress="true" + webxml="src/main/webapp/WEB-INF/web.xml"> diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch new file mode 100644 index 000000000000..25d694a198a3 --- /dev/null +++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch @@ -0,0 +1,162 @@ +--- a/apps/blank/maven-build.xml ++++ b/apps/blank/maven-build.xml +@@ -125,7 +125,7 @@ + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> +- <javac destdir="${maven.build.outputDir}" ++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -153,7 +153,7 @@ + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> +- <javac destdir="${maven.build.testOutputDir}" ++ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -159,6 +159,7 @@ + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> ++ <pathelement path="${gentoo.test.classpath}" /> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> +--- a/apps/mailreader/maven-build.xml ++++ b/apps/mailreader/maven-build.xml +@@ -125,7 +125,7 @@ + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> +- <javac destdir="${maven.build.outputDir}" ++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" + nowarn="false" + debug="true" + optimize="false" +--- a/apps/portlet/maven-build.xml ++++ b/apps/portlet/maven-build.xml +@@ -125,7 +125,7 @@ + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> +- <javac destdir="${maven.build.outputDir}" ++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -153,7 +153,7 @@ + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> +- <javac destdir="${maven.build.testOutputDir}" ++ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -159,6 +159,7 @@ + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> ++ <pathelement path="${gentoo.test.classpath}" /> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> +--- a/apps/showcase/maven-build.xml ++++ b/apps/showcase/maven-build.xml +@@ -125,7 +125,7 @@ + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> +- <javac destdir="${maven.build.outputDir}" ++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -153,7 +153,7 @@ + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> +- <javac destdir="${maven.build.testOutputDir}" ++ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -159,6 +159,7 @@ + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> ++ <pathelement path="${gentoo.test.classpath}" /> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> +--- a/apps/rest-showcase/maven-build.xml ++++ b/apps/rest-showcase/maven-build.xml +@@ -125,7 +125,7 @@ + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> +- <javac destdir="${maven.build.outputDir}" ++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -153,7 +153,7 @@ + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> +- <javac destdir="${maven.build.testOutputDir}" ++ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -159,6 +159,7 @@ + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> ++ <pathelement path="${gentoo.test.classpath}" /> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> +--- a/bundles/admin/maven-build.xml ++++ b/bundles/admin/maven-build.xml +@@ -125,7 +125,7 @@ + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> +- <javac destdir="${maven.build.outputDir}" ++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -153,7 +153,7 @@ + description="Compile the test code" + unless="maven.test.skip"> + <mkdir dir="${maven.build.testOutputDir}"/> +- <javac destdir="${maven.build.testOutputDir}" ++ <javac destdir="${maven.build.testOutputDir}" classpath="${gentoo.test.classpath}" + nowarn="false" + debug="true" + optimize="false" +@@ -159,6 +159,7 @@ + <path refid="build.test.classpath"/> + <pathelement location="${maven.build.outputDir}"/> + <pathelement location="${maven.build.testOutputDir}"/> ++ <pathelement path="${gentoo.test.classpath}" /> + </classpath> + <batchtest todir="${maven.test.reports}" unless="test"> + <fileset dir="${maven.build.testDir.0}"> +--- a/bundles/demo/maven-build.xml ++++ b/bundles/demo/maven-build.xml +@@ -125,7 +125,7 @@ + + <target name="compile" depends="get-deps" description="Compile the code"> + <mkdir dir="${maven.build.outputDir}"/> +- <javac destdir="${maven.build.outputDir}" ++ <javac destdir="${maven.build.outputDir}" classpath="${gentoo.classpath}" + nowarn="false" + debug="true" + optimize="false" diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch new file mode 100644 index 000000000000..3a046a006399 --- /dev/null +++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch @@ -0,0 +1,30 @@ +--- a/bundles/admin/maven-build.xml ++++ b/bundles/admin/maven-build.xml +@@ -271,12 +271,8 @@ + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" +- 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" + basedir="${maven.build.outputDir}" + excludes="**/package.html"> +- <manifest> +- <attribute name="Main-Class"/> +- </manifest> + </jar> + </target> + +--- a/bundles/demo/maven-build.xml ++++ b/bundles/demo/maven-build.xml +@@ -271,12 +271,8 @@ + <jar jarfile="${maven.build.dir}/${maven.build.finalName}.jar" + compress="true" + index="false" +- 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" + basedir="${maven.build.outputDir}" + excludes="**/package.html"> +- <manifest> +- <attribute name="Main-Class"/> +- </manifest> + </jar> + </target> + diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch new file mode 100644 index 000000000000..27c101ddc5e0 --- /dev/null +++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch @@ -0,0 +1,50 @@ +--- a/apps/maven-build.xml ++++ b/apps/maven-build.xml +@@ -24,7 +24,6 @@ + <target name="clean" description="Clean the output directory"> + <ant antfile="build.xml" dir="blank" target="clean"/> + <ant antfile="build.xml" dir="mailreader" target="clean"/> +- <ant antfile="build.xml" dir="portlet" target="clean"/> + <ant antfile="build.xml" dir="showcase" target="clean"/> + <ant antfile="build.xml" dir="rest-showcase" target="clean"/> + </target> +@@ -36,7 +35,6 @@ + <target name="compile" description="Compile the code"> + <ant antfile="build.xml" dir="blank" target="compile"/> + <ant antfile="build.xml" dir="mailreader" target="compile"/> +- <ant antfile="build.xml" dir="portlet" target="compile"/> + <ant antfile="build.xml" dir="showcase" target="compile"/> + <ant antfile="build.xml" dir="rest-showcase" target="compile"/> + </target> +@@ -48,7 +46,6 @@ + <target name="compile-tests" description="Compile the test code"> + <ant antfile="build.xml" dir="blank" target="compile-tests"/> + <ant antfile="build.xml" dir="mailreader" target="compile-tests"/> +- <ant antfile="build.xml" dir="portlet" target="compile-tests"/> + <ant antfile="build.xml" dir="showcase" target="compile-tests"/> + <ant antfile="build.xml" dir="rest-showcase" target="compile-tests"/> + </target> +@@ -60,7 +57,6 @@ + <target name="test" description="Run the test cases"> + <ant antfile="build.xml" dir="blank" target="test"/> + <ant antfile="build.xml" dir="mailreader" target="test"/> +- <ant antfile="build.xml" dir="portlet" target="test"/> + <ant antfile="build.xml" dir="showcase" target="test"/> + <ant antfile="build.xml" dir="rest-showcase" target="test"/> + </target> +@@ -72,7 +68,6 @@ + <target name="javadoc" description="Generates the Javadoc of the application"> + <ant antfile="build.xml" dir="blank" target="javadoc"/> + <ant antfile="build.xml" dir="mailreader" target="javadoc"/> +- <ant antfile="build.xml" dir="portlet" target="javadoc"/> + <ant antfile="build.xml" dir="showcase" target="javadoc"/> + <ant antfile="build.xml" dir="rest-showcase" target="javadoc"/> + </target> +@@ -84,7 +79,6 @@ + <target name="package" description="Package the application"> + <ant antfile="build.xml" dir="blank" target="package"/> + <ant antfile="build.xml" dir="mailreader" target="package"/> +- <ant antfile="build.xml" dir="portlet" target="package"/> + <ant antfile="build.xml" dir="showcase" target="package"/> + <ant antfile="build.xml" dir="rest-showcase" target="package"/> + </target> diff --git a/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch new file mode 100644 index 000000000000..d04acd040d09 --- /dev/null +++ b/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch @@ -0,0 +1,56 @@ +--- a/maven-build.xml ++++ b/maven-build.xml +@@ -22,8 +22,5 @@ + <!-- ====================================================================== --> + + <target name="clean" description="Clean the output directory"> +- <ant antfile="build.xml" dir="xwork-core" target="clean"/> +- <ant antfile="build.xml" dir="core" target="clean"/> + <ant antfile="build.xml" dir="apps" target="clean"/> +- <ant antfile="build.xml" dir="plugins" target="clean"/> + <ant antfile="build.xml" dir="bundles" target="clean"/> +@@ -35,8 +33,5 @@ + <!-- ====================================================================== --> + + <target name="compile" description="Compile the code"> +- <ant antfile="build.xml" dir="xwork-core" target="compile"/> +- <ant antfile="build.xml" dir="core" target="compile"/> + <ant antfile="build.xml" dir="apps" target="compile"/> +- <ant antfile="build.xml" dir="plugins" target="compile"/> + <ant antfile="build.xml" dir="bundles" target="compile"/> +@@ -48,8 +44,5 @@ + <!-- ====================================================================== --> + + <target name="compile-tests" description="Compile the test code"> +- <ant antfile="build.xml" dir="xwork-core" target="compile-tests"/> +- <ant antfile="build.xml" dir="core" target="compile-tests"/> + <ant antfile="build.xml" dir="apps" target="compile-tests"/> +- <ant antfile="build.xml" dir="plugins" target="compile-tests"/> + <ant antfile="build.xml" dir="bundles" target="compile-tests"/> +@@ -61,8 +55,5 @@ + <!-- ====================================================================== --> + + <target name="test" description="Run the test cases"> +- <ant antfile="build.xml" dir="xwork-core" target="test"/> +- <ant antfile="build.xml" dir="core" target="test"/> + <ant antfile="build.xml" dir="apps" target="test"/> +- <ant antfile="build.xml" dir="plugins" target="test"/> + <ant antfile="build.xml" dir="bundles" target="test"/> +@@ -74,8 +66,5 @@ + <!-- ====================================================================== --> + + <target name="javadoc" description="Generates the Javadoc of the application"> +- <ant antfile="build.xml" dir="xwork-core" target="javadoc"/> +- <ant antfile="build.xml" dir="core" target="javadoc"/> + <ant antfile="build.xml" dir="apps" target="javadoc"/> +- <ant antfile="build.xml" dir="plugins" target="javadoc"/> + <ant antfile="build.xml" dir="bundles" target="javadoc"/> +@@ -87,8 +77,5 @@ + <!-- ====================================================================== --> + + <target name="package" description="Package the application"> +- <ant antfile="build.xml" dir="xwork-core" target="package"/> +- <ant antfile="build.xml" dir="core" target="package"/> + <ant antfile="build.xml" dir="apps" target="package"/> +- <ant antfile="build.xml" dir="plugins" target="package"/> + <ant antfile="build.xml" dir="bundles" target="package"/> diff --git a/dev-java/struts/struts-2.3.15.2.ebuild b/dev-java/struts/struts-2.3.15.2.ebuild new file mode 100644 index 000000000000..fc317a86eef0 --- /dev/null +++ b/dev-java/struts/struts-2.3.15.2.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/struts/struts-2.3.15.2.ebuild,v 1.1 2013/10/02 23:02:51 tomwij Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="doc source test" +WANT_ANT_TASKS="ant-trax" + +inherit java-pkg-2 java-ant-2 + +MY_P="${P}-src" + +DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets" +SRC_URI="mirror://apache/struts/source/${MY_P}.zip + http://dev.gentoo.org/~tomwij/files/dist/${PN}-build.xml-${PV}.tar.xz" +HOMEPAGE="http://struts.apache.org/index.html" + +LICENSE="Apache-2.0" +SLOT="2" +KEYWORDS="~amd64" + +COMMON_DEPS=" + dev-java/felix-shell:0 + dev-java/osgi-core-api:0 + dev-java/struts-core:${SLOT} + dev-java/struts-plugins:${SLOT} + dev-java/struts-xwork:${SLOT} + java-virtuals/servlet-api:2.3" + +RDEPEND=">=virtual/jre-1.5 + ${COMMON_DEPS}" + +DEPEND=">=virtual/jdk-1.5 + test? ( dev-java/ant-junit:0 ) + ${COMMON_DEPS}" + +S="${WORKDIR}/${P}/src" + +JAVA_ANT_REWRITE_CLASSPATH="true" +EANT_GENTOO_CLASSPATH="struts-core-${SLOT},struts-plugins-${SLOT},struts-xwork-${SLOT}" +EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}" +EANT_BUILD_TARGET="package" +EANT_TEST_TARGET="test" + +# TODO: Incompatible with newer junit; we either need to patch it or slot junit. +RESTRICT="test" + +src_unpack() { + unpack ${MY_P}.zip + cd "${S}" || die + unpack ${PN}-build.xml-${PV}.tar.xz +} + +java_prepare() { + find . -name '*.jar' -print -delete || die + + epatch "${FILESDIR}"/${P}-build.xml-remove-core-and-plugins.patch + epatch "${FILESDIR}"/${P}-build.xml-classpath.patch + epatch "${FILESDIR}"/${P}-build.xml-manifest.patch + epatch "${FILESDIR}"/${P}-build.xml-apps-package.patch + epatch "${FILESDIR}"/${P}-build.xml-remove-apps-portlet.patch + + java-pkg_getjars felix-shell,osgi-core-api,servlet-api-2.3 +} + +src_install() { + insinto /usr/share/${PN}-${SLOT}/ + + # Misses apps/portlet. + for dir in apps/{blank,mailreader,rest-showcase,showcase} bundles/{admin,demo} ; do + if [[ ${dir} == "apps/"* ]] ; then + doins ${dir}/target/${PN}2-${dir/apps\//}.war + else + java-pkg_newjar ${dir}/target/${PN}2-osgi-*-bundle-${PV}.jar ${dir/bundles\//}.jar + fi + + if use doc ; then + java-pkg_dojavadoc ${dir}/target/site/apidocs + mkdir "${D}"/usr/share/doc/${P}/${dir/*\//} || die + mv "${D}"/usr/share/doc/${P}/{html,${dir/*\//}/html} || die + fi + + if [[ ${dir} == *"mailreader"* ]] ; then + use source && java-pkg_dosrc ${dir}/src/main/java/mailreader2 + else + use source && java-pkg_dosrc ${dir}/src/main/java/org + fi + done + + if use doc ; then + rm "${D}"/usr/share/${PN}-${SLOT}/api || die + fi +} + +src_test() { + EANT_TEST_EXTRA_ARGS="-Dgentoo.test.classpath=$(java-pkg_getjars ${EANT_TEST_GENTOO_CLASSPATH})" + EANT_TEST_EXTRA_ARGS+=" -Djunit.present=true" + + java-pkg-2_src_test +} + +pkg_postinst() { + elog "The application 'portlet' is not in this release because it doesn't build." +} |