diff options
| author |   Patrice Clement <monsieurp@gentoo.org> | 2016-02-07 11:00:50 +0000 |
|---|---|---|
| committer | Patrice Clement <monsieurp@gentoo.org> | 2016-02-07 11:01:19 +0000 |
| commit | 10c2a080bfd1aad86f8b955159f651a8a49dbb81 (patch) | |
| tree | a0949e5890ebd650439f4e3306f3a8443e81990d /dev-java | |
| parent | app-admin/ec2-api-tools: Removal. Fixes bug 471942. (diff) | |
| download | gentoo-10c2a080bfd1aad86f8b955159f651a8a49dbb81.tar.gz gentoo-10c2a080bfd1aad86f8b955159f651a8a49dbb81.tar.bz2 gentoo-10c2a080bfd1aad86f8b955159f651a8a49dbb81.zip | |
dev-java/struts{,-plugins,-core,-xwork}: Removal. Fixes bug 540888.
Diffstat (limited to 'dev-java')
22 files changed, 0 insertions, 1477 deletions
diff --git a/dev-java/struts-core/Manifest b/dev-java/struts-core/Manifest deleted file mode 100644 index c2974670e4ab..000000000000 --- a/dev-java/struts-core/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 diff --git a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch deleted file mode 100644 index 1ce5974427b7..000000000000 --- a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-classpath.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/maven-build.xml -+++ b/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" diff --git a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch deleted file mode 100644 index 001b5fdb4630..000000000000 --- a/dev-java/struts-core/files/struts-2.3.15.2-build.xml-manifest.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/core/maven-build.xml -+++ b/core/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/core/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-core/metadata.xml b/dev-java/struts-core/metadata.xml deleted file mode 100644 index 2444066aa02b..000000000000 --- a/dev-java/struts-core/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> -</pkgmetadata> diff --git a/dev-java/struts-core/struts-core-2.3.15.2.ebuild b/dev-java/struts-core/struts-core-2.3.15.2.ebuild deleted file mode 100644 index 1d62ab6dc5a2..000000000000 --- a/dev-java/struts-core/struts-core-2.3.15.2.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="struts" -MY_P="${MY_PN}-${PV}-src" - -DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: Core" -SRC_URI="mirror://apache/struts/source/${MY_P}.zip - https://dev.gentoo.org/~tomwij/files/dist/${MY_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/commons-fileupload:0 - dev-java/commons-lang:3.1 - dev-java/freemarker:2.3 - dev-java/ognl:3.0 - dev-java/struts-xwork:2 - dev-java/velocity:0 - java-virtuals/servlet-api:3.0" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPS}" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEPS}" - -S="${WORKDIR}/${MY_PN}-${PV}/src/core" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="struts-xwork-2" - -src_unpack() { - unpack ${MY_P}.zip - cd "${WORKDIR}"/${MY_PN}-${PV}/src || die - unpack ${MY_PN}-build.xml-${PV}.tar.xz - - java-pkg_getjars commons-fileupload,commons-lang-3.1,freemarker-2.3,ognl-3.0,velocity,servlet-api-3.0 -} - -java_prepare() { - find . -name '*.jar' -print -delete || die - - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch -} - -src_test() { - EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test -} - -src_install() { - java-pkg_newjar target/${MY_PN}2-core-${PV}.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/com -} diff --git a/dev-java/struts-plugins/Manifest b/dev-java/struts-plugins/Manifest deleted file mode 100644 index ff3e70f32de7..000000000000 --- a/dev-java/struts-plugins/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST struts-2.3.15.2-build.xml-classpath.patch 26778 SHA256 757fa1e729a3b196807e53350dbbd9d0a2fb2830095ac0227b4324f019cc27d1 SHA512 c84fd2226ccfaabb9405c27017b52d2a951a106ecc1f8fed1dd447b30e052572e6a81d66b1732ffe51dfd7078944938de417248a5a6816a32fbb1ffc610c3da6 WHIRLPOOL 7d7b7849f49cdc5502b2686555779a6bb231e18bc936f24ee0570319f1f84d57bf9239282e256968a07f067d8815f0a8f63de692221745a744bb91a32daa0859 -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch deleted file mode 100644 index 3944ff651b57..000000000000 --- a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-manifest.patch +++ /dev/null @@ -1,406 +0,0 @@ ---- a/convention/maven-build.xml -+++ b/convention/maven-build.xml -@@ -238,12 +238,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/plugins/convention/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/config-browser/maven-build.xml -+++ b/config-browser/maven-build.xml -@@ -238,12 +238,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/plugins/config-browser/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/javatemplates/maven-build.xml -+++ b/javatemplates/maven-build.xml -@@ -238,12 +238,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/plugins/javatemplates/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/jasperreports/maven-build.xml -+++ b/jasperreports/maven-build.xml -@@ -238,12 +238,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/plugins/jasperreports/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/jfreechart/maven-build.xml -+++ b/jfreechart/maven-build.xml -@@ -238,12 +238,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/plugins/jfreechart/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/jsf/maven-build.xml -+++ b/jsf/maven-build.xml -@@ -238,12 +238,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/plugins/jsf/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/pell-multipart/maven-build.xml -+++ b/pell-multipart/maven-build.xml -@@ -238,12 +238,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/plugins/pell-multipart/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/plexus/maven-build.xml -+++ b/plexus/maven-build.xml -@@ -238,12 +238,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/plugins/plexus/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/sitegraph/maven-build.xml -+++ b/sitegraph/maven-build.xml -@@ -260,13 +260,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/plugins/sitegraph/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class" -- value="org.apache.struts2.sitegraph.SiteGraph"/> -- </manifest> - </jar> - </target> - ---- a/sitemesh/maven-build.xml -+++ b/sitemesh/maven-build.xml -@@ -238,12 +238,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/plugins/sitemesh/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/spring/maven-build.xml -+++ b/spring/maven-build.xml -@@ -238,12 +238,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/plugins/spring/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/struts1/maven-build.xml -+++ b/struts1/maven-build.xml -@@ -238,12 +238,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/plugins/struts1/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/tiles/maven-build.xml -+++ b/tiles/maven-build.xml -@@ -238,12 +238,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/plugins/tiles/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/dojo/maven-build.xml -+++ b/dojo/maven-build.xml -@@ -238,12 +238,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/plugins/dojo/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/rest/maven-build.xml -+++ b/rest/maven-build.xml -@@ -238,12 +238,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/plugins/rest/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/portlet/maven-build.xml -+++ b/portlet/maven-build.xml -@@ -238,12 +238,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/plugins/portlet/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/portlet-tiles/maven-build.xml -+++ b/portlet-tiles/maven-build.xml -@@ -238,12 +238,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/plugins/portlet-tiles/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/junit/maven-build.xml -+++ b/junit/maven-build.xml -@@ -238,12 +238,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/plugins/junit/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/testng/maven-build.xml -+++ b/testng/maven-build.xml -@@ -238,12 +238,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/plugins/testng/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/dwr/maven-build.xml -+++ b/dwr/maven-build.xml -@@ -238,12 +238,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/plugins/dwr/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/oval/maven-build.xml -+++ b/oval/maven-build.xml -@@ -238,12 +238,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/plugins/oval/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/osgi/maven-build.xml -+++ b/osgi/maven-build.xml -@@ -238,12 +238,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/plugins/osgi/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/json/maven-build.xml -+++ b/json/maven-build.xml -@@ -238,12 +238,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/plugins/json/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/embeddedjsp/maven-build.xml -+++ b/embeddedjsp/maven-build.xml -@@ -238,12 +238,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/plugins/embeddedjsp/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/gxp/maven-build.xml -+++ b/gxp/maven-build.xml -@@ -238,12 +238,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/plugins/gxp/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/cdi/maven-build.xml -+++ b/cdi/maven-build.xml -@@ -238,12 +238,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/plugins/cdi/target/classes/META-INF/MANIFEST.MF" - basedir="${maven.build.outputDir}" - excludes="**/package.html"> -- <manifest> -- <attribute name="Main-Class"/> -- </manifest> - </jar> - </target> - ---- a/tiles3/maven-build.xml -+++ b/tiles3/maven-build.xml -@@ -238,12 +238,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/plugins/tiles3/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-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch deleted file mode 100644 index 14143bad26b0..000000000000 --- a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-codebehind.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/plugins/maven-build.xml -+++ b/plugins/maven-build.xml -@@ -22,7 +22,6 @@ - <!-- ====================================================================== --> - - <target name="clean" description="Clean the output directory"> -- <ant antfile="build.xml" dir="codebehind" target="clean"/> - <ant antfile="build.xml" dir="convention" target="clean"/> - <ant antfile="build.xml" dir="config-browser" target="clean"/> - <ant antfile="build.xml" dir="javatemplates" target="clean"/> -@@ -57,7 +56,6 @@ - <!-- ====================================================================== --> - - <target name="compile" description="Compile the code"> -- <ant antfile="build.xml" dir="codebehind" target="compile"/> - <ant antfile="build.xml" dir="convention" target="compile"/> - <ant antfile="build.xml" dir="config-browser" target="compile"/> - <ant antfile="build.xml" dir="javatemplates" target="compile"/> -@@ -92,7 +90,6 @@ - <!-- ====================================================================== --> - - <target name="compile-tests" description="Compile the test code"> -- <ant antfile="build.xml" dir="codebehind" target="compile-tests"/> - <ant antfile="build.xml" dir="convention" target="compile-tests"/> - <ant antfile="build.xml" dir="config-browser" target="compile-tests"/> - <ant antfile="build.xml" dir="javatemplates" target="compile-tests"/> -@@ -127,7 +124,6 @@ - <!-- ====================================================================== --> - - <target name="test" description="Run the test cases"> -- <ant antfile="build.xml" dir="codebehind" target="test"/> - <ant antfile="build.xml" dir="convention" target="test"/> - <ant antfile="build.xml" dir="config-browser" target="test"/> - <ant antfile="build.xml" dir="javatemplates" target="test"/> -@@ -162,7 +158,6 @@ - <!-- ====================================================================== --> - - <target name="javadoc" description="Generates the Javadoc of the application"> -- <ant antfile="build.xml" dir="codebehind" target="javadoc"/> - <ant antfile="build.xml" dir="convention" target="javadoc"/> - <ant antfile="build.xml" dir="config-browser" target="javadoc"/> - <ant antfile="build.xml" dir="javatemplates" target="javadoc"/> -@@ -197,7 +192,6 @@ - <!-- ====================================================================== --> - - <target name="package" description="Package the application"> -- <ant antfile="build.xml" dir="codebehind" target="package"/> - <ant antfile="build.xml" dir="convention" target="package"/> - <ant antfile="build.xml" dir="config-browser" target="package"/> - <ant antfile="build.xml" dir="javatemplates" target="package"/> diff --git a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch b/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch deleted file mode 100644 index 3c64fbc560e1..000000000000 --- a/dev-java/struts-plugins/files/struts-2.3.15.2-build.xml-remove-portlet.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/maven-build.xml -+++ b/maven-build.xml -@@ -38,7 +38,5 @@ - <ant antfile="build.xml" dir="tiles" target="clean"/> - <ant antfile="build.xml" dir="dojo" target="clean"/> - <ant antfile="build.xml" dir="rest" target="clean"/> -- <ant antfile="build.xml" dir="portlet" target="clean"/> -- <ant antfile="build.xml" dir="portlet-tiles" target="clean"/> - <ant antfile="build.xml" dir="junit" target="clean"/> - <ant antfile="build.xml" dir="testng" target="clean"/> -@@ -73,7 +72,5 @@ - <ant antfile="build.xml" dir="tiles" target="compile"/> - <ant antfile="build.xml" dir="dojo" target="compile"/> - <ant antfile="build.xml" dir="rest" target="compile"/> -- <ant antfile="build.xml" dir="portlet" target="compile"/> -- <ant antfile="build.xml" dir="portlet-tiles" target="compile"/> - <ant antfile="build.xml" dir="junit" target="compile"/> - <ant antfile="build.xml" dir="testng" target="compile"/> -@@ -108,7 +106,5 @@ - <ant antfile="build.xml" dir="tiles" target="compile-tests"/> - <ant antfile="build.xml" dir="dojo" target="compile-tests"/> - <ant antfile="build.xml" dir="rest" target="compile-tests"/> -- <ant antfile="build.xml" dir="portlet" target="compile-tests"/> -- <ant antfile="build.xml" dir="portlet-tiles" target="compile-tests"/> - <ant antfile="build.xml" dir="junit" target="compile-tests"/> - <ant antfile="build.xml" dir="testng" target="compile-tests"/> -@@ -143,7 +140,5 @@ - <ant antfile="build.xml" dir="tiles" target="test"/> - <ant antfile="build.xml" dir="dojo" target="test"/> - <ant antfile="build.xml" dir="rest" target="test"/> -- <ant antfile="build.xml" dir="portlet" target="test"/> -- <ant antfile="build.xml" dir="portlet-tiles" target="test"/> - <ant antfile="build.xml" dir="junit" target="test"/> - <ant antfile="build.xml" dir="testng" target="test"/> -@@ -178,7 +174,5 @@ - <ant antfile="build.xml" dir="tiles" target="javadoc"/> - <ant antfile="build.xml" dir="dojo" target="javadoc"/> - <ant antfile="build.xml" dir="rest" target="javadoc"/> -- <ant antfile="build.xml" dir="portlet" target="javadoc"/> -- <ant antfile="build.xml" dir="portlet-tiles" target="javadoc"/> - <ant antfile="build.xml" dir="junit" target="javadoc"/> - <ant antfile="build.xml" dir="testng" target="javadoc"/> -@@ -213,7 +208,5 @@ - <ant antfile="build.xml" dir="tiles" target="package"/> - <ant antfile="build.xml" dir="dojo" target="package"/> - <ant antfile="build.xml" dir="rest" target="package"/> -- <ant antfile="build.xml" dir="portlet" target="package"/> -- <ant antfile="build.xml" dir="portlet-tiles" target="package"/> - <ant antfile="build.xml" dir="junit" target="package"/> - <ant antfile="build.xml" dir="testng" target="package"/> diff --git a/dev-java/struts-plugins/metadata.xml b/dev-java/struts-plugins/metadata.xml deleted file mode 100644 index 2444066aa02b..000000000000 --- a/dev-java/struts-plugins/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> -</pkgmetadata> diff --git a/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild b/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild deleted file mode 100644 index a6e85e7e2641..000000000000 --- a/dev-java/struts-plugins/struts-plugins-2.3.15.2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="struts" -MY_P="${MY_PN}-${PV}-src" - -DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: Plugins" -SRC_URI="mirror://apache/struts/source/${MY_P}.zip - https://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-build.xml-${PV}.tar.xz - https://dev.gentoo.org/~tomwij/files/dist/${MY_PN}-${PV}-build.xml-classpath.patch" -HOMEPAGE="http://struts.apache.org/index.html" - -LICENSE="Apache-2.0" -SLOT="2" -KEYWORDS="~amd64" - -COMMON_DEPS="dev-java/commons-beanutils:1.7 - dev-java/commons-lang:3.1 - dev-java/commons-io:1 - dev-java/freemarker:2.3 - dev-java/juel:0 - dev-java/ognl:3.0 - dev-java/osgi-core-api:0 - dev-java/struts-core:${SLOT} - dev-java/struts-xwork:${SLOT} - dev-java/velocity:0 - java-virtuals/servlet-api:3.0" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPS}" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEPS}" - -S="${WORKDIR}/${MY_PN}-${PV}/src/plugins" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="struts-core-${SLOT},struts-xwork-${SLOT}" -EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}" -EANT_BUILD_TARGET="package" -EANT_TEST_TARGET="test" - -# javatemplates/maven-build.xml:149: -# Test org.apache.struts2.views.java.simple.AbstractCommonAttributesTest failed -# Cannot instantiate test case: testRenderTextFieldDynamicAttrs -RESTRICT="test" - -src_unpack() { - unpack ${MY_P}.zip - cd "${WORKDIR}"/${MY_PN}-${PV}/src || die - unpack ${MY_PN}-build.xml-${PV}.tar.xz -} - -java_prepare() { - find . -name '*.jar' -print -delete || die - - epatch "${DISTDIR}"/${MY_PN}-${PV}-build.xml-classpath.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-manifest.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-codebehind.patch - epatch "${FILESDIR}"/${MY_PN}-${PV}-build.xml-remove-portlet.patch - - # Remove tests that don't build due to test files that aren't installed. - rm jfreechart/src/test/java/org/apache/struts2/dispatcher/ChartResultTest.java - - java-pkg_getjars commons-beanutils-1.7,commons-io-1,commons-lang-3.1,freemarker-2.3,juel,ognl-3.0,osgi-core-api,servlet-api-3.0,velocity -} - -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 -} - -src_install() { - for plugin in $(find . -mindepth 1 -maxdepth 1 -type d | sed 's:./::g' | tr '\n' ' ') ; do - [[ ! -d ${plugin}/target ]] && continue - - einfo "Installing plugin '${plugin}' ..." - java-pkg_newjar ${plugin}/target/${MY_PN}2-${plugin}-plugin-${PV}.jar ${plugin}.jar - - if use doc ; then - java-pkg_dojavadoc ${plugin}/target/site/apidocs - mkdir "${D}"/usr/share/doc/${P}/${plugin} || die - mv "${D}"/usr/share/doc/${P}/{html,${plugin}/html} || die - fi - - use source && java-pkg_dosrc ${plugin}/src/main/java/org - done - - if use doc ; then - rm "${D}"/usr/share/${PN}-${SLOT}/api || die - fi -} - -pkg_postinst() { - elog "The 'codebehind' and 'portlet' plugins are not in this release because they don't build yet." -} diff --git a/dev-java/struts-xwork/Manifest b/dev-java/struts-xwork/Manifest deleted file mode 100644 index c2974670e4ab..000000000000 --- a/dev-java/struts-xwork/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 diff --git a/dev-java/struts-xwork/metadata.xml b/dev-java/struts-xwork/metadata.xml deleted file mode 100644 index 2444066aa02b..000000000000 --- a/dev-java/struts-xwork/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> -</pkgmetadata> diff --git a/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild b/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild deleted file mode 100644 index 6011b7fc629a..000000000000 --- a/dev-java/struts-xwork/struts-xwork-2.3.15.2.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc examples source test" - -inherit java-pkg-2 java-ant-2 - -MY_PN="struts" -MY_P="${MY_PN}-${PV}-src" - -DESCRIPTION="A powerful Model View Controller Framework for JSP/Servlets: XWork Core" -SRC_URI="mirror://apache/struts/source/${MY_P}.zip - https://dev.gentoo.org/~tomwij/files/dist/${MY_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/asm:3 - dev-java/commons-io:1 - dev-java/commons-lang:3.1 - dev-java/commons-logging:0 - dev-java/ognl:3.0 - dev-java/slf4j-api:0" - -RDEPEND=">=virtual/jre-1.5 - ${COMMON_DEPS}" - -DEPEND=">=virtual/jdk-1.5 - test? ( dev-java/ant-junit:0 ) - ${COMMON_DEPS}" - -S="${WORKDIR}/${MY_PN}-${PV}/src/xwork-core" - -JAVA_ANT_REWRITE_CLASSPATH="true" -EANT_GENTOO_CLASSPATH="asm-3,commons-io-1,commons-lang-3.1,commons-logging,ognl-3.0,slf4j-api" - -# Could not open files of the name xwork-jar.xml -RESTRICT="test" - -src_unpack() { - unpack ${MY_P}.zip - cd "${WORKDIR}"/${MY_PN}-${PV}/src || die - unpack ${MY_PN}-build.xml-${PV}.tar.xz -} - -java_prepare() { - find . -name '*.jar' -print -delete || die -} - -src_test() { - EANT_TEST_EXTRA_ARGS="-Djunit.present=true" java-pkg-2_src_test -} - -src_install() { - java-pkg_dojar target/xwork-core.jar - - use doc && java-pkg_dojavadoc target/site/apidocs - use source && java-pkg_dosrc src/main/java/com -} diff --git a/dev-java/struts/Manifest b/dev-java/struts/Manifest deleted file mode 100644 index c2974670e4ab..000000000000 --- a/dev-java/struts/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST struts-2.3.15.2-src.zip 6957356 SHA256 26d85c52e7764ece49ccd7b9df38353003326116363a630ee8ae33bc26db3cd5 SHA512 55df8ea52717781efe1b34b0b09b8677c88ce50cf160119bebfec979f22d95b0a801b9e1184dba3733ca80e9db27297d42412ae550eaa4451e4aad6f25b66825 WHIRLPOOL dcc7d263c22ada417e3e3c518d10e2a8937cda0755110bcf29981c1eec7ce8e3b9b6260c708e0292916d9e5fb11b9d35a061b2e823254d0c2030a95035a67a86 -DIST struts-build.xml-2.3.15.2.tar.xz 20744 SHA256 c76b3d852140f3ff62718949ec752673b99845abe028445fbca69fd9f4879d5b SHA512 d4c21ff8dea2990507bff4968311a4f6a44c17ae1cbbd321b818d3fe558c131ee6c0132d5e61509f61aa53e284b61fb3cce24b89020f9889cf9ef960b7c31da3 WHIRLPOOL 7f42a22a5a43f91aba871ce4f04a38b0f1314b47395d22054bc6922b7565bb6c978141bb5a1b1274f7bfc9bd51a863ddcde9f711c1374f1cb5c707b0613e1897 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 deleted file mode 100644 index d1e414414320..000000000000 --- a/dev-java/struts/files/struts-2.3.15.2-build.xml-apps-package.patch +++ /dev/null @@ -1,249 +0,0 @@ -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 deleted file mode 100644 index 25d694a198a3..000000000000 --- a/dev-java/struts/files/struts-2.3.15.2-build.xml-classpath.patch +++ /dev/null @@ -1,162 +0,0 @@ ---- 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 deleted file mode 100644 index 3a046a006399..000000000000 --- a/dev-java/struts/files/struts-2.3.15.2-build.xml-manifest.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- 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 deleted file mode 100644 index 27c101ddc5e0..000000000000 --- a/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-apps-portlet.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- 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 deleted file mode 100644 index d04acd040d09..000000000000 --- a/dev-java/struts/files/struts-2.3.15.2-build.xml-remove-core-and-plugins.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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/metadata.xml b/dev-java/struts/metadata.xml deleted file mode 100644 index 72d5736c1eb7..000000000000 --- a/dev-java/struts/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>java@gentoo.org</email> - <name>Java</name> -</maintainer> -<longdescription> -The Struts framework provides the invisible underpinnings every professional -web application needs to survive. Struts helps you create an extensible -development environment for your application, based on published standards -and proven design patterns. -</longdescription> -</pkgmetadata> diff --git a/dev-java/struts/struts-2.3.15.2.ebuild b/dev-java/struts/struts-2.3.15.2.ebuild deleted file mode 100644 index 2abc8db056aa..000000000000 --- a/dev-java/struts/struts-2.3.15.2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -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 - https://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." -} |