Author: rmannibucau
Date: Tue Jul 24 15:55:28 2012
New Revision: 1365147
URL: http://svn.apache.org/viewvc?rev=1365147&view=rev
Log:
fixing bonecp config (url)
Added:
openejb/branches/openejb-pool/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java
Modified:
openejb/branches/openejb-pool/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java
Modified:
openejb/branches/openejb-pool/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java?rev=1365147&r1=1365146&r2=1365147&view=diff
==============================================================================
---
openejb/branches/openejb-pool/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java
(original)
+++
openejb/branches/openejb-pool/server/openejb-bonecp/src/main/java/org/apache/openejb/bonecp/BoneCPDataSourceCreator.java
Tue Jul 24 15:55:28 2012
@@ -18,6 +18,10 @@ public class BoneCPDataSourceCreator ext
@Override
public DataSource pool(final String name, final DataSource ds, final
Properties properties) {
+ if (properties.containsKey("url")) {
+ properties.setProperty("jdbcUrl", properties.getProperty("url"));
+ }
+
final BoneCPConfig config;
final BoneCP pool;
try {
@@ -46,6 +50,7 @@ public class BoneCPDataSourceCreator ext
static {
try {
POOL_FIELD = BoneCPDataSource.class.getDeclaredField("pool");
+ POOL_FIELD.setAccessible(true);
} catch (NoSuchFieldException e) {
throw new OpenEJBRuntimeException(e);
}
Added:
openejb/branches/openejb-pool/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-pool/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java?rev=1365147&view=auto
==============================================================================
---
openejb/branches/openejb-pool/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java
(added)
+++
openejb/branches/openejb-pool/server/openejb-bonecp/src/test/java/org/apache/openejb/bonecp/BoneCPPooledDataSourceFromPoolTest.java
Tue Jul 24 15:55:28 2012
@@ -0,0 +1,214 @@
+package org.apache.openejb.bonecp;
+
+import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.SingletonBean;
+import org.apache.openejb.junit.ApplicationComposer;
+import org.apache.openejb.junit.Configuration;
+import org.apache.openejb.junit.Module;
+import org.apache.openejb.resource.jdbc.managed.local.ManagedConnection;
+import org.hsqldb.jdbc.JDBCDataSource;
+import org.junit.After;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import javax.annotation.Resource;
+import javax.annotation.sql.DataSourceDefinition;
+import javax.ejb.EJB;
+import javax.ejb.EJBContext;
+import javax.ejb.LocalBean;
+import javax.ejb.Singleton;
+import javax.ejb.TransactionAttribute;
+import javax.ejb.TransactionAttributeType;
+import javax.sql.DataSource;
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.Map;
+import java.util.Properties;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+
+@RunWith(ApplicationComposer.class)
+public class BoneCPPooledDataSourceFromPoolTest {
+ private static final String URL =
"jdbc:hsqldb:mem:managed;hsqldb.tx=MVCC"; // mvcc otherwise multiple
transaction tests will fail
+ private static final String USER = "sa";
+ private static final String PASSWORD = "";
+ private static final String TABLE = "PUBLIC.MANAGED_DATASOURCE_TEST";
+
+ @EJB
+ private Persister persistManager;
+
+ @BeforeClass
+ public static void createTable() throws SQLException,
ClassNotFoundException {
+ Class.forName("org.hsqldb.jdbcDriver");
+
+ final Connection connection = DriverManager.getConnection(URL, USER,
PASSWORD);
+ final Statement statement = connection.createStatement();
+ statement.execute("CREATE TABLE " + TABLE + "(ID INTEGER)");
+ statement.close();
+ connection.commit();
+ connection.close();
+ }
+
+ @Configuration
+ public Properties config() {
+ final Properties p = new Properties();
+ p.put("openejb.jdbc.datasource-creator", "bonecp");
+ return p;
+ }
+
+ @Module
+ public EjbJar app() throws Exception {
+ return new EjbJar()
+ .enterpriseBean(new SingletonBean(Persister.class).localBean())
+ .enterpriseBean(new
SingletonBean(OtherPersister.class).localBean());
+ }
+
+ @LocalBean
+ @Singleton
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ public static class OtherPersister {
+ @Resource(name = "managed")
+ private DataSource ds;
+
+ @Resource
+ private EJBContext context;
+
+ public void save() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 10);
+ }
+
+ public void saveAndRollback() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 11);
+ context.setRollbackOnly();
+ }
+ }
+
+ @LocalBean
+ @Singleton
+ @DataSourceDefinition(
+ name = "managed",
+ url = URL, user = USER, password = PASSWORD,
+ className = "org.hsqldb.jdbc.JDBCDataSource")
+ public static class Persister {
+ @Resource(name = "managed")
+ private DataSource ds;
+
+ @Resource
+ private EJBContext context;
+
+ @EJB
+ private OtherPersister other;
+
+ public void save() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 1);
+ }
+
+ public void saveAndRollback() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 2);
+ context.setRollbackOnly();
+ }
+
+ public void saveTwice() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 3);
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 4);
+ }
+
+ public void rollbackMultipleSave() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 5);
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 6);
+ context.setRollbackOnly();
+ }
+
+ public void saveInThisTxAndAnotherOne() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 7);
+ other.save();
+ }
+
+ public void saveInThisTxAndRollbackInAnotherOne() throws SQLException {
+ BoneCPPooledDataSourceFromPoolTest.save(ds, 8);
+ other.saveAndRollback();
+ }
+ }
+
+ @Test
+ public void commit() throws SQLException {
+ persistManager.save();
+ assertTrue(exists(1));
+ }
+
+ @Test
+ public void rollback() throws SQLException {
+ persistManager.saveAndRollback();
+ assertFalse(exists(2));
+ }
+
+ @Test
+ public void commit2() throws SQLException {
+ persistManager.saveTwice();
+ assertTrue(exists(3));
+ assertTrue(exists(4));
+ }
+
+ @Test
+ public void rollback2() throws SQLException {
+ persistManager.rollbackMultipleSave();
+ assertFalse(exists(5));
+ assertFalse(exists(6));
+ }
+
+ @Test
+ public void saveDifferentTx() throws SQLException {
+ persistManager.saveInThisTxAndAnotherOne();
+ assertTrue(exists(7));
+ assertTrue(exists(10));
+ }
+
+ @Test
+ public void saveRollbackDifferentTx() throws SQLException {
+ persistManager.saveInThisTxAndRollbackInAnotherOne();
+ assertTrue(exists(8));
+ assertFalse(exists(12));
+ }
+
+ @After
+ public void checkTxMapIsEmpty() throws Exception { // avoid memory leak
+ final Field map =
ManagedConnection.class.getDeclaredField("CONNECTION_BY_TX");
+ map.setAccessible(true);
+ final Map<?, ?> instance = (Map<?, ?>) map.get(null);
+ assertEquals(0, instance.size());
+ }
+
+ private static boolean exists(int id) throws SQLException {
+ final Connection connection = DriverManager.getConnection(URL, USER,
PASSWORD);
+ final Statement statement = connection.createStatement();
+ final ResultSet result = statement.executeQuery("SELECT count(*) AS NB
FROM " + TABLE + " WHERE ID = " + id);
+ try {
+ assertTrue(result.next());
+ return result.getInt(1) == 1;
+ } finally {
+ statement.close();
+ connection.close();
+ }
+ }
+
+ private static void save(final DataSource ds, int id) throws SQLException {
+ execute(ds, "INSERT INTO " + TABLE + "(ID) VALUES(" + id + ")");
+ }
+
+ private static void execute(final DataSource ds, final String sql) throws
SQLException {
+ final Connection connection = ds.getConnection();
+ final Statement statement = connection.createStatement();
+ statement.executeUpdate(sql);
+ statement.close();
+ connection.close();
+ }
+}
+
