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

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

Author: petemuir
Date: 2009-04-15 10:16:00 -0400 (Wed, 15 Apr 2009)
New Revision: 87348

Added:
   projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/lib-int/
Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansUrlIntegrationDeployer.java
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
Log:
WBRI-235

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansUrlIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansUrlIntegrationDeployer.java	2009-04-15 14:12:30 UTC (rev 87347)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansUrlIntegrationDeployer.java	2009-04-15 14:16:00 UTC (rev 87348)
@@ -36,8 +36,9 @@
          String libOpt = getServerHome() + getOptionalLib();
          libOpt = StringPropertyReplacer.replaceProperties(libOpt);
 
-         Set<URL> urls = new HashSet<URL>(1);
+         Set<URL> urls = new HashSet<URL>(2);
          urls.add(new URL(libOpt + "webbeans-core.jar"));
+         urls.add(new URL(libOpt + "META-INF"));
          return urls;
       }
       catch (MalformedURLException e)

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java	2009-04-15 14:12:30 UTC (rev 87347)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/env/WebBeansBootstrapDeployer.java	2009-04-15 14:16:00 UTC (rev 87348)
@@ -25,6 +25,7 @@
 import org.jboss.beans.metadata.spi.ValueMetaData;
 import org.jboss.beans.metadata.spi.builder.BeanMetaDataBuilder;
 import org.jboss.beans.metadata.spi.builder.ParameterMetaDataBuilder;
+import org.jboss.dependency.spi.ControllerState;
 import org.jboss.deployers.spi.DeploymentException;
 import org.jboss.deployers.spi.deployer.DeploymentStages;
 import org.jboss.deployers.spi.deployer.helpers.AbstractSimpleRealDeployer;
@@ -34,7 +35,6 @@
 import org.jboss.webbeans.context.api.BeanStore;
 import org.jboss.webbeans.context.api.helpers.ConcurrentHashMapBeanStore;
 import org.jboss.webbeans.integration.deployer.DeployersUtils;
-import org.jboss.dependency.spi.ControllerState;
 
 /**
  * Deploy WebBeans boostrap service.
@@ -85,6 +85,7 @@
       install.addParameterMetaData(String.class.getName(), "Start");
       
       unit.addAttachment(bootstrapName + "_" + BeanMetaData.class.getSimpleName(), bootstrap.getBeanMetaData());
+      
    }
 
    /**