|
1 http://pkgs.fedoraproject.org/cgit/apache-commons-dbcp.git/tree/jdbc41.patch |
|
2 |
|
3 diff -u -r dbcp/BasicDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/BasicDataSource.java |
|
4 --- src/java/org/apache/commons/dbcp/BasicDataSource.java 2010-02-07 17:59:20.000000000 +0100 |
|
5 +++ src/java/org/apache/commons/dbcp/BasicDataSource.java 2012-02-23 09:11:04.481618663 +0100 |
|
6 @@ -24,10 +24,12 @@ |
|
7 import java.util.ArrayList; |
|
8 import java.util.Iterator; |
|
9 import java.util.Collections; |
|
10 +import java.util.logging.Logger; |
|
11 import java.sql.Connection; |
|
12 import java.sql.Driver; |
|
13 import java.sql.DriverManager; |
|
14 import java.sql.SQLException; |
|
15 +import java.sql.SQLFeatureNotSupportedException; |
|
16 import javax.sql.DataSource; |
|
17 |
|
18 import org.apache.commons.pool.KeyedObjectPoolFactory; |
|
19 @@ -1579,4 +1581,10 @@ |
|
20 logWriter.println(message); |
|
21 } |
|
22 } |
|
23 + |
|
24 + /* This functionality is not implemented yet */ |
|
25 + public Logger getParentLogger() throws SQLFeatureNotSupportedException { |
|
26 + throw new SQLFeatureNotSupportedException(); |
|
27 + } |
|
28 + |
|
29 } |
|
30 diff -u -r dbcp/cpdsadapter/DriverAdapterCPDS.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java |
|
31 --- src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2010-02-07 17:59:19.000000000 +0100 |
|
32 +++ src/java/org/apache/commons/dbcp/cpdsadapter/DriverAdapterCPDS.java 2012-02-23 09:13:29.490605580 +0100 |
|
33 @@ -19,10 +19,12 @@ |
|
34 |
|
35 import java.util.Hashtable; |
|
36 import java.util.Properties; |
|
37 +import java.util.logging.Logger; |
|
38 import java.io.PrintWriter; |
|
39 import java.io.Serializable; |
|
40 import java.sql.DriverManager; |
|
41 import java.sql.SQLException; |
|
42 +import java.sql.SQLFeatureNotSupportedException; |
|
43 import javax.sql.PooledConnection; |
|
44 import javax.sql.ConnectionPoolDataSource; |
|
45 import javax.naming.Name; |
|
46 @@ -719,4 +721,10 @@ |
|
47 { |
|
48 _maxPreparedStatements = maxPreparedStatements; |
|
49 } |
|
50 + |
|
51 + /* This functionality is not implemented yet */ |
|
52 + public Logger getParentLogger() throws SQLFeatureNotSupportedException { |
|
53 + throw new SQLFeatureNotSupportedException(); |
|
54 + } |
|
55 + |
|
56 } |
|
57 diff -u -r dbcp/datasources/PerUserPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java |
|
58 --- src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100 |
|
59 +++ src/java/org/apache/commons/dbcp/datasources/PerUserPoolDataSource.java 2012-02-23 09:12:13.582612432 +0100 |
|
60 @@ -21,10 +21,12 @@ |
|
61 import java.io.ObjectInputStream; |
|
62 import java.sql.Connection; |
|
63 import java.sql.SQLException; |
|
64 +import java.sql.SQLFeatureNotSupportedException; |
|
65 import java.util.HashMap; |
|
66 import java.util.Iterator; |
|
67 import java.util.Map; |
|
68 import java.util.NoSuchElementException; |
|
69 +import java.util.logging.Logger; |
|
70 |
|
71 import javax.naming.NamingException; |
|
72 import javax.naming.Reference; |
|
73 @@ -561,4 +563,10 @@ |
|
74 CPDSConnectionFactory mgr = (CPDSConnectionFactory) managers.get(key); |
|
75 return mgr == null ? null : (GenericObjectPool) mgr.getPool(); |
|
76 } |
|
77 + |
|
78 + /* This functionality is not implemented yet */ |
|
79 + public Logger getParentLogger() throws SQLFeatureNotSupportedException { |
|
80 + throw new SQLFeatureNotSupportedException(); |
|
81 + } |
|
82 + |
|
83 } |
|
84 diff -u -r dbcp/datasources/SharedPoolDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java |
|
85 --- src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2010-02-07 17:59:20.000000000 +0100 |
|
86 +++ src/java/org/apache/commons/dbcp/datasources/SharedPoolDataSource.java 2012-02-23 09:14:10.326601896 +0100 |
|
87 @@ -21,6 +21,8 @@ |
|
88 import java.io.ObjectInputStream; |
|
89 import java.sql.Connection; |
|
90 import java.sql.SQLException; |
|
91 +import java.sql.SQLFeatureNotSupportedException; |
|
92 +import java.util.logging.Logger; |
|
93 |
|
94 import javax.naming.NamingException; |
|
95 import javax.naming.Reference; |
|
96 @@ -269,5 +271,11 @@ |
|
97 throw new IOException("NamingException: " + e); |
|
98 } |
|
99 } |
|
100 + |
|
101 + /* This functionality is not implemented yet */ |
|
102 + public Logger getParentLogger() throws SQLFeatureNotSupportedException { |
|
103 + throw new SQLFeatureNotSupportedException(); |
|
104 + } |
|
105 + |
|
106 } |
|
107 |
|
108 diff -u -r dbcp/DelegatingCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java |
|
109 --- src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2010-02-07 17:59:20.000000000 +0100 |
|
110 +++ src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java 2012-02-23 09:17:35.805583354 +0100 |
|
111 @@ -37,6 +37,7 @@ |
|
112 import java.sql.RowId; |
|
113 import java.sql.SQLXML; |
|
114 /* JDBC_4_ANT_KEY_END */ |
|
115 +import java.sql.SQLFeatureNotSupportedException; |
|
116 |
|
117 /** |
|
118 * A base delegating implementation of {@link CallableStatement}. |
|
119 @@ -661,4 +662,14 @@ |
|
120 } |
|
121 } |
|
122 /* JDBC_4_ANT_KEY_END */ |
|
123 + |
|
124 + /* This functionality is not implemented yet */ |
|
125 + public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { |
|
126 + throw new SQLFeatureNotSupportedException(); |
|
127 + } |
|
128 + |
|
129 + /* This functionality is not implemented yet */ |
|
130 + public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { |
|
131 + throw new SQLFeatureNotSupportedException(); |
|
132 + } |
|
133 } |
|
134 diff -u -r dbcp/DelegatingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingConnection.java |
|
135 --- src/java/org/apache/commons/dbcp/DelegatingConnection.java 2010-02-07 17:59:20.000000000 +0100 |
|
136 +++ src/java/org/apache/commons/dbcp/DelegatingConnection.java 2012-02-23 09:04:56.488651873 +0100 |
|
137 @@ -27,6 +27,7 @@ |
|
138 import java.util.Iterator; |
|
139 import java.util.List; |
|
140 import java.util.Map; |
|
141 +import java.util.concurrent.Executor; |
|
142 import java.sql.ResultSet; |
|
143 /* JDBC_4_ANT_KEY_BEGIN */ |
|
144 import java.sql.Array; |
|
145 @@ -40,6 +41,7 @@ |
|
146 import java.util.Collections; |
|
147 import java.util.Properties; |
|
148 /* JDBC_4_ANT_KEY_END */ |
|
149 +import java.sql.SQLFeatureNotSupportedException; |
|
150 |
|
151 /** |
|
152 * A base delegating implementation of {@link Connection}. |
|
153 @@ -678,5 +680,31 @@ |
|
154 return null; |
|
155 } |
|
156 } |
|
157 -/* JDBC_4_ANT_KEY_END */ |
|
158 + /* JDBC_4_ANT_KEY_END */ |
|
159 + |
|
160 + /* This functionality is not implemented yet */ |
|
161 + public int getNetworkTimeout() throws SQLException { |
|
162 + throw new SQLFeatureNotSupportedException(); |
|
163 + } |
|
164 + |
|
165 + /* This functionality is not implemented yet */ |
|
166 + public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { |
|
167 + throw new SQLFeatureNotSupportedException(); |
|
168 + } |
|
169 + |
|
170 + /* This functionality is not implemented yet */ |
|
171 + public void abort(Executor executor) throws SQLException { |
|
172 + throw new SQLFeatureNotSupportedException(); |
|
173 + } |
|
174 + |
|
175 + /* This functionality is not implemented yet */ |
|
176 + public String getSchema() throws SQLException { |
|
177 + throw new SQLFeatureNotSupportedException(); |
|
178 + } |
|
179 + |
|
180 + /* This functionality is not implemented yet */ |
|
181 + public void setSchema(String schema) throws SQLException { |
|
182 + throw new SQLFeatureNotSupportedException(); |
|
183 + } |
|
184 } |
|
185 + |
|
186 diff -u -r dbcp/DelegatingDatabaseMetaData.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java |
|
187 --- src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2010-02-07 17:59:20.000000000 +0100 |
|
188 +++ src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java 2012-02-23 09:20:38.181566898 +0100 |
|
189 @@ -24,6 +24,7 @@ |
|
190 import java.sql.RowIdLifetime; |
|
191 /* JDBC_4_ANT_KEY_END */ |
|
192 import java.sql.SQLException; |
|
193 +import java.sql.SQLFeatureNotSupportedException; |
|
194 |
|
195 /** |
|
196 * A base delegating implementation of {@link DatabaseMetaData}. |
|
197 @@ -1208,4 +1209,13 @@ |
|
198 |
|
199 /* JDBC_4_ANT_KEY_END */ |
|
200 |
|
201 + /* This functionality is not implemented yet */ |
|
202 + public boolean generatedKeyAlwaysReturned() throws SQLException { |
|
203 + throw new SQLFeatureNotSupportedException(); |
|
204 + } |
|
205 + |
|
206 + /* This functionality is not implemented yet */ |
|
207 + public ResultSet getPseudoColumns(String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern) throws SQLException { |
|
208 + throw new SQLFeatureNotSupportedException(); |
|
209 + } |
|
210 } |
|
211 diff -u -r dbcp/DelegatingPreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java |
|
212 --- src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2010-02-07 17:59:20.000000000 +0100 |
|
213 +++ src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java 2012-02-23 09:04:37.793653560 +0100 |
|
214 @@ -34,6 +34,7 @@ |
|
215 import java.sql.RowId; |
|
216 import java.sql.SQLXML; |
|
217 /* JDBC_4_ANT_KEY_END */ |
|
218 +import java.sql.SQLFeatureNotSupportedException; |
|
219 |
|
220 /** |
|
221 * A base delegating implementation of {@link PreparedStatement}. |
|
222 @@ -402,4 +403,15 @@ |
|
223 } |
|
224 } |
|
225 /* JDBC_4_ANT_KEY_END */ |
|
226 + |
|
227 + /* This functionality is not implemented yet */ |
|
228 + public boolean isCloseOnCompletion() throws SQLException { |
|
229 + throw new SQLFeatureNotSupportedException(); |
|
230 + } |
|
231 + |
|
232 + /* This functionality is not implemented yet */ |
|
233 + public void closeOnCompletion() throws SQLException { |
|
234 + throw new SQLFeatureNotSupportedException(); |
|
235 + } |
|
236 + |
|
237 } |
|
238 diff -u -r dbcp/DelegatingResultSet.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingResultSet.java |
|
239 --- src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2010-02-07 17:59:20.000000000 +0100 |
|
240 +++ src/java/org/apache/commons/dbcp/DelegatingResultSet.java 2012-02-23 09:17:19.905584789 +0100 |
|
241 @@ -40,6 +40,7 @@ |
|
242 import java.sql.RowId; |
|
243 import java.sql.SQLXML; |
|
244 /* JDBC_4_ANT_KEY_END */ |
|
245 +import java.sql.SQLFeatureNotSupportedException; |
|
246 |
|
247 /** |
|
248 * A base delegating implementation of {@link ResultSet}. |
|
249 @@ -1079,4 +1080,14 @@ |
|
250 } |
|
251 } |
|
252 /* JDBC_4_ANT_KEY_END */ |
|
253 + |
|
254 + /* This functionality is not implemented yet */ |
|
255 + public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { |
|
256 + throw new SQLFeatureNotSupportedException(); |
|
257 + } |
|
258 + |
|
259 + /* This functionality is not implemented yet */ |
|
260 + public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { |
|
261 + throw new SQLFeatureNotSupportedException(); |
|
262 + } |
|
263 } |
|
264 diff -u -r dbcp/DelegatingStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/DelegatingStatement.java |
|
265 --- src/java/org/apache/commons/dbcp/DelegatingStatement.java 2010-02-07 17:59:20.000000000 +0100 |
|
266 +++ src/java/org/apache/commons/dbcp/DelegatingStatement.java 2012-02-23 09:04:41.171653252 +0100 |
|
267 @@ -22,6 +22,7 @@ |
|
268 import java.sql.SQLException; |
|
269 import java.sql.SQLWarning; |
|
270 import java.sql.Statement; |
|
271 +import java.sql.SQLFeatureNotSupportedException; |
|
272 import java.util.List; |
|
273 |
|
274 /** |
|
275 @@ -386,4 +387,15 @@ |
|
276 } |
|
277 } |
|
278 /* JDBC_4_ANT_KEY_END */ |
|
279 + |
|
280 + /* This functionality is not implemented yet */ |
|
281 + public boolean isCloseOnCompletion() throws SQLException { |
|
282 + throw new SQLFeatureNotSupportedException(); |
|
283 + } |
|
284 + |
|
285 + /* This functionality is not implemented yet */ |
|
286 + public void closeOnCompletion() throws SQLException { |
|
287 + throw new SQLFeatureNotSupportedException(); |
|
288 + } |
|
289 + |
|
290 } |
|
291 diff -u -r dbcp/PoolableCallableStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolableCallableStatement.java |
|
292 --- src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2010-02-07 17:59:20.000000000 +0100 |
|
293 +++ src/java/org/apache/commons/dbcp/PoolableCallableStatement.java 2012-02-23 09:17:44.514582568 +0100 |
|
294 @@ -21,6 +21,7 @@ |
|
295 import java.sql.Connection; |
|
296 import java.sql.ResultSet; |
|
297 import java.sql.SQLException; |
|
298 +import java.sql.SQLFeatureNotSupportedException; |
|
299 import java.util.List; |
|
300 |
|
301 import org.apache.commons.pool.KeyedObjectPool; |
|
302 @@ -123,4 +124,13 @@ |
|
303 super.passivate(); |
|
304 } |
|
305 |
|
306 + /* This functionality is not implemented yet */ |
|
307 + public <T> T getObject(String columnLabel, Class<T> type) throws SQLException { |
|
308 + throw new SQLFeatureNotSupportedException(); |
|
309 + } |
|
310 + |
|
311 + /* This functionality is not implemented yet */ |
|
312 + public <T> T getObject(int columnIndex, Class<T> type) throws SQLException { |
|
313 + throw new SQLFeatureNotSupportedException(); |
|
314 + } |
|
315 } |
|
316 diff -u -r dbcp/PoolablePreparedStatement.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java |
|
317 --- src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2010-02-07 17:59:20.000000000 +0100 |
|
318 +++ src/java/org/apache/commons/dbcp/PoolablePreparedStatement.java 2012-02-23 09:16:01.670591848 +0100 |
|
319 @@ -21,6 +21,7 @@ |
|
320 import java.sql.PreparedStatement; |
|
321 import java.sql.ResultSet; |
|
322 import java.sql.SQLException; |
|
323 +import java.sql.SQLFeatureNotSupportedException; |
|
324 import java.util.List; |
|
325 |
|
326 import org.apache.commons.pool.KeyedObjectPool; |
|
327 @@ -137,4 +138,14 @@ |
|
328 super.passivate(); |
|
329 } |
|
330 |
|
331 + /* This functionality is not implemented yet */ |
|
332 + public boolean isCloseOnCompletion() throws SQLException { |
|
333 + throw new SQLFeatureNotSupportedException(); |
|
334 + } |
|
335 + |
|
336 + /* This functionality is not implemented yet */ |
|
337 + public void closeOnCompletion() throws SQLException { |
|
338 + throw new SQLFeatureNotSupportedException(); |
|
339 + } |
|
340 + |
|
341 } |
|
342 diff -u -r dbcp/PoolingConnection.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingConnection.java |
|
343 --- src/java/org/apache/commons/dbcp/PoolingConnection.java 2010-02-07 17:59:20.000000000 +0100 |
|
344 +++ src/java/org/apache/commons/dbcp/PoolingConnection.java 2012-02-23 09:08:08.716634524 +0100 |
|
345 @@ -21,8 +21,10 @@ |
|
346 import java.sql.Connection; |
|
347 import java.sql.PreparedStatement; |
|
348 import java.sql.SQLException; |
|
349 +import java.sql.SQLFeatureNotSupportedException; |
|
350 |
|
351 import java.util.NoSuchElementException; |
|
352 +import java.util.concurrent.Executor; |
|
353 |
|
354 import org.apache.commons.pool.KeyedObjectPool; |
|
355 import org.apache.commons.pool.KeyedPoolableObjectFactory; |
|
356 @@ -455,4 +457,30 @@ |
|
357 return buf.toString(); |
|
358 } |
|
359 } |
|
360 + |
|
361 + /* This functionality is not implemented yet */ |
|
362 + public int getNetworkTimeout() throws SQLException { |
|
363 + throw new SQLFeatureNotSupportedException(); |
|
364 + } |
|
365 + |
|
366 + /* This functionality is not implemented yet */ |
|
367 + public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException { |
|
368 + throw new SQLFeatureNotSupportedException(); |
|
369 + } |
|
370 + |
|
371 + /* This functionality is not implemented yet */ |
|
372 + public void abort(Executor executor) throws SQLException { |
|
373 + throw new SQLFeatureNotSupportedException(); |
|
374 + } |
|
375 + |
|
376 + /* This functionality is not implemented yet */ |
|
377 + public String getSchema() throws SQLException { |
|
378 + throw new SQLFeatureNotSupportedException(); |
|
379 + } |
|
380 + |
|
381 + /* This functionality is not implemented yet */ |
|
382 + public void setSchema(String schema) throws SQLException { |
|
383 + throw new SQLFeatureNotSupportedException(); |
|
384 + } |
|
385 } |
|
386 + |
|
387 diff -u -r dbcp/PoolingDataSource.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDataSource.java |
|
388 --- src/java/org/apache/commons/dbcp/PoolingDataSource.java 2010-02-07 17:59:20.000000000 +0100 |
|
389 +++ src/java/org/apache/commons/dbcp/PoolingDataSource.java 2012-02-23 09:11:31.873616194 +0100 |
|
390 @@ -23,10 +23,12 @@ |
|
391 import java.sql.DatabaseMetaData; |
|
392 import java.sql.PreparedStatement; |
|
393 import java.sql.SQLException; |
|
394 +import java.sql.SQLFeatureNotSupportedException; |
|
395 import java.sql.SQLWarning; |
|
396 import java.sql.Statement; |
|
397 import java.util.Map; |
|
398 import java.util.NoSuchElementException; |
|
399 +import java.util.logging.Logger; |
|
400 |
|
401 import javax.sql.DataSource; |
|
402 |
|
403 @@ -437,4 +439,9 @@ |
|
404 } |
|
405 } |
|
406 } |
|
407 + |
|
408 + /* This functionality is not implemented yet */ |
|
409 + public Logger getParentLogger() throws SQLFeatureNotSupportedException { |
|
410 + throw new SQLFeatureNotSupportedException(); |
|
411 + } |
|
412 } |
|
413 diff -u -r dbcp/PoolingDriver.java /home/tester/Desktop/apache-commons-dbcp/f17/commons-dbcp-1.4-src/src/java/org/apache/commons/dbcp/PoolingDriver.java |
|
414 --- src/java/org/apache/commons/dbcp/PoolingDriver.java 2010-02-07 17:59:20.000000000 +0100 |
|
415 +++ src/java/org/apache/commons/dbcp/PoolingDriver.java 2012-02-23 09:14:12.193601726 +0100 |
|
416 @@ -27,6 +27,7 @@ |
|
417 import java.sql.DriverPropertyInfo; |
|
418 import java.sql.PreparedStatement; |
|
419 import java.sql.SQLException; |
|
420 +import java.sql.SQLFeatureNotSupportedException; |
|
421 import java.sql.SQLWarning; |
|
422 import java.sql.Statement; |
|
423 import java.util.HashMap; |
|
424 @@ -34,6 +35,7 @@ |
|
425 import java.util.NoSuchElementException; |
|
426 import java.util.Properties; |
|
427 import java.util.Set; |
|
428 +import java.util.logging.Logger; |
|
429 |
|
430 import org.apache.commons.jocl.JOCLContentHandler; |
|
431 import org.apache.commons.pool.ObjectPool; |
|
432 @@ -496,4 +498,10 @@ |
|
433 } |
|
434 } |
|
435 } |
|
436 + |
|
437 + /* This functionality is not implemented yet */ |
|
438 + public Logger getParentLogger() throws SQLFeatureNotSupportedException { |
|
439 + throw new SQLFeatureNotSupportedException(); |
|
440 + } |
|
441 + |
|
442 } |