svn commit: r629390 - /incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java

[antelder]

Author: antelder
Date: Wed Feb 20 01:16:12 2008
New Revision: 629390

URL: http://svn.apache.org/viewvc?rev=629390&view=rev
Log:
First try jndi lookup in java:comp environment

Modified:
    
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java

Modified: 
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
URL: 
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java?rev=629390&r1=629389&r2=629390&view=diff
==============================================================================
--- 
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
 (original)
+++ 
incubator/tuscany/java/sca/modules/binding-jms/src/main/java/org/apache/tuscany/sca/binding/jms/provider/JMSResourceFactory.java
 Wed Feb 20 01:16:12 2008
@@ -128,7 +128,7 @@
     }
 
     private void createConnection() throws NamingException, JMSException {
-        ConnectionFactory connectionFactory = 
(ConnectionFactory)getInitialContext().lookup(connectionFactoryName);
+        ConnectionFactory connectionFactory = 
(ConnectionFactory)jndiLookUp(connectionFactoryName);
         connection = connectionFactory.createConnection();
     }
 
@@ -148,14 +148,7 @@
     }
 
     public Destination lookupDestination(String jndiName) throws 
NamingException {
-        Destination dest = null;
-
-        try {
-            dest = (Destination)getInitialContext().lookup(jndiName);
-        } catch (NamingException ex) {
-
-        }
-        return dest;
+        return (Destination)jndiLookUp(jndiName);
     }
 
     /**
@@ -164,5 +157,22 @@
      */
     public Destination createDestination(String jndiName) throws 
NamingException {
         return lookupDestination("dynamicQueues/" + jndiName);
+    }
+    
+    protected Object jndiLookUp(String name) {
+        Object o = null;
+        try {
+            o = getInitialContext().lookup("java:comp/env/" + name);
+        } catch (NamingException ex) {
+            // ignore
+        }
+        if (o == null) {
+            try {
+                o = getInitialContext().lookup(name);
+            } catch (NamingException ex) {
+                // ignore
+            }
+        }
+        return o;
     }
 }



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]