You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/01/23 21:37:17 UTC
svn commit: r614656 - in /myfaces/tobago/branches/tobago-1.0.x: ./
example/demo/src/main/webapp/WEB-INF/faces-config.xml
example/demo/src/main/webapp/WEB-INF/web.xml
Author: bommel
Date: Wed Jan 23 12:37:14 2008
New Revision: 614656
URL: http://svn.apache.org/viewvc?rev=614656&view=rev
Log:
Merged revisions 614278 via svnmerge from
https://svn.apache.org/repos/asf/myfaces/tobago/trunk
........
r614278 | bommel | 2008-01-22 19:17:24 +0100 (Di, 22 Jan 2008) | 2 lines
(TOBAGO-516) Unable to deploy Tobago sample application to JSF RI 1.2_05 RC3
Thanks Ryan Lubke for the hint
........
Modified:
myfaces/tobago/branches/tobago-1.0.x/ (props changed)
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/faces-config.xml (contents, props changed)
myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/web.xml
Propchange: myfaces/tobago/branches/tobago-1.0.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jan 23 12:37:14 2008
@@ -1 +1 @@
-/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939
+/myfaces/tobago/trunk:1-603371,609568-609629,612250-612251,612282,612518,613455,613939,614278
Modified: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/faces-config.xml?rev=614656&r1=614655&r2=614656&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/faces-config.xml Wed Jan 23 12:37:14 2008
@@ -228,11 +228,11 @@
<navigation-rule>
<from-view-id>/best-practice/error.jsp</from-view-id>
<navigation-case>
- <from-action>404</from-action>
+ <from-outcome>404</from-outcome>
<to-view-id>/best-practice/not-existing-page.jsp</to-view-id>
</navigation-case>
<navigation-case>
- <from-action>syntax</from-action>
+ <from-outcome>syntax</from-outcome>
<to-view-id>/best-practice/error-in-syntax.jsp</to-view-id>
</navigation-case>
</navigation-rule>
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/faces-config.xml
('svn:eol-style' removed)
Propchange: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/faces-config.xml
('svn:keywords' removed)
Modified: myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/web.xml?rev=614656&r1=614655&r2=614656&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/branches/tobago-1.0.x/example/demo/src/main/webapp/WEB-INF/web.xml Wed Jan 23 12:37:14 2008
@@ -18,12 +18,17 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
<display-name>Tobago Demo Application</display-name>
+ <context-param>
+ <param-name>com.sun.faces.validateXml</param-name>
+ <param-value>true</param-value>
+ </context-param>
+
<filter>
<filter-name>multipartFormdataFilter</filter-name>
<filter-class>org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataFilter</filter-class>
@@ -48,7 +53,7 @@
<url-pattern>/faces/*</url-pattern>
</filter-mapping>
-<!-- workaround (e.g. for Oracle AS 10.1.2.0.0)-->
+ <!-- workaround (e.g. for Oracle AS 10.1.2.0.0)-->
<listener>
<listener-class>org.apache.myfaces.tobago.webapp.TobagoServletContextListener</listener-class>
</listener>
@@ -58,13 +63,13 @@
</listener-->
<!-- servlet -->
-<!-- no longer needed since Weblogic 8.1 SP 3
- <servlet>
- <servlet-name>WeblogicWorkaroundServlet</servlet-name>
- <servlet-class>org.apache.myfaces.tobago.webapp.WeblogicWorkaroundServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
--->
+ <!-- no longer needed since Weblogic 8.1 SP 3
+ <servlet>
+ <servlet-name>WeblogicWorkaroundServlet</servlet-name>
+ <servlet-class>org.apache.myfaces.tobago.webapp.WeblogicWorkaroundServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ -->
<servlet>
<servlet-name>FacesServlet</servlet-name>