- Revision
- 897
- Author
- mauro
- Date
- 2009-01-18 05:23:18 -0600 (Sun, 18 Jan 2009)
Log Message
Minor cleanup.
Modified Paths
- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/monitor/ContextMonitor.java
- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java
Diff
Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/monitor/ContextMonitor.java (896 => 897)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/monitor/ContextMonitor.java 2009-01-18 11:14:03 UTC (rev 896) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/monitor/ContextMonitor.java 2009-01-18 11:23:18 UTC (rev 897) @@ -4,7 +4,6 @@ package org.codehaus.waffle.monitor; import org.codehaus.waffle.WaffleException; -import org.picocontainer.MutablePicoContainer; /** * A monitor for context-related events
Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java (896 => 897)
--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java 2009-01-18 11:14:03 UTC (rev 896) +++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java 2009-01-18 11:23:18 UTC (rev 897) @@ -1,24 +1,23 @@ package org.codehaus.waffle.servlet; -import org.picocontainer.web.PicoServletContainerListener; +import org.codehaus.waffle.context.pico.WaffleLifecycleStrategy; import org.picocontainer.DefaultPicoContainer; -import org.picocontainer.ComponentMonitor; import org.picocontainer.LifecycleStrategy; -import org.picocontainer.monitors.NullComponentMonitor; -import org.picocontainer.behaviors.Guarding; import org.picocontainer.behaviors.Caching; +import org.picocontainer.behaviors.Guarding; import org.picocontainer.behaviors.Storing; -import org.codehaus.waffle.context.pico.WaffleLifecycleStrategy; +import org.picocontainer.web.PicoServletContainerListener; +...@suppresswarnings("serial") public class WaffleListener extends PicoServletContainerListener { protected ScopedContainers makeScopedContainers() { - DefaultPicoContainer appCtnr = new DefaultPicoContainer(new Guarding().wrap(new Caching()), makeLifecycleStrategy(), makeParentContainer()); - Storing sessStoring = new Storing(); - DefaultPicoContainer sessCtnr = new DefaultPicoContainer(new Guarding().wrap(sessStoring), makeLifecycleStrategy(), appCtnr); - Storing reqStoring = new Storing(); - DefaultPicoContainer reqCtnr = new DefaultPicoContainer(new Guarding().wrap(addRequestBehaviors(reqStoring)), makeLifecycleStrategy(), sessCtnr); - return new ScopedContainers(appCtnr, sessCtnr, reqCtnr, sessStoring, reqStoring); + DefaultPicoContainer application = new DefaultPicoContainer(new Guarding().wrap(new Caching()), makeLifecycleStrategy(), makeParentContainer()); + Storing sessionStoring = new Storing(); + DefaultPicoContainer session = new DefaultPicoContainer(new Guarding().wrap(sessionStoring), makeLifecycleStrategy(), application); + Storing requestStoring = new Storing(); + DefaultPicoContainer request = new DefaultPicoContainer(new Guarding().wrap(addRequestBehaviors(requestStoring)), makeLifecycleStrategy(), session); + return new ScopedContainers(application, session, request, sessionStoring, requestStoring); } protected LifecycleStrategy makeLifecycleStrategy() {
To unsubscribe from this list please visit:
