You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gc...@apache.org on 2009/11/10 19:21:32 UTC
svn commit: r834580 -
/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml
Author: gcrawford
Date: Tue Nov 10 18:21:32 2009
New Revision: 834580
URL: http://svn.apache.org/viewvc?rev=834580&view=rev
Log:
clean up web.xml wrt facelets
remove TrinidadFaceletViewHandler as it's no longer used
rename org.apache.myfaces.trinidad.FACELETS_VIEW_MAPPINGS to javax.faces.FACELETS_VIEW_MAPPINGS
rename facelets.SKIP_COMMENTS to javax.faces.FACELETS_SKIP_COMMENTS
Modified:
myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml
Modified: myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml?rev=834580&r1=834579&r2=834580&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/trinidad/branches/trinidad-2.0.x/trinidad-examples/trinidad-demo/src/main/webapp/WEB-INF/web.xml Tue Nov 10 18:21:32 2009
@@ -16,7 +16,7 @@
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -30,14 +30,6 @@
<param-value>client</param-value>
<!--param-value>server</param-value-->
</context-param>
-
- <!-- Temporarily disable partial state saving default until we make it work with Trinidad -->
- <context-param>
- <param-name>javax.faces.PARTIAL_STATE_SAVING</param-name>
- <param-value>false</param-value>
- </context-param>
-
-
<context-param>
<param-name>javax.faces.DEFAULT_SUFFIX</param-name>
@@ -129,22 +121,23 @@
<param-value>userInputHere:</param-value>
</context-param-->
- <!-- Uncomment the below for use with Facelets
+ <!-- Temporarily disable partial state saving default until we make it work with Trinidad -->
<context-param>
- <param-name>org.apache.myfaces.trinidad.ALTERNATE_VIEW_HANDLER</param-name>
- <param-value>org.apache.myfaces.trinidadinternal.facelets.TrinidadFaceletViewHandler</param-value>
+ <param-name>javax.faces.PARTIAL_STATE_SAVING</param-name>
+ <param-value>false</param-value>
</context-param>
+ <!-- Uncomment the below for use with Facelets -->
+
<context-param>
- <param-name>org.apache.myfaces.trinidad.FACELETS_VIEW_MAPPINGS</param-name>
+ <param-name>javax.faces.FACELETS_VIEW_MAPPINGS</param-name>
<param-value>*.xhtml</param-value>
</context-param>
<context-param>
- <param-name>facelets.SKIP_COMMENTS</param-name>
+ <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>
<param-value>true</param-value>
</context-param>
- -->
<filter>
<filter-name>trinidad</filter-name>