- Revision
- 936
- Author
- paul
- Date
- 2009-04-08 15:15:10 -0500 (Wed, 08 Apr 2009)
Log Message
upgrade to latest pico
Modified Paths
- trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/SimpleExampleComposer.java
- trunk/waffle-core/pom.xml
- trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/WaffleListener.java
Diff
Modified: trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/SimpleExampleComposer.java (935 => 936)
--- trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/SimpleExampleComposer.java 2009-03-04 04:34:09 UTC (rev 935) +++ trunk/examples/simple-example/src/main/java/org/codehaus/waffle/example/simple/SimpleExampleComposer.java 2009-04-08 20:15:10 UTC (rev 936) @@ -5,7 +5,6 @@ import javax.servlet.ServletContext; import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.codehaus.waffle.context.WaffleComposer; import org.codehaus.waffle.example.simple.controllers.AutomobileController; import org.codehaus.waffle.example.simple.controllers.CalculatorController; import org.codehaus.waffle.example.simple.controllers.HelloWorldController; @@ -14,6 +13,7 @@ import org.codehaus.waffle.example.simple.controllers.UploadController; import org.codehaus.waffle.example.simple.dao.SimplePersonDAO; import org.codehaus.waffle.io.RequestFileUploader; +import org.codehaus.waffle.pico.WaffleComposer; import org.picocontainer.MutablePicoContainer; public class SimpleExampleComposer extends WaffleComposer {
Modified: trunk/waffle-core/pom.xml (935 => 936)
--- trunk/waffle-core/pom.xml 2009-03-04 04:34:09 UTC (rev 935) +++ trunk/waffle-core/pom.xml 2009-04-08 20:15:10 UTC (rev 936) @@ -18,27 +18,23 @@ <dependency> <groupId>org.picocontainer</groupId> <artifactId>picocontainer</artifactId> - <version>2.8</version> + <version>2.9-SNAPSHOT</version> </dependency> <dependency> <groupId>org.picocontainer.web</groupId> <artifactId>picocontainer-web-core</artifactId> - <version>2.3</version> + <version>2.4-SNAPSHOT</version> </dependency> - <dependency> - <groupId>org.picocontainer.web</groupId> - <artifactId>picocontainer-web-core</artifactId> - <version>2.3</version> - </dependency> - <dependency> + <!-- <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId> <version>1.0</version> <scope>optional</scope> - </dependency> + </dependency> --> <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> + <optional>true</optional> </dependency> <dependency> <groupId>com.thoughtworks.paranamer</groupId>
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/WaffleListener.java (935 => 936)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/WaffleListener.java 2009-03-04 04:34:09 UTC (rev 935) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/pico/WaffleListener.java 2009-04-08 20:15:10 UTC (rev 936) @@ -6,17 +6,23 @@ import org.picocontainer.behaviors.Guarding; import org.picocontainer.behaviors.Storing; import org.picocontainer.web.PicoServletContainerListener; +import org.picocontainer.web.ScopedContainers; +import org.picocontainer.web.ThreadLocalLifecycleState; @SuppressWarnings("serial") public class WaffleListener extends PicoServletContainerListener { protected ScopedContainers makeScopedContainers() { - DefaultPicoContainer application = new DefaultPicoContainer(new Guarding().wrap(new Caching()), new WaffleLifecycleStrategy(makeAppComponentMonitor()), makeParentContainer()); + DefaultPicoContainer application = new DefaultPicoContainer(new Guarding().wrap(new Caching()), new WaffleLifecycleStrategy(makeAppComponentMonitor()), makeParentContainer(), makeAppComponentMonitor()); Storing sessionStoring = new Storing(); - DefaultPicoContainer session = new DefaultPicoContainer(new Guarding().wrap(sessionStoring), new WaffleLifecycleStrategy(makeSessionComponentMonitor()), application); + DefaultPicoContainer session = new DefaultPicoContainer(new Guarding().wrap(sessionStoring), new WaffleLifecycleStrategy(makeSessionComponentMonitor()), application, makeSessionComponentMonitor()); Storing requestStoring = new Storing(); - DefaultPicoContainer request = new DefaultPicoContainer(new Guarding().wrap(addRequestBehaviors(requestStoring)), new WaffleLifecycleStrategy(makeRequestComponentMonitor()), session); - return new ScopedContainers(application, session, request, sessionStoring, requestStoring); + DefaultPicoContainer request = new DefaultPicoContainer(new Guarding().wrap(addRequestBehaviors(requestStoring)), new WaffleLifecycleStrategy(makeRequestComponentMonitor()), session, makeRequestComponentMonitor()); + ThreadLocalLifecycleState sessionState = new ThreadLocalLifecycleState(); + ThreadLocalLifecycleState requestState = new ThreadLocalLifecycleState(); + session.setLifecycleState(sessionState); + request.setLifecycleState(requestState); + return new ScopedContainers(application, session, request, sessionStoring, requestStoring, sessionState, requestState); } }
To unsubscribe from this list please visit:
