fix for Ales's change to mc project

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@340 1c488680-804c-0410-94cd-c6b725194a0e
weld · Nov 20, 2008 · 0c3d82c · 0c3d82c
1 parent 79b717a
commit 0c3d82c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/build.xml b/build.xml
@@ -11,7 +11,7 @@
 		<mkdir dir="target/webbeans.deployer"/>
 
 		<artifact:dependencies filesetId="jboss5.deployer.fileset" versionsId="jboss5.deployer.versions">
-         <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-jbossas" version="5.2.0-SNAPSHOT"/>
+         <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-ri-int-microcontainer" version="5.2.0-SNAPSHOT"/>
       </artifact:dependencies>
 
 		<artifact:dependencies filesetId="google.collections.fileset">

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java
@@ -48,7 +48,6 @@ public void registerBeans(Iterable<Class<?>> classes)
    {
       Set<AbstractBean<?, ?>> beans = createBeans(classes);
       manager.setBeans(beans);
-      manager.getResolver().resolveInjectionPoints();
    }
 
    /**
@@ -96,6 +95,8 @@ public void boot(WebBeanDiscovery webBeanDiscovery)
          throw new IllegalStateException("No WebBeanDiscovery provider found, you need to implement the org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery interface, and tell the RI to use it by specifying -D" + Bootstrap.WEB_BEAN_DISCOVERY_PROPERTY_NAME + "=<classname>");
       }
       registerBeans(webBeanDiscovery.discoverWebBeanClasses());
+      log.info("Validing Web Bean injection points");
+      manager.getResolver().resolveInjectionPoints();
    }
 
    public static String getVersion()

diff --git a/webbeans-ri/webbeans-deployers-jboss-beans.xml b/webbeans-ri/webbeans-deployers-jboss-beans.xml
@@ -6,6 +6,6 @@
 <deployment xmlns="urn:jboss:bean-deployer:2.0">
 
   <!-- Web Beans deployer -->
-  <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.jbossas.WebBeanDiscoveryDeployer"/>
+  <bean name="WebBeansDeployer" class="org.jboss.webbeans.integration.microcontainer.WebBeanDiscoveryDeployer"/>
 
 </deployment>