diff --git a/lib/com/taobao/parent/1.0.1/parent-1.0.1.pom b/lib/com/taobao/parent/1.0.1/parent-1.0.1.pom new file mode 100644 index 0000000000..745485cd23 --- /dev/null +++ b/lib/com/taobao/parent/1.0.1/parent-1.0.1.pom @@ -0,0 +1,179 @@ + + 4.0.0 + com.taobao + parent + pom + 1.0.1 + parent pom for tb + + + + central + http://mvnrepo.taobao.ali.com/mvn/repository + + true + + + false + + + + snapshots + http://mvnrepo.taobao.ali.com/mvn/repository + + false + + + true + + + + + + central + http://mvnrepo.taobao.ali.com/mvn/repository + + true + + + false + + + + snapshots + http://mvnrepo.taobao.ali.com/mvn/repository + + false + + + true + + + + + + releases + http://mvnrepo.taobao.ali.com/mvn/releases + + + snapshots + http://mvnrepo.taobao.ali.com/mvn/snapshots + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + + + maven-compiler-plugin + + 1.5 + 1.5 + GBK + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + + UTF16 + true + + + + + + com.atlassian.maven.plugins + maven-clover2-plugin + 2.3.2 + + ${clover.license} + true + GBK + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*Test.java + + + + + + + + com.taobao.scm + scm-maven-plugin + 1.0 + + + + + + + src/main/resources + + **/* + + + + + + src/test/java + + **/* + + + + src/test/resources + + **/* + + + + + \ No newline at end of file diff --git a/lib/com/taobao/parent/1.0.1/parent-1.0.1.pom.sha1 b/lib/com/taobao/parent/1.0.1/parent-1.0.1.pom.sha1 new file mode 100644 index 0000000000..299bdcdbb0 --- /dev/null +++ b/lib/com/taobao/parent/1.0.1/parent-1.0.1.pom.sha1 @@ -0,0 +1 @@ +dc05668192b5726439cf98e75a15b1ccc2ff69c1 \ No newline at end of file diff --git a/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2-sources.jar b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2-sources.jar new file mode 100644 index 0000000000..4b89dc2ba4 Binary files /dev/null and b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2-sources.jar differ diff --git a/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2-sources.jar.sha1 b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2-sources.jar.sha1 new file mode 100644 index 0000000000..39e52fd16d --- /dev/null +++ b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2-sources.jar.sha1 @@ -0,0 +1 @@ +01899596a36b40dc7d5570830248bc42a14dffd3 \ No newline at end of file diff --git a/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.jar b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.jar new file mode 100644 index 0000000000..3d121d01e4 Binary files /dev/null and b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.jar differ diff --git a/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.jar.sha1 b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.jar.sha1 new file mode 100644 index 0000000000..5d3f2e843a --- /dev/null +++ b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.jar.sha1 @@ -0,0 +1 @@ +8be62df4341ba19690261a61b4c04d70472040bb \ No newline at end of file diff --git a/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.pom b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.pom new file mode 100644 index 0000000000..3459678581 --- /dev/null +++ b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.pom @@ -0,0 +1,122 @@ + + + parent + com.taobao + 1.0.1 + + 4.0.0 + com.taobao.tbdatasource + tbdatasource + tbdatasource + 2.0.2 + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar + + + + + + maven-compiler-plugin + + 1.6 + 1.6 + GBK + + + + + + + jboss.common + jboss-common + 1.2.1.GA + + + jboss + jboss-j2ee + 4.2.2.GA + + + log4j + log4j + 1.2.14 + + + dom4j + dom4j + 1.6.1 + + + jaxen + jaxen + 1.1.1 + + + commons-lang + commons-lang + 2.4 + + + xom + xom + 1.0b3 + + + org.springframework + spring-core + 2.0.7 + test + + + org.springframework + spring-beans + 2.0.7 + test + + + junit + junit + 4.6 + test + + + hsqldb + hsqldb + 1.8.0.10 + test + + + com.oracle + ojdbc14 + 10.2.0.3.0 + test + + + mysql + mysql-connector-java + 5.1.6 + test + + + org.springframework + spring-mock + 2.0.7 + test + + + org.springframework + spring-jdbc + 2.0.7 + test + + + \ No newline at end of file diff --git a/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.pom.sha1 b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.pom.sha1 new file mode 100644 index 0000000000..2232fe194f --- /dev/null +++ b/lib/com/taobao/tbdatasource/tbdatasource/2.0.2/tbdatasource-2.0.2.pom.sha1 @@ -0,0 +1 @@ +de09f1978fe0edb43cc9504e8744dc2136117423 \ No newline at end of file diff --git a/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar new file mode 100644 index 0000000000..adada209fd Binary files /dev/null and b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar differ diff --git a/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar.sha1 b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar.sha1 new file mode 100644 index 0000000000..a8648a0b03 --- /dev/null +++ b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.jar.sha1 @@ -0,0 +1 @@ +3817e27bab440d02e370c430e15d545803b0c9cf \ No newline at end of file diff --git a/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.pom b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.pom new file mode 100644 index 0000000000..bc6b089c43 --- /dev/null +++ b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.pom @@ -0,0 +1,6 @@ + + 4.0.0 + jboss.common + jboss-common + 1.2.1.GA + \ No newline at end of file diff --git a/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.pom.sha1 b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.pom.sha1 new file mode 100644 index 0000000000..75a7705199 --- /dev/null +++ b/lib/jboss/common/jboss-common/1.2.1.GA/jboss-common-1.2.1.GA.pom.sha1 @@ -0,0 +1 @@ +d4af82986b37cf9a9fdd06ad84b68b8f4bf0aed0 \ No newline at end of file diff --git a/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar new file mode 100644 index 0000000000..d2526d6859 Binary files /dev/null and b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar differ diff --git a/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar.sha1 b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar.sha1 new file mode 100644 index 0000000000..93d4e9cc86 --- /dev/null +++ b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.jar.sha1 @@ -0,0 +1 @@ +c4e0e7f56f0d82fd0c4ad25e9cdc62c085bd8546 \ No newline at end of file diff --git a/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.pom b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.pom new file mode 100644 index 0000000000..6251891218 --- /dev/null +++ b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.pom @@ -0,0 +1,7 @@ + + 4.0.0 + jboss + jboss-j2ee + 4.2.2.GA + POM was created from install:install-file + \ No newline at end of file diff --git a/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.pom.sha1 b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.pom.sha1 new file mode 100644 index 0000000000..709d737497 --- /dev/null +++ b/lib/jboss/jboss-j2ee/4.2.2.GA/jboss-j2ee-4.2.2.GA.pom.sha1 @@ -0,0 +1 @@ +ef455d3e860297685b8484310619bd35b8341c1a \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7865611142..34712324af 100644 --- a/pom.xml +++ b/pom.xml @@ -522,6 +522,12 @@ hibernate-core 4.1.8.Final provided + + + org.jboss.logging + jboss-logging + + @@ -544,5 +550,11 @@ 1.b.46 test + + com.taobao.tbdatasource + tbdatasource + 2.0.2 + test + diff --git a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java index 3d32d551ff..db773c1c14 100644 --- a/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java +++ b/src/test/java/com/alibaba/druid/benckmark/pool/Case1.java @@ -32,6 +32,9 @@ import com.alibaba.druid.TestUtil; import com.alibaba.druid.pool.DruidDataSource; import com.jolbox.bonecp.BoneCPDataSource; import com.mchange.v2.c3p0.ComboPooledDataSource; +import com.taobao.datasource.LocalTxDataSourceDO; +import com.taobao.datasource.TaobaoDataSourceFactory; +import com.taobao.datasource.resource.adapter.jdbc.local.LocalTxDataSource; /** * TestOnBo 类Case1.java的实现描述:TODO 类实现描述 @@ -59,7 +62,7 @@ public class Case1 extends TestCase { password = "dragoon25"; driverClass = "org.h2.Driver"; } - + public void test_druid() throws Exception { DruidDataSource dataSource = new DruidDataSource(); @@ -81,6 +84,26 @@ public class Case1 extends TestCase { } System.out.println(); } + + public void test_jobss() throws Exception { + LocalTxDataSourceDO dataSourceDO = new LocalTxDataSourceDO(); + dataSourceDO.setBlockingTimeoutMillis(1000 * 60); + dataSourceDO.setMaxPoolSize(maxPoolSize); + dataSourceDO.setMinPoolSize(minPoolSize); + + dataSourceDO.setDriverClass(driverClass); + dataSourceDO.setConnectionURL(jdbcUrl); + dataSourceDO.setUserName(user); + dataSourceDO.setPassword(password); + + LocalTxDataSource tx = TaobaoDataSourceFactory.createLocalTxDataSource(dataSourceDO); + DataSource dataSource = tx.getDatasource(); + + for (int i = 0; i < loopCount; ++i) { + p0(dataSource, "jboss-datasource", threadCount); + } + System.out.println(); + } public void test_dbcp() throws Exception { final BasicDataSource dataSource = new BasicDataSource();