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/22 19:17:27 UTC

svn commit: r614278 - in /myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF: faces-config.xml web.xml

Author: bommel
Date: Tue Jan 22 10:17:24 2008
New Revision: 614278

URL: http://svn.apache.org/viewvc?rev=614278&view=rev
Log:
(TOBAGO-516) Unable to deploy Tobago sample application to JSF RI 1.2_05 RC3
Thanks Ryan Lubke for the hint

Modified:
    myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml   (contents, props changed)
    myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml?rev=614278&r1=614277&r2=614278&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml Tue Jan 22 10:17:24 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/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
            ('svn:eol-style' removed)

Propchange: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/faces-config.xml
            ('svn:keywords' removed)

Modified: myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml?rev=614278&r1=614277&r2=614278&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/example/demo/src/main/webapp/WEB-INF/web.xml Tue Jan 22 10:17:24 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>