[jboss-cvs] JBossAS SVN: r70549 - in trunk/ejb3/src: resources/META-INF and 1 other directory.

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

Author: scott.stark at jboss.org
Date: 2008-03-07 10:14:29 -0500 (Fri, 07 Mar 2008)
New Revision: 70549

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
   trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
Log:
JBAS-5281, add a scanWars property to the Ejb3Deployer

Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-03-07 15:05:40 UTC (rev 70548)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java	2008-03-07 15:14:29 UTC (rev 70549)
@@ -39,6 +39,7 @@
 import org.jboss.ejb3.remoting.RemoteProxyFactoryRegistry;
 import org.jboss.kernel.Kernel;
 import org.jboss.metadata.ejb.jboss.JBossMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
 import org.jboss.virtual.VirtualFile;
 
 /**
@@ -70,6 +71,8 @@
    private RemoteProxyFactoryRegistry remoteProxyFactoryRegistry;
    
    private PersistenceManagerFactoryRegistry persistenceManagerFactoryRegistry;
+   /** A flag indicating if wars should be scanned for ejbs */
+   private boolean scanWars = false;
    
    public Ejb3Deployer()
    {
@@ -100,7 +103,13 @@
             log.debug("Ignoring legacy EJB deployment " + unit);
             return;
          }
-         
+         // If this is a war, check scanWars
+         if(unit.getAttachment(JBossWebMetaData.class) != null && scanWars == false)
+         {
+            log.trace("Skipping web deployment: "+unit.getSimpleName());
+            return;            
+         }
+
          VirtualFile jar = unit.getRoot();
          if (jar.isLeaf() || ignoredJarsSet.contains(jar.getName()))
          {
@@ -207,6 +216,15 @@
       this.persistenceManagerFactoryRegistry = persistenceManagerFactoryRegistry;
    }
 
+   public boolean isScanWars()
+   {
+      return scanWars;
+   }
+   public void setScanWars(boolean scanWars)
+   {
+      this.scanWars = scanWars;
+   }
+
    private boolean hasAllowedSuffix(String name)
    {
       if(allowedSuffixes == null)

Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2008-03-07 15:05:40 UTC (rev 70548)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml	2008-03-07 15:14:29 UTC (rev 70549)
@@ -18,6 +18,8 @@
       <property name="poolFactoryRegistry"><inject bean="EJB3PoolFactoryRegistry" /></property>
       <property name="remoteProxyFactoryRegistry"><inject bean="EJB3RemoteProxyFactoryRegistry" /></property>
       <property name="persistenceManagerFactoryRegistry"><inject bean="EJB3PersistenceManagerFactoryRegistry" /></property>
+      <!-- Should war deployments be scanned for annotated ejbs -->
+      <property name="scanWars">false</property>
       
       <!--