[jboss-svn-commits] JBL Code SVN: r9944 - labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common.

[jboss-svn-commits at lists.jboss.org]

Author: daniel.brum at jboss.com
Date: 2007-03-03 16:11:55 -0500 (Sat, 03 Mar 2007)
New Revision: 9944

Modified:
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
   labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
Log:
support for multiple connection pool managers

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2007-03-03 21:11:40 UTC (rev 9943)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java	2007-03-03 21:11:55 UTC (rev 9944)
@@ -66,7 +66,9 @@
 			new KeyValuePair(Environment.MSG_STORE_DB_POOL_INITIAL_SIZE,getStorePoolInitialSize()),
 			new KeyValuePair(Environment.MSG_STORE_DB_POOL_TEST_TABLE,  getStorePoolTestTable()),
 			new KeyValuePair(Environment.MSG_STORE_DB_POOL_TIMEOUT_MILLIS,getStorePoolTimeoutMillis()),
-			new KeyValuePair(Environment.MSG_STORE_CONN_FACTORY			 ,getStoreConnectionFactory()),
+			new KeyValuePair(Environment.MSG_STORE_CONN_FACTORY			,getStoreConnectionFactory()),
+			new KeyValuePair(Environment.MSG_STORE_DB_CONN_MANAGER		,getStoreDBConnectionManager()),
+			new KeyValuePair(Environment.MSG_STORE_DB_DATASOURCE_NAME	,getStoreDBDatasourceName()),
 			new KeyValuePair(Environment.ROUTER_CBR_CLASS,               getContentBasedRouterImplementationClass())
 	};
 
@@ -288,8 +290,20 @@
 	{
 		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.MSG_STORE_CONN_FACTORY);
 		return property;
+	}	
+	
+	public static String getStoreDBConnectionManager()
+	{
+		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE).getProperty(Environment.MSG_STORE_DB_CONN_MANAGER);
+		return property;
 	}
 	
+	public static String getStoreDBDatasourceName()
+	{
+		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.DBSTORE_MODULE).getProperty(Environment.MSG_STORE_DB_DATASOURCE_NAME);
+		return property;
+	}
+
 	public static String getContentBasedRouterImplementationClass()
 	{
 		String property = ModulePropertyManager.getPropertyManager(ModulePropertyManager.ROUTER_MODULE).getProperty(Environment.ROUTER_CBR_CLASS);

Modified: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-03-03 21:11:40 UTC (rev 9943)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java	2007-03-03 21:11:55 UTC (rev 9944)
@@ -103,12 +103,12 @@
 	public static final String DEFAULT_PASSWORD                       = "";
 	public static final String DEFAULT_PORT                           = "25";
 	public static final String DEFAULT_JNDI_CONTEXT_FACTORY           = "org.jnp.interfaces.NamingContextFactory";
-	public static final String DEFAULT_JNDI_PKG_PREFIX                = "org.jboss.naming:org.jnp.interfaces";
+	public static final String DEFAULT_JNDI_PKG_PREFIX                = "org.jnp.interfaces";
 	
 	/*
 	 * DatabaseMessageStore Persistence Store properties.
 	 */
-	public static final String MSG_STORE_CONN_FACTORY			= "org.jboss.soa.esb.persistence.connection.factory";
+	public static final String MSG_STORE_CONN_FACTORY			= "org.jboss.soa.esb.persistence.connection.factory";	
 	public static final String MSG_STORE_DB_CONNECTION_URL 		= "org.jboss.soa.esb.persistence.db.connection.url";
 	public static final String MSG_STORE_DB_CONNECTION_USER 	= "org.jboss.soa.esb.persistence.db.user";
 	public static final String MSG_STORE_DB_CONNECTION_PWD 		= "org.jboss.soa.esb.persistence.db.pwd";
@@ -118,6 +118,8 @@
 	public static final String MSG_STORE_DB_POOL_MIN_SIZE		= "org.jboss.soa.esb.persistence.db.pool.min.size";
 	public static final String MSG_STORE_DB_POOL_MAX_SIZE		= "org.jboss.soa.esb.persistence.db.pool.max.size";
 	public static final String MSG_STORE_DB_POOL_TEST_TABLE		= "org.jboss.soa.esb.persistence.db.pool.test.table";
-	public static final String MSG_STORE_DB_POOL_TIMEOUT_MILLIS	= "org.jboss.soa.esb.persistence.db.pool.timeout.millis";	
+	public static final String MSG_STORE_DB_POOL_TIMEOUT_MILLIS	= "org.jboss.soa.esb.persistence.db.pool.timeout.millis";
+	public static final String MSG_STORE_DB_CONN_MANAGER		= "org.jboss.soa.esb.persistence.db.conn.manager";
+	public static final String MSG_STORE_DB_DATASOURCE_NAME		= "org.jboss.soa.esb.persistence.db.datasource.name";
 
 }
\ No newline at end of file