svn commit: r772341 - /incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java

[ge...@apache.org]

Author: gerdogdu
Date: Wed May  6 16:07:11 2009
New Revision: 772341

URL: http://svn.apache.org/viewvc?rev=772341&view=rev
Log:
Updating JNDI for connection factory

Modified:
    incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java

Modified: incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java
URL: http://svn.apache.org/viewvc/incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java?rev=772341&r1=772340&r2=772341&view=diff
==============================================================================
--- incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java (original)
+++ incubator/openwebbeans/trunk/webbeans-jms/src/main/java/org/apache/webbeans/jms/util/JmsUtil.java Wed May  6 16:07:11 2009
@@ -38,6 +38,7 @@
 import javax.jms.TopicSession;
 import javax.jms.TopicSubscriber;
 
+import org.apache.webbeans.config.OpenWebBeansConfiguration;
 import org.apache.webbeans.exception.WebBeansCreationException;
 import org.apache.webbeans.exception.WebBeansException;
 import org.apache.webbeans.jms.JMSModel;
@@ -135,7 +136,14 @@
     
     public static ConnectionFactory getConnectionFactory()
     {
-        return getJNDIService().getObject("ConnectionFactory", ConnectionFactory.class);
+        String connectionFactoryJndiName = OpenWebBeansConfiguration.getInstance().getProperty(JNDIService.JMS_CONNECTION_FACTORY_JNDI_KEY);
+        
+        if(connectionFactoryJndiName == null || connectionFactoryJndiName.equals(""))
+        {
+            connectionFactoryJndiName = JNDIService.JMS_CONNECTION_FACTORY_JNDI_DEFAULT_VALUE;
+        }
+        
+        return getJNDIService().getObject(connectionFactoryJndiName, ConnectionFactory.class);
     }
     
     public static <T> T getInstanceFromJndi(JMSModel jmsModel, Class<T> jmsClass)