svn commit: r1364245 - in /openejb/trunk/openejb/container/openejb-core/src: main/java/org/apache/openejb/resource/jdbc/pool/DefaultDataSourceCreator.java test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionJndiTest.java

[rm...@apache.org]

Author: rmannibucau
Date: Sun Jul 22 09:18:00 2012
New Revision: 1364245

URL: http://svn.apache.org/viewvc?rev=1364245&view=rev
Log:
fixing test

Modified:
    openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/DefaultDataSourceCreator.java
    openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionJndiTest.java

Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/DefaultDataSourceCreator.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/DefaultDataSourceCreator.java?rev=1364245&r1=1364244&r2=1364245&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/DefaultDataSourceCreator.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/resource/jdbc/pool/DefaultDataSourceCreator.java Sun Jul 22 09:18:00 2012
@@ -22,8 +22,10 @@ public class DefaultDataSourceCreator im
     }
 
     @Override
-    public DataSource pool(final String name, final DataSource ds) {
-        return new DbcpDataSource(name, ds);
+    public DataSource poolManaged(final String name, final String driver, final Properties properties) {
+        final BasicManagedDataSource ds = new BasicManagedDataSource(name);
+        ds.setDriverClassName(driver);
+        return ds;
     }
 
     @Override
@@ -34,10 +36,8 @@ public class DefaultDataSourceCreator im
     }
 
     @Override
-    public DataSource poolManaged(final String name, final String driver, final Properties properties) {
-        final BasicManagedDataSource ds = new BasicManagedDataSource(name);
-        ds.setDriverClassName(driver);
-        return ds;
+    public DataSource pool(final String name, final DataSource ds) {
+        return new DbcpDataSource(name, ds);
     }
 
     @Override

Modified: openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionJndiTest.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionJndiTest.java?rev=1364245&r1=1364244&r2=1364245&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionJndiTest.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/DataSourceDefinitionJndiTest.java Sun Jul 22 09:18:00 2012
@@ -39,6 +39,7 @@ import org.apache.openejb.junit.Applicat
 import org.apache.openejb.junit.Module;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.resource.jdbc.DataSourceFactory;
+import org.apache.openejb.resource.jdbc.dbcp.DbcpManagedDataSource;
 import org.apache.openejb.spi.ContainerSystem;
 import org.hsqldb.jdbc.JDBCConnection;
 import org.hsqldb.jdbc.JDBCDataSource;
@@ -111,8 +112,8 @@ public class DataSourceDefinitionJndiTes
 
     private void check(final DataSource ds, final String name) throws SQLException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         // the first "cast part" is not important, we just want to check the jdbc url is ok
-        assertThat(ds, instanceOf(DataSourceFactory.DbcpManagedDataSource.class));
-        final DataSourceFactory.DbcpManagedDataSource dbcp = (DataSourceFactory.DbcpManagedDataSource) ds;
+        assertThat(ds, instanceOf(DbcpManagedDataSource.class));
+        final DbcpManagedDataSource dbcp = (DbcpManagedDataSource) ds;
         final Connection connection = dbcp.getConnection();
         assertThat(connection, instanceOf(ManagedConnection.class));
         final ManagedConnection mc = (ManagedConnection) connection;