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

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

Author: dan.j.allen
Date: 2009-07-17 14:33:37 -0400 (Fri, 17 Jul 2009)
New Revision: 91382

Modified:
   projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
   projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansCoreIntegrationDeployer.java
Log:
fix duplicate entry in webbeans-deployers-jboss-beans.xml
make WebBeansCoreIntegrationDeployer construction accessible

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml	2009-07-17 16:41:58 UTC (rev 91381)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/assembly/resources/META-INF/webbeans-deployers-jboss-beans.xml	2009-07-17 18:33:37 UTC (rev 91382)
@@ -24,10 +24,10 @@
   <bean name="WebBeansBootstrapDeployer" class="org.jboss.webbeans.integration.deployer.env.WebBeansBootstrapDeployer"/>
   
   <!-- Responsible for pushing the JSF onto the application classpath -->
-  <bean name="WebBeansWebUrlIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansFacesIntegrationDeployer"/>
+  <bean name="WebBeansFacesIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansFacesIntegrationDeployer"/>
   
   <!-- Responsible for pushing the WB RI onto the application classpath -->
-  <bean name="WebBeansWebUrlIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansCoreIntegrationDeployer"/>
+  <bean name="WebBeansCoreIntegrationDeployer" class="org.jboss.webbeans.integration.deployer.cl.WebBeansCoreIntegrationDeployer"/>
 
   <!-- Responsible for inserting the Web Beans RI EJB interceptor -->
   <bean name="PostEjbJarMetadataDeployer" class="org.jboss.webbeans.integration.deployer.metadata.WBEjbInterceptorMetadataDeployer"/>

Modified: projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansCoreIntegrationDeployer.java
===================================================================
--- projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansCoreIntegrationDeployer.java	2009-07-17 16:41:58 UTC (rev 91381)
+++ projects/webbeans-ri-int/trunk/deployer/src/main/java/org/jboss/webbeans/integration/deployer/cl/WebBeansCoreIntegrationDeployer.java	2009-07-17 18:33:37 UTC (rev 91382)
@@ -12,7 +12,7 @@
  */
 public class WebBeansCoreIntegrationDeployer extends WebBeansUrlIntegrationDeployer<JBossWebBeansMetaData>
 {
-   protected WebBeansCoreIntegrationDeployer()
+   public WebBeansCoreIntegrationDeployer()
    {
       super(JBossWebBeansMetaData.class);
       setTopLevelOnly(true); // only top level, as that's where Bootstrap bean is gonna be
@@ -26,6 +26,7 @@
       return DeployersUtils.checkForWebBeansFiles(unit);
    }
 
+   @Override
    protected String getShortLibName()
    {
       return "webbeans-core.jar";