[jboss-cvs] JBossAS SVN: r90538 - in projects/webbeans-ri-int/trunk: deployer/src/main/java/org/jboss/webbeans/integration/deployer/env and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jun 23 19:14:31 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-23 19:14:30 -0400 (Tue, 23 Jun 2009)
New Revision: 90538
Modified:
projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java
projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java
Log:
Fix up the exceptions a bit, bind manager at app/BeanManager
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml 2009-06-23 22:52:10 UTC (rev 90537)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml 2009-06-23 23:14:30 UTC (rev 90538)
@@ -41,7 +41,7 @@
<!-- Responsible for adding the Web Beans Manager object factory to JNDI -->
<bean name="WebBeansJndiBinder" class="org.jboss.webbeans.integration.deployer.env.WebBeansJndiBinder">
<start method="startService">
- <parameter>java:app/Manager</parameter>
+ <parameter>java:app/BeanManager</parameter>
<parameter>org.jboss.webbeans.resources.ManagerObjectFactory</parameter>
</start>
<stop method="stopService"/>
Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java 2009-06-23 22:52:10 UTC (rev 90537)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansJndiBinder.java 2009-06-23 23:14:30 UTC (rev 90538)
@@ -18,19 +18,18 @@
package org.jboss.webbeans.integration.deployer.env;
import javax.enterprise.inject.spi.BeanManager;
-import javax.inject.ExecutionException;
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
import javax.naming.Reference;
/**
- * This singleton bean for the deployer is responsible for binding
- * an object factory to the required name(s) in JNDI. Once bound,
- * all deployed applications can obtain the Web Beans manager from JNDI.
+ * This singleton bean for the deployer is responsible for binding an object
+ * factory to the required name(s) in JNDI. Once bound, all deployed
+ * applications can obtain the Web Beans manager from JNDI.
*
* @author David Allen
- *
+ *
*/
public class WebBeansJndiBinder
{
@@ -38,7 +37,7 @@
/**
* Start the service.
- *
+ *
* @param jndiContextPath the jndi context path
* @param managerObjectFactoryClass the manager object factory
* @throws Exception for any error
@@ -52,7 +51,7 @@
/**
* Stop the service.
- *
+ *
* @throws Exception for any error
*/
public void stopService() throws Exception
@@ -63,7 +62,7 @@
/**
* Bind object to jndi.
- *
+ *
* @param key the key
* @param binding the object to bind
* @throws Exception for any error
@@ -93,7 +92,7 @@
}
catch (NamingException e)
{
- throw new ExecutionException("Cannot bind " + binding + " to " + key, e);
+ throw new RuntimeException("Cannot bind " + binding + " to " + key, e);
}
}
}
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-06-23 22:52:10 UTC (rev 90537)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbServices.java 2009-06-23 23:14:30 UTC (rev 90538)
@@ -8,7 +8,6 @@
import javax.ejb.EJB;
import javax.enterprise.inject.spi.InjectionPoint;
-import javax.inject.ExecutionException;
import javax.naming.NamingException;
import org.jboss.deployers.structure.spi.DeploymentUnit;
@@ -95,7 +94,7 @@
}
catch (NamingException e)
{
- throw new ExecutionException("Error retreiving EJB from JNDI for injection point " + injectionPoint, e);
+ throw new RuntimeException("Error retreiving EJB from JNDI for injection point " + injectionPoint, e);
}
}
@@ -107,7 +106,7 @@
}
catch (NamingException e)
{
- throw new ExecutionException("Error retreiving EJB from JNDI " + ejbDescriptor, e);
+ throw new RuntimeException("Error retreiving EJB from JNDI " + ejbDescriptor, e);
}
}
@@ -121,7 +120,7 @@
}
catch (NamingException e)
{
- throw new ExecutionException("Error retreiving EJB from JNDI with mappedName " + mappedName, e);
+ throw new RuntimeException("Error retreiving EJB from JNDI with mappedName " + mappedName, e);
}
}
else if (jndiName != null)
@@ -132,7 +131,7 @@
}
catch (NamingException e)
{
- throw new ExecutionException("Error retreiving EJB from JNDI with mappedName " + jndiName, e);
+ throw new RuntimeException("Error retreiving EJB from JNDI with mappedName " + jndiName, e);
}
}
else
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java 2009-06-23 22:52:10 UTC (rev 90537)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/messaging/JBossJmsServices.java 2009-06-23 23:14:30 UTC (rev 90538)
@@ -1,6 +1,5 @@
package org.jboss.webbeans.integration.messaging;
-import javax.inject.ExecutionException;
import javax.jms.Destination;
import javax.jms.QueueConnectionFactory;
import javax.jms.TopicConnectionFactory;
@@ -37,7 +36,7 @@
}
catch (NamingException e)
{
- throw new ExecutionException("Error looking up connection factory in JNDI " + CONNECTION_FACTORY_NAME, e);
+ throw new RuntimeException("Error looking up connection factory in JNDI " + CONNECTION_FACTORY_NAME, e);
}
}
@@ -49,7 +48,7 @@
}
catch (NamingException e)
{
- throw new ExecutionException("Error looking up connection factory in JNDI " + CONNECTION_FACTORY_NAME, e);
+ throw new RuntimeException("Error looking up connection factory in JNDI " + CONNECTION_FACTORY_NAME, e);
}
}
Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java 2009-06-23 22:52:10 UTC (rev 90537)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/transaction/JBossTransactionServices.java 2009-06-23 23:14:30 UTC (rev 90538)
@@ -17,7 +17,6 @@
package org.jboss.webbeans.integration.transaction;
-import javax.inject.ExecutionException;
import static javax.transaction.Status.STATUS_ACTIVE;
import javax.transaction.Synchronization;
@@ -48,7 +47,7 @@
}
catch (SystemException e)
{
- throw new ExecutionException("Failed to determine transaction status", e);
+ throw new RuntimeException("Failed to determine transaction status", e);
}
}
@@ -86,7 +85,7 @@
}
catch (Exception e)
{
- throw new ExecutionException("Failed to register synchronization " + synchronizedObserver + " for current transaction", e);
+ throw new RuntimeException("Failed to register synchronization " + synchronizedObserver + " for current transaction", e);
}
}
}
More information about the jboss-cvs-commits
mailing list