From: <eag...@us...> - 2013-01-29 22:24:08
|
Revision: 6809 http://jaffa.svn.sourceforge.net/jaffa/?rev=6809&view=rev Author: eagleigor Date: 2013-01-29 22:24:02 +0000 (Tue, 29 Jan 2013) Log Message: ----------- Update JNDI Lookup Modified Paths: -------------- branches/JBOSS_7/console/jaffa-console-api/src/main/java/org/jaffa/wsapi/apis/QuartzStateManagerService.java Modified: branches/JBOSS_7/console/jaffa-console-api/src/main/java/org/jaffa/wsapi/apis/QuartzStateManagerService.java =================================================================== --- branches/JBOSS_7/console/jaffa-console-api/src/main/java/org/jaffa/wsapi/apis/QuartzStateManagerService.java 2013-01-29 22:23:04 UTC (rev 6808) +++ branches/JBOSS_7/console/jaffa-console-api/src/main/java/org/jaffa/wsapi/apis/QuartzStateManagerService.java 2013-01-29 22:24:02 UTC (rev 6809) @@ -69,10 +69,10 @@ import javax.transaction.Transaction; import javax.transaction.TransactionManager; import org.jaffa.wsapi.apis.helper.OrderedProperties; -import org.jboss.mq.SpyJMSException; -import org.jboss.tm.TransactionManagerService; +import org.jboss.tm.TransactionManagerLocator; + /** * The QuartzStateManagerService is used to create and populate the Quartz tables * and data related to Quartz tables into in-memory DB on Quartz service start up @@ -214,7 +214,9 @@ InitialContext ctx = new InitialContext(); try { this.dataSource = ((DataSource) ctx.lookup(dsName)); - this.tm = ((TransactionManager) ctx.lookup(TransactionManagerService.JNDI_NAME)); + //this.tm = ((TransactionManager) ctx.lookup(TransactionManagerService.JNDI_NAME)); + // TODO: Validate JNDI lookup + this.tm = (TransactionManager) TransactionManagerLocator.locateTransactionManager(); } finally { ctx.close(); } @@ -336,7 +338,8 @@ throw t; } } catch (Throwable t) { - throw new SpyJMSException("Error creating connection to the database.", t); + // OLD: throw new SpyJMSException("Error creating connection to the database.", t); + throw new JMSException("Error creating connection to the database."); } } @@ -412,7 +415,8 @@ QuartzStateManagerService.this.tm.commit(); } } catch (Exception e) { - throw new SpyJMSException("Could not commit/rollback a transaction with the transaction manager.", e); + //OLD: throw new SpyJMSException("Could not commit/rollback a transaction with the transaction manager.", e); + throw new JMSException("Could not commit/rollback a transaction with the transaction manager."); } finally { try { if (this.threadTx != null) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |