Author: niallp
Date: Wed May 28 14:49:43 2008
New Revision: 661103

URL: http://svn.apache.org/viewvc?rev=661103&view=rev
Log:
Add 2nd example webapp that uses ChainProcessor

Added:
    commons/proper/chain/trunk/apps/example1/
      - copied from r661097, commons/proper/chain/trunk/apps/example/
    commons/proper/chain/trunk/apps/example2/
      - copied from r661097, commons/proper/chain/trunk/apps/example/
Removed:
    commons/proper/chain/trunk/apps/example/
    
commons/proper/chain/trunk/apps/example1/src/main/java/org/apache/commons/chain/apps/example/ExampleServlet.java
Modified:
    commons/proper/chain/trunk/apps/example1/pom.xml
    
commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml
    commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml
    commons/proper/chain/trunk/apps/example2/pom.xml

Modified: commons/proper/chain/trunk/apps/example1/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/pom.xml?rev=661103&r1=661097&r2=661103&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/pom.xml (original)
+++ commons/proper/chain/trunk/apps/example1/pom.xml Wed May 28 14:49:43 2008
@@ -28,10 +28,10 @@
         <version>10</version>
     </parent>
 
-    <artifactId>chain-example</artifactId>
+    <artifactId>chain-example1</artifactId>
     <packaging>war</packaging>
     <version>1.2-SNAPSHOT</version>
-    <name>Chan Example App</name>
+    <name>Chan Example 1 App</name>
 
     <dependencies>
 

Modified: 
commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml?rev=661103&r1=661097&r2=661103&view=diff
==============================================================================
--- 
commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml
 (original)
+++ 
commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/chain-config.xml
 Wed May 28 14:49:43 2008
@@ -25,7 +25,7 @@
     <catalog>
 
         <!-- Command that maps "Path Info" patterns to Commands -->
-        <chain name="COMMAND_MAPPER">
+        <chain name="command">
             <command                       
className="org.apache.commons.chain.web.servlet.PathInfoMapper"/>
             <command forward="/pathinfo.jsp"  
className="org.apache.commons.chain.apps.example.ForwardCommand"/>
         </chain>
@@ -46,7 +46,7 @@
     <catalog name="reqparam">
 
         <!-- Command that maps a "Request Parameter" to Commands -->
-        <chain name="COMMAND_MAPPER">
+        <chain name="command">
             <command catalogName="reqparam"  
className="org.apache.commons.chain.web.servlet.RequestParameterMapper"/>
             <command forward="/reqparam.jsp" 
className="org.apache.commons.chain.apps.example.ForwardCommand"/>
         </chain>
@@ -67,7 +67,7 @@
     <catalog name="servletpath">
 
         <!-- Command that maps "Servlet Path" patterns to Commands -->
-        <chain name="COMMAND_MAPPER">
+        <chain name="command">
             <command catalogName="servletpath"  
className="org.apache.commons.chain.web.servlet.ServletPathMapper"/>
             <command forward="/servletpath.jsp" 
className="org.apache.commons.chain.apps.example.ForwardCommand"/>
         </chain>

Modified: 
commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml?rev=661103&r1=661097&r2=661103&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml 
(original)
+++ commons/proper/chain/trunk/apps/example1/src/main/webapp/WEB-INF/web.xml 
Wed May 28 14:49:43 2008
@@ -26,32 +26,39 @@
         <param-value>/WEB-INF/chain-config.xml</param-value>
     </context-param>
 
-    <!-- Configuration Listener -->
-    <listener>
-        <listener-class>
-            org.apache.commons.chain.web.ChainListener
-        </listener-class>
-    </listener>
-
-    <!-- "Path Info" Servlet Configuration -->
+    <!-- "Path Info" Servlet Configuration (uses default catalog) -->
     <servlet>
         <servlet-name>pathinfo</servlet-name>
-        
<servlet-class>org.apache.commons.chain.apps.example.ExampleServlet</servlet-class>
+        
<servlet-class>org.apache.commons.chain.web.servlet.ChainProcessor</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
     <!-- "Request Parameter" Servlet Configuration -->
     <servlet>
         <servlet-name>reqparam</servlet-name>
-        
<servlet-class>org.apache.commons.chain.apps.example.ExampleServlet</servlet-class>
+        
<servlet-class>org.apache.commons.chain.web.servlet.ChainProcessor</servlet-class>
         <load-on-startup>2</load-on-startup>
+
+        <!-- Configure catalog name -->
+        <init-param>
+            <param-name>org.apache.commons.chain.CATALOG</param-name>
+            <param-value>reqparam</param-value>
+        </init-param>
+
     </servlet>
 
     <!-- "Servlet Path" Servlet Configuration -->
     <servlet>
         <servlet-name>servletpath</servlet-name>
-        
<servlet-class>org.apache.commons.chain.apps.example.ExampleServlet</servlet-class>
+        
<servlet-class>org.apache.commons.chain.web.servlet.ChainProcessor</servlet-class>
         <load-on-startup>3</load-on-startup>
+
+        <!-- Configure catalog name -->
+        <init-param>
+            <param-name>org.apache.commons.chain.CATALOG</param-name>
+            <param-value>servletpath</param-value>
+        </init-param>
+
     </servlet>
 
     <!-- "Path Info" Servlet Mappings -->

Modified: commons/proper/chain/trunk/apps/example2/pom.xml
URL: 
http://svn.apache.org/viewvc/commons/proper/chain/trunk/apps/example2/pom.xml?rev=661103&r1=661097&r2=661103&view=diff
==============================================================================
--- commons/proper/chain/trunk/apps/example2/pom.xml (original)
+++ commons/proper/chain/trunk/apps/example2/pom.xml Wed May 28 14:49:43 2008
@@ -28,10 +28,10 @@
         <version>10</version>
     </parent>
 
-    <artifactId>chain-example</artifactId>
+    <artifactId>chain-example2</artifactId>
     <packaging>war</packaging>
     <version>1.2-SNAPSHOT</version>
-    <name>Chan Example App</name>
+    <name>Chan Example 2 App</name>
 
     <dependencies>
 


Reply via email to