- Revision
- 928
- Author
- paul
- Date
- 2009-02-26 12:42:17 -0600 (Thu, 26 Feb 2009)
Log Message
upgrade picocontainer + web + xstream
Modified Paths
- trunk/pom.xml
- trunk/waffle-core/pom.xml
- trunk/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java
Diff
Modified: trunk/pom.xml (927 => 928)
--- trunk/pom.xml 2009-02-25 17:00:15 UTC (rev 927) +++ trunk/pom.xml 2009-02-26 18:42:17 UTC (rev 928) @@ -59,7 +59,7 @@ <dependency> <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> - <version>1.3</version> + <version>1.3.1</version> <scope>provided</scope> </dependency> <dependency> @@ -376,7 +376,7 @@ <roles> <role>developer</role> </roles> - <timezone>-6</timezone> + <timezone>-8</timezone> </developer> <developer> <id>gas</id>
Modified: trunk/waffle-core/pom.xml (927 => 928)
--- trunk/waffle-core/pom.xml 2009-02-25 17:00:15 UTC (rev 927) +++ trunk/waffle-core/pom.xml 2009-02-26 18:42:17 UTC (rev 928) @@ -18,12 +18,12 @@ <dependency> <groupId>org.picocontainer</groupId> <artifactId>picocontainer</artifactId> - <version>2.7-SNAPSHOT</version> + <version>2.8</version> </dependency> <dependency> <groupId>org.picocontainer.web</groupId> <artifactId>picocontainer-web-core</artifactId> - <version>2.2-SNAPSHOT</version> + <version>2.3</version> </dependency> <dependency> <groupId>javax.servlet</groupId>
Modified: trunk/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java (927 => 928)
--- trunk/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java 2009-02-25 17:00:15 UTC (rev 927) +++ trunk/waffle-core/src/main/java/org/codehaus/waffle/servlet/WaffleListener.java 2009-02-26 18:42:17 UTC (rev 928) @@ -12,17 +12,12 @@ public class WaffleListener extends PicoServletContainerListener { protected ScopedContainers makeScopedContainers() { - DefaultPicoContainer application = new DefaultPicoContainer(new Guarding().wrap(new Caching()), makeLifecycleStrategy(), makeParentContainer()); + DefaultPicoContainer application = new DefaultPicoContainer(new Guarding().wrap(new Caching()), new WaffleLifecycleStrategy(makeAppComponentMonitor()), makeParentContainer()); Storing sessionStoring = new Storing(); - DefaultPicoContainer session = new DefaultPicoContainer(new Guarding().wrap(sessionStoring), makeLifecycleStrategy(), application); + DefaultPicoContainer session = new DefaultPicoContainer(new Guarding().wrap(sessionStoring), new WaffleLifecycleStrategy(makeSessionComponentMonitor()), application); Storing requestStoring = new Storing(); - DefaultPicoContainer request = new DefaultPicoContainer(new Guarding().wrap(addRequestBehaviors(requestStoring)), makeLifecycleStrategy(), session); + DefaultPicoContainer request = new DefaultPicoContainer(new Guarding().wrap(addRequestBehaviors(requestStoring)), new WaffleLifecycleStrategy(makeRequestComponentMonitor()), session); return new ScopedContainers(application, session, request, sessionStoring, requestStoring); } - protected LifecycleStrategy makeLifecycleStrategy() { - return new WaffleLifecycleStrategy(makeComponentMonitor()); - } - - }
To unsubscribe from this list please visit:
