Skip to content

Commit 71824f8

Browse files
psteitzpsteitz
committed
Filtered sources to remove JDBC 4 methods.
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/dbcp/branches/DBCP_1_3_BRANCH@892929 13f79535-47bb-0310-9956-ffa450edef68
1 parent 3e1e20d commit 71824f8

18 files changed

+66
-66
lines changed

‎src/java/org/apache/commons/dbcp/BasicDataSource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1322,15 +1322,15 @@ public synchronized boolean isClosed() {
13221322
return closed;
13231323
}
13241324

1325-
/* JDBC_4_ANT_KEY_BEGIN */
1325+
/*
13261326
public boolean isWrapperFor(Class<?> iface) throws SQLException {
13271327
return false;
13281328
}
13291329
13301330
public <T> T unwrap(Class<T> iface) throws SQLException {
13311331
throw new SQLException("BasicDataSource is not a wrapper.");
13321332
}
1333-
/* JDBC_4_ANT_KEY_END */
1333+
*/
13341334

13351335

13361336
// ------------------------------------------------------ Protected Methods

‎src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@
3232
import java.io.InputStream;
3333
import java.io.Reader;
3434
import java.sql.SQLException;
35-
/* JDBC_4_ANT_KEY_BEGIN */
35+
/*
3636
import java.sql.NClob;
3737
import java.sql.RowId;
3838
import java.sql.SQLXML;
39-
/* JDBC_4_ANT_KEY_END */
39+
*/
4040

4141
/**
4242
* A base delegating implementation of {@link CallableStatement}.
@@ -329,7 +329,7 @@ public Timestamp getTimestamp(String parameterName, Calendar cal) throws SQLExce
329329
public URL getURL(String parameterName) throws SQLException
330330
{ checkOpen(); try { return ((CallableStatement)_stmt).getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } }
331331

332-
/* JDBC_4_ANT_KEY_BEGIN */
332+
/*
333333
334334
public RowId getRowId(int parameterIndex) throws SQLException {
335335
checkOpen();
@@ -660,5 +660,5 @@ public void setNClob(String parameterName, Reader reader) throws SQLException {
660660
handleException(e);
661661
}
662662
}
663-
/* JDBC_4_ANT_KEY_END */
663+
*/
664664
}

‎src/java/org/apache/commons/dbcp/DelegatingConnection.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import java.util.List;
2929
import java.util.Map;
3030
import java.sql.ResultSet;
31-
/* JDBC_4_ANT_KEY_BEGIN */
31+
/*
3232
import java.sql.Array;
3333
import java.sql.Blob;
3434
import java.sql.ClientInfoStatus;
@@ -39,7 +39,7 @@
3939
import java.sql.Struct;
4040
import java.util.Collections;
4141
import java.util.Properties;
42-
/* JDBC_4_ANT_KEY_END */
42+
*/
4343

4444
/**
4545
* A base delegating implementation of {@link Connection}.
@@ -65,10 +65,10 @@
6565
public class DelegatingConnection extends AbandonedTrace
6666
implements Connection {
6767

68-
/* JDBC_4_ANT_KEY_BEGIN */
68+
/*
6969
private static final Map<String, ClientInfoStatus> EMPTY_FAILED_PROPERTIES =
7070
Collections.<String, ClientInfoStatus>emptyMap();
71-
/* JDBC_4_ANT_KEY_END */
71+
*/
7272

7373
/** My delegate {@link Connection}. */
7474
protected Connection _conn = null;
@@ -534,7 +534,7 @@ public PreparedStatement prepareStatement(String sql, String columnNames[]) thro
534534
}
535535
}
536536

537-
/* JDBC_4_ANT_KEY_BEGIN */
537+
/*
538538
539539
public boolean isWrapperFor(Class<?> iface) throws SQLException {
540540
return iface.isAssignableFrom(getClass()) || _conn.isWrapperFor(iface);
@@ -674,5 +674,5 @@ public String getClientInfo(String name) throws SQLException {
674674
return null;
675675
}
676676
}
677-
/* JDBC_4_ANT_KEY_END */
677+
*/
678678
}

‎src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import java.sql.Connection;
2121
import java.sql.DatabaseMetaData;
2222
import java.sql.ResultSet;
23-
/* JDBC_4_ANT_KEY_BEGIN */
23+
/*
2424
import java.sql.RowIdLifetime;
25-
/* JDBC_4_ANT_KEY_END */
25+
*/
2626
import java.sql.SQLException;
2727

2828
/**
@@ -1121,7 +1121,7 @@ public boolean usesLocalFiles() throws SQLException {
11211121
catch (SQLException e) { handleException(e); return false; } }
11221122
}
11231123

1124-
/* JDBC_4_ANT_KEY_BEGIN */
1124+
/*
11251125
11261126
public boolean isWrapperFor(Class<?> iface) throws SQLException {
11271127
return iface.isAssignableFrom(getClass()) || _meta.isWrapperFor(iface);
@@ -1206,6 +1206,6 @@ public ResultSet getFunctionColumns(String catalog, String schemaPattern,
12061206
}
12071207
}
12081208
1209-
/* JDBC_4_ANT_KEY_END */
1209+
*/
12101210

12111211
}

‎src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
import java.sql.ResultSetMetaData;
2828
import java.sql.SQLException;
2929
import java.util.Calendar;
30-
/* JDBC_4_ANT_KEY_BEGIN */
30+
/*
3131
import java.io.InputStream;
3232
import java.io.Reader;
3333
import java.sql.NClob;
3434
import java.sql.RowId;
3535
import java.sql.SQLXML;
36-
/* JDBC_4_ANT_KEY_END */
36+
*/
3737

3838
/**
3939
* A base delegating implementation of {@link PreparedStatement}.
@@ -220,7 +220,7 @@ public void setURL(int parameterIndex, java.net.URL x) throws SQLException
220220
public java.sql.ParameterMetaData getParameterMetaData() throws SQLException
221221
{ checkOpen(); try { return ((PreparedStatement)_stmt).getParameterMetaData(); } catch (SQLException e) { handleException(e); throw new AssertionError(); } }
222222

223-
/* JDBC_4_ANT_KEY_BEGIN */
223+
/*
224224
225225
public void setRowId(int parameterIndex, RowId value) throws SQLException {
226226
checkOpen();
@@ -401,5 +401,5 @@ public void setNClob(int parameterIndex, Reader reader) throws SQLException {
401401
handleException(e);
402402
}
403403
}
404-
/* JDBC_4_ANT_KEY_END */
404+
*/
405405
}

‎src/java/org/apache/commons/dbcp/DelegatingResultSet.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
import java.sql.Clob;
3636
import java.sql.Array;
3737
import java.util.Calendar;
38-
/* JDBC_4_ANT_KEY_BEGIN */
38+
/*
3939
import java.sql.NClob;
4040
import java.sql.RowId;
4141
import java.sql.SQLXML;
42-
/* JDBC_4_ANT_KEY_END */
42+
*/
4343

4444
/**
4545
* A base delegating implementation of {@link ResultSet}.
@@ -619,7 +619,7 @@ public void updateArray(int columnIndex, java.sql.Array x) throws SQLException
619619
public void updateArray(String columnName, java.sql.Array x) throws SQLException
620620
{ try { _res.updateArray(columnName, x); } catch (SQLException e) { handleException(e); } }
621621

622-
/* JDBC_4_ANT_KEY_BEGIN */
622+
/*
623623
624624
public boolean isWrapperFor(Class<?> iface) throws SQLException {
625625
return iface.isAssignableFrom(getClass()) || _res.isWrapperFor(iface);
@@ -1078,5 +1078,5 @@ public void updateNClob(String columnLabel, Reader reader) throws SQLException {
10781078
handleException(e);
10791079
}
10801080
}
1081-
/* JDBC_4_ANT_KEY_END */
1081+
*/
10821082
}

‎src/java/org/apache/commons/dbcp/DelegatingStatement.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,7 @@ public boolean isClosed() throws SQLException {
345345
return _closed;
346346
}
347347

348-
/* JDBC_4_ANT_KEY_BEGIN */
348+
/*
349349
350350
public boolean isWrapperFor(Class<?> iface) throws SQLException {
351351
return iface.isAssignableFrom(getClass()) || _stmt.isWrapperFor(iface);
@@ -381,5 +381,5 @@ public boolean isPoolable() throws SQLException {
381381
return false;
382382
}
383383
}
384-
/* JDBC_4_ANT_KEY_END */
384+
*/
385385
}

‎src/java/org/apache/commons/dbcp/PoolingDataSource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,15 +85,15 @@ public void setAccessToUnderlyingConnectionAllowed(boolean allow) {
8585
this.accessToUnderlyingConnectionAllowed = allow;
8686
}
8787

88-
/* JDBC_4_ANT_KEY_BEGIN */
88+
/*
8989
public boolean isWrapperFor(Class<?> iface) throws SQLException {
9090
return false;
9191
}
9292
9393
public <T> T unwrap(Class<T> iface) throws SQLException {
9494
throw new SQLException("PoolingDataSource is not a wrapper.");
9595
}
96-
/* JDBC_4_ANT_KEY_END */
96+
*/
9797

9898
//--- DataSource methods -----------------------------------------
9999

‎src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
import javax.sql.ConnectionEvent;
2727
import javax.sql.ConnectionEventListener;
2828
import javax.sql.PooledConnection;
29-
/* JDBC_4_ANT_KEY_BEGIN */
29+
/*
3030
import javax.sql.StatementEventListener;
31-
/* JDBC_4_ANT_KEY_END */
31+
*/
3232

3333
import org.apache.commons.dbcp.DelegatingConnection;
3434
import org.apache.commons.dbcp.DelegatingPreparedStatement;
@@ -113,13 +113,13 @@ public void addConnectionEventListener(ConnectionEventListener listener) {
113113
}
114114
}
115115

116-
/* JDBC_4_ANT_KEY_BEGIN */
116+
/*
117117
public void addStatementEventListener(StatementEventListener listener) {
118118
if (!statementEventListeners.contains(listener)) {
119119
statementEventListeners.add(listener);
120120
}
121121
}
122-
/* JDBC_4_ANT_KEY_END */
122+
*/
123123

124124
/**
125125
* Closes the physical connection and marks this
@@ -190,11 +190,11 @@ public void removeConnectionEventListener(
190190
eventListeners.remove(listener);
191191
}
192192

193-
/* JDBC_4_ANT_KEY_BEGIN */
193+
/*
194194
public void removeStatementEventListener(StatementEventListener listener) {
195195
statementEventListeners.remove(listener);
196196
}
197-
/* JDBC_4_ANT_KEY_END */
197+
*/
198198

199199
/**
200200
* Closes the physical connection and checks that the logical connection

‎src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,15 @@ protected void assertInitializationAllowed()
155155
*/
156156
public abstract void close() throws Exception;
157157

158-
/* JDBC_4_ANT_KEY_BEGIN */
158+
/*
159159
public boolean isWrapperFor(Class<?> iface) throws SQLException {
160160
return false;
161161
}
162162
163163
public <T> T unwrap(Class<T> iface) throws SQLException {
164164
throw new SQLException("InstanceKeyDataSource is not a wrapper.");
165165
}
166-
/* JDBC_4_ANT_KEY_END */
166+
*/
167167

168168
// -------------------------------------------------------------------
169169
// Properties

0 commit comments

Comments
 (0)