Author: rmannibucau
Date: Wed May 2 10:05:57 2012
New Revision: 1332973
URL: http://svn.apache.org/viewvc?rev=1332973&view=rev
Log:
adding ExceptionManagerFacade in internal module if webapp deployer is present
(they are in the same module so no need to double check)
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
openejb/trunk/openejb/utils/webdeployer/src/main/java/org/apache/tomee/catalina/deployer/WebappDeployer.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java?rev=1332973&r1=1332972&r2=1332973&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/SystemApps.java
Wed May 2 10:05:57 2012
@@ -20,6 +20,7 @@ import org.apache.openejb.assembler.Depl
import org.apache.openejb.assembler.classic.cmd.ConfigurationInfoEjb;
import org.apache.openejb.assembler.monitoring.JMXDeployer;
import org.apache.openejb.jee.EjbJar;
+import org.apache.openejb.jee.SingletonBean;
import org.apache.openejb.jee.StatelessBean;
import org.apache.openejb.jee.oejb3.EjbDeployment;
import org.apache.openejb.jee.oejb3.OpenejbJar;
@@ -44,9 +45,12 @@ public class SystemApps {
final String className =
"org.apache.tomee.catalina.deployer.WebappDeployer";
if (exists(className)) {
- final StatelessBean bean = ejbJar.addEnterpriseBean(new
StatelessBean("openejb/WebappDeployer", className));
+ final SingletonBean bean = ejbJar.addEnterpriseBean(new
SingletonBean("openejb/WebappDeployer", className));
final EjbDeployment deployment = openejbJar.addEjbDeployment(bean);
deployment.getProperties().put("openejb.jndiname.format",
"{deploymentId}{interfaceType.annotationName}");
+
+ final SingletonBean exceptionManager =
ejbJar.addEnterpriseBean(new SingletonBean("openejb/ExceptionManagerFacade",
"org.apache.tomee.catalina.facade.ExceptionManagerFacadeBean"));
+
openejbJar.addEjbDeployment(exceptionManager).getProperties().put("openejb.jndiname.format",
"{deploymentId}{interfaceType.annotationName}");
}
Modified:
openejb/trunk/openejb/utils/webdeployer/src/main/java/org/apache/tomee/catalina/deployer/WebappDeployer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/webdeployer/src/main/java/org/apache/tomee/catalina/deployer/WebappDeployer.java?rev=1332973&r1=1332972&r2=1332973&view=diff
==============================================================================
---
openejb/trunk/openejb/utils/webdeployer/src/main/java/org/apache/tomee/catalina/deployer/WebappDeployer.java
(original)
+++
openejb/trunk/openejb/utils/webdeployer/src/main/java/org/apache/tomee/catalina/deployer/WebappDeployer.java
Wed May 2 10:05:57 2012
@@ -16,6 +16,17 @@
*/
package org.apache.tomee.catalina.deployer;
+import java.io.File;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Properties;
+import javax.ejb.Lock;
+import javax.ejb.LockType;
+import javax.ejb.Remote;
+import javax.ejb.Singleton;
+import javax.ejb.TransactionManagement;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
import org.apache.catalina.Container;
import org.apache.catalina.Engine;
import org.apache.catalina.Service;
@@ -37,19 +48,10 @@ import org.apache.tomee.catalina.TomEERu
import org.apache.tomee.catalina.TomcatWebAppBuilder;
import org.apache.tomee.loader.TomcatHelper;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.management.MBeanServer;
-import javax.management.ObjectName;
-import java.io.File;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Properties;
-
import static javax.ejb.TransactionManagementType.BEAN;
-@Stateless(name = "openejb/WebappDeployer")
+@Lock(LockType.READ)
+@Singleton(name = "openejb/WebappDeployer")
@Remote(Deployer.class)
@TransactionManagement(BEAN)
public class WebappDeployer implements Deployer {
