Title: [waffle-scm] [888] sandbox/v2experiment/examples/paranamer-example/src/main/webapp/WEB-INF: half working

Diff

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

--- sandbox/v2experiment/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/ParanamerExampleWebappComposer.java	2009-01-15 22:31:40 UTC (rev 887)
+++ sandbox/v2experiment/examples/paranamer-example/src/main/java/org/codehaus/waffle/example/paranamer/ParanamerExampleWebappComposer.java	2009-01-15 22:52:27 UTC (rev 888)
@@ -5,6 +5,10 @@
 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.action.AnnotatedMethodDefinitionFinder;
+import org.codehaus.waffle.action.MethodDefinitionFinder;
+import org.codehaus.waffle.action.ParanamerMethodDefinitionFinder;
+import org.codehaus.waffle.bind.converters.DateValueConverter;
 import org.picocontainer.MutablePicoContainer;
 
 import javax.servlet.ServletContext;
@@ -14,12 +18,19 @@
     @Override
     public void composeApplication(MutablePicoContainer picoContainer, ServletContext servletContext) {
         super.composeApplication(picoContainer, servletContext);
+
+        picoContainer.addComponent(DateValueConverter.class);
+
         picoContainer.addComponent(SimplePersonDAO.class);
         picoContainer.addComponent("helloworld", HelloWorldController.class);
         picoContainer.addComponent("ajaxexample", AjaxExample.class);
         picoContainer.addComponent("people/person", PersonController.class);
     }
 
+    protected Class<? extends MethodDefinitionFinder> methodDefinitionFinder() {
+        return ParanamerMethodDefinitionFinder.class;
+    }
+
     @Override
     public void composeSession(MutablePicoContainer picoContainer) {
         super.composeSession(picoContainer);

Modified: sandbox/v2experiment/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml (887 => 888)

--- sandbox/v2experiment/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 22:31:40 UTC (rev 887)
+++ sandbox/v2experiment/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 22:52:27 UTC (rev 888)
@@ -7,30 +7,21 @@
 
     <display-name>Waffle Example</display-name>
 
-    <!-- 1. This is how an application registers its custom Registrar -->
+    <!-- 1. This is how PicoContainer-Web registers composition class -->
     <context-param>
-        <param-name>org.codehaus.waffle.registrar.Registrar</param-name>
-        <param-value>org.codehaus.waffle.example.paranamer.ParanamerRegistrar</param-value>
+        <param-name>webapp-composer-class</param-name>
+        <param-value>org.codehaus.waffle.example.paranamer.ParanamerExampleWebappComposer</param-value>
     </context-param>
-    <context-param>
-        <param-name>org.codehaus.waffle.action.MethodDefinitionFinder</param-name>
-        <param-value>org.codehaus.waffle.action.ParanamerMethodDefinitionFinder</param-value>
-    </context-param>
-    <!-- 2. We are adding a Custom components objects -->
-    <context-param>
-        <param-name>register:DateConverter</param-name>
-        <param-value>org.codehaus.waffle.bind.converters.DateValueConverter</param-value>
-    </context-param>
 
-    <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
+    <!-- 3. PicoContainer-Web context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.context.WaffleContextListener</listener-class>
+       <listener-class>org.picocontainer.web.PicoServletContainerListener</listener-class>
     </listener>
 
     <!-- 4. Waffle request filter (responsible for request level context) -->
     <filter>
         <filter-name>WaffleRequestFilter</filter-name>
-        <filter-class>org.codehaus.waffle.context.WaffleRequestFilter</filter-class>
+        <filter-class>org.codehaus.waffle.servlet.WaffleServlet$ServletFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>WaffleRequestFilter</filter-name>


To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to