Skip to content

Commit

Permalink
'a.b.c.d';
Browse files Browse the repository at this point in the history
  • Loading branch information
wenshao committed Sep 9, 2014
1 parent e6eddc5 commit 4ca437c
Show file tree
Hide file tree
Showing 45 changed files with 83 additions and 61 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,7 @@
<dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-jdbc</artifactId>
<version>7.0.34</version>
<version>8.0.12</version>
<scope>test</scope>
</dependency>

Expand Down
24 changes: 23 additions & 1 deletion src/main/java/com/alibaba/druid/pool/DruidDataSource.java
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
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;
Expand Down Expand Up @@ -95,7 +97,7 @@
* @author ljw<ljw2083@alibaba-inc.com>
* @author wenshao<szujobs@hotmail.com>
*/
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);

Expand Down Expand Up @@ -2702,4 +2704,24 @@ private void emptySignal() {
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() {

}
}
4 changes: 2 additions & 2 deletions src/test/java/com/alibaba/druid/TestMySqlPing.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/alibaba/druid/TestMySqlPing2.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/alibaba/druid/TestOraclePing.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ?";
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/alibaba/druid/TestRollBack.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/alibaba/druid/TestSqlServer.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ?";
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/com/alibaba/druid/benckmark/pool/Case0.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ protected void setUp() throws Exception {
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 {
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/benckmark/pool/Case3.java
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ protected void setUp() throws Exception {
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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,12 @@ protected void setUp() throws Exception {
// 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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,12 +61,12 @@ protected void setUp() throws Exception {
// 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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@ protected void setUp() throws Exception {
// 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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,12 @@ protected void setUp() throws Exception {

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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ?";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,15 @@ public void test_druid_benchmark() throws Exception {

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);
}

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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/pool/Case3.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/pool/CobarTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/pool/ConcurrentTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/pool/ConcurrentTest2.java
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/pool/DruidTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public static void initDS(String connectURI) {

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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/pool/QueryTimeoutTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/alibaba/druid/pool/TestMySqlPing.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ?";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading

0 comments on commit 4ca437c

Please sign in to comment.