[jboss-cvs] JBoss Messaging SVN: r3311 - branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer.

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

Author: ataylor
Date: 2007-11-12 04:25:50 -0500 (Mon, 12 Nov 2007)
New Revision: 3311

Modified:
   branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java
Log:
initial microcontainer integration, fix for embedded datasource

Modified: branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java
===================================================================
--- branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java	2007-11-11 23:28:33 UTC (rev 3310)
+++ branches/Branch_MC_Integration_New/src/main/org/jboss/jms/server/microcontainer/ServiceLocator.java	2007-11-12 09:25:50 UTC (rev 3311)
@@ -28,7 +28,6 @@
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
-import javax.naming.NameNotFoundException;
 import javax.sql.DataSource;
 import javax.transaction.TransactionManager;
 
@@ -85,9 +84,9 @@
            {
               dataSource = (DataSource)ic.lookup("java:DefaultDS");
            }
-           catch (NameNotFoundException e)
+           catch (Exception e)
            {
-              dataSource = (DataSource) kernelControllerContext.getController().getInstalledContext("DataSource").getTarget();
+              dataSource = (DataSource) kernelControllerContext.getController().getInstalledContext("jboss.jca:name=DefaultDS,service=DataSourceBinding").getTarget();
            }
         }
         return dataSource;