[waffle-scm] [876] sandbox/v2experiment/examples/jruby-example/src/main/webapp/WEB-INF: merge some interface with impl

Thu, 15 Jan 2009 04:46:37 -0800

Title: [waffle-scm] [876] sandbox/v2experiment/examples/jruby-example/src/main/webapp/WEB-INF: merge some interface with impl

Diff

Modified: sandbox/v2experiment/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml (875 => 876)

--- sandbox/v2experiment/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:46:31 UTC (rev 876)
@@ -37,7 +37,7 @@
   
   <!-- Waffle context listener -->
   <listener>
-    <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
+    <listener-class>org.codehaus.waffle.context.WaffleContextListener</listener-class>
   </listener>
 
   <!-- Filters -->

Modified: sandbox/v2experiment/examples/jruby-example/src/main/webapp/WEB-INF/web.xml (875 => 876)

--- sandbox/v2experiment/examples/jruby-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/examples/jruby-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:46:31 UTC (rev 876)
@@ -57,7 +57,7 @@
   </context-param>-->
   
   <listener>
-    <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
+    <listener-class>org.codehaus.waffle.context.WaffleContextListener</listener-class>
   </listener>
 
   <!-- 4. Waffle request filter (responsible for request level context) -->

Modified: sandbox/v2experiment/examples/migration-example/src/main/webapp/WEB-INF/waffle-web.xml (875 => 876)

--- sandbox/v2experiment/examples/migration-example/src/main/webapp/WEB-INF/waffle-web.xml	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/examples/migration-example/src/main/webapp/WEB-INF/waffle-web.xml	2009-01-15 12:46:31 UTC (rev 876)
@@ -18,7 +18,7 @@
 
     <!-- Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
+        <listener-class>org.codehaus.waffle.context.WaffleContextListener</listener-class>
     </listener>
 
     <!-- Waffle request filter (responsible for request level context) -->

Modified: sandbox/v2experiment/examples/mydvds-example/src/main/webapp/WEB-INF/web.xml (875 => 876)

--- sandbox/v2experiment/examples/mydvds-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/examples/mydvds-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:46:31 UTC (rev 876)
@@ -20,7 +20,7 @@
 
   <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
   <listener>
-    <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
+    <listener-class>org.codehaus.waffle.context.WaffleContextListener</listener-class>
   </listener>
 
   <!-- 4. Waffle request filter (responsible for request level context) -->

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

--- sandbox/v2experiment/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:46:31 UTC (rev 876)
@@ -24,7 +24,7 @@
 
     <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
+        <listener-class>org.codehaus.waffle.context.WaffleContextListener</listener-class>
     </listener>
 
     <!-- 4. Waffle request filter (responsible for request level context) -->

Modified: sandbox/v2experiment/examples/simple-example/src/main/webapp/WEB-INF/web.xml (875 => 876)

--- sandbox/v2experiment/examples/simple-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/examples/simple-example/src/main/webapp/WEB-INF/web.xml	2009-01-15 12:46:31 UTC (rev 876)
@@ -32,7 +32,7 @@
 
     <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.context.pico.PicoWaffleContextListener</listener-class>
+        <listener-class>org.codehaus.waffle.context.WaffleContextListener</listener-class>
     </listener>
 
     <!-- 4. Waffle request filter (responsible for request level context) -->

Modified: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleContextListener.java (875 => 876)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleContextListener.java	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/WaffleContextListener.java	2009-01-15 12:46:31 UTC (rev 876)
@@ -21,7 +21,7 @@
  * @author Mike Ward
  * @author Mauro Talevi
  */
-public abstract class WaffleContextListener implements ServletContextListener, HttpSessionListener {
+public class WaffleContextListener implements ServletContextListener, HttpSessionListener {
     private ContextContainerFactory contextContainerFactory;
 
     /**
@@ -73,6 +73,8 @@
      * @param servletContext
      * @return A ComponentRegistry
      */
-    protected abstract ComponentRegistry buildComponentRegistry(ServletContext servletContext);
+    protected ComponentRegistry buildComponentRegistry(ServletContext servletContext) {
+        return new ComponentRegistry(servletContext);
+    }
 
 }

Deleted: sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoWaffleContextListener.java (875 => 876)

--- sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoWaffleContextListener.java	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/waffle-core/src/main/java/org/codehaus/waffle/context/pico/PicoWaffleContextListener.java	2009-01-15 12:46:31 UTC (rev 876)
@@ -1,22 +0,0 @@
-/*
- * Copyright (c) terms as published in http://waffle.codehaus.org/license.html
- */
-package org.codehaus.waffle.context.pico;
-
-import javax.servlet.ServletContext;
-
-import org.codehaus.waffle.ComponentRegistry;
-import org.codehaus.waffle.context.WaffleContextListener;
-
-/**
- * Pico-based WaffleContextListener that uses PicoComponentRegistry instances.
- * 
- * @author Mauro Talevi
- */
-public class PicoWaffleContextListener extends WaffleContextListener {
-
-    protected ComponentRegistry buildComponentRegistry(ServletContext servletContext) {
-        return new ComponentRegistry(servletContext);
-    }
-
-}

Modified: sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoWaffleContextListenerTest.java (875 => 876)

--- sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoWaffleContextListenerTest.java	2009-01-15 12:42:17 UTC (rev 875)
+++ sandbox/v2experiment/waffle-core/src/test/java/org/codehaus/waffle/context/pico/PicoWaffleContextListenerTest.java	2009-01-15 12:46:31 UTC (rev 876)
@@ -95,7 +95,7 @@
 
     @Test
     public void canInvokeHttpSessionListenerMethods() throws Exception {
-        WaffleContextListener waffleContextListener = new PicoWaffleContextListener();
+        WaffleContextListener waffleContextListener = new WaffleContextListener();
 
         // Mock ContextContainer
         final MutablePicoContainer container = mockery.mock(MutablePicoContainer.class);

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email

Reply via email to