[jboss-cvs] JBossAS SVN: r82991 - in projects/webbeans-ri-int/trunk: microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl and 1 other directory.

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

Author: alesj
Date: 2009-01-16 11:05:11 -0500 (Fri, 16 Jan 2009)
New Revision: 82991

Modified:
   projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java
   projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java
Log:
Fix lib opt number.
Optimize recursion.

Modified: projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java	2009-01-16 15:36:42 UTC (rev 82990)
+++ projects/webbeans-ri-int/trunk/ejb/src/main/java/org/jboss/webbeans/integration/ejb/JBossEjbDiscovery.java	2009-01-16 16:05:11 UTC (rev 82991)
@@ -24,25 +24,23 @@
  */
 public class JBossEjbDiscovery implements EjbDiscovery
 {
-   
-   private final Iterable<EjbDescriptor<?>> ejbs;
+   private final List<EjbDescriptor<?>> ejbs;
 
-   
-
    public JBossEjbDiscovery(DeploymentUnit topLevelDeploymentUnit, KernelController controller)
    {
       EjbReferenceResolver resolver = JBossEjb.lookupEjbReferenceResolver(controller);
-      this.ejbs = discoverEjbs(topLevelDeploymentUnit, resolver);
+      this.ejbs = new ArrayList<EjbDescriptor<?>>();
+      discoverEjbs(topLevelDeploymentUnit, resolver);
    }
 
    /**
     * Discover ejbs.
     *
     * @param du the deployment unit
+    * @param resolver the ejb ref resolver
     */
-   protected List<EjbDescriptor<?>> discoverEjbs(DeploymentUnit du, EjbReferenceResolver resolver)
+   protected void discoverEjbs(DeploymentUnit du, EjbReferenceResolver resolver)
    {
-      List<EjbDescriptor<?>> ejbs = new ArrayList<EjbDescriptor<?>>();
       // Ensure it's an EJB3 DU (by looking for the processed metadata)
       if (du.getAttachment(AttachmentNames.PROCESSED_METADATA, JBossMetaData.class) != null && du.getAttachment(JBossMetaData.class).isEJB3x())
       {
@@ -68,10 +66,9 @@
       {
          for (DeploymentUnit childDu : children)
          {
-            ejbs.addAll(discoverEjbs(childDu, resolver));
+            discoverEjbs(childDu, resolver);
          }
       }
-      return ejbs;
    }
 
    public Iterable<EjbDescriptor<?>> discoverEjbs()

Modified: projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java	2009-01-16 15:36:42 UTC (rev 82990)
+++ projects/webbeans-ri-int/trunk/microcontainer/src/main/java/org/jboss/webbeans/integration/microcontainer/deployer/cl/WebBeansUrlIntegrationDeployer.java	2009-01-16 16:05:11 UTC (rev 82991)
@@ -36,7 +36,7 @@
          String libOpt = getServerHome() + getOptionalLib();
          libOpt = StringPropertyReplacer.replaceProperties(libOpt);
 
-         Set<URL> urls = new HashSet<URL>(4);
+         Set<URL> urls = new HashSet<URL>(5);
          urls.add(new URL(libOpt + "webbeans-api.jar"));
          urls.add(new URL(libOpt + "webbeans-ri-spi.jar"));
          urls.add(new URL(libOpt + "webbeans-ri.jar"));