diff --git a/pom.xml b/pom.xml index daa2279989..71383f6001 100644 --- a/pom.xml +++ b/pom.xml @@ -528,7 +528,7 @@ org.apache.tomcat tomcat-jdbc - 7.0.34 + 8.0.12 test diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index eecc295a1b..a9970efe5a 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -41,6 +41,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; import javax.management.JMException; +import javax.management.MBeanRegistration; +import javax.management.MBeanServer; import javax.management.ObjectName; import javax.naming.NamingException; import javax.naming.Reference; @@ -95,7 +97,7 @@ import com.alibaba.druid.wall.WallProviderStatValue; * @author ljw * @author wenshao */ -public class DruidDataSource extends DruidAbstractDataSource implements DruidDataSourceMBean, ManagedDataSource, Referenceable, Closeable, Cloneable, ConnectionPoolDataSource { +public class DruidDataSource extends DruidAbstractDataSource implements DruidDataSourceMBean, ManagedDataSource, Referenceable, Closeable, Cloneable, ConnectionPoolDataSource, MBeanRegistration { private final static Log LOG = LogFactory.getLog(DruidDataSource.class); @@ -2702,4 +2704,24 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat CreateConnectionTask task = new CreateConnectionTask(); createScheduler.submit(task); } + + @Override + public ObjectName preRegister(MBeanServer server, ObjectName name) throws Exception { + return null; + } + + @Override + public void postRegister(Boolean registrationDone) { + + } + + @Override + public void preDeregister() throws Exception { + + } + + @Override + public void postDeregister() { + + } } diff --git a/src/test/java/com/alibaba/druid/TestMySqlPing.java b/src/test/java/com/alibaba/druid/TestMySqlPing.java index f5e92c4e0c..826fe74cf1 100644 --- a/src/test/java/com/alibaba/druid/TestMySqlPing.java +++ b/src/test/java/com/alibaba/druid/TestMySqlPing.java @@ -30,12 +30,12 @@ public class TestMySqlPing extends TestCase { private String driverClass; protected void setUp() throws Exception { - // jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // SQL = "SELECT * FROM WP_ORDERS WHERE ID = ?"; - jdbcUrl = "jdbc:mysql://10.20.147.142:3308/dragoon_v25_masterdb"; + jdbcUrl = "jdbc:mysql://a.b.c.d:3308/dragoon_v25_masterdb"; user = "dragoon_admin"; password = "dragoon_root"; diff --git a/src/test/java/com/alibaba/druid/TestMySqlPing2.java b/src/test/java/com/alibaba/druid/TestMySqlPing2.java index f62e11b5aa..ab8b59b85d 100644 --- a/src/test/java/com/alibaba/druid/TestMySqlPing2.java +++ b/src/test/java/com/alibaba/druid/TestMySqlPing2.java @@ -35,12 +35,12 @@ public class TestMySqlPing2 extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - // jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // SQL = "SELECT * FROM WP_ORDERS WHERE ID = ?"; - jdbcUrl = "jdbc:mysql://10.20.147.142:3308/dragoon_v25_masterdb"; + jdbcUrl = "jdbc:mysql://a.b.c.d:3308/dragoon_v25_masterdb"; user = "dragoon_admin"; password = "dragoon_root"; diff --git a/src/test/java/com/alibaba/druid/TestOraclePing.java b/src/test/java/com/alibaba/druid/TestOraclePing.java index 80e90a9337..483e5435ee 100644 --- a/src/test/java/com/alibaba/druid/TestOraclePing.java +++ b/src/test/java/com/alibaba/druid/TestOraclePing.java @@ -32,12 +32,12 @@ public class TestOraclePing extends TestCase { private String SQL; protected void setUp() throws Exception { - // jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // SQL = "SELECT * FROM WP_ORDERS WHERE ID = ?"; - jdbcUrl = "jdbc:oracle:thin:@10.20.149.81:1521:ointest3"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ointest3"; user = "alibaba"; password = "deYcR7facWSJtCuDpm2r"; SQL = "SELECT * FROM AV_INFO WHERE ID = ?"; diff --git a/src/test/java/com/alibaba/druid/TestRollBack.java b/src/test/java/com/alibaba/druid/TestRollBack.java index 08cae1c912..fe8f24fff5 100644 --- a/src/test/java/com/alibaba/druid/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/TestRollBack.java @@ -39,17 +39,17 @@ public class TestRollBack { static Dao dao_c3p0; static Dao dao_druid; -// static String url = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; +// static String url = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // static String user = "alibaba"; // static String password = "ccbuauto"; // static String driver = "oracle.jdbc.driver.OracleDriver"; - static String url = "jdbc:jtds:sqlserver://10.16.16.30:1433/druid_db"; + static String url = "jdbc:jtds:sqlserver://a.b.c.d:1433/druid_db"; static String user = "sa"; static String password = "hello123"; static String driver = "net.sourceforge.jtds.jdbc.Driver"; -// jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; +// jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; diff --git a/src/test/java/com/alibaba/druid/TestSqlServer.java b/src/test/java/com/alibaba/druid/TestSqlServer.java index 8073ef9308..7ac6d41c18 100644 --- a/src/test/java/com/alibaba/druid/TestSqlServer.java +++ b/src/test/java/com/alibaba/druid/TestSqlServer.java @@ -29,12 +29,12 @@ public class TestSqlServer extends TestCase { private String SQL; protected void setUp() throws Exception { - // jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // SQL = "SELECT * FROM WP_ORDERS WHERE ID = ?"; - jdbcUrl = "jdbc:jtds:sqlserver://10.16.16.28:1433/druid_db"; + jdbcUrl = "jdbc:jtds:sqlserver://a.b.c.d:1433/druid_db"; user = "sa"; password = "hello123"; SQL = "SELECT * FROM AV_INFO WHERE ID = ?"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java index 28dd3e5320..f1a9c076b1 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case0.java @@ -55,9 +55,9 @@ public class Case0 extends TestCase { password = "dragoon25"; driverClass = "com.alibaba.druid.mock.MockDriver"; -// jdbcUrl = "jdbc:mysql://10.20.159.104:3306/masterdb"; -// user = "dragoon"; -// password = "dragoon"; +// jdbcUrl = "jdbc:mysql://a.b.c.d:3306/masterdb"; +// user = "x"; +// password = "x"; } public void test_druid() throws Exception { diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java index e6dff1411e..65abfdf9cd 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case3.java @@ -62,7 +62,7 @@ public class Case3 extends TestCase { driverClass = "com.alibaba.druid.mock.MockDriver"; // connectionProperties = "connectSleep=3;executeSleep=1"; - // jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2"; + // jdbcUrl = "jdbc:mysql://a.b.c.d:3306/druid2"; // user = "root"; // password = "root"; // driverClass = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java index 5cb43f98d1..4515ee1be9 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_Oracle.java @@ -64,12 +64,12 @@ public class CaseKylin_Oracle extends TestCase { // password = "dragoon25"; // driverClass = "com.alibaba.druid.mock.MockDriver"; - // jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2"; + // jdbcUrl = "jdbc:mysql://a.b.c.d:3306/druid2"; // user = "root"; // password = "root"; // driverClass = "com.mysql.jdbc.Driver"; - jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; user = "alibaba"; password = "ccbuauto"; driverClass = "oracle.jdbc.driver.OracleDriver"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java index c01c75f3ee..ba03558cb4 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql.java @@ -61,12 +61,12 @@ public class CaseKylin_mysql extends TestCase { // password = "dragoon25"; // driverClass = "com.alibaba.druid.mock.MockDriver"; - jdbcUrl = "jdbc:mysql://10.20.153.104:3306/druid2"; + jdbcUrl = "jdbc:mysql://a.b.c.d:3306/druid2"; user = "root"; password = "root"; driverClass = "com.mysql.jdbc.Driver"; - // jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // driverClass = "oracle.jdbc.driver.OracleDriver"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java index a404c1c5b7..04f80fa67b 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_1.java @@ -59,12 +59,12 @@ public class CaseKylin_mysql_idle_1 extends TestCase { // password = "dragoon25"; // driverClass = "com.alibaba.druid.mock.MockDriver"; - jdbcUrl = "jdbc:mysql://10.20.141.150:8066/amoeba"; + jdbcUrl = "jdbc:mysql://a.b.c.d:8066/amoeba"; user = "root"; password = "12345"; driverClass = "com.mysql.jdbc.Driver"; - // jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // driverClass = "oracle.jdbc.driver.OracleDriver"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java index 4ddf6f4d81..2bcc4302ee 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/CaseKylin_mysql_idle_2.java @@ -62,12 +62,12 @@ public class CaseKylin_mysql_idle_2 extends TestCase { MockDriver.instance.setIdleTimeCount(50 * 60 * 10); - // jdbcUrl = "jdbc:mysql://10.20.141.150:8066/amoeba"; + // jdbcUrl = "jdbc:mysql://a.b.c.d:8066/amoeba"; // user = "root"; // password = "12345"; // driverClass = "com.mysql.jdbc.Driver"; - // jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // driverClass = "oracle.jdbc.driver.OracleDriver"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java index 510163136e..78ad4fad2f 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case0.java @@ -46,7 +46,7 @@ public class Oracle_Case0 extends TestCase { public final int LOOP_COUNT = 5; protected void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; user = "alibaba"; password = "ccbuauto"; driverClass = "oracle.jdbc.driver.OracleDriver"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java index a87a4d2ca7..3af110305a 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case3.java @@ -47,7 +47,7 @@ public class Oracle_Case3 extends TestCase { private boolean testOnBorrow = true; protected void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; user = "alibaba"; password = "ccbuauto"; driverClass = "oracle.jdbc.driver.OracleDriver"; diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java index e79ac05198..361b6dd7bd 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Oracle_Case4.java @@ -55,12 +55,12 @@ public class Oracle_Case4 extends TestCase { private String SQL; protected void setUp() throws Exception { -// jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; +// jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // user = "alibaba"; // password = "ccbuauto"; // SQL = "SELECT * FROM WP_ORDERS WHERE ID = ?"; - jdbcUrl = "jdbc:oracle:thin:@10.20.149.81:1521:ointest3"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ointest3"; user = "alibaba"; password = "deYcR7facWSJtCuDpm2r"; SQL = "SELECT * FROM AV_INFO WHERE ID = ?"; diff --git a/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java index 7001a9371c..1c4c498b7c 100644 --- a/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java +++ b/src/test/java/com/alibaba/druid/benckmark/proxy/DruidBenchmarkTest.java @@ -39,7 +39,7 @@ public class DruidBenchmarkTest extends TestCase { public DirectSQLExecutor createExecutorDirect() { String name = "direct"; - String jdbcUrl = "jdbc:mysql://10.20.129.146/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; + String jdbcUrl = "jdbc:mysql://a.b.c.d/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; String user = "dragoon25"; String password = "dragoon25"; return new DirectSQLExecutor(name, jdbcUrl, user, password); @@ -47,7 +47,7 @@ public class DruidBenchmarkTest extends TestCase { public DirectSQLExecutor createExecutorDruid() { String name = "druid"; - String jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=benchmark:jdbc:mysql://10.20.129.146/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; + String jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=benchmark:jdbc:mysql://a.b.c.d/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; String user = "dragoon25"; String password = "dragoon25"; return new DirectSQLExecutor(name, jdbcUrl, user, password); diff --git a/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java b/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java index 3a241a8273..a17aefd221 100644 --- a/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java +++ b/src/test/java/com/alibaba/druid/mysql/MySqlBigTableTest.java @@ -35,7 +35,7 @@ public class MySqlBigTableTest extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - jdbcUrl = "jdbc:mysql://10.20.144.27:3306/dragoon_v25_masterdb"; + jdbcUrl = "jdbc:mysql://a.b.c.d:3306/dragoon_v25_masterdb"; user = "dragoon_test"; password = "dragoon_test"; driverClass = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java b/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java index b4e7f734e5..bda19d0dc3 100644 --- a/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java +++ b/src/test/java/com/alibaba/druid/mysql/QueryTimeoutTest.java @@ -15,7 +15,7 @@ public class QueryTimeoutTest extends TestCase { protected void setUp() throws Exception { dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:oracle:thin:@10.20.36.21:1521:OINTEST"); + dataSource.setUrl("jdbc:oracle:thin:@a.b.c.d:1521:OINTEST"); dataSource.setUsername("alibaba"); dataSource.setPassword("deYcR7facWSJtCuDpm2r"); dataSource.setInitialSize(1); diff --git a/src/test/java/com/alibaba/druid/pool/Case3.java b/src/test/java/com/alibaba/druid/pool/Case3.java index 03357ba4b4..ad569c43b9 100644 --- a/src/test/java/com/alibaba/druid/pool/Case3.java +++ b/src/test/java/com/alibaba/druid/pool/Case3.java @@ -26,7 +26,7 @@ public class Case3 extends TestCase { public void test_1() throws Exception { DruidDataSource dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:mysql://10.20.153.104:3306/druid2"); + dataSource.setUrl("jdbc:mysql://a.b.c.d:3306/druid2"); dataSource.setUsername("root"); dataSource.setPassword("root"); diff --git a/src/test/java/com/alibaba/druid/pool/CobarTest.java b/src/test/java/com/alibaba/druid/pool/CobarTest.java index 1349c2c28c..e39e7df80e 100644 --- a/src/test/java/com/alibaba/druid/pool/CobarTest.java +++ b/src/test/java/com/alibaba/druid/pool/CobarTest.java @@ -31,7 +31,7 @@ public class CobarTest extends TestCase { private DruidDataSource dataSource; protected void setUp() throws Exception { - jdbcUrl = "jdbc:mysql://10.20.146.88:8066/pt_dragoon_masterdb_test?useUnicode=true&characterEncoding=UTF-8"; + jdbcUrl = "jdbc:mysql://a.b.c.d:8066/pt_dragoon_masterdb_test?useUnicode=true&characterEncoding=UTF-8"; user = "pt_dragoon_test"; password = "pt_dragoon_test"; driverClass = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java b/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java index 2a903a8daa..e6a7c6d3ab 100644 --- a/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java +++ b/src/test/java/com/alibaba/druid/pool/ConcurrentTest.java @@ -34,7 +34,7 @@ public class ConcurrentTest extends TestCase { protected void setUp() throws Exception { // jdbcUrl = - // "jdbc:mysql://10.20.129.146/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; + // "jdbc:mysql://a.b.c.d/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; // user = "dragoon25"; // password = "dragoon25"; // driverClass = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java b/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java index 07796ac132..0ce090c2b3 100644 --- a/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java +++ b/src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java @@ -34,7 +34,7 @@ public class ConcurrentTest2 extends TestCase { protected void setUp() throws Exception { // jdbcUrl = - // "jdbc:mysql://10.20.129.146/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; + // "jdbc:mysql://a.b.c.d/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; // user = "dragoon25"; // password = "dragoon25"; // driverClass = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/pool/DruidTest.java b/src/test/java/com/alibaba/druid/pool/DruidTest.java index e3b40f0a60..0d6e384d98 100644 --- a/src/test/java/com/alibaba/druid/pool/DruidTest.java +++ b/src/test/java/com/alibaba/druid/pool/DruidTest.java @@ -76,7 +76,7 @@ public class DruidTest { public static void main(String[] args) throws IOException, SQLException { - DruidTest db = new DruidTest("jdbc:mysql://10.20.141.150:8066/amoeba"); + DruidTest db = new DruidTest("jdbc:mysql://a.b.c.d:8066/amoeba"); Connection conn = null; Statement stmt = null; ResultSet rs = null; diff --git a/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java b/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java index 8eb4c73659..802a47163e 100644 --- a/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java +++ b/src/test/java/com/alibaba/druid/pool/MySqlValdConnectionTest.java @@ -29,7 +29,7 @@ public class MySqlValdConnectionTest extends TestCase { private String driverClass; public void setUp() throws Exception { - jdbcUrl = "jdbc:mysql://10.20.129.146/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; + jdbcUrl = "jdbc:mysql://a.b.c.d/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; user = "dragoon25"; password = "dragoon25"; driverClass = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java b/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java index 6793105d63..6855c7fd8b 100644 --- a/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java +++ b/src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java @@ -15,7 +15,7 @@ public class QueryTimeoutTest extends TestCase { protected void setUp() throws Exception { dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:oracle:thin:@10.20.36.21:1521:OINTEST"); + dataSource.setUrl("jdbc:oracle:thin:@a.b.c.d:1521:OINTEST"); dataSource.setUsername("alibaba"); dataSource.setPassword("deYcR7facWSJtCuDpm2r"); dataSource.setInitialSize(1); diff --git a/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java b/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java index 0c2e83cd36..b4de6644fa 100644 --- a/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestDruidOraclePreparedStatement.java @@ -32,8 +32,8 @@ public class TestDruidOraclePreparedStatement extends TestCase { private DruidDataSource dataSource; public void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; - // jdbcUrl = "jdbc:oracle:thin:@20.20.149.85:1521:ocnauto"; // error url + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; + // jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // error url user = "alibaba"; password = "ccbuauto"; diff --git a/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java b/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java index 03b7f3387b..9aca0896ac 100644 --- a/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java +++ b/src/test/java/com/alibaba/druid/pool/TestMySqlPing.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; public class TestMySqlPing extends TestCase { public void test_ping() throws Exception { - String url = "jdbc:mysql://10.20.147.142:3308/dragoon_v25_masterdb"; + String url = "jdbc:mysql://a.b.c.d:3308/dragoon_v25_masterdb"; String user = "dragoon_admin"; String password = "dragoon_root"; diff --git a/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java b/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java index 89fa671344..311dcd2109 100644 --- a/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestOraclePreparedStatement.java @@ -36,12 +36,12 @@ public class TestOraclePreparedStatement extends TestCase { private String SQL; public void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // jdbcUrl = "jdbc:oracle:thin:@20.20.149.85:1521:ocnauto"; // error url user = "alibaba"; password = "ccbuauto"; - jdbcUrl = "jdbc:oracle:thin:@10.20.149.81:1521:ointest3"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ointest3"; user = "alibaba"; password = "deYcR7facWSJtCuDpm2r"; SQL = "SELECT * FROM AV_INFO WHERE ID = ?"; diff --git a/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java b/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java index ada10ded42..fe127a1ebc 100644 --- a/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java +++ b/src/test/java/com/alibaba/druid/pool/TestOracle_DruidDataSource.java @@ -33,7 +33,7 @@ public class TestOracle_DruidDataSource extends TestCase { private String password; public void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // jdbcUrl = "jdbc:oracle:thin:@20.20.149.85:1521:ocnauto"; // error url user = "alibaba"; password = "ccbuauto"; diff --git a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java index 5b5b00a655..8b02a6c789 100644 --- a/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java +++ b/src/test/java/com/alibaba/druid/pool/TestPoolStatement.java @@ -33,7 +33,7 @@ public class TestPoolStatement extends TestCase { protected void setUp() throws Exception { dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:oracle:thin:@10.20.36.18:1521:testconn"); + dataSource.setUrl("jdbc:oracle:thin:@a.b.c.d:1521:testconn"); dataSource.setInitialSize(1); dataSource.setMaxActive(14); dataSource.setMaxIdle(14); diff --git a/src/test/java/com/alibaba/druid/pool/TestRollBack.java b/src/test/java/com/alibaba/druid/pool/TestRollBack.java index e957939ad1..084f564501 100644 --- a/src/test/java/com/alibaba/druid/pool/TestRollBack.java +++ b/src/test/java/com/alibaba/druid/pool/TestRollBack.java @@ -32,7 +32,7 @@ public class TestRollBack extends TestCase { protected void setUp() throws Exception { dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:mysql://10.20.144.27/druid?useUnicode=true&characterEncoding=UTF-8"); + dataSource.setUrl("jdbc:mysql://a.b.c.d/druid?useUnicode=true&characterEncoding=UTF-8"); dataSource.setUsername("dragoon_test"); dataSource.setPassword("dragoon_test"); dataSource.setFilters("stat,trace,encoding"); diff --git a/src/test/java/com/alibaba/druid/pool/Test_C2.java b/src/test/java/com/alibaba/druid/pool/Test_C2.java index e0c5b99373..f772d9944b 100644 --- a/src/test/java/com/alibaba/druid/pool/Test_C2.java +++ b/src/test/java/com/alibaba/druid/pool/Test_C2.java @@ -34,7 +34,7 @@ public class Test_C2 extends TestCase { protected void setUp() throws Exception { // jdbcUrl = - // "jdbc:mysql://10.20.129.146/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; + // "jdbc:mysql://a.b.c.d/dragoon_v25masterdb?useUnicode=true&characterEncoding=UTF-8"; // user = "dragoon25"; // password = "dragoon25"; // driverClass = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/pool/Test_kyline.java b/src/test/java/com/alibaba/druid/pool/Test_kyline.java index 1335720ca5..5417b4cd0a 100644 --- a/src/test/java/com/alibaba/druid/pool/Test_kyline.java +++ b/src/test/java/com/alibaba/druid/pool/Test_kyline.java @@ -22,7 +22,7 @@ import junit.framework.TestCase; public class Test_kyline extends TestCase { - private String url = "jdbc:mysql://10.20.141.150:8066/amoeba"; + private String url = "jdbc:mysql://a.b.c.d:8066/amoeba"; private String user = "root"; private String password = "12345"; private String driver = "com.mysql.jdbc.Driver"; diff --git a/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java b/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java index 99f8caf19d..1b4aa58dfa 100644 --- a/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java +++ b/src/test/java/com/alibaba/druid/pool/oceanbase/OBTest.java @@ -12,7 +12,7 @@ public class OBTest extends TestCase { protected void setUp() throws Exception { dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:mysql://10.232.36.171:45447/"); + dataSource.setUrl("jdbc:mysql://a.b.c.d:45447/"); dataSource.setUsername("admin"); dataSource.setPassword("admin"); dataSource.setFilters("log4j"); diff --git a/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java b/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java index 39cae3deb7..89d5f6c2cd 100644 --- a/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java +++ b/src/test/java/com/alibaba/druid/pool/oracle/QueryTimeoutTest.java @@ -17,7 +17,7 @@ public class QueryTimeoutTest extends TestCase { protected void setUp() throws Exception { dataSource = new DruidDataSource(); - dataSource.setUrl("jdbc:mysql://10.232.64.68:3306/umiddb"); + dataSource.setUrl("jdbc:mysql://a.b.c.d:3306/umiddb"); dataSource.setUsername("umiddb"); dataSource.setPassword("umiddb1001"); dataSource.setInitialSize(1); diff --git a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java index 0885d71c0a..1fc7dfbdd8 100644 --- a/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java +++ b/src/test/java/com/alibaba/druid/pool/ui/DruidDataSourceUIManager.java @@ -65,7 +65,7 @@ public class DruidDataSourceUIManager extends JFrame { private JLabel lbUrl = new JLabel("URL : "); private JTextField txtUrl = new JTextField( - "jdbc:oracle:thin:@10.20.36.18:1521:ocndb"); + "jdbc:oracle:thin:@a.b.c.d:1521:ocndb"); private JLabel lbDriverClass = new JLabel("DriverClassName : "); private JTextField txtDriverClass = new JTextField(); diff --git a/src/test/java/com/alibaba/druid/proxy/TestOracle.java b/src/test/java/com/alibaba/druid/proxy/TestOracle.java index 93ccd63d32..0697ec0bf4 100644 --- a/src/test/java/com/alibaba/druid/proxy/TestOracle.java +++ b/src/test/java/com/alibaba/druid/proxy/TestOracle.java @@ -34,7 +34,7 @@ public class TestOracle extends TestCase { private String password; public void setUp() throws Exception { - jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=oracleTest:jdbc:oracle:thin:@10.20.149.85:1521:ocnauto"; + jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=oracleTest:jdbc:oracle:thin:@a.b.c.d:1521:ocnauto"; // jdbcUrl = "jdbc:wrap-jdbc:filters=default:name=oracleTest:jdbc:mock:xx"; user = "alibaba"; password = "ccbuauto"; diff --git a/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java b/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java index bbab230c97..02832a57bc 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineOracleTest3.java @@ -33,7 +33,7 @@ public class OnlineOracleTest3 extends TestCase { private DruidDataSource dataSource; public void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.18:1521:emdb"; + jdbcUrl = "jdbc:oracle:thin:@xx.xx.xx.xx:1521:emdb"; user = "wardon"; password = "wardon"; diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java index 93ed92a664..f55c8f2378 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest.java @@ -34,7 +34,7 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleParameterizedOutputVis public class OnlineSQLTest extends TestCase { - private String url = "jdbc:mysql://10.20.129.146/dragoon_v25monitordb_online"; + private String url = "jdbc:mysql://a.b.c.d/dragoon_v25monitordb_online"; private String user = "dragoon"; private String password = "dragoon"; diff --git a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java index c78206696e..6a3f3966f8 100644 --- a/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java +++ b/src/test/java/com/alibaba/druid/sql/OnlineSQLTest2.java @@ -30,7 +30,7 @@ import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; public class OnlineSQLTest2 extends TestCase { - private String url = "jdbc:mysql://10.20.36.26/dragoon_v25_monitordb_test"; + private String url = "jdbc:mysql://a.b.c.d/dragoon_v25_monitordb_test"; private String user = "dragoon"; private String password = "dragoon"; diff --git a/src/test/java/com/alibaba/druid/sql/TestMigrate.java b/src/test/java/com/alibaba/druid/sql/TestMigrate.java index 38c9e96612..8ff0e56b34 100644 --- a/src/test/java/com/alibaba/druid/sql/TestMigrate.java +++ b/src/test/java/com/alibaba/druid/sql/TestMigrate.java @@ -40,7 +40,7 @@ public class TestMigrate extends OracleTest { private DruidDataSource dataSource; public void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.18:1521:emdb"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:emdb"; user = "wardon"; password = "wardon"; diff --git a/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java b/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java index 2404c705e6..babcc52fcd 100644 --- a/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java +++ b/src/test/java/com/alibaba/druid/sql/TestOnlineSQLTest3.java @@ -26,7 +26,7 @@ import com.alibaba.druid.util.JdbcUtils; public class TestOnlineSQLTest3 extends TestCase { - private String url = "jdbc:mysql://10.20.144.27/dragoon_v25_masterdb"; + private String url = "jdbc:mysql://a.b.c.d/dragoon_v25_masterdb"; private String user = "dragoon_test"; private String password = "dragoon_test"; diff --git a/src/test/java/com/alibaba/druid/sql/TestTransform.java b/src/test/java/com/alibaba/druid/sql/TestTransform.java index 72b1666d30..aa918e5bc8 100644 --- a/src/test/java/com/alibaba/druid/sql/TestTransform.java +++ b/src/test/java/com/alibaba/druid/sql/TestTransform.java @@ -44,7 +44,7 @@ public class TestTransform extends OracleTest { private ExecutorService executor = Executors.newFixedThreadPool(10); public void setUp() throws Exception { - jdbcUrl = "jdbc:oracle:thin:@10.20.149.18:1521:emdb"; + jdbcUrl = "jdbc:oracle:thin:@a.b.c.d:1521:emdb"; user = "wardon"; password = "wardon"; diff --git a/src/test/java/com/alibaba/druid/stat/TestOracle.java b/src/test/java/com/alibaba/druid/stat/TestOracle.java index cf487c3b9d..1e06f0d30e 100644 --- a/src/test/java/com/alibaba/druid/stat/TestOracle.java +++ b/src/test/java/com/alibaba/druid/stat/TestOracle.java @@ -24,7 +24,7 @@ import junit.framework.TestCase; public class TestOracle extends TestCase { public void test_0() throws Exception { - String url = "jdbc:oracle:thin:@10.20.144.80:1521:orcl"; + String url = "jdbc:oracle:thin:@a.b.c.d:1521:orcl"; Class.forName("oracle.jdbc.driver.OracleDriver"); Connection conn = DriverManager.getConnection(url, "DRUID", "DRUID");