[gentoo-commits] gentoo-x86 commit in dev-java/avalon-logkit/files: avalon-logkit-1.2.2-java7.patch

[Ralph Sennhauser (sera)]

sera        12/09/29 11:04:43

  Added:                avalon-logkit-1.2.2-java7.patch
  Log:
  Use virtuals for jaf javamail jms and servlet-api.
  Use slot deps.
  Fix building slot 1.2 with jdk7.
  
  (Portage version: 2.1.11.13/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/avalon-logkit/files/avalon-logkit-1.2.2-java7.patch?rev=1.1&content-type=text/plain

Index: avalon-logkit-1.2.2-java7.patch
===================================================================
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");
+    }
 }