You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2008/10/15 14:13:34 UTC

svn commit: r704877 - /myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml

Author: lofwyr
Date: Wed Oct 15 05:13:33 2008
New Revision: 704877

URL: http://svn.apache.org/viewvc?rev=704877&view=rev
Log:
TOBAGO-518: cleanup demo page structure

Modified:
    myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml

Modified: myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml?rev=704877&r1=704876&r2=704877&view=diff
==============================================================================
--- myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/tobago/trunk/example/sandbox/src/main/webapp/WEB-INF/faces-config.xml Wed Oct 15 05:13:33 2008
@@ -41,120 +41,56 @@
   <navigation-rule>
     <navigation-case>
       <from-outcome>index</from-outcome>
-      <to-view-id>/wizard/index.jsp</to-view-id>
+      <to-view-id>/jsp/wizard/index.jsp</to-view-id>
     </navigation-case>
   </navigation-rule>
 
   <navigation-rule>
-    <from-view-id>/wizard/bean/single.jsp</from-view-id>
+    <from-view-id>/jsp/wizard/bean/single.jsp</from-view-id>
     <navigation-case>
       <from-outcome>wizard</from-outcome>
-      <to-view-id>/wizard/bean/single.jsp</to-view-id>
+      <to-view-id>/jsp/wizard/bean/single.jsp</to-view-id>
     </navigation-case>
   </navigation-rule>
 
   <navigation-rule>
-    <from-view-id>/wizard.xml</from-view-id>
-    <navigation-case>
-      <from-outcome>wizard</from-outcome>
-      <to-view-id>/wizard.xml</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
-  <navigation-rule>
-    <from-view-id>/wizard/*</from-view-id>
+    <from-view-id>/jsp/wizard/navi/*</from-view-id>
     <navigation-case>
       <from-outcome>filter</from-outcome>
-      <to-view-id>/wizard/navi/filter.jsp</to-view-id>
+      <to-view-id>/jsp/wizard/navi/filter.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
       <from-outcome>fileIntoCondition</from-outcome>
-      <to-view-id>/wizard/navi/fileIntoCondition.jsp</to-view-id>
+      <to-view-id>/jsp/wizard/navi/fileIntoCondition.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
       <from-outcome>forwardCondition</from-outcome>
-      <to-view-id>/wizard/navi/forwardCondition.jsp</to-view-id>
+      <to-view-id>/jsp/wizard/navi/forwardCondition.jsp</to-view-id>
     </navigation-case>
     <navigation-case>
       <from-outcome>finish</from-outcome>
-      <to-view-id>/wizard/navi/finish.jsp</to-view-id>
+      <to-view-id>/jsp/wizard/navi/finish.jsp</to-view-id>
     </navigation-case>
   </navigation-rule>
 
   <navigation-rule>
-    <from-view-id>/facelets/wizard/*</from-view-id>
+    <from-view-id>/facelet/wizard/navi/*</from-view-id>
     <navigation-case>
       <from-outcome>filter</from-outcome>
-      <to-view-id>/facelets/wizard/navi/filter.xml</to-view-id>
+      <to-view-id>/facelet/wizard/navi/filter.xml</to-view-id>
     </navigation-case>
     <navigation-case>
       <from-outcome>fileIntoCondition</from-outcome>
-      <to-view-id>/facelets/wizard/navi/fileIntoCondition.xml</to-view-id>
+      <to-view-id>/facelet/wizard/navi/fileIntoCondition.xml</to-view-id>
     </navigation-case>
     <navigation-case>
       <from-outcome>forwardCondition</from-outcome>
-      <to-view-id>/facelets/wizard/navi/forwardCondition.xml</to-view-id>
+      <to-view-id>/facelet/wizard/navi/forwardCondition.xml</to-view-id>
     </navigation-case>
     <navigation-case>
       <from-outcome>finish</from-outcome>
-      <to-view-id>/facelets/wizard/navi/finish.xml</to-view-id>
+      <to-view-id>/facelet/wizard/navi/finish.xml</to-view-id>
     </navigation-case>
   </navigation-rule>
 
-<!--
-  <navigation-rule>
-    <from-view-id>/wizard/navi/filter.jsp</from-view-id>
-    <navigation-case>
-      <from-outcome>fileIntoCondition</from-outcome>
-      <to-view-id>/wizard/navi/fileIntoCondition.jsp</to-view-id>
-    </navigation-case>
-    <navigation-case>
-      <from-outcome>forwardCondition</from-outcome>
-      <to-view-id>/wizard/navi/forwardCondition.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
-  <navigation-rule>
-    <from-view-id>/wizard/navi/fileIntoCondition.jsp</from-view-id>
-    <navigation-case>
-      <from-outcome>next</from-outcome>
-      <to-view-id>/wizard/navi/finish.jsp</to-view-id>
-    </navigation-case>
--->
-<!--
-    <navigation-case>
-      <from-outcome>previous</from-outcome>
-      <to-view-id>/wizard/navi/filter.jsp</to-view-id>
-    </navigation-case>
--->
-<!--  </navigation-rule>
-
-  <navigation-rule>
-    <from-view-id>/wizard/navi/forwardCondition.jsp</from-view-id>
-    <navigation-case>
-      <from-outcome>next</from-outcome>
-      <to-view-id>/wizard/navi/finish.jsp</to-view-id>
-    </navigation-case>-->
-<!--
-    <navigation-case>
-      <from-outcome>previous</from-outcome>
-      <to-view-id>/wizard/navi/filter.jsp</to-view-id>
-    </navigation-case>
--->
-<!--  </navigation-rule>
-
-  <navigation-rule>
-    <from-view-id>/wizard/navi/finish.jsp</from-view-id>-->
-<!--
-    <navigation-case>
-      <from-outcome>forwardCondition</from-outcome>
-      <to-view-id>/wizard/navi/fileIntoCondition.jsp</to-view-id>
-    </navigation-case>
-    <navigation-case>
-      <from-outcome>forwardCondition</from-outcome>
-      <to-view-id>/wizard/navi/forwardCondition.jsp</to-view-id>
-    </navigation-case>
--->
-<!--  </navigation-rule> -->
-
 </faces-config>