This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 7.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1fd365f70cee897860f8f6342a8a4acbb2f3370b
Author: Phil Steitz <phil.ste...@gmail.com>
AuthorDate: Sun Oct 20 09:37:12 2019 -0700
Repackaging.
---
.../apache/tomcat/dbcp/dbcp/TestBasicDataSource.java | 20 ++++++++++++--------
.../apache/tomcat/dbcp/dbcp/TestConnectionPool.java | 2 +-
.../tomcat/dbcp/dbcp/TesterCallableStatement.java | 2 +-
.../apache/tomcat/dbcp/dbcp/TesterClassLoader.java | 2 +-
.../apache/tomcat/dbcp/dbcp/TesterConnection.java | 2 +-
.../tomcat/dbcp/dbcp/TesterDatabaseMetaData.java | 2 +-
test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java | 4 ++--
.../tomcat/dbcp/dbcp/TesterPreparedStatement.java | 2 +-
.../org/apache/tomcat/dbcp/dbcp/TesterResultSet.java | 2 +-
.../org/apache/tomcat/dbcp/dbcp/TesterStatement.java | 2 +-
10 files changed, 22 insertions(+), 18 deletions(-)
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TestBasicDataSource.java
b/test/org/apache/tomcat/dbcp/dbcp/TestBasicDataSource.java
index c98e4bd..734e681 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TestBasicDataSource.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TestBasicDataSource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.io.IOException;
import java.sql.Connection;
@@ -27,6 +27,10 @@ import javax.sql.DataSource;
import junit.framework.Test;
import junit.framework.TestSuite;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertNotNull;
/**
* TestSuite for BasicDataSource
@@ -53,8 +57,8 @@ public class TestBasicDataSource extends TestConnectionPool {
public void setUp() throws Exception {
super.setUp();
ds = createDataSource();
- ds.setDriverClassName("org.apache.commons.dbcp.TesterDriver");
- ds.setUrl("jdbc:apache:commons:testdriver");
+ ds.setDriverClassName("org.apache.tomcat.dbcp.dbcp.TesterDriver");
+ ds.setUrl("jdbc:apache:tomcat:dbcp:testdriver");
ds.setMaxActive(getMaxActive());
ds.setMaxWait(getMaxWait());
ds.setDefaultAutoCommit(true);
@@ -479,8 +483,8 @@ public class TestBasicDataSource extends TestConnectionPool
{
ds.close();
ds = null;
ds = createDataSource();
- ds.setDriverClassName("org.apache.commons.dbcp.TesterDriver");
- ds.setUrl("jdbc:apache:commons:testdriver");
+ ds.setDriverClassName("org.apache.tomcat.dbcp.dbcp.TesterDriver");
+ ds.setUrl("jdbc:apache:tomcat:dbcp:testdriver");
ds.setMaxActive(getMaxActive());
ds.setMaxWait(getMaxWait());
ds.setDefaultAutoCommit(true);
@@ -526,8 +530,8 @@ public class TestBasicDataSource extends TestConnectionPool
{
ds.close();
ds = null;
ds = createDataSource();
-
ds.setDriverClassName("org.apache.commons.dbcp.TesterConnRequestCountDriver");
- ds.setUrl("jdbc:apache:commons:testerConnRequestCountDriver");
+
ds.setDriverClassName("org.apache.tomcat.dbcp.dbcp.TesterConnRequestCountDriver");
+ ds.setUrl("jdbc:apache:tomcat:dbcp:testerConnRequestCountDriver");
ds.setValidationQuery("SELECT DUMMY FROM DUAL");
ds.setUsername("username");
@@ -568,7 +572,7 @@ public class TestBasicDataSource extends TestConnectionPool
{
* TesterDriver that keeps a static count of connection requests.
*/
class TesterConnRequestCountDriver extends TesterDriver {
- protected static final String CONNECT_STRING =
"jdbc:apache:commons:testerConnRequestCountDriver";
+ protected static final String CONNECT_STRING =
"jdbc:apache:tomcat:dbcp:testerConnRequestCountDriver";
private static int connectionRequestCount = 0;
@Override
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TestConnectionPool.java
b/test/org/apache/tomcat/dbcp/dbcp/TestConnectionPool.java
index 004a054..b458263 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TestConnectionPool.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TestConnectionPool.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.sql.Connection;
import java.sql.PreparedStatement;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
index 851dfbf..d463cc1 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterCallableStatement.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.io.InputStream;
import java.io.Reader;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterClassLoader.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterClassLoader.java
index 166041c..6cda3ac 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterClassLoader.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterClassLoader.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.util.HashSet;
import java.util.Set;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java
index 1c1fd25..8b14447 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterConnection.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.sql.CallableStatement;
import java.sql.Connection;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java
index 95dae0c..c99c28b 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterDatabaseMetaData.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.sql.Connection;
import java.sql.DatabaseMetaData;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java
index 26eff85..6e2fca2 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterDriver.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.sql.Connection;
import java.sql.Driver;
@@ -125,7 +125,7 @@ public class TesterDriver implements Driver {
}
/* JDBC_4_1_ANT_KEY_END */
- protected static final String CONNECT_STRING =
"jdbc:apache:commons:testdriver";
+ protected static final String CONNECT_STRING =
"jdbc:apache:tomcat:dbcp:testdriver";
// version numbers
protected static final int MAJOR_VERSION = 1;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java
index cf2ab2c..d210733 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterPreparedStatement.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.math.BigDecimal;
import java.sql.Array;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
index bc8134a..410ecfc 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterResultSet.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.math.BigDecimal;
import java.sql.Array;
diff --git a/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java
b/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java
index 4a81e10..9aebccf 100644
--- a/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java
+++ b/test/org/apache/tomcat/dbcp/dbcp/TesterStatement.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.commons.dbcp;
+package org.apache.tomcat.dbcp.dbcp;
import java.sql.Connection;
import java.sql.ResultSet;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
