[jboss-svn-commits] JBL Code SVN: r8186 - in labs/jbossesb/trunk: product/core/listeners/src/org/jboss/soa/esb/actions/routing product/core/rosetta/src/org/jboss/soa/esb/common product/core/rosetta/tests/resources/etc product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/propertymanager product/etc/test/resources product/install/conf qa/junit/src/org/jboss/soa/esb/util
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Dec 10 15:33:46 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-10 15:33:41 -0500 (Sun, 10 Dec 2006)
New Revision: 8186
Modified:
labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
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
labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/jbossesb-test-properties.xml
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/propertymanager/PropertyManagerUnitTest.java
labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml
labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java
Log:
renaming connection.factory to context.factory
Modified: labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/product/core/listeners/src/org/jboss/soa/esb/actions/routing/JMSRouter.java 2006-12-10 20:33:41 UTC (rev 8186)
@@ -178,7 +178,7 @@
private JMSSendQueueSetup(String queueName) throws NamingException, JMSException {
Context m_oCtx = NamingContext.getServerContext(
Configuration.getJndiServerURL(),
- Configuration.getJndiServerConnectionFactory(),
+ Configuration.getJndiServerContextFactory(),
Configuration.getJndiServerPkgPrefix());
QueueConnectionFactory qcf = (QueueConnectionFactory) m_oCtx.lookup("ConnectionFactory");
QueueConnection oQconn = qcf.createQueueConnection();
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 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Configuration.java 2006-12-10 20:33:41 UTC (rev 8186)
@@ -35,7 +35,7 @@
new KeyValuePair(Environment.SMTP_FROM, getSmtpFrom()),
new KeyValuePair(Environment.SMTP_AUTH, getSmtpAuth()),
new KeyValuePair(Environment.JNDI_SERVER_URL, getJndiServerURL()),
- new KeyValuePair(Environment.JNDI_SERVER_CONNECTION_FACTORY,getJndiServerConnectionFactory()),
+ new KeyValuePair(Environment.JNDI_SERVER_CONTEXT_FACTORY, getJndiServerContextFactory()),
new KeyValuePair(Environment.JNDI_SERVER_PKG_PREFIX, getJndiServerPkgPrefix()),
new KeyValuePair(Environment.REGISTRY_QUERY_MANAGER_URI, getRegistryQueryManageURI()),
new KeyValuePair(Environment.REGISTRY_LIFECYCLE_MANAGER_URI,getRegistryLifecycleManagerURI()),
@@ -113,9 +113,9 @@
Environment.DEFAULT_HOST);
}
- public static String getJndiServerConnectionFactory()
+ public static String getJndiServerContextFactory()
{
- return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_CONNECTION_FACTORY,
+ return ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty(Environment.JNDI_SERVER_CONTEXT_FACTORY,
Environment.DEFAULT_JNDI_CONTEXT_FACTORY);
}
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 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/common/Environment.java 2006-12-10 20:33:41 UTC (rev 8186)
@@ -41,7 +41,7 @@
* Code properties
*/
public static final String JNDI_SERVER_URL = "org.jboss.soa.esb.jndi.server.url";
- public static final String JNDI_SERVER_CONNECTION_FACTORY = "org.jboss.soa.esb.jndi.server.connection.factory";
+ public static final String JNDI_SERVER_CONTEXT_FACTORY = "org.jboss.soa.esb.jndi.server.context.factory";
public static final String JNDI_SERVER_PKG_PREFIX = "org.jboss.soa.esb.jndi.server.pkg.prefix";
public static final String PARAMS_REPOS_IMPL_CLASS = "org.jboss.soa.esb.paramsRepository.class";
public static final String OBJECT_STORE_CONFIG_FILE = "org.jboss.soa.esb.objStore.configFile";
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/jbossesb-test-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/jbossesb-test-properties.xml 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/resources/etc/jbossesb-test-properties.xml 2006-12-10 20:33:41 UTC (rev 8186)
@@ -31,7 +31,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
<properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.connection.factory" value="foobar"/>
+ <property name="org.jboss.soa.esb.jndi.server.context.factory" value="foobar"/>
<property name="org.jboss.soa.esb.objStore.configFile" value="file:config.xml"/>
</properties>
<properties name="transports" depends="core">
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/propertymanager/PropertyManagerUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/propertymanager/PropertyManagerUnitTest.java 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/propertymanager/PropertyManagerUnitTest.java 2006-12-10 20:33:41 UTC (rev 8186)
@@ -50,7 +50,7 @@
fail(e.toString());
}
- assertEquals(corepm.getProperty(Environment.JNDI_SERVER_CONNECTION_FACTORY), "foobar");
+ assertEquals(corepm.getProperty(Environment.JNDI_SERVER_CONTEXT_FACTORY), "foobar");
assertEquals(corepm.getProperty(Environment.OBJECT_STORE_CONFIG_FILE), "file:config.xml");
try
@@ -80,7 +80,7 @@
fail(e.toString());
}
- assertEquals(transportpm.getProperty(Environment.JNDI_SERVER_CONNECTION_FACTORY), "foobar");
+ assertEquals(transportpm.getProperty(Environment.JNDI_SERVER_CONTEXT_FACTORY), "foobar");
assertEquals(transportpm.getProperty(Environment.SMTP_HOST), "thishost");
}
Modified: labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/product/etc/test/resources/jbossesb-unittest-properties.xml 2006-12-10 20:33:41 UTC (rev 8186)
@@ -30,8 +30,8 @@
<esb
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
- <properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+ <properties name="core">
+ <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
<property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
</properties>
Modified: labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml
===================================================================
--- labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/product/install/conf/jbossesb-properties.xml 2006-12-10 20:33:41 UTC (rev 8186)
@@ -31,7 +31,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
<properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.type" value="jboss"/>
+ <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
<property name="org.jboss.soa.esb.jndi.server.url" value="localhost"/>
<property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
</properties>
Modified: labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java
===================================================================
--- labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java 2006-12-10 20:14:52 UTC (rev 8185)
+++ labs/jbossesb/trunk/qa/junit/src/org/jboss/soa/esb/util/JMSClientUtil.java 2006-12-10 20:33:41 UTC (rev 8186)
@@ -102,7 +102,7 @@
private JMSSendQueueSetup(QUEUE queue) throws Exception {
Context m_oCtx = NamingContext.getServerContext(
Configuration.getJndiServerURL(),
- Configuration.getJndiServerConnectionFactory(),
+ Configuration.getJndiServerContextFactory(),
Configuration.getJndiServerPkgPrefix());
QueueConnectionFactory qcf = (QueueConnectionFactory) m_oCtx.lookup("ConnectionFactory");
QueueConnection oQconn = qcf.createQueueConnection();
More information about the jboss-svn-commits
mailing list