svn commit: r582158 - /myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml

[sk...@apache.org]

Author: skitching
Date: Fri Oct  5 02:28:09 2007
New Revision: 582158

URL: http://svn.apache.org/viewvc?rev=582158&view=rev
Log:
Fix up web.xml after refactorings in core and examples code. Add documentation.

Modified:
    myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml

Modified: myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml?rev=582158&r1=582157&r2=582158&view=diff
==============================================================================
--- myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/orchestra/trunk/examples/src/main/webapp/WEB-INF/web.xml Fri Oct  5 02:28:09 2007
@@ -85,7 +85,7 @@
 
 	<filter>
 		<filter-name>requestEncodingFilter</filter-name>
-		<filter-class>org.apache.myfaces.filter.RequestEncodingFilter</filter-class>
+		<filter-class>org.apache.myfaces.examples.filter.RequestEncodingFilter</filter-class>
 	</filter>
 
 	<filter>
@@ -98,24 +98,52 @@
 		<filter-class>org.apache.myfaces.orchestra.conversation.jsf.filter.OrchestraServletFilter</filter-class>
 	</filter>
 
+	<filter>
+		<filter-name>basicFrameworkAdapterFilter</filter-name>
+		<filter-class>org.apache.myfaces.orchestra.frameworkAdapter.basic.BasicFrameworkAdapterFilter</filter-class>
+	</filter>
+
+    <!-- Force all submitted text to be interpreted as UTF8. -->
 	<filter-mapping>
 		<filter-name>requestEncodingFilter</filter-name>
 		<url-pattern>/*</url-pattern>
 	</filter-mapping>
 
+   <!--
+     - Set up Orchestra to handle non-JSF pages, ie raw jsp.
+     -
+     - Orchestra is explicitly designed to work without needing JSF, and the examples
+     - demonstrate this by having some pages implemented as plain jsp. However
+     - Orchestra uses the JSF faces-config.xml file to set up some necessary
+     - configuration automatically for JSF users; when not using JSF additional
+     - filters need to be explicitly defined to handle the same tasks.
+     -
+     - These filters are not needed if the app is JSF-only.
+     -->
 	<filter-mapping>
-		<filter-name>requestParameterFilter</filter-name>
-		<url-pattern>*.faces</url-pattern>
+		<filter-name>basicFrameworkAdapterFilter</filter-name>
+		<url-pattern>*.jsp</url-pattern>
 	</filter-mapping>
 
 	<filter-mapping>
-		<filter-name>FacesExtensionsFilter</filter-name>
-		<url-pattern>/faces/*</url-pattern>
+		<filter-name>requestParameterFilter</filter-name>
+		<url-pattern>*.jsp</url-pattern>
 	</filter-mapping>
 
+   <!--
+     - Set up Orchestra filters to handle JSF pages.
+     -->
 	<filter-mapping>
 		<filter-name>orchestraFilter</filter-name>
 		<url-pattern>*.faces</url-pattern>
+	</filter-mapping>
+
+   <!--
+     - Set up standard MyFaces stuff.
+     -->
+	<filter-mapping>
+		<filter-name>FacesExtensionsFilter</filter-name>
+		<url-pattern>/faces/*</url-pattern>
 	</filter-mapping>
 
 	<filter-mapping>