diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/avalon-logkit | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-java/avalon-logkit')
-rw-r--r-- | dev-java/avalon-logkit/Manifest | 2 | ||||
-rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild | 94 | ||||
-rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild | 61 | ||||
-rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild | 57 | ||||
-rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild | 62 | ||||
-rw-r--r-- | dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild | 62 | ||||
-rw-r--r-- | dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch | 17 | ||||
-rw-r--r-- | dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch | 30 | ||||
-rw-r--r-- | dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch | 30 | ||||
-rw-r--r-- | dev-java/avalon-logkit/metadata.xml | 5 |
10 files changed, 420 insertions, 0 deletions
diff --git a/dev-java/avalon-logkit/Manifest b/dev-java/avalon-logkit/Manifest new file mode 100644 index 000000000000..9ce57063aef3 --- /dev/null +++ b/dev-java/avalon-logkit/Manifest @@ -0,0 +1,2 @@ +DIST avalon-logkit-2.1-src.tar.gz 60218 SHA256 a5f158a52db9acd58648ffe75a023f43c5cbb94d027bb2beccf4983614d4e155 SHA512 9977a3a172ca4fb5c3ad1f623ff109214f71900d2e244f175cc5d140f5f9993caca7e5ca3220728f18a1d6242d11a48990f9ce0150c36b7a9bb10a7a6d5a905a WHIRLPOOL 8fdd0206c2b65c2a8626331ea07b8e5668ef9b2c841ce20ae85459bc8e128c4096c2091f05ad7e92b7c9c769ba0ad485738f7078ce5f205fa38e21d9a1ca1b47 +DIST logkit-1.2.2-src.tar.gz 113180 SHA256 2c81edc87571fbd05797da7f65515e089c62cbb735bdbd10f93e29bd3aa3ddb8 SHA512 a2a027e70a2432d07ef44d229edde57b1fe7a89ee9db2cd85c5609b180d704e28273f7ddbe55b7086260bc4be2c0ac56b1e23f405b785068678a50a8159a5333 WHIRLPOOL 2f5eebe87fd6dddce535360c44bb62e0ff90f2eead5a162dea748d7ee712faf2385b16ab0b719cd1537cada0436a9217f093e48de1a50767680d1230eff301f9 diff --git a/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild new file mode 100644 index 000000000000..651c72a0bb95 --- /dev/null +++ b/dev-java/avalon-logkit/avalon-logkit-1.2.2-r1.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +JAVA_PKG_IUSE="doc source test" + +inherit eutils java-pkg-2 + +DESCRIPTION="An easy-to-use Java logging toolkit designed for secure, performance-oriented logging" +HOMEPAGE="http://avalon.apache.org/" +SRC_URI="mirror://apache/avalon/logkit/source/logkit-${PV}-src.tar.gz" + +LICENSE="Apache-1.1" +SLOT="1.2" +IUSE="" +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" + +COMMON_DEP=" + dev-java/avalon-framework:4.1 + dev-java/log4j:0 + java-virtuals/jaf:0 + java-virtuals/javamail:0 + java-virtuals/jms:0 + java-virtuals/servlet-api:2.5" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.4" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.4 + test? ( dev-java/junit:4 )" + +S="${WORKDIR}/logkit-${PV}-dev" +SRC_DIR="${S}/src/java" +JAVADOC_DIR="${S}/javadoc" + +java_prepare() { + epatch "${FILESDIR}/${P}-java7.patch" +} + +src_compile() { + mkdir classes || die "Could not create compile output dir" + + ejavac \ + -encoding "ISO-8859-1" \ + -classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \ + -d classes $(find "${SRC_DIR}" -name "*.java") \ + || die "Compilation failed" + + jar -cf "${S}/${PN}.jar" -C classes . || die "Could not create jar" + + #Generate javadoc + if use doc ; then + mkdir "${JAVADOC_DIR}" || die "Could not create javadoc dir" + cd "${SRC_DIR}" + javadoc \ + -encoding "ISO-8859-1" \ + -sourcepath "${SRC_DIR}" \ + -classpath $(java-pkg_getjars jaf,javamail,jms,log4j,servlet-api-2.5,avalon-framework-4.1) \ + -source "${JAVA_VERSION}" \ + -d "${JAVADOC_DIR}" \ + $(find "org/apache/log" -type d | tr '/' '.') \ + || die "Could not create javadoc" + fi +} + +src_test() { + mkdir test-classes || die "Unable to make dir" + local TESTJAR="avalon-logkit-test.jar" + + ejavac \ + -encoding "ISO-8859-1" \ + -classpath "avalon-logkit.jar:$(java-config -p junit-4)" \ + -d test-classes \ + $(find src/test -name '*.java') + + jar -cf "${TESTJAR}" -C test-classes . + + java -cp "avalon-logkit.jar:${TESTJAR}:$(java-config -p junit:4)" \ + org.junit.runner.JUnitCore org.apache.log.format.test.FormatterTestCase \ + org.apache.log.output.test.RevolvingFileStrategyTestCase \ + org.apache.log.output.test.OutputTargetTestCase \ + org.apache.log.output.test.DBTargetTestCase \ + org.apache.log.util.test.UtilTestCase \ + org.apache.log.test.LoggerListenerTestCase \ + org.apache.log.test.WrappingTargetTestCase \ + org.apache.log.test.InheritanceTestCase +} + +src_install() { + java-pkg_dojar "${PN}.jar" + use doc && java-pkg_dojavadoc "${JAVADOC_DIR}" + use source && java-pkg_dosrc "${SRC_DIR}/*" +} diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild new file mode 100644 index 000000000000..751b51706a37 --- /dev/null +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r5.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=2 +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Easy-to-use Java logging toolkit" +HOMEPAGE="http://avalon.apache.org/" +SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz" + +KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +LICENSE="Apache-2.0" +SLOT="2.0" +IUSE="" + +COMMON_DEP=" + dev-java/log4j + java-virtuals/jms + java-virtuals/javamail + =dev-java/servletapi-2.4*" + +RDEPEND=">=virtual/jre-1.4 + ${COMMON_DEP}" +# Doesn't like 1.6 changes to JDBC +DEPEND=">=virtual/jdk-1.4 + test? ( + =dev-java/junit-3* + dev-java/ant-junit + ) + ${COMMON_DEP}" + +java_prepare() { + epatch "${FILESDIR}/${P}-java7.patch" + + java-ant_ignore-system-classes + + java-ant_xml-rewrite -f build.xml \ + -c -e available -a classpathref -v 'build.classpath' || die + + mkdir -p target/lib || die + cd target/lib || die + java-pkg_jar-from servletapi-2.4 + java-pkg_jar-from jms + java-pkg_jar-from --virtual javamail + java-pkg_jar-from log4j + java-pkg_filter-compiler jikes +} + +src_test() { + java-pkg_jar-from --into target/lib junit + ANT_TASKS="ant-junit" eant test +} + +src_install() { + java-pkg_newjar target/${P}.jar + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild new file mode 100644 index 000000000000..3ccdb1b53faf --- /dev/null +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r6.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=4 + +JAVA_PKG_IUSE="doc source test" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="Easy-to-use Java logging toolkit" +HOMEPAGE="http://avalon.apache.org/" +SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +LICENSE="Apache-2.0" +SLOT="2.0" +IUSE="" + +COMMON_DEP=" + dev-java/log4j:0 + java-virtuals/jms:0 + java-virtuals/javamail:0 + java-virtuals/servlet-api:3.0" +RDEPEND="${COMMON_DEP} + >=virtual/jre-1.4" +DEPEND="${COMMON_DEP} + >=virtual/jdk-1.4 + test? ( + dev-java/ant-junit:0 + )" + +java_prepare() { + # Doesn't like 1.6 / 1.7 changes to JDBC + epatch "${FILESDIR}/${P}-java7.patch" + + java-ant_ignore-system-classes + + java-ant_xml-rewrite -f build.xml \ + -c -e available -a classpathref -v 'build.classpath' || die + + java-pkg_filter-compiler jikes +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-2.5" + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar target/${P}.jar + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild new file mode 100644 index 000000000000..6c817eaa10bd --- /dev/null +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r7.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 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 + +# NB: this project is dead and we should look into removing it from the tree. +# Take a look at the homepage. +DESCRIPTION="Easy-to-use Java logging toolkit" +HOMEPAGE="http://avalon.apache.org/" +SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +LICENSE="Apache-2.0" +SLOT="2.0" +IUSE="" + +CDEPEND=" + dev-java/log4j:0 + java-virtuals/jms:0 + java-virtuals/javamail:0 + java-virtuals/servlet-api:3.0" +RDEPEND="${CDEPEND} + >=virtual/jre-1.6" +DEPEND="${CDEPEND} + >=virtual/jdk-1.6 + test? ( + dev-java/ant-junit:0 + )" + +java_prepare() { + # Doesn't like 1.6 / 1.7 changes to JDBC + epatch "${FILESDIR}/${P}-java7.patch" + + java-ant_ignore-system-classes + + java-ant_xml-rewrite \ + -f build.xml \ + -c -e available \ + -a classpathref \ + -v 'build.classpath' || die + + java-pkg_filter-compiler jikes +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_GENTOO_CLASSPATH="javamail,jms,log4j,servlet-api-3.0" + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar target/${P}.jar + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild new file mode 100644 index 000000000000..334dbee94b1a --- /dev/null +++ b/dev-java/avalon-logkit/avalon-logkit-2.1-r8.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2015 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 + +# NB: this project is dead and we should look into removing it from the tree. +# Take a look at the homepage. +DESCRIPTION="Easy-to-use Java logging toolkit" +HOMEPAGE="http://avalon.apache.org/" +SRC_URI="mirror://apache/excalibur/excalibur-logkit/source/${P}-src.tar.gz" + +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" +LICENSE="Apache-2.0" +SLOT="2.0" +IUSE="" + +CDEPEND=" + dev-java/log4j:0 + java-virtuals/jms:0 + dev-java/oracle-javamail:0 + java-virtuals/servlet-api:3.0" +RDEPEND="${CDEPEND} + >=virtual/jre-1.6" +DEPEND="${CDEPEND} + >=virtual/jdk-1.6 + test? ( + dev-java/ant-junit:0 + )" + +java_prepare() { + # Doesn't like 1.6 / 1.7 changes to JDBC + epatch "${FILESDIR}/${P}-java7.patch" + + java-ant_ignore-system-classes + + java-ant_xml-rewrite \ + -f build.xml \ + -c -e available \ + -a classpathref \ + -v 'build.classpath' || die + + java-pkg_filter-compiler jikes +} + +JAVA_ANT_REWRITE_CLASSPATH="yes" + +EANT_GENTOO_CLASSPATH="oracle-javamail,jms,log4j,servlet-api-3.0" + +src_test() { + java-pkg-2_src_test +} + +src_install() { + java-pkg_newjar target/${P}.jar + use doc && java-pkg_dojavadoc dist/docs/api + use source && java-pkg_dosrc src/java/* +} diff --git a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch new file mode 100644 index 000000000000..07c4930d3a1d --- /dev/null +++ b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch @@ -0,0 +1,17 @@ +# Patch by Vlastimil Babka <caster@gentoo.org> +# Straightforward compatilibity with java6 interface extensions +--- src/java/org/apache/log/output/db/DefaultDataSource.java.orig 2009-11-06 18:03:16.000000000 +0100 ++++ src/java/org/apache/log/output/db/DefaultDataSource.java 2009-11-06 18:04:05.000000000 +0100 +@@ -149,4 +149,12 @@ + { + m_logWriter = logWriter; + } ++ ++ public boolean isWrapperFor(Class cls) { ++ return false; ++ } ++ ++ public Object unwrap(Class cls) throws SQLException { ++ throw new SQLException("Not a wrapper for " + cls); ++ } + } diff --git a/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch new file mode 100644 index 000000000000..cb2611bf0de4 --- /dev/null +++ b/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch @@ -0,0 +1,30 @@ +diff -Nur avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java +--- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java 2005-08-30 05:03:49.000000000 +0300 ++++ avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java 2011-09-27 08:27:49.313005212 +0300 +@@ -20,7 +20,9 @@ + import java.sql.Connection; + import java.sql.DriverManager; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import javax.sql.DataSource; ++import java.util.logging.Logger; + + /** + * A basic datasource that doesn't do any pooling but just wraps +@@ -111,4 +113,16 @@ + { + m_logWriter = logWriter; + } ++ ++ public boolean isWrapperFor(Class cls) { ++ return false; ++ } ++ ++ public Object unwrap(Class cls) throws SQLException { ++ throw new SQLException("Not a wrapper for " + cls); ++ } ++ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException("Not a supported feature"); ++ } + } diff --git a/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch new file mode 100644 index 000000000000..cb2611bf0de4 --- /dev/null +++ b/dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch @@ -0,0 +1,30 @@ +diff -Nur avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java +--- avalon-logkit-2.1/src/java/org/apache/log/output/db/DefaultDataSource.java 2005-08-30 05:03:49.000000000 +0300 ++++ avalon-logkit-2.1_patched//src/java/org/apache/log/output/db/DefaultDataSource.java 2011-09-27 08:27:49.313005212 +0300 +@@ -20,7 +20,9 @@ + import java.sql.Connection; + import java.sql.DriverManager; + import java.sql.SQLException; ++import java.sql.SQLFeatureNotSupportedException; + import javax.sql.DataSource; ++import java.util.logging.Logger; + + /** + * A basic datasource that doesn't do any pooling but just wraps +@@ -111,4 +113,16 @@ + { + m_logWriter = logWriter; + } ++ ++ public boolean isWrapperFor(Class cls) { ++ return false; ++ } ++ ++ public Object unwrap(Class cls) throws SQLException { ++ throw new SQLException("Not a wrapper for " + cls); ++ } ++ ++ public Logger getParentLogger() throws SQLFeatureNotSupportedException { ++ throw new SQLFeatureNotSupportedException("Not a supported feature"); ++ } + } diff --git a/dev-java/avalon-logkit/metadata.xml b/dev-java/avalon-logkit/metadata.xml new file mode 100644 index 000000000000..250f2d1940ea --- /dev/null +++ b/dev-java/avalon-logkit/metadata.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <herd>java</herd> +</pkgmetadata> |