[jboss-cvs] JBossAS SVN: r84342 - projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap.

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

Author: petemuir
Date: 2009-02-17 20:06:39 -0500 (Tue, 17 Feb 2009)
New Revision: 84342

Added:
   projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/JBossWebBeanDiscovery.java
Modified:
   projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossWebBeanDiscovery.java
Log:
Extract a generic WebBeanEnvironment->WebBeanDiscovery adapter

Added: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/JBossWebBeanDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/JBossWebBeanDiscovery.java	                        (rev 0)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/JBossWebBeanDiscovery.java	2009-02-18 01:06:39 UTC (rev 84342)
@@ -0,0 +1,28 @@
+package org.jboss.webbeans.integration.jbossas.bootstrap;
+
+import java.net.URL;
+
+import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
+
+public class JBossWebBeanDiscovery implements WebBeanDiscovery
+{
+   
+   protected final WebBeanDiscoveryEnvironment environment;
+
+   public JBossWebBeanDiscovery(WebBeanDiscoveryEnvironment environment)
+   {
+      this.environment = environment;
+   }
+
+   public Iterable<Class<?>> discoverWebBeanClasses()
+   {
+      return environment.getWebBeanClasses();
+   }
+
+   public Iterable<URL> discoverWebBeansXml()
+   {
+      return environment.getWebBeansXml();
+   }
+   
+}
\ No newline at end of file


Property changes on: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/JBossWebBeanDiscovery.java
___________________________________________________________________
Name: svn:mime-type
   + text/plain

Modified: projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossWebBeanDiscovery.java
===================================================================
--- projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossWebBeanDiscovery.java	2009-02-18 00:50:11 UTC (rev 84341)
+++ projects/webbeans-ri-int/trunk/jbossas/src/main/java/org/jboss/webbeans/integration/jbossas/bootstrap/ServletJBossWebBeanDiscovery.java	2009-02-18 01:06:39 UTC (rev 84342)
@@ -1,16 +1,16 @@
 package org.jboss.webbeans.integration.jbossas.bootstrap;
 
-import java.net.URL;
 
 import javax.servlet.ServletContext;
 
 import org.jboss.webbeans.bootstrap.spi.WebBeanDiscovery;
+import org.jboss.webbeans.bootstrap.spi.helpers.ForwardingWebBeanDiscovery;
 import org.jboss.webbeans.integration.jbossas.vdf.plugins.WebBeanDiscoveryEnvVDFConnector;
-import org.jboss.webbeans.integration.microcontainer.deployer.env.WebBeanDiscoveryEnvironment;
 
-public class ServletJBossWebBeanDiscovery implements WebBeanDiscovery
+public class ServletJBossWebBeanDiscovery extends ForwardingWebBeanDiscovery
 {   
-   private WebBeanDiscoveryEnvironment environment;
+  
+   private final WebBeanDiscovery delegate;
    
    public ServletJBossWebBeanDiscovery(ServletContext servletContext)
    {
@@ -18,16 +18,13 @@
       if (connector.isValid() == false)
          throw new IllegalArgumentException("Cannot find web-beans discovery in deployment: " + servletContext);
 
-      environment = connector.getUtility();
+      this.delegate = new JBossWebBeanDiscovery(connector.getUtility());
    }
-   
-   public Iterable<Class<?>> discoverWebBeanClasses()
+
+   @Override
+   protected WebBeanDiscovery delegate()
    {
-      return environment.getWebBeanClasses();
+      return delegate;
    }
    
-   public Iterable<URL> discoverWebBeansXml()
-   {
-      return environment.getWebBeansXml();
-   }
 }