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

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

Author: bdecoste
Date: 2007-03-08 14:09:33 -0500 (Thu, 08 Mar 2007)
New Revision: 61231

Modified:
   trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java
   trunk/ejb3/src/resources/META-INF/jboss-service.xml
Log:
[EJBTHREE-877] merged from Branch_4_2

Modified: trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java	2007-03-08 18:21:47 UTC (rev 61230)
+++ trunk/ejb3/src/main/org/jboss/ejb3/EJB3Deployer.java	2007-03-08 19:09:33 UTC (rev 61231)
@@ -78,6 +78,8 @@
    private SubDeployer thisProxy;
 
    private Properties DefaultProperties;
+   
+   private boolean deployEjb3ExtensionOnly;
 
    private HashSet ignoredJarsSet;
    private HashMap<DeploymentInfo, String> jmxNames = new HashMap();
@@ -243,6 +245,7 @@
       {
          return true;
       }
+      
       // To be accepted the deployment's root name must end in jar
       if (!urlStr.endsWith(".jar") && !urlStr.endsWith(".jar/"))
       {
@@ -253,11 +256,15 @@
       {
          return false;
       }
-
-      if (hasPersistenceXml(di)) return true;
-      if (hasOnlyJbossXml(di)) return true;
+      
       if (has30EjbJarXml(di)) return true;
-      if (hasEjbAnnotation(di)) return true;
+         
+      if (!deployEjb3ExtensionOnly)
+      {
+         if (hasPersistenceXml(di)) return true;
+         if (hasOnlyJbossXml(di)) return true;
+         if (hasEjbAnnotation(di)) return true;
+      }
 
 
       return false;
@@ -272,6 +279,16 @@
    {
       ignoredJarsSet = mbean.getIgnoredJarsSet();
    }
+   
+   public boolean getDeployEjb3ExtensionOnly()
+   {
+      return deployEjb3ExtensionOnly;
+   }
+   
+   public void setDeployEjb3ExtensionOnly(boolean deployEjb3ExtensionOnly)
+   {
+      this.deployEjb3ExtensionOnly = deployEjb3ExtensionOnly;
+   }
 
    /**
     * Overriden to set the hibernate.bytecode.provider from the

Modified: trunk/ejb3/src/resources/META-INF/jboss-service.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/jboss-service.xml	2007-03-08 18:21:47 UTC (rev 61230)
+++ trunk/ejb3/src/resources/META-INF/jboss-service.xml	2007-03-08 19:09:33 UTC (rev 61231)
@@ -102,6 +102,8 @@
 
    <mbean code="org.jboss.ejb3.EJB3Deployer" name="jboss.ejb3:service=EJB3Deployer" xmbean-dd="">
 
+      <attribute name="DeployEjb3ExtensionOnly">false</attribute>
+      
       <!-- Inline XMBean Descriptor BEGIN -->
       <xmbean>
          <description>The EJB3Deployer responsible for ejb3 deployment</description>
@@ -156,6 +158,12 @@
             <name>DefaultProperties</name>
             <type>java.util.Properties</type>
          </attribute>
+         
+         <attribute access="read-write" getMethod="getDeployEjb3ExtensionOnly" setMethod="setDeployEjb3ExtensionOnly">
+            <description>If true, .jars will not be examined for annotations, 3.0 descriptors</description>
+            <name>DeployEjb3ExtensionOnly</name>
+            <type>boolean</type>
+         </attribute>
 
          <attribute access="write-only" setMethod="setJarsIgnoredForScanning">
             <description>mbean that has list of jars to ignore</description>