[waffle-scm] [62] trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy: Updated to latest snapshot of webcontainer.

Sun, 20 May 2007 11:29:01 -0700

Title: [waffle-scm] [62] trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy: Updated to latest snapshot of webcontainer.

Diff

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ActionRegistrarNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ActionRegistrarNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ActionRegistrarNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -13,7 +13,7 @@
 import java.util.Map;
 
 import org.codehaus.waffle.registrar.Registrar;
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 import org.picocontainer.PicoContainer;
 
 public class ActionRegistrarNodeBuilder extends NodeBuilder {
@@ -21,9 +21,9 @@
     private static final String EMPTY_NODE = "";
     private final PicoContainer parentContainer;
     private Object registrarClass;
-    private final PicoContextHandler context;
+    private final PicoContext context;
 
-    public ActionRegistrarNodeBuilder(PicoContainer parentContainer, Object registrarClass, PicoContextHandler context) {
+    public ActionRegistrarNodeBuilder(PicoContainer parentContainer, Object registrarClass, PicoContext context) {
         this.parentContainer = parentContainer;
         this.registrarClass = registrarClass;
         this.context = context;

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ActionsNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ActionsNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ActionsNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -16,21 +16,21 @@
 import org.codehaus.waffle.registrar.Registrar;
 import org.nanocontainer.DefaultNanoContainer;
 import org.nanocontainer.NanoContainer;
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 import org.picocontainer.PicoContainer;
 
 public class ActionsNodeBuilder extends NodeBuilder {
     protected final PicoContainer parentContainer;
-    protected final PicoContextHandler context;
+    protected final PicoContext context;
 
-    protected ActionsNodeBuilder(PicoContainer parentContainer, PicoContextHandler context) {
+    protected ActionsNodeBuilder(PicoContainer parentContainer, PicoContext context) {
         this.parentContainer = parentContainer;
         this.context = context;
     }
 
     protected Object buildInstance(String actionClassName) {
         NanoContainer factory = new DefaultNanoContainer();
-        factory.getPico().registerComponentInstance(PicoContextHandler.class, context);
+        factory.getPico().registerComponentInstance(PicoContext.class, context);
         factory.getPico().registerComponentInstance(PicoContainer.class, parentContainer);
         try {
             factory.registerComponentImplementation("action", actionClassName);

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ApplicationActionsNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ApplicationActionsNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ApplicationActionsNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -11,12 +11,12 @@
 
 import java.util.Map;
 
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 import org.picocontainer.PicoContainer;
 
 public class ApplicationActionsNodeBuilder extends ActionsNodeBuilder {
 
-    public ApplicationActionsNodeBuilder(PicoContainer parentContainer, PicoContextHandler context) {
+    public ApplicationActionsNodeBuilder(PicoContainer parentContainer, PicoContext context) {
         super(parentContainer, context);
     }

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RegisterActionsNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RegisterActionsNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RegisterActionsNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -9,16 +9,16 @@
  *****************************************************************************/
 package org.codehaus.waffle.groovy;
 
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 import org.picocontainer.PicoContainer;
 
 import java.util.Map;
 
 public class RegisterActionsNodeBuilder extends Object {
     private final PicoContainer parentContainer;
-    private final PicoContextHandler context;
+    private final PicoContext context;
 
-    public RegisterActionsNodeBuilder(PicoContainer parentContainer, PicoContextHandler context) {
+    public RegisterActionsNodeBuilder(PicoContainer parentContainer, PicoContext context) {
         this.parentContainer = parentContainer;
         this.context = context;
     }
@@ -34,6 +34,4 @@
         return null;
     }
 
-
-
 }

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RequestActionsNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RequestActionsNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RequestActionsNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -1,14 +1,14 @@
 package org.codehaus.waffle.groovy;
 
 import groovy.util.NodeBuilder;
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 
 import java.util.Map;
 
 public class RequestActionsNodeBuilder extends NodeBuilder {
-    private final PicoContextHandler context;
+    private final PicoContext context;
 
-    public RequestActionsNodeBuilder(PicoContextHandler context) {
+    public RequestActionsNodeBuilder(PicoContext context) {
         this.context = context;
     }

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RequestFilterNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RequestFilterNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/RequestFilterNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -12,13 +12,13 @@
 
 import org.codehaus.waffle.context.WaffleRequestFilter;
 import groovy.util.NodeBuilder;
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 
 import java.util.Map;
 
 public class RequestFilterNodeBuilder extends NodeBuilder {
 
-    public RequestFilterNodeBuilder(PicoContextHandler context, String pathMapping) {
+    public RequestFilterNodeBuilder(PicoContext context, String pathMapping) {
         context.addFilterWithMapping(new WaffleRequestFilter(), pathMapping, 0);
     }

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/SessionActionsNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/SessionActionsNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/SessionActionsNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -10,14 +10,14 @@
 package org.codehaus.waffle.groovy;
 
 import groovy.util.NodeBuilder;
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 
 import java.util.Map;
 
 public class SessionActionsNodeBuilder extends NodeBuilder {
-    private final PicoContextHandler context;
+    private final PicoContext context;
 
-    public SessionActionsNodeBuilder(PicoContextHandler context) {
+    public SessionActionsNodeBuilder(PicoContext context) {
         this.context = context;
     }

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ViewSuffixNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ViewSuffixNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/ViewSuffixNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -1,8 +1,8 @@
 package org.codehaus.waffle.groovy;
 
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 
 public class ViewSuffixNodeBuilder extends Object {
-    public ViewSuffixNodeBuilder(PicoContextHandler context, String suffix) {
+    public ViewSuffixNodeBuilder(PicoContext context, String suffix) {
     }
 }

Modified: trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/WaffleNodeBuilder.java (61 => 62)

--- trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/WaffleNodeBuilder.java	2007-05-20 11:30:54 UTC (rev 61)
+++ trunk/extensions/webcontainer/src/main/java/org/codehaus/waffle/groovy/WaffleNodeBuilder.java	2007-05-20 18:28:52 UTC (rev 62)
@@ -17,15 +17,15 @@
 import org.codehaus.waffle.context.pico.PicoWaffleContextListener;
 import org.codehaus.waffle.servlet.WaffleServlet;
 import org.nanocontainer.script.NanoContainerMarkupException;
-import org.nanocontainer.webcontainer.PicoContextHandler;
+import org.nanocontainer.webcontainer.PicoContext;
 import org.nanocontainer.webcontainer.PicoServletHolder;
 import org.picocontainer.PicoContainer;
 
 public class WaffleNodeBuilder extends NodeBuilder {
     private final PicoContainer parentContainer;
-    private final PicoContextHandler context;
+    private final PicoContext context;
     
-    public WaffleNodeBuilder(PicoContainer parentContainer, PicoContextHandler context, Map attributes) {
+    public WaffleNodeBuilder(PicoContainer parentContainer, PicoContext context, Map attributes) {
         this.parentContainer = parentContainer;
         this.context = context;

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to