[weld-commits] Weld SVN: r6195 - core/trunk/impl/src/main/java/org/jboss/weld/bootstrap.

[weld-commits at lists.jboss.org]

Author: dallen6
Date: 2010-04-29 15:00:25 -0400 (Thu, 29 Apr 2010)
New Revision: 6195

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
Log:
Another piece for the new ProxyServices...adds a default service if none provided.

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java	2010-04-29 17:01:41 UTC (rev 6194)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/WeldBootstrap.java	2010-04-29 19:00:25 UTC (rev 6195)
@@ -42,6 +42,7 @@
 import org.jboss.weld.ContainerState;
 import org.jboss.weld.bean.builtin.BeanManagerBean;
 import org.jboss.weld.bean.interceptor.InterceptionMetadataService;
+import org.jboss.weld.bean.proxy.util.SimpleProxyServices;
 import org.jboss.weld.bootstrap.api.Bootstrap;
 import org.jboss.weld.bootstrap.api.Environment;
 import org.jboss.weld.bootstrap.api.Lifecycle;
@@ -87,6 +88,7 @@
 import org.jboss.weld.resources.spi.ScheduledExecutorServiceFactory;
 import org.jboss.weld.serialization.ContextualStoreImpl;
 import org.jboss.weld.serialization.spi.ContextualStore;
+import org.jboss.weld.serialization.spi.ProxyServices;
 import org.jboss.weld.servlet.HttpSessionManager;
 import org.jboss.weld.servlet.ServletApiAbstraction;
 import org.jboss.weld.servlet.api.ServletServices;
@@ -230,7 +232,6 @@
    private Map<BeanDeploymentArchive, BeanDeployment> beanDeployments;
    private Environment environment;
    private Deployment deployment;
-   private ExtensionBeanDeployerEnvironment extensionDeployerEnvironment;
    private DeploymentVisitor deploymentVisitor;
  
    public Bootstrap startContainer(Environment environment, Deployment deployment, BeanStore applicationBeanStore)
@@ -249,6 +250,10 @@
          {
             deployment.getServices().add(ScheduledExecutorServiceFactory.class, new SingleThreadScheduledExecutorServiceFactory());
          }
+         if (!deployment.getServices().contains(ProxyServices.class))
+         {
+            deployment.getServices().add(ProxyServices.class, new SimpleProxyServices());
+         }
          
          verifyServices(deployment.getServices(), environment.getRequiredDeploymentServices());
          
@@ -294,7 +299,7 @@
          initializeContexts();
          // Start the application context
          Container.instance().services().get(ContextLifecycle.class).beginApplication(applicationBeanStore);
-         this.extensionDeployerEnvironment = new ExtensionBeanDeployerEnvironment(EjbDescriptors.EMPTY, deploymentManager);
+         new ExtensionBeanDeployerEnvironment(EjbDescriptors.EMPTY, deploymentManager);
          this.deploymentVisitor = new DeploymentVisitor(deploymentManager, environment, deployment);
          
          // Read the deployment structure, this will be the physical structure as caused by the presence of beans.xml