1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
|
Description: Compatibility patch for JDBC 4.1 API in Java 7
Drop with 3.1 release of spring.
Author: James Page <james.page@ubuntu.com>
Forwarded: not-needed
Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java
===================================================================
--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java 2012-08-06 18:06:09.943525138 +0100
+++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DriverManagerDataSource.java 2012-08-06 18:06:10.875529907 +0100
@@ -20,6 +20,8 @@
import java.sql.DriverManager;
import java.sql.SQLException;
import java.util.Properties;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
@@ -173,4 +175,11 @@
return DriverManager.getConnection(url, props);
}
+ /*
+ * JDBC 4.1
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
}
Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java
===================================================================
--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java 2012-08-06 18:06:09.943525138 +0100
+++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/SimpleDriverDataSource.java 2012-08-06 18:06:10.879529928 +0100
@@ -20,6 +20,8 @@
import java.sql.Driver;
import java.sql.SQLException;
import java.util.Properties;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
import org.springframework.beans.BeanUtils;
import org.springframework.util.Assert;
@@ -140,4 +142,11 @@
return driver.connect(url, props);
}
+ /*
+ * JDBC 4.1
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
}
Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java
===================================================================
--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java 2012-08-06 18:06:09.943525138 +0100
+++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/DerbyEmbeddedDatabaseConfigurer.java 2012-08-06 18:06:10.879529928 +0100
@@ -21,6 +21,8 @@
import java.sql.SQLException;
import java.util.Properties;
import javax.sql.DataSource;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -99,4 +101,11 @@
}
}
+
+ /*
+ * JDBC 4.1
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java
===================================================================
--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java 2012-08-06 18:06:09.943525138 +0100
+++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/embedded/EmbeddedDatabaseFactory.java 2012-08-06 18:07:24.095903511 +0100
@@ -20,6 +20,8 @@
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -228,6 +230,13 @@
public void shutdown() {
shutdownDatabase();
}
+
+ /*
+ * JDBC 4.1
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
}
Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java
===================================================================
--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java 2012-08-06 18:06:09.943525138 +0100
+++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/lookup/IsolationLevelDataSourceRouter.java 2012-08-06 18:06:10.879529928 +0100
@@ -16,6 +16,9 @@
package org.springframework.jdbc.datasource.lookup;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
+
import org.springframework.core.Constants;
import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.support.DefaultTransactionDefinition;
@@ -123,4 +126,11 @@
return TransactionSynchronizationManager.getCurrentTransactionIsolationLevel();
}
+ /*
+ * JDBC 4.1
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
+
}
Index: libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java
===================================================================
--- libspring-java-3.0.6.RELEASE.orig/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java 2012-08-06 18:06:09.943525138 +0100
+++ libspring-java-3.0.6.RELEASE/projects/org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/DelegatingDataSource.java 2012-08-06 18:06:10.879529928 +0100
@@ -20,6 +20,8 @@
import java.sql.Connection;
import java.sql.SQLException;
import javax.sql.DataSource;
+import java.sql.SQLFeatureNotSupportedException;
+import java.util.logging.Logger;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.util.Assert;
@@ -117,4 +119,10 @@
return getTargetDataSource().isWrapperFor(iface);
}
+ /*
+ * JDBC 4.1
+ */
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new SQLFeatureNotSupportedException();
+ }
}
|
