[jboss-cvs] JBossAS SVN: r61225 - in branches/Branch_4_2/ejb3: src/main/org/jboss/ejb3 and 1 other directory.

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

Author: bdecoste
Date: 2007-03-08 11:55:13 -0500 (Thu, 08 Mar 2007)
New Revision: 61225

Modified:
   branches/Branch_4_2/ejb3/build-test.xml
   branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
Log:
[EJBTHREE-903] check for lib deployments regardless of classes in ejb3 deployment

Modified: branches/Branch_4_2/ejb3/build-test.xml
===================================================================
--- branches/Branch_4_2/ejb3/build-test.xml	2007-03-08 16:22:55 UTC (rev 61224)
+++ branches/Branch_4_2/ejb3/build-test.xml	2007-03-08 16:55:13 UTC (rev 61225)
@@ -2586,7 +2586,7 @@
 
       <jar jarfile="${build.lib}/libdeployment-test.jar">
          <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/libdeployment/*.class"/>
+            <include name="org/jboss/ejb3/test/libdeployment/Stateless*.class"/>
          </fileset>
          <fileset dir="${resources}/test/libdeployment">
             <include name="META-INF/*.xml"/>

Modified: branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	2007-03-08 16:22:55 UTC (rev 61224)
+++ branches/Branch_4_2/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java	2007-03-08 16:55:13 UTC (rev 61225)
@@ -377,10 +377,8 @@
             deployElement(stream, factory, initialContext);
          }
       }
-      else
-      {
-         deployBeansFromLib(initialContext);
-      }
+ 
+      deployBeansFromLib(initialContext);
    }
 
    protected void deployUrl(Ejb3HandlerFactory factory)