Author: rmannibucau
Date: Mon Jul 23 23:55:18 2012
New Revision: 1364847
URL: http://svn.apache.org/viewvc?rev=1364847&view=rev
Log:
renaming tomee dbcp tomee jdbc for consistency and adding it to the webapp
Added:
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/
- copied from r1364846,
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/dbcp/
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/
- copied from r1364846,
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/dbcp/
Removed:
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/dbcp/
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/dbcp/
Modified:
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomcatDbcpDataSource.java
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java
Modified:
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java?rev=1364847&r1=1364846&r2=1364847&view=diff
==============================================================================
---
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
(original)
+++
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomEEDataSourceCreator.java
Mon Jul 23 23:55:18 2012
@@ -1,13 +1,11 @@
-package org.apache.tomee.dbcp;
+package org.apache.tomee.jdbc;
import org.apache.openejb.monitoring.LocalMBeanServer;
import org.apache.openejb.resource.jdbc.pool.PoolDataSourceCreator;
-import org.apache.tomcat.dbcp.dbcp.BasicDataSource;
import org.apache.tomcat.jdbc.pool.DataSourceFactory;
import javax.management.ObjectName;
import javax.sql.DataSource;
-import java.util.Hashtable;
import java.util.Map;
import java.util.Properties;
Modified:
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomcatDbcpDataSource.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomcatDbcpDataSource.java?rev=1364847&r1=1364846&r2=1364847&view=diff
==============================================================================
---
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomcatDbcpDataSource.java
(original)
+++
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/jdbc/TomcatDbcpDataSource.java
Mon Jul 23 23:55:18 2012
@@ -1,4 +1,4 @@
-package org.apache.tomee.dbcp;
+package org.apache.tomee.jdbc;
import org.apache.openejb.resource.jdbc.DataSourceHelper;
import org.apache.openejb.util.reflection.Reflections;
Modified:
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java?rev=1364847&r1=1364846&r2=1364847&view=diff
==============================================================================
---
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java
(original)
+++
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/jdbc/TomcatPoolTest.java
Mon Jul 23 23:55:18 2012
@@ -1,4 +1,4 @@
-package org.apache.tomee.dbcp;
+package org.apache.tomee.jdbc;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.SingletonBean;
