[jboss-cvs] JBossAS SVN: r61988 - branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/keygenerator/hilo.

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

Author: alex.loubyansky at jboss.com
Date: 2007-04-02 10:24:21 -0400 (Mon, 02 Apr 2007)
New Revision: 61988

Modified:
   branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/keygenerator/hilo/HiLoKeyGeneratorFactory.java
Log:
JBAS-4285

Modified: branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/keygenerator/hilo/HiLoKeyGeneratorFactory.java
===================================================================
--- branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/keygenerator/hilo/HiLoKeyGeneratorFactory.java	2007-04-02 14:14:39 UTC (rev 61987)
+++ branches/Branch_4_2/server/src/main/org/jboss/ejb/plugins/keygenerator/hilo/HiLoKeyGeneratorFactory.java	2007-04-02 14:24:21 UTC (rev 61988)
@@ -28,6 +28,8 @@
 import org.jboss.ejb.plugins.cmp.jdbc.SQLUtil;
 import org.jboss.naming.Util;
 import org.jboss.deployment.DeploymentException;
+import org.jboss.tm.TransactionManagerLocator;
+import org.jboss.mx.util.MBeanServerLocator;
 
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
@@ -273,7 +275,7 @@
       // bind the factory
       Util.rebind(ctx, getFactoryName(), this);
 
-      tm = (TransactionManager)ctx.lookup("java:/TransactionManager");
+      tm = TransactionManagerLocator.getInstance().locate();
 
       ds = lookupDataSource(dataSource);
       initSequence(tableName, sequenceColumn, sequenceName, idColumnName);
@@ -428,9 +430,20 @@
       idColumnName = (String)getField.get("idColumnName", null);
       createTableDdl = (String)getField.get("createTableDdl", null);
       selectHiSql = (String)getField.get("selectHiSql", null);
-      blockSize = getField.get("blockSize", 0);
+      blockSize = getField.get("blockSize", (long)0);
 
       createTable = getField.get("createTable", true);
       dropTable = getField.get("dropTable", false);
+
+      server = MBeanServerLocator.locateJBoss();
+      tm = TransactionManagerLocator.getInstance().locate();
+      try
+      {
+         ds = lookupDataSource(dataSource);
+      }
+      catch(Exception e)
+      {
+         throw new IllegalStateException("Failed to lookup the DataSource " + dataSource, e);
+      }
    }
 }