[waffle-scm] [896] sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby: Moved WaffleWebappComposer to pico package, being Pico-specific.

[mauro]

Title: [waffle-scm] [896] sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby: Moved WaffleWebappComposer to pico package, being Pico-specific.

Revision

896

Author

mauro

Date

2009-01-18 05:14:03 -0600 (Sun, 18 Jan 2009)

Log Message

Moved WaffleWebappComposer to pico package, being Pico-specific.

Modified Paths

• sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerExampleWebappComposer.java
• sandbox/v2experiment/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/JrubyExampleWebappComposer.java
• sandbox/v2experiment/examples/migration-example/src/main/java/org/codehaus/waffle/example/migration/actions/waffle/CalendarWebappComposer.java
• sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/MyDvdsWebappComposer.java
• sandbox/v2experiment/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/ParanamerExampleWebappComposer.java
• sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby/RubyWaffleWebappComposer.java

Added Paths

sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleWebappComposer.java


Removed Paths

sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleWebappComposer.java

Diff

Modified: sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerExampleWebappComposer.java (895 => 896)

--- sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerExampleWebappComposer.java	2009-01-18 11:02:18 UTC (rev 895)
+++ sandbox/v2experiment/examples/freemarker-example/src/main/java/org/codehaus/waffle/example/freemarker/FreemarkerExampleWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -11,7 +11,8 @@
 import org.codehaus.waffle.bind.converters.StringNumberListMapValueConverter;
 import static org.codehaus.waffle.bind.converters.DateValueConverter.DAY_FORMAT_KEY;
 import static org.codehaus.waffle.bind.converters.DateValueConverter.TIME_FORMAT_KEY;
-import org.codehaus.waffle.context.WaffleWebappComposer;
+
+import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.codehaus.waffle.example.freemarker.controller.DateProvider;
 import org.codehaus.waffle.example.freemarker.controller.PersonController;
 import org.codehaus.waffle.example.freemarker.converters.PersonListValueConverter;

Modified: sandbox/v2experiment/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/JrubyExampleWebappComposer.java (895 => 896)

--- sandbox/v2experiment/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/JrubyExampleWebappComposer.java	2009-01-18 11:02:18 UTC (rev 895)
+++ sandbox/v2experiment/examples/jruby-example/src/main/java/org/codehaus/waffle/example/jruby/JrubyExampleWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -4,7 +4,7 @@
 package org.codehaus.waffle.example.jruby;
 
 import org.codehaus.waffle.example.jruby.dao.SimplePersonDAO;
-import org.codehaus.waffle.context.WaffleWebappComposer;
+import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.codehaus.waffle.ruby.registrar.pico.RubyScriptComponentAdapter;
 import org.codehaus.waffle.ruby.RubyWaffleWebappComposer;
 import org.codehaus.waffle.monitor.ActionMonitor;

Modified: sandbox/v2experiment/examples/migration-example/src/main/java/org/codehaus/waffle/example/migration/actions/waffle/CalendarWebappComposer.java (895 => 896)

--- sandbox/v2experiment/examples/migration-example/src/main/java/org/codehaus/waffle/example/migration/actions/waffle/CalendarWebappComposer.java	2009-01-18 11:02:18 UTC (rev 895)
+++ sandbox/v2experiment/examples/migration-example/src/main/java/org/codehaus/waffle/example/migration/actions/waffle/CalendarWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -1,6 +1,6 @@
 package org.codehaus.waffle.example.migration.actions.waffle;
 
-import org.codehaus.waffle.context.WaffleWebappComposer;
+import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.picocontainer.MutablePicoContainer;
 
 public class CalendarWebappComposer extends WaffleWebappComposer {

Modified: sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/MyDvdsWebappComposer.java (895 => 896)

--- sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/MyDvdsWebappComposer.java	2009-01-18 11:02:18 UTC (rev 895)
+++ sandbox/v2experiment/examples/mydvds-example/src/main/java/org/codehaus/waffle/example/mydvds/MyDvdsWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -7,7 +7,7 @@
 import org.codehaus.waffle.example.mydvds.model.Passport;
 import org.codehaus.waffle.example.mydvds.persistence.HibernateSessionFactory;
 import org.codehaus.waffle.example.mydvds.persistence.PersistenceManager;
-import org.codehaus.waffle.context.WaffleWebappComposer;
+import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.picocontainer.MutablePicoContainer;
 
 import javax.servlet.ServletContext;

Modified: sandbox/v2experiment/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/ParanamerExampleWebappComposer.java (895 => 896)

--- sandbox/v2experiment/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/ParanamerExampleWebappComposer.java	2009-01-18 11:02:18 UTC (rev 895)
+++ sandbox/v2experiment/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/ParanamerExampleWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -4,7 +4,7 @@
 import org.codehaus.waffle.example.paranamer.action.HelloWorldController;
 import org.codehaus.waffle.example.paranamer.action.PersonController;
 import org.codehaus.waffle.example.paranamer.dao.SimplePersonDAO;
-import org.codehaus.waffle.context.WaffleWebappComposer;
+import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.codehaus.waffle.action.AnnotatedMethodDefinitionFinder;
 import org.codehaus.waffle.action.MethodDefinitionFinder;
 import org.codehaus.waffle.action.ParanamerMethodDefinitionFinder;

Deleted: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleWebappComposer.java (895 => 896)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleWebappComposer.java	2009-01-18 11:02:18 UTC (rev 895)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -1,207 +0,0 @@
-/*
- * Copyright (c) terms as published in http://waffle.codehaus.org/license.html
- */
-package org.codehaus.waffle.context;
-
-import org.picocontainer.web.WebappComposer;
-import org.picocontainer.MutablePicoContainer;
-import org.picocontainer.Parameter;
-import org.codehaus.waffle.registrar.pico.ParameterResolver;
-import org.codehaus.waffle.view.ViewDispatcher;
-import org.codehaus.waffle.view.DefaultViewDispatcher;
-import org.codehaus.waffle.view.ViewResolver;
-import org.codehaus.waffle.view.DefaultViewResolver;
-import org.codehaus.waffle.validation.Validator;
-import org.codehaus.waffle.validation.DefaultValidator;
-import org.codehaus.waffle.validation.ErrorsContext;
-import org.codehaus.waffle.validation.DefaultErrorsContext;
-import org.codehaus.waffle.monitor.ActionMonitor;
-import org.codehaus.waffle.monitor.SilentMonitor;
-import org.codehaus.waffle.monitor.BindMonitor;
-import org.codehaus.waffle.monitor.ControllerMonitor;
-import org.codehaus.waffle.monitor.ServletMonitor;
-import org.codehaus.waffle.monitor.ValidationMonitor;
-import org.codehaus.waffle.monitor.ViewMonitor;
-import org.codehaus.waffle.i18n.MessageResources;
-import org.codehaus.waffle.i18n.DefaultMessageResources;
-import org.codehaus.waffle.controller.ControllerDefinitionFactory;
-import org.codehaus.waffle.controller.ControllerNameResolver;
-import org.codehaus.waffle.controller.ContextPathControllerNameResolver;
-import org.codehaus.waffle.controller.ContextControllerDefinitionFactory;
-import org.codehaus.waffle.bind.BindErrorMessageResolver;
-import org.codehaus.waffle.bind.ControllerDataBinder;
-import org.codehaus.waffle.bind.ViewDataBinder;
-import org.codehaus.waffle.bind.IntrospectingViewDataBinder;
-import org.codehaus.waffle.bind.StringTransmuter;
-import org.codehaus.waffle.bind.DefaultStringTransmuter;
-import org.codehaus.waffle.bind.ValueConverterFinder;
-import org.codehaus.waffle.bind.ognl.OgnlBindErrorMessageResolver;
-import org.codehaus.waffle.bind.ognl.OgnlControllerDataBinder;
-import org.codehaus.waffle.bind.ognl.OgnlValueConverterFinder;
-import org.codehaus.waffle.action.ActionMethodExecutor;
-import org.codehaus.waffle.action.InterceptingActionMethodExecutor;
-import org.codehaus.waffle.action.ActionMethodResponseHandler;
-import org.codehaus.waffle.action.DefaultActionMethodResponseHandler;
-import org.codehaus.waffle.action.ArgumentResolver;
-import org.codehaus.waffle.action.HierarchicalArgumentResolver;
-import org.codehaus.waffle.action.MethodDefinitionFinder;
-import org.codehaus.waffle.action.AnnotatedMethodDefinitionFinder;
-import org.codehaus.waffle.action.MethodNameResolver;
-import org.codehaus.waffle.action.RequestParameterMethodNameResolver;
-
-import javax.servlet.ServletContext;
-
-/**
- * @author Michael Ward
- * @author Mauro Talevi
- */
-public abstract class WaffleWebappComposer implements WebappComposer {
-
-    private ParameterResolver parameterResolver;
-
-    public void composeApplication(MutablePicoContainer picoContainer, ServletContext servletContext) {
-        picoContainer.addComponent(servletContext);
-
-        // add all known components
-        picoContainer.addComponent(ActionMethodExecutor.class, actionMethodExecutor());
-        picoContainer.addComponent(ActionMethodResponseHandler.class, actionMethodResponseHandler());
-        picoContainer.addComponent(ArgumentResolver.class, argumentResolver());
-        picoContainer.addComponent(MethodDefinitionFinder.class, methodDefinitionFinder());
-        picoContainer.addComponent(MethodNameResolver.class, methodNameResolver());
-        picoContainer.addComponent(BindErrorMessageResolver.class, bindErrorMessageResolver());
-        picoContainer.addComponent(ControllerDataBinder.class, controllerDataBinder());
-        picoContainer.addComponent(ViewDataBinder.class, viewDataBinder());
-        picoContainer.addComponent(StringTransmuter.class, stringTransmuter());
-        picoContainer.addComponent(ValueConverterFinder.class, valueConverterFinder());
-        picoContainer.addComponent(ControllerDefinitionFactory.class, controllerDefinitionFactory());
-        picoContainer.addComponent(ControllerNameResolver.class, controllerNameResolver());
-        picoContainer.addComponent(MessageResources.class, messageResources());
-        picoContainer.addComponent(ActionMonitor.class, actionMonitor());
-        picoContainer.addComponent(BindMonitor.class, bindMonitor());
-        picoContainer.addComponent(ControllerMonitor.class, bindMonitor());
-        picoContainer.addComponent(ServletMonitor.class, servletMonitor());
-        picoContainer.addComponent(ValidationMonitor.class, validationMonitor());
-        picoContainer.addComponent(ViewMonitor.class, viewMonitor());
-        picoContainer.addComponent(Validator.class, validator());
-        picoContainer.addComponent(ViewDispatcher.class, viewDispatcher());
-        picoContainer.addComponent(ViewResolver.class, viewResolver());
-        picoContainer.addComponent(ParameterResolver.class, parameterResolver());
-
-        parameterResolver = picoContainer.getComponent(ParameterResolver.class);
-
-    }
-
-    protected Class<? extends ActionMethodExecutor> actionMethodExecutor() {
-        return InterceptingActionMethodExecutor.class;
-    }
-
-    protected Class<? extends ActionMethodResponseHandler> actionMethodResponseHandler() {
-        return DefaultActionMethodResponseHandler.class;
-    }
-
-    protected Class<? extends ArgumentResolver> argumentResolver() {
-        return HierarchicalArgumentResolver.class;
-    }
-
-    protected Class<? extends MethodDefinitionFinder> methodDefinitionFinder() {
-        return AnnotatedMethodDefinitionFinder.class;
-    }
-
-    protected Class<? extends MethodNameResolver> methodNameResolver() {
-        return RequestParameterMethodNameResolver.class;
-    }
-
-    protected Class<? extends BindErrorMessageResolver> bindErrorMessageResolver() {
-        return OgnlBindErrorMessageResolver.class;
-    }
-
-    protected Class<? extends ControllerDataBinder> controllerDataBinder() {
-        return OgnlControllerDataBinder.class;
-    }
-
-    protected Class<? extends ViewDataBinder> viewDataBinder() {
-        return IntrospectingViewDataBinder.class;
-    }
-
-    protected Class<? extends StringTransmuter> stringTransmuter() {
-        return DefaultStringTransmuter.class;
-    }
-
-    protected Class<? extends ValueConverterFinder> valueConverterFinder() {
-        return OgnlValueConverterFinder.class;
-    }
-
-    protected Class<? extends ControllerDefinitionFactory> controllerDefinitionFactory() {
-        return ContextControllerDefinitionFactory.class;
-    }
-
-    protected Class<? extends ControllerNameResolver> controllerNameResolver() {
-        return ContextPathControllerNameResolver.class;
-    }
-
-    protected Class<? extends MessageResources> messageResources() {
-        return DefaultMessageResources.class;
-    }
-
-    protected Class<? extends ParameterResolver> parameterResolver() {
-        return ParameterResolver.class;
-    }
-
-    protected Class<? extends ViewResolver> viewResolver() {
-        return DefaultViewResolver.class;
-    }
-
-    protected Class<? extends ViewDispatcher> viewDispatcher() {
-        return DefaultViewDispatcher.class;
-    }
-
-    protected Class<? extends Validator> validator() {
-        return DefaultValidator.class;
-    }
-
-    protected Class<? extends ViewMonitor> viewMonitor() {
-        return SilentMonitor.class;
-    }
-
-    protected Class<? extends ValidationMonitor> validationMonitor() {
-        return SilentMonitor.class;
-    }
-
-    protected Class<? extends ServletMonitor> servletMonitor() {
-        return SilentMonitor.class;
-    }
-
-    protected Class<? extends BindMonitor> bindMonitor() {
-        return SilentMonitor.class;
-    }
-
-    protected Class<? extends ActionMonitor> actionMonitor() {
-        return SilentMonitor.class;
-    }
-
-
-    public void composeSession(MutablePicoContainer picoContainer) {
-        // nothing yet
-    }
-
-    public void composeRequest(MutablePicoContainer picoContainer) {
-        picoContainer.addComponent(ErrorsContext.class, errorsContext());
-    }
-
-    protected Class<? extends ErrorsContext> errorsContext() {
-        return DefaultErrorsContext.class;
-    }
-
-    protected Parameter[] picoParameters(Object... parameters) {
-        if (parameters.length == 0) {
-            return null; // pico expects a null when no parameters
-        }
-
-        Parameter[] picoParameters = new Parameter[parameters.length];
-        for (int i = 0; i < parameters.length; i++) {
-            picoParameters[i] = parameterResolver.resolve(parameters[i]);
-        }
-        return picoParameters;
-    }
-
-}

Copied: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleWebappComposer.java (from rev 894, sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleWebappComposer.java) (0 => 896)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleWebappComposer.java	                        (rev 0)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -0,0 +1,207 @@
+/*
+ * Copyright (c) terms as published in http://waffle.codehaus.org/license.html
+ */
+package org.codehaus.waffle.context.pico;
+
+import org.picocontainer.web.WebappComposer;
+import org.picocontainer.MutablePicoContainer;
+import org.picocontainer.Parameter;
+import org.codehaus.waffle.registrar.pico.ParameterResolver;
+import org.codehaus.waffle.view.ViewDispatcher;
+import org.codehaus.waffle.view.DefaultViewDispatcher;
+import org.codehaus.waffle.view.ViewResolver;
+import org.codehaus.waffle.view.DefaultViewResolver;
+import org.codehaus.waffle.validation.Validator;
+import org.codehaus.waffle.validation.DefaultValidator;
+import org.codehaus.waffle.validation.ErrorsContext;
+import org.codehaus.waffle.validation.DefaultErrorsContext;
+import org.codehaus.waffle.monitor.ActionMonitor;
+import org.codehaus.waffle.monitor.SilentMonitor;
+import org.codehaus.waffle.monitor.BindMonitor;
+import org.codehaus.waffle.monitor.ControllerMonitor;
+import org.codehaus.waffle.monitor.ServletMonitor;
+import org.codehaus.waffle.monitor.ValidationMonitor;
+import org.codehaus.waffle.monitor.ViewMonitor;
+import org.codehaus.waffle.i18n.MessageResources;
+import org.codehaus.waffle.i18n.DefaultMessageResources;
+import org.codehaus.waffle.controller.ControllerDefinitionFactory;
+import org.codehaus.waffle.controller.ControllerNameResolver;
+import org.codehaus.waffle.controller.ContextPathControllerNameResolver;
+import org.codehaus.waffle.controller.ContextControllerDefinitionFactory;
+import org.codehaus.waffle.bind.BindErrorMessageResolver;
+import org.codehaus.waffle.bind.ControllerDataBinder;
+import org.codehaus.waffle.bind.ViewDataBinder;
+import org.codehaus.waffle.bind.IntrospectingViewDataBinder;
+import org.codehaus.waffle.bind.StringTransmuter;
+import org.codehaus.waffle.bind.DefaultStringTransmuter;
+import org.codehaus.waffle.bind.ValueConverterFinder;
+import org.codehaus.waffle.bind.ognl.OgnlBindErrorMessageResolver;
+import org.codehaus.waffle.bind.ognl.OgnlControllerDataBinder;
+import org.codehaus.waffle.bind.ognl.OgnlValueConverterFinder;
+import org.codehaus.waffle.action.ActionMethodExecutor;
+import org.codehaus.waffle.action.InterceptingActionMethodExecutor;
+import org.codehaus.waffle.action.ActionMethodResponseHandler;
+import org.codehaus.waffle.action.DefaultActionMethodResponseHandler;
+import org.codehaus.waffle.action.ArgumentResolver;
+import org.codehaus.waffle.action.HierarchicalArgumentResolver;
+import org.codehaus.waffle.action.MethodDefinitionFinder;
+import org.codehaus.waffle.action.AnnotatedMethodDefinitionFinder;
+import org.codehaus.waffle.action.MethodNameResolver;
+import org.codehaus.waffle.action.RequestParameterMethodNameResolver;
+
+import javax.servlet.ServletContext;
+
+/**
+ * @author Michael Ward
+ * @author Mauro Talevi
+ */
+public abstract class WaffleWebappComposer implements WebappComposer {
+
+    private ParameterResolver parameterResolver;
+
+    public void composeApplication(MutablePicoContainer picoContainer, ServletContext servletContext) {
+        picoContainer.addComponent(servletContext);
+
+        // add all known components
+        picoContainer.addComponent(ActionMethodExecutor.class, actionMethodExecutor());
+        picoContainer.addComponent(ActionMethodResponseHandler.class, actionMethodResponseHandler());
+        picoContainer.addComponent(ArgumentResolver.class, argumentResolver());
+        picoContainer.addComponent(MethodDefinitionFinder.class, methodDefinitionFinder());
+        picoContainer.addComponent(MethodNameResolver.class, methodNameResolver());
+        picoContainer.addComponent(BindErrorMessageResolver.class, bindErrorMessageResolver());
+        picoContainer.addComponent(ControllerDataBinder.class, controllerDataBinder());
+        picoContainer.addComponent(ViewDataBinder.class, viewDataBinder());
+        picoContainer.addComponent(StringTransmuter.class, stringTransmuter());
+        picoContainer.addComponent(ValueConverterFinder.class, valueConverterFinder());
+        picoContainer.addComponent(ControllerDefinitionFactory.class, controllerDefinitionFactory());
+        picoContainer.addComponent(ControllerNameResolver.class, controllerNameResolver());
+        picoContainer.addComponent(MessageResources.class, messageResources());
+        picoContainer.addComponent(ActionMonitor.class, actionMonitor());
+        picoContainer.addComponent(BindMonitor.class, bindMonitor());
+        picoContainer.addComponent(ControllerMonitor.class, bindMonitor());
+        picoContainer.addComponent(ServletMonitor.class, servletMonitor());
+        picoContainer.addComponent(ValidationMonitor.class, validationMonitor());
+        picoContainer.addComponent(ViewMonitor.class, viewMonitor());
+        picoContainer.addComponent(Validator.class, validator());
+        picoContainer.addComponent(ViewDispatcher.class, viewDispatcher());
+        picoContainer.addComponent(ViewResolver.class, viewResolver());
+        picoContainer.addComponent(ParameterResolver.class, parameterResolver());
+
+        parameterResolver = picoContainer.getComponent(ParameterResolver.class);
+
+    }
+
+    protected Class<? extends ActionMethodExecutor> actionMethodExecutor() {
+        return InterceptingActionMethodExecutor.class;
+    }
+
+    protected Class<? extends ActionMethodResponseHandler> actionMethodResponseHandler() {
+        return DefaultActionMethodResponseHandler.class;
+    }
+
+    protected Class<? extends ArgumentResolver> argumentResolver() {
+        return HierarchicalArgumentResolver.class;
+    }
+
+    protected Class<? extends MethodDefinitionFinder> methodDefinitionFinder() {
+        return AnnotatedMethodDefinitionFinder.class;
+    }
+
+    protected Class<? extends MethodNameResolver> methodNameResolver() {
+        return RequestParameterMethodNameResolver.class;
+    }
+
+    protected Class<? extends BindErrorMessageResolver> bindErrorMessageResolver() {
+        return OgnlBindErrorMessageResolver.class;
+    }
+
+    protected Class<? extends ControllerDataBinder> controllerDataBinder() {
+        return OgnlControllerDataBinder.class;
+    }
+
+    protected Class<? extends ViewDataBinder> viewDataBinder() {
+        return IntrospectingViewDataBinder.class;
+    }
+
+    protected Class<? extends StringTransmuter> stringTransmuter() {
+        return DefaultStringTransmuter.class;
+    }
+
+    protected Class<? extends ValueConverterFinder> valueConverterFinder() {
+        return OgnlValueConverterFinder.class;
+    }
+
+    protected Class<? extends ControllerDefinitionFactory> controllerDefinitionFactory() {
+        return ContextControllerDefinitionFactory.class;
+    }
+
+    protected Class<? extends ControllerNameResolver> controllerNameResolver() {
+        return ContextPathControllerNameResolver.class;
+    }
+
+    protected Class<? extends MessageResources> messageResources() {
+        return DefaultMessageResources.class;
+    }
+
+    protected Class<? extends ParameterResolver> parameterResolver() {
+        return ParameterResolver.class;
+    }
+
+    protected Class<? extends ViewResolver> viewResolver() {
+        return DefaultViewResolver.class;
+    }
+
+    protected Class<? extends ViewDispatcher> viewDispatcher() {
+        return DefaultViewDispatcher.class;
+    }
+
+    protected Class<? extends Validator> validator() {
+        return DefaultValidator.class;
+    }
+
+    protected Class<? extends ViewMonitor> viewMonitor() {
+        return SilentMonitor.class;
+    }
+
+    protected Class<? extends ValidationMonitor> validationMonitor() {
+        return SilentMonitor.class;
+    }
+
+    protected Class<? extends ServletMonitor> servletMonitor() {
+        return SilentMonitor.class;
+    }
+
+    protected Class<? extends BindMonitor> bindMonitor() {
+        return SilentMonitor.class;
+    }
+
+    protected Class<? extends ActionMonitor> actionMonitor() {
+        return SilentMonitor.class;
+    }
+
+
+    public void composeSession(MutablePicoContainer picoContainer) {
+        // nothing yet
+    }
+
+    public void composeRequest(MutablePicoContainer picoContainer) {
+        picoContainer.addComponent(ErrorsContext.class, errorsContext());
+    }
+
+    protected Class<? extends ErrorsContext> errorsContext() {
+        return DefaultErrorsContext.class;
+    }
+
+    protected Parameter[] picoParameters(Object... parameters) {
+        if (parameters.length == 0) {
+            return null; // pico expects a null when no parameters
+        }
+
+        Parameter[] picoParameters = new Parameter[parameters.length];
+        for (int i = 0; i < parameters.length; i++) {
+            picoParameters[i] = parameterResolver.resolve(parameters[i]);
+        }
+        return picoParameters;
+    }
+
+}

Property changes: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/WaffleWebappComposer.java

Name: svn:mergeinfo
   + 

Modified: sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby/RubyWaffleWebappComposer.java (895 => 896)

--- sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby/RubyWaffleWebappComposer.java	2009-01-18 11:02:18 UTC (rev 895)
+++ sandbox/v2experiment/waffle-ruby/src/main/java/org/codehaus/waffle/ruby/RubyWaffleWebappComposer.java	2009-01-18 11:14:03 UTC (rev 896)
@@ -3,7 +3,7 @@
  */
 package org.codehaus.waffle.ruby;
 
-import org.codehaus.waffle.context.WaffleWebappComposer;
+import org.codehaus.waffle.context.pico.WaffleWebappComposer;
 import org.codehaus.waffle.bind.ControllerDataBinder;
 import org.codehaus.waffle.ruby.bind.ognl.RubyControllerDataBinder;
 import org.codehaus.waffle.ruby.controller.RubyControllerDefinitionFactory;

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email