summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-java/avalon-logkit/files
downloadgentoo-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/files')
-rw-r--r--dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java6.patch17
-rw-r--r--dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch30
-rw-r--r--dev-java/avalon-logkit/files/avalon-logkit-2.1-java7.patch30
3 files changed, 77 insertions, 0 deletions
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");
++ }
+ }