svn commit: r1364846 - in /openejb/branches/openejb-pool/tomee: ./ tomee-dbcp/ tomee-jdbc/ tomee-jdbc/src/main/java/org/apache/tomee/dbcp/ tomee-jdbc/src/test/java/org/apache/tomee/dbcp/ tomee-webapp/

[rmannibucau]

Author: rmannibucau
Date: Mon Jul 23 23:53:47 2012
New Revision: 1364846

URL: http://svn.apache.org/viewvc?rev=1364846&view=rev
Log:
renaming tomee dbcp tomee jdbc for consistency and adding it to the webapp

Added:
    openejb/branches/openejb-pool/tomee/tomee-jdbc/
      - copied from r1364835, openejb/branches/openejb-pool/tomee/tomee-dbcp/
    
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/main/java/org/apache/tomee/dbcp/TomEEDataSourceCreator.java
      - copied unchanged from r1364845, 
openejb/branches/openejb-pool/tomee/tomee-dbcp/src/main/java/org/apache/tomee/dbcp/TomEEDataSourceCreator.java
    
openejb/branches/openejb-pool/tomee/tomee-jdbc/src/test/java/org/apache/tomee/dbcp/TomcatPoolTest.java
      - copied unchanged from r1364845, 
openejb/branches/openejb-pool/tomee/tomee-dbcp/src/test/java/org/apache/tomee/dbcp/TomcatPoolTest.java
Removed:
    openejb/branches/openejb-pool/tomee/tomee-dbcp/
Modified:
    openejb/branches/openejb-pool/tomee/pom.xml
    openejb/branches/openejb-pool/tomee/tomee-jdbc/pom.xml
    openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml

Modified: openejb/branches/openejb-pool/tomee/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/pom.xml?rev=1364846&r1=1364845&r2=1364846&view=diff
==============================================================================
--- openejb/branches/openejb-pool/tomee/pom.xml (original)
+++ openejb/branches/openejb-pool/tomee/pom.xml Mon Jul 23 23:53:47 2012
@@ -36,6 +36,7 @@
     <module>tomee-common</module>
     <module>tomee-myfaces</module>
     <module>tomee-mojarra</module>
+    <module>tomee-jdbc</module>
     <module>tomee-webapp</module>
     <module>tomee-plus-webapp</module>
     <module>tomee-webservices</module>
@@ -44,7 +45,6 @@
     <module>tomee-jaxrs-webapp</module>
     <module>apache-tomee</module>
     <module>apache-tomcat</module>
-    <module>tomee-dbcp</module>
   </modules>
 
   <repositories>

Modified: openejb/branches/openejb-pool/tomee/tomee-jdbc/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-jdbc/pom.xml?rev=1364846&r1=1364835&r2=1364846&view=diff
==============================================================================
--- openejb/branches/openejb-pool/tomee/tomee-jdbc/pom.xml (original)
+++ openejb/branches/openejb-pool/tomee/tomee-jdbc/pom.xml Mon Jul 23 23:53:47 
2012
@@ -9,8 +9,8 @@
   </parent>
   <modelVersion>4.0.0</modelVersion>
 
-  <artifactId>tomee-dbcp</artifactId>
-  <name>OpenEJB :: TomEE :: Common</name>
+  <artifactId>tomee-jdbc</artifactId>
+  <name>OpenEJB :: TomEE :: JDBC</name>
 
   <dependencies>
     <dependency>

Modified: openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml
URL: 
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml?rev=1364846&r1=1364845&r2=1364846&view=diff
==============================================================================
--- openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml (original)
+++ openejb/branches/openejb-pool/tomee/tomee-webapp/pom.xml Mon Jul 23 
23:53:47 2012
@@ -232,6 +232,12 @@
       <groupId>org.codehaus.swizzle</groupId>
       <artifactId>swizzle-stream</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.openejb</groupId>
+      <artifactId>tomee-jdbc</artifactId>
+      <version>${tomee.version}</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
 </project>