[jboss-svn-commits] JBL Code SVN: r10771 - labs/jbossesb/trunk/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq.

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

Author: kurt.stam at jboss.com
Date: 2007-04-04 19:09:44 -0400 (Wed, 04 Apr 2007)
New Revision: 10771

Modified:
   labs/jbossesb/trunk/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java
Log:
making sure the InitialContext is not going to the MockContext

Modified: labs/jbossesb/trunk/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java
===================================================================
--- labs/jbossesb/trunk/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java	2007-04-04 21:05:41 UTC (rev 10770)
+++ labs/jbossesb/trunk/plugins/org.jboss.soa.esb.oracle.aq/src/main/java/org/jboss/soa/esb/oracle/aq/AQInitialContextFactory.java	2007-04-04 23:09:44 UTC (rev 10771)
@@ -26,13 +26,15 @@
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Properties;
 
 import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
 import javax.jms.JMSException;
+import javax.jms.Queue;
 import javax.jms.QueueConnection;
 import javax.jms.QueueConnectionFactory;
 import javax.jms.Session;
+import javax.jms.Topic;
 import javax.jms.TopicConnection;
 import javax.jms.TopicConnectionFactory;
 import javax.jms.XAConnectionFactory;
@@ -50,6 +52,7 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.mockejb.jndi.MockContextFactory;
 
 
 public class AQInitialContextFactory implements InitialContextFactory {
@@ -122,6 +125,7 @@
 
             XAConnectionFactory factory = AQjmsFactory.getXAConnectionFactory(xaDs);
             context.rebind(XA_CONNECTION_FACTORY, factory);
+            context.rebind("KURTSTAM", new String("hello"));
 
             // create the connection factory
             ConnectionFactory connectionFactory = AQjmsFactory.getConnectionFactory(ds);
@@ -180,17 +184,15 @@
             return;
         }
 
-        Destination destination = null;
         try {
             if (di.isMultipleSubscribers()) {
-                destination = session.getTopic(di.getOwner(), di.getQueueName());
+                Topic topic = session.getTopic(di.getOwner(), di.getQueueName());
+                context.rebind(topic.getTopicName(), topic);
             } else {
-                destination = session.getQueue(di.getOwner(), di.getQueueName());
+                Queue queue = session.getQueue(di.getOwner(), di.getQueueName());
+                context.rebind(queue.getQueueName(), queue);
             }
 
-            // place in context
-            context.rebind(di.getQueueName(), destination);
-            // data.put(QUEUE_PREFIX + aqQueueName, destination);
         } catch (Exception e) {
             // we want to eat any exceptions associated with looking up
             // the queues from the database
@@ -217,8 +219,10 @@
     @SuppressWarnings("unused")
     public Context getInitialContext(Hashtable<?,?> environment) throws NamingException {
         init(environment);
-        Hashtable<String, Object> data = new Hashtable<String, Object>();
-        Context context = new InitialContext();
+        Properties mockProperties = new Properties();
+        mockProperties.setProperty(Context.INITIAL_CONTEXT_FACTORY,MockContextFactory.class.getName());
+        mockProperties.setProperty(Context.URL_PKG_PREFIXES, "org.mockejb.jndi");
+        Context context = new InitialContext(mockProperties);
         addAQDestinationContext(context);
         return context;
     }