[jboss-svn-commits] JBL Code SVN: r13651 - in labs/jbossesb/trunk: product/install/conf and 11 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jul 19 16:44:36 EDT 2007
Author: mark.little at jboss.com
Date: 2007-07-19 16:44:36 -0400 (Thu, 19 Jul 2007)
New Revision: 13651
Added:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManager.java
Removed:
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java
Modified:
labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml
labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml
labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java
labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java
labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb-properties.xml
labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java
labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java
labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml
labs/jbossesb/trunk/qa/jbossesb-unittest-properties.xml
Log:
http://jira.jboss.com/jira/browse/JBESB-699
Modified: labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml 2007-07-19 20:44:36 UTC (rev 13651)
@@ -61,8 +61,8 @@
</properties>
<properties name="dbstore">
<!-- connection manager type -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/>
- <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
<!-- this property is only used if using the j2ee connection manager -->
<property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossesbDS"/>
Modified: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2007-07-19 20:44:36 UTC (rev 13651)
@@ -66,8 +66,8 @@
<properties name="dbstore">
<!-- connection manager type -->
- <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/> -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/>
+ <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/> -->
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/>
<!-- this property is only used if using the j2ee connection manager -->
<property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/>
Modified: labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/install/tomcat/jbossesb-properties.xml 2007-07-19 20:44:36 UTC (rev 13651)
@@ -64,8 +64,8 @@
<properties name="dbstore">
<!-- connection manager type -->
- <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/ -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/>
+ <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/ -->
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/>
<!-- this property is only used if using the j2ee connection manager -->
<property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:comp/env/jdbc/JBossesbDS"/>
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -1,22 +0,0 @@
-package org.jboss.internal.soa.esb.persistence.manager;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import org.jboss.soa.esb.ConfigurationException;
-
-public interface ConnectionManager {
- /**
- *
- * @return ConnectionManager
- */
- public ConnectionManager getInstance();
- /**
- * Returns a connection from the pool.
- */
- public Connection getConnection() throws SQLException;
- /**
- * Initializes the Connection Manager.
- */
- public void init() throws ConfigurationException;
-}
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java (from rev 13537, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ * (C) 2005-2006
+ *
+ */
+
+package org.jboss.internal.soa.esb.persistence.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.naming.Context;
+import javax.naming.InitialContext;
+import javax.sql.DataSource;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.persistence.manager.ConnectionManager;
+
+/**
+ * J2EE datasource based Connection Pooling implementation for use when deploying to a J2EE container
+ *
+ */
+public class J2eeConnectionManager implements ConnectionManager {
+
+ private static J2eeConnectionManager instance = null;
+ @SuppressWarnings("unused")
+ private DataSource datasource = null;
+ private Context oJndiCtx = null;
+
+ private static Logger _logger = Logger.getLogger(J2eeConnectionManager.class);
+ private static final Object foo = new Integer(0);
+
+ public Connection getConnection() throws SQLException
+ {
+ return datasource.getConnection();
+ }
+
+ public ConnectionManager getInstance() {
+ if (null != instance)
+ {
+ return instance;
+ }
+
+ synchronized (foo)
+ {
+ if (null != instance)
+ return instance;
+
+ try
+ {
+ instance = new J2eeConnectionManager();
+ instance.init();
+ }
+ catch (Exception e)
+ {
+ _logger.error("Could not initialise instance.", e);
+
+ return null;
+ }
+
+ return instance;
+ }
+ }
+
+ public void init() throws ConfigurationException {
+ _logger.info("initializing...");
+
+
+ try
+ {
+ oJndiCtx = new InitialContext();
+ if (null == oJndiCtx) {
+ _logger.error("could not get a valid context");
+ throw new ConfigurationException("could not get a valid context - check your settings in the config file");
+ }
+ String dataSourcename = Configuration.getStoreDBDatasourceName();
+ datasource = ((DataSource) oJndiCtx.lookup(dataSourcename));
+ }
+ catch (Exception ex)
+ {
+ throw new ConfigurationException(ex);
+ }
+ }
+
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/J2eeConnectionManager.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java (from rev 13537, labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -0,0 +1,137 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author daniel.brum at jboss.com
+ */
+
+package org.jboss.internal.soa.esb.persistence.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.apache.log4j.Logger;
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.common.Configuration;
+import org.jboss.soa.esb.persistence.manager.ConnectionManager;
+
+import com.mchange.v2.c3p0.ComboPooledDataSource;
+
+/**
+ * C3PO Connection Pooling implementation for stand-alone use, outside of a J2EE container
+ *
+ */
+public class StandaloneConnectionManager implements ConnectionManager
+{
+
+ private static StandaloneConnectionManager instance = null;
+
+ protected ComboPooledDataSource pooledDS = null;
+
+ private static final Object foo = new Integer(0);
+
+ private static Logger _logger = Logger.getLogger(StandaloneConnectionManager.class);
+
+ public ConnectionManager getInstance ()
+ {
+ if (null != instance)
+ {
+ return instance;
+ }
+
+ synchronized (foo)
+ {
+ if (null != instance)
+ return instance;
+
+ try
+ {
+ instance = new StandaloneConnectionManager();
+ instance.init();
+ }
+ catch (Exception e)
+ {
+ _logger.error("Could not initialise instance.", e);
+
+ return null;
+ }
+
+ return instance;
+ }
+ }
+
+ public void init () throws ConfigurationException
+ {
+ _logger.info("initializing...");
+ pooledDS = new ComboPooledDataSource();
+
+ try
+ {
+ pooledDS.setDriverClass(Configuration.getStoreDriver());
+ pooledDS.setJdbcUrl(Configuration.getStoreUrl());
+ pooledDS.setUser(Configuration.getStoreUser());
+ pooledDS.setPassword(Configuration.getStorePwd());
+ pooledDS.setMinPoolSize(Integer.valueOf(Configuration
+ .getStorePoolMinSize()));
+ pooledDS.setInitialPoolSize(Integer.valueOf(Configuration
+ .getStorePoolInitialSize()));
+ pooledDS.setMaxPoolSize(Integer.valueOf(Configuration
+ .getStorePoolMaxSize()));
+ pooledDS.setAutomaticTestTable(Configuration.getStorePoolTestTable());
+ pooledDS.setCheckoutTimeout(Integer.valueOf(Configuration
+ .getStorePoolTimeoutMillis()));
+ }
+ catch (Exception ex)
+ {
+ throw new ConfigurationException(ex);
+ }
+ }
+
+ public Connection getConnection () throws SQLException
+ {
+ Connection conn = null;
+
+ // TODO: figure out why this is neccessary - pool should never return
+ // null if DB is up and can connect
+ // testing showed null was being returned from pool in QA test
+ // MessageStoreTest
+
+ while (true)
+ {
+ if (null != pooledDS)
+ {
+ if (null != (conn = pooledDS.getConnection()))
+ break;
+ else
+ _logger.error("Null pooledDS");
+ }
+
+ try
+ {
+ // TODO magic number
+
+ Thread.sleep(1000);
+ }
+ catch (Exception e)
+ {
+ }
+ }
+
+ return conn;
+ }
+
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/StandaloneConnectionManager.java
___________________________________________________________________
Name: svn:eol-style
+ native
Copied: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManager.java (from rev 13537, labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/persistence/manager/ConnectionManager.java)
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManager.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManager.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -0,0 +1,43 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author daniel.brum at jboss.com
+ */
+
+package org.jboss.soa.esb.persistence.manager;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import org.jboss.soa.esb.ConfigurationException;
+
+public interface ConnectionManager {
+ /**
+ *
+ * @return ConnectionManager
+ */
+ public ConnectionManager getInstance();
+ /**
+ * Returns a connection from the pool.
+ */
+ public Connection getConnection() throws SQLException;
+ /**
+ * Initializes the Connection Manager.
+ */
+ public void init() throws ConfigurationException;
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManager.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactory.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -2,7 +2,7 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
+import org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.util.ClassUtil;
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/J2eeConnectionManager.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -1,81 +0,0 @@
-package org.jboss.soa.esb.persistence.manager;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.sql.DataSource;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Configuration;
-
-/**
- * J2EE datasource based Connection Pooling implementation for use when deploying to a J2EE container
- *
- */
-public class J2eeConnectionManager implements ConnectionManager {
-
- private static J2eeConnectionManager instance = null;
- @SuppressWarnings("unused")
- private DataSource datasource = null;
- private Context oJndiCtx = null;
-
- private static Logger _logger = Logger.getLogger(J2eeConnectionManager.class);
- private static final Object foo = new Integer(0);
-
- public Connection getConnection() throws SQLException
- {
- return datasource.getConnection();
- }
-
- public ConnectionManager getInstance() {
- if (null != instance)
- {
- return instance;
- }
-
- synchronized (foo)
- {
- if (null != instance)
- return instance;
-
- try
- {
- instance = new J2eeConnectionManager();
- instance.init();
- }
- catch (Exception e)
- {
- _logger.error("Could not initialise instance.", e);
-
- return null;
- }
-
- return instance;
- }
- }
-
- public void init() throws ConfigurationException {
- _logger.info("initializing...");
-
-
- try
- {
- oJndiCtx = new InitialContext();
- if (null == oJndiCtx) {
- _logger.error("could not get a valid context");
- throw new ConfigurationException("could not get a valid context - check your settings in the config file");
- }
- String dataSourcename = Configuration.getStoreDBDatasourceName();
- datasource = ((DataSource) oJndiCtx.lookup(dataSourcename));
- }
- catch (Exception ex)
- {
- throw new ConfigurationException(ex);
- }
- }
-
-}
Deleted: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/persistence/manager/StandaloneConnectionManager.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -1,141 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author daniel.brum at jboss.com
- */
-
-package org.jboss.soa.esb.persistence.manager;
-
-import java.sql.Connection;
-import java.sql.SQLException;
-
-import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
-import org.jboss.soa.esb.ConfigurationException;
-import org.jboss.soa.esb.common.Configuration;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
-/**
- * C3PO Connection Pooling implementation for stand-alone use, outside of a J2EE container
- *
- */
-public class StandaloneConnectionManager implements ConnectionManager
-{
-
- private static StandaloneConnectionManager instance = null;
-
- protected ComboPooledDataSource pooledDS = null;
-
- private static final Object foo = new Integer(0);
-
- private static Logger _logger = Logger.getLogger(StandaloneConnectionManager.class);
-
- protected StandaloneConnectionManager ()
- {
- }
-
- public ConnectionManager getInstance ()
- {
- if (null != instance)
- {
- return instance;
- }
-
- synchronized (foo)
- {
- if (null != instance)
- return instance;
-
- try
- {
- instance = new StandaloneConnectionManager();
- instance.init();
- }
- catch (Exception e)
- {
- _logger.error("Could not initialise instance.", e);
-
- return null;
- }
-
- return instance;
- }
- }
-
- public void init () throws ConfigurationException
- {
- _logger.info("initializing...");
- pooledDS = new ComboPooledDataSource();
-
- try
- {
- pooledDS.setDriverClass(Configuration.getStoreDriver());
- pooledDS.setJdbcUrl(Configuration.getStoreUrl());
- pooledDS.setUser(Configuration.getStoreUser());
- pooledDS.setPassword(Configuration.getStorePwd());
- pooledDS.setMinPoolSize(Integer.valueOf(Configuration
- .getStorePoolMinSize()));
- pooledDS.setInitialPoolSize(Integer.valueOf(Configuration
- .getStorePoolInitialSize()));
- pooledDS.setMaxPoolSize(Integer.valueOf(Configuration
- .getStorePoolMaxSize()));
- pooledDS.setAutomaticTestTable(Configuration.getStorePoolTestTable());
- pooledDS.setCheckoutTimeout(Integer.valueOf(Configuration
- .getStorePoolTimeoutMillis()));
- }
- catch (Exception ex)
- {
- throw new ConfigurationException(ex);
- }
- }
-
- public Connection getConnection () throws SQLException
- {
- Connection conn = null;
-
- // TODO: figure out why this is neccessary - pool should never return
- // null if DB is up and can connect
- // testing showed null was being returned from pool in QA test
- // MessageStoreTest
-
- while (true)
- {
- if (null != pooledDS)
- {
- if (null != (conn = pooledDS.getConnection()))
- break;
- else
- _logger.error("Null pooledDS");
- }
-
- try
- {
- // TODO magic number
-
- Thread.sleep(1000);
- }
- catch (Exception e)
- {
- }
- }
-
- return conn;
- }
-
-}
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerFactoryUnitTest.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -27,7 +27,6 @@
import javax.naming.NamingException;
import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.common.ModulePropertyManager;
Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/persistence/manager/ConnectionManagerUnitTest.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -15,7 +15,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
* (C) 2005-2006
- * */
+ *
+ */
package org.jboss.soa.esb.persistence.manager;
import java.sql.Connection;
@@ -26,7 +27,6 @@
import javax.naming.NamingException;
import org.apache.log4j.Logger;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.common.Environment;
import org.jboss.soa.esb.common.ModulePropertyManager;
@@ -39,8 +39,8 @@
* @author tcunning at redhat.com
*/
public class ConnectionManagerUnitTest extends BaseTest {
- private static final String JEE_CONNECTIONMGR_CLASS = "org.jboss.soa.esb.persistence.manager.J2eeConnectionManager";
- private static final String STANDALONE_CONNECTIONMGR_CLASS = "org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager";
+ private static final String JEE_CONNECTIONMGR_CLASS = "org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager";
+ private static final String STANDALONE_CONNECTIONMGR_CLASS = "org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager";
private static final Logger logger = Logger.getLogger(ConnectionManagerFactoryUnitTest.class);
protected void setUp() throws Exception {
Modified: labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb-properties.xml 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/samples/trailblazer/esb/conf/jbossesb-properties.xml 2007-07-19 20:44:36 UTC (rev 13651)
@@ -66,7 +66,7 @@
<property name="abandoned-connection-time-interval" value="30000"/>
</properties>
<properties name="dbstore">
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
<property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
<property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/main/java/org/jboss/internal/soa/esb/persistence/format/db/DBMessageStoreImpl.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -33,10 +33,10 @@
import org.apache.log4j.Logger;
import org.jboss.internal.soa.esb.message.urigen.DefaultMessageURIGenerator;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.internal.soa.esb.thirdparty.Base64;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.urigen.MessageURIGenerator;
+import org.jboss.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.persistence.manager.ConnectionManagerException;
import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
import org.jboss.soa.esb.services.persistence.MessageStore;
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/actions/MessagePersisterTest.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -38,12 +38,12 @@
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.actions.MessagePersister;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.helpers.ConfigTree;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
import org.jboss.soa.esb.services.persistence.MessageStore;
import org.jboss.soa.esb.testutils.HsqldbUtil;
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/esb/persistence/tests/MessageStoreUnitTest.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -43,11 +43,11 @@
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.persistence.manager.ConnectionManagerException;
import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
import org.jboss.soa.esb.services.persistence.MessageStore;
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/test/java/org/jboss/soa/esb/messagestore/MessageStoreTest.java 2007-07-19 20:44:36 UTC (rev 13651)
@@ -36,11 +36,11 @@
import org.apache.log4j.Logger;
import org.apache.log4j.xml.DOMConfigurator;
import org.jboss.internal.soa.esb.persistence.format.MessageStoreFactory;
-import org.jboss.internal.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.common.Configuration;
import org.jboss.soa.esb.message.Message;
import org.jboss.soa.esb.message.format.MessageFactory;
import org.jboss.soa.esb.message.format.MessageType;
+import org.jboss.soa.esb.persistence.manager.ConnectionManager;
import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
import org.jboss.soa.esb.services.persistence.MessageStore;
import org.jboss.soa.esb.testutils.HsqldbUtil;
Modified: labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/product/services/jbossesb/src/test/resources/jbossesb-unittest-properties.xml 2007-07-19 20:44:36 UTC (rev 13651)
@@ -63,8 +63,8 @@
<properties name="dbstore">
<!-- connection manager type -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/>
- <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
<!-- this property is only used if using the j2ee connection manager -->
<property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossesbDS"/>
Modified: labs/jbossesb/trunk/qa/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/trunk/qa/jbossesb-unittest-properties.xml 2007-07-19 20:37:07 UTC (rev 13650)
+++ labs/jbossesb/trunk/qa/jbossesb-unittest-properties.xml 2007-07-19 20:44:36 UTC (rev 13651)
@@ -58,8 +58,8 @@
</properties>
<properties name="dbstore">
<!-- connection manager type -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.StandaloneConnectionManager"/>
- <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/>
+ <!-- property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/ -->
<!-- this property is only used if using the j2ee connection manager -->
<property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossesbDS"/>
More information about the jboss-svn-commits
mailing list