[waffle-scm] [937] trunk/waffle-distribution/src/site/content: reflect new locations

[paul]

Title: [waffle-scm] [937] trunk/waffle-distribution/src/site/content: reflect new locations

Revision

937

Author

paul

Date

2009-04-08 15:22:36 -0500 (Wed, 08 Apr 2009)

Log Message

reflect new locations

Modified Paths

• trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml
• trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml
• trunk/examples/jruby-example/src/test/ruby/specs/foobar_spec.rb
• trunk/examples/migration-example/src/main/webapp/WEB-INF/waffle-web.xml
• trunk/examples/mydvds-example/src/main/webapp/WEB-INF/web.xml
• trunk/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml
• trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml
• trunk/integration/waffle-taglib/src/main/webapp/WEB-INF/web.xml
• trunk/waffle-distribution/src/site/content/tutorials/tutorial-one.html
• trunk/waffle-distribution/src/site/content/views.html
• trunk/waffle-distribution/src/site/content/webxml.html
• trunk/waffle-distribution/src/templates/eclipse/webapp/WEB-INF/web.xml

Diff

Modified: trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml (936 => 937)

--- trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/examples/freemarker-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -14,7 +14,7 @@
 
     <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.servlet.WaffleListener</listener-class>
+        <listener-class>org.codehaus.waffle.pico.WaffleListener</listener-class>
     </listener>
 
     <!-- Filters -->
@@ -26,7 +26,7 @@
     <!-- 4. Waffle request filter (responsible for request level context) -->
     <filter>
         <filter-name>WaffleRequestFilter</filter-name>
-        <filter-class>org.codehaus.waffle.servlet.WaffleServlet$ServletFilter</filter-class>
+        <filter-class>org.codehaus.waffle.pico.WafflePicoServlet$ServletFilter</filter-class>
     </filter>
 
     <filter-mapping>
@@ -42,7 +42,7 @@
     <!-- Servlets -->
     <servlet>
         <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+        <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
         <init-param>
             <param-name>view.suffix</param-name>
             <param-value>.ftl</param-value>

Modified: trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml (936 => 937)

--- trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/examples/jruby-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -27,7 +27,7 @@
 
     <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.servlet.WaffleListener</listener-class>
+        <listener-class>org.codehaus.waffle.pico.WaffleListener</listener-class>
     </listener>
 
     <!-- 4. Waffle request filter (responsible for request level context) -->
@@ -43,7 +43,7 @@
     <!-- 5. Register Waffle's FrontController servlet -->
     <servlet>
         <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+        <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
         <init-param>
             <param-name>view.suffix</param-name>
             <param-value>.rhtml</param-value>

Modified: trunk/examples/jruby-example/src/test/ruby/specs/foobar_spec.rb (936 => 937)

--- trunk/examples/jruby-example/src/test/ruby/specs/foobar_spec.rb	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/examples/jruby-example/src/test/ruby/specs/foobar_spec.rb	2009-04-08 20:22:36 UTC (rev 937)
@@ -1,6 +1,6 @@
 require 'java'
 
-import org.codehaus.waffle.servlet.WaffleServlet
+import org.codehaus.waffle.pico.WafflePicoServlet
 require 'person'
 
 describe 'stuff' do

Modified: trunk/examples/migration-example/src/main/webapp/WEB-INF/waffle-web.xml (936 => 937)

--- trunk/examples/migration-example/src/main/webapp/WEB-INF/waffle-web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/examples/migration-example/src/main/webapp/WEB-INF/waffle-web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -34,7 +34,7 @@
     <!-- Register Waffle's FrontController servlet -->
     <servlet>
         <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+        <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

Modified: trunk/examples/mydvds-example/src/main/webapp/WEB-INF/web.xml (936 => 937)

--- trunk/examples/mydvds-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/examples/mydvds-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -20,13 +20,13 @@
 
     <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.servlet.WaffleListener</listener-class>
+        <listener-class>org.codehaus.waffle.pico.WaffleListener</listener-class>
     </listener>
 
     <!-- 4. Waffle request filter (responsible for request level context) -->
     <filter>
         <filter-name>WaffleRequestFilter</filter-name>
-        <filter-class>org.codehaus.waffle.servlet.WaffleServlet$ServletFilter</filter-class>
+        <filter-class>org.codehaus.waffle.pico.WafflePicoServlet$ServletFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>WaffleRequestFilter</filter-name>
@@ -36,7 +36,7 @@
     <!-- 5. Register Waffle's FrontController servlet -->
     <servlet>
         <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+        <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
         <init-param>
             <param-name>view.suffix</param-name>
             <param-value>.jspx</param-value>

Modified: trunk/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml (936 => 937)

--- trunk/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/examples/paranamer-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -15,13 +15,13 @@
 
     <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.servlet.WaffleListener</listener-class>
+        <listener-class>org.codehaus.waffle.pico.WaffleListener</listener-class>
     </listener>
 
     <!-- 4. Waffle request filter (responsible for request level context) -->
     <filter>
         <filter-name>WaffleRequestFilter</filter-name>
-        <filter-class>org.codehaus.waffle.servlet.WaffleServlet$ServletFilter</filter-class>
+        <filter-class>org.codehaus.waffle.pico.WafflePicoServlet$ServletFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>WaffleRequestFilter</filter-name>
@@ -31,7 +31,7 @@
     <!-- 5. Register Waffle's FrontController servlet -->
     <servlet>
         <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+        <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

Modified: trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml (936 => 937)

--- trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/examples/simple-example/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -15,13 +15,13 @@
 
     <!-- 3. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-        <listener-class>org.codehaus.waffle.servlet.WaffleListener</listener-class>
+        <listener-class>org.codehaus.waffle.pico.WaffleListener</listener-class>
     </listener>
 
     <!-- 4. Waffle request filter (responsible for request level context) -->
     <filter>
         <filter-name>WaffleRequestFilter</filter-name>
-        <filter-class>org.codehaus.waffle.servlet.WaffleServlet$ServletFilter</filter-class>
+        <filter-class>org.codehaus.waffle.pico.WafflePicoServlet$ServletFilter</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>WaffleRequestFilter</filter-name>
@@ -35,7 +35,7 @@
     <!-- 5. Register Waffle's FrontController servlet -->
     <servlet>
         <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+        <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
         <init-param>
             <param-name>errors.view</param-name>
             <param-value>errors</param-value>

Modified: trunk/integration/waffle-taglib/src/main/webapp/WEB-INF/web.xml (936 => 937)

--- trunk/integration/waffle-taglib/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/integration/waffle-taglib/src/main/webapp/WEB-INF/web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -31,7 +31,7 @@
   <!-- 5. Register Waffle's FrontController servlet -->
   <servlet>
     <servlet-name>waffle</servlet-name>
-    <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+    <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
     <init-param>
       <param-name>view.suffix</param-name>
       <param-value>.jsp</param-value>

Modified: trunk/waffle-distribution/src/site/content/tutorials/tutorial-one.html (936 => 937)

--- trunk/waffle-distribution/src/site/content/tutorials/tutorial-one.html	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/waffle-distribution/src/site/content/tutorials/tutorial-one.html	2009-04-08 20:22:36 UTC (rev 937)
@@ -71,18 +71,18 @@
   <li><b><a href=""
         webapp-composer-class</a></b> is the key
   used to register your applications with Waffle.</li>
-  <li><b><a href=""
-        org.codehaus.waffle.servlet.WaffleListener</a></b>
+  <li><b><a href=""
+        org.codehaus.waffle.pico.WaffleListener</a></b>
   needs to be registered as a listener so that Waffle can be notified of
   context level (application, session) events.</li>
   <li>
-    <b><a href=""
-        org.codehaus.waffle.servlet.WaffleServlet$WaffleFilter</a></b> this is the Filter Waffle uses to handle request level
+    <b><a href=""
+        org.codehaus.waffle.pico.WafflePicoServlet$WaffleFilter</a></b> this is the Filter Waffle uses to handle request level
     events. This is superior to a RequestAttributeListeners implementation because we can ensure a request level
     container will only be created when appropriate (i.e. not when images or cascading style sheets are requested).
   </li>
-  <li><b><a href=""
-        org.codehaus.waffle.servlet.WaffleServlet</a></b> is Waffle's front controller for handling requests.</li>
+  <li><b><a href=""
+        org.codehaus.waffle.pico.WafflePicoServlet</a></b> is Waffle's front controller for handling requests.</li>
 </ol>
 
 <textarea class="xml:nogutter:nocontrols" name="code">
@@ -103,13 +103,13 @@
 
     <!-- 2. Waffle context listener (ServletContext and HttpSession) -->
     <listener>
-      <listener-class>org.codehaus.waffle.servlet.WaffleListener</listener-class>
+      <listener-class>org.codehaus.waffle.pico.WaffleListener</listener-class>
     </listener>
 
     <!-- 3. Waffle request filter (responsible for request level context) -->
     <filter>
       <filter-name>WaffleRequestFilter</filter-name>
-      <filter-class>org.codehaus.waffle.servlet.WaffleServlet$WaffleFilter</filter-class>
+      <filter-class>org.codehaus.waffle.pico.WafflePicoServlet$WaffleFilter</filter-class>
     </filter>
     <filter-mapping>
       <filter-name>WaffleRequestFilter</filter-name>
@@ -119,7 +119,7 @@
     <!-- 4. Register Waffle's FrontController servlet -->
     <servlet>
       <servlet-name>waffle</servlet-name>
-      <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+      <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
       <init-param>
         <param-name>view.suffix</param-name>
         <param-value>.jspx</param-value>

Modified: trunk/waffle-distribution/src/site/content/views.html (936 => 937)

--- trunk/waffle-distribution/src/site/content/views.html	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/waffle-distribution/src/site/content/views.html	2009-04-08 20:22:36 UTC (rev 937)
@@ -45,7 +45,7 @@
 <textarea class="xml:nogutter:nocontrols" name="code">
   <servlet>
     <servlet-name>waffle</servlet-name>
-    <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+    <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
     <init-param>
       <description>Optional, by default '/' (root) is used.</description>
       <param-name>view.prefix</param-name>

Modified: trunk/waffle-distribution/src/site/content/webxml.html (936 => 937)

--- trunk/waffle-distribution/src/site/content/webxml.html	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/waffle-distribution/src/site/content/webxml.html	2009-04-08 20:22:36 UTC (rev 937)
@@ -31,13 +31,13 @@
 15:
 16:    <!-- 2. Waffle context listener (ServletContext and HttpSession) -->
 17:    <listener>
-18:      <listener-class>org.codehaus.waffle.servlet.WaffleListener</listener-class>
+18:      <listener-class>org.codehaus.waffle.pico.WaffleListener</listener-class>
 19:    </listener>
 20:
 21:    <!-- 3. Waffle request filter (responsible for request level context) -->
 22:    <filter>
 23:      <filter-name>WaffleRequestFilter</filter-name>
-24:      <filter-class>org.codehaus.waffle.servlet.WaffleServlet$ServletFilter</filter-class>
+24:      <filter-class>org.codehaus.waffle.pico.WafflePicoServlet$ServletFilter</filter-class>
 25:    </filter>
 26:    <filter-mapping>
 27:      <filter-name>WaffleRequestFilter</filter-name>
@@ -47,7 +47,7 @@
 31:    <!-- 4. Register Waffle's FrontController servlet -->
 32:    <servlet>
 33:      <servlet-name>waffle</servlet-name>
-34:      <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+34:      <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
 35:      <init-param>
 36:        <param-name>view.suffix</param-name>
 37:        <param-value>.jspx</param-value> <!-- or *.ftl for freemarker etc -->

Modified: trunk/waffle-distribution/src/templates/eclipse/webapp/WEB-INF/web.xml (936 => 937)

--- trunk/waffle-distribution/src/templates/eclipse/webapp/WEB-INF/web.xml	2009-04-08 20:15:10 UTC (rev 936)
+++ trunk/waffle-distribution/src/templates/eclipse/webapp/WEB-INF/web.xml	2009-04-08 20:22:36 UTC (rev 937)
@@ -46,7 +46,7 @@
     <!-- 5. Register Waffle's FrontController servlet -->
     <servlet>
         <servlet-name>waffle</servlet-name>
-        <servlet-class>org.codehaus.waffle.servlet.WaffleServlet</servlet-class>
+        <servlet-class>org.codehaus.waffle.pico.WafflePicoServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email