[waffle-scm] [877] sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context: less ContextContainerFactory

Thu, 15 Jan 2009 08:29:16 -0800

Title: [waffle-scm] [877] sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context: less ContextContainerFactory

Diff

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainerFactory.java (876 => 877)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainerFactory.java	2009-01-15 12:46:31 UTC (rev 876)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/ContextContainerFactory.java	2009-01-15 16:29:10 UTC (rev 877)
@@ -66,7 +66,7 @@
         delegate.addComponent(new HttpSessionComponentAdapter());
 
         ContextContainer sessionContextContainer = new ContextContainer(delegate, messageResources);
-        registrarAssistant.executeDelegatingRegistrar(createRegistrar(sessionContextContainer), ContextLevel.SESSION);
+        registrarAssistant.executeDelegatingRegistrar(createRegistrar(sessionContextContainer, picoLifecycleStrategy), ContextLevel.SESSION);
         getContextMonitor().sessionContextContainerCreated(applicationContextContainer);
         return sessionContextContainer;
     }
@@ -83,7 +83,7 @@
             MutablePicoContainer delegate = sessionContextContainer.getDelegate();
 
             ContextContainer requestContextContainer = new ContextContainer(buildMutablePicoContainer(delegate), messageResources);
-            registrarAssistant.executeDelegatingRegistrar(createRegistrar(requestContextContainer), ContextLevel.REQUEST);
+            registrarAssistant.executeDelegatingRegistrar(createRegistrar(requestContextContainer, picoLifecycleStrategy), ContextLevel.REQUEST);
             getContextMonitor().requestContextContainerCreated(sessionContextContainer);
             return requestContextContainer;
         } finally {
@@ -95,7 +95,7 @@
         }
     }
 
-    public Registrar createRegistrar(MutablePicoContainer contextContainer) {
+    public Registrar createRegistrar(MutablePicoContainer contextContainer, LifecycleStrategy lifecycleStrategy) {
         Registrar registrar = new PicoRegistrar(contextContainer, parameterResolver, picoLifecycleStrategy,
                 registrarMonitor, picoComponentMonitor, messageResources);
         getContextMonitor().registrarCreated(registrar, registrarMonitor);
@@ -110,10 +110,6 @@
         return picoComponentMonitor;
     }
 
-    protected LifecycleStrategy getPicoLifecycleStrategy() {
-        return picoLifecycleStrategy;
-    }
-
     protected RegistrarMonitor getRegistrarMonitor() {
         return registrarMonitor;
     }
@@ -176,7 +172,7 @@
     }
 
     private void buildApplicationLevelRegistry() {
-        Registrar registrar = createRegistrar(applicationContextContainer);
+        Registrar registrar = createRegistrar(applicationContextContainer, picoLifecycleStrategy);
         registrarAssistant.executeDelegatingRegistrar(registrar, ContextLevel.APPLICATION);
     }

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java (876 => 877)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java	2009-01-15 12:46:31 UTC (rev 876)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoContextContainerFactoryTest.java	2009-01-15 16:29:10 UTC (rev 877)
@@ -43,6 +43,7 @@
 import org.junit.runner.RunWith;
 import org.picocontainer.DefaultPicoContainer;
 import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.lifecycle.NullLifecycleStrategy;
 import org.picocontainer.behaviors.Caching;
 import org.picocontainer.containers.EmptyPicoContainer;
 import org.picocontainer.monitors.NullComponentMonitor;
@@ -346,7 +347,7 @@
         // Mock ContextContainer
         final MutablePicoContainer contextContainer = mockery.mock(MutablePicoContainer.class);
 
-        Registrar registrar = contextContainerFactory.createRegistrar(contextContainer);
+        Registrar registrar = contextContainerFactory.createRegistrar(contextContainer, new NullLifecycleStrategy());
 
         // Ensure 'picoContainer' was set
         Field picoContainerField = PicoRegistrar.class.getDeclaredField("picoContainer");

Modified: sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby/context/RubyContextContainerFactory.java (876 => 877)

--- sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby/context/RubyContextContainerFactory.java	2009-01-15 12:46:31 UTC (rev 876)
+++ sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby/context/RubyContextContainerFactory.java	2009-01-15 16:29:10 UTC (rev 877)
@@ -22,6 +22,7 @@
 import org.codehaus.waffle.ruby.registrar.pico.RubyScriptedRegistrar;
 import org.jruby.Ruby;
 import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.LifecycleStrategy;
 
 /**
  * @author Michael Ward
@@ -61,11 +62,11 @@
     }
 
     @Override
-    public Registrar createRegistrar(MutablePicoContainer contextContainer) { // todo we need tests for this ... can this
+    public Registrar createRegistrar(MutablePicoContainer contextContainer, LifecycleStrategy lifecycleStrategy) { // todo we need tests for this ... can this
                                                                              // be refactored cleaner?
         RegistrarMonitor registrarMonitor = getRegistrarMonitor();
         Registrar registrar = new RubyScriptedRegistrar(contextContainer, getParameterResolver(),
-                getPicoLifecycleStrategy(), registrarMonitor, getPicoComponentMonitor(), getMessageResources());
+                lifecycleStrategy, registrarMonitor, getPicoComponentMonitor(), getMessageResources());
         getContextMonitor().registrarCreated(registrar, registrarMonitor);
         return registrar;
     }

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to