[webbeans-commits] Webbeans SVN: r340 - in ri/trunk: webbeans-ri and 1 other directories.
Author: pete.muir(a)jboss.org
Date: 2008-11-20 06:33:58 -0500 (Thu, 20 Nov 2008)
New Revision: 340
Modified:
ri/trunk/build.xml
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java
ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml
Log:
fix for Ales's change to mc project
Modified: ri/trunk/build.xml
===================================================================
--- ri/trunk/build.xml 2008-11-20 10:43:42 UTC (rev 339)
+++ ri/trunk/build.xml 2008-11-20 11:33:58 UTC (rev 340)
@@ -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">
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java
===================================================================
---
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java 2008-11-20
10:43:42 UTC (rev 339)
+++
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/Bootstrap.java 2008-11-20
11:33:58 UTC (rev 340)
@@ -48,7 +48,6 @@
{
Set<AbstractBean<?, ?>> beans = createBeans(classes);
manager.setBeans(beans);
- manager.getResolver().resolveInjectionPoints();
}
/**
@@ -96,6 +95,8 @@
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()
Modified: ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml
===================================================================
--- ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml 2008-11-20 10:43:42 UTC (rev
339)
+++ ri/trunk/webbeans-ri/webbeans-deployers-jboss-beans.xml 2008-11-20 11:33:58 UTC (rev
340)
@@ -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>