Renamed controller method to doChangeItem() (naming convention)

[pizzaservice-war.git] / web / WEB-INF / faces-config.xml

diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml
index 46fa57203ce1768483ba30ac9bae835aa75a2728..c1187b0f50ab816d331b3a3786f4a9f8c6a3faa4 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -61,16 +61,58 @@
                        <from-outcome>admin_index</from-outcome>
                        <to-view-id>/admin/index.xhtml</to-view-id>
                </navigation-case>
-           <navigation-case>
-               <from-outcome>basket</from-outcome>
-               <to-view-id>/basketController.xhtml</to-view-id>
-           </navigation-case>
+               <navigation-case>
+                       <from-outcome>basket</from-outcome>
+                       <to-view-id>/basket.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>item_not_changed</from-outcome>
+                       <to-view-id>/errorHandler.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/basket.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>checkout</from-outcome>
+                       <to-view-id>/customer/checkout.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/customer/checkout.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>checkout2</from-outcome>
+                       <to-view-id>/customer/checkout2.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/index.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>item_added</from-outcome>
+                       <to-view-id>/item_added.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/customer/checkout2.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>checkout_done</from-outcome>
+                       <to-view-id>/customer/checkout_done.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>empty_basket</from-outcome>
+                       <to-view-id>/customer/empty_basket.xhtml</to-view-id>
+               </navigation-case>
+       </navigation-rule>
+       <navigation-rule>
+               <from-view-id>/admin/admin_logout.xhtml</from-view-id>
+               <navigation-case>
+                       <from-outcome>index</from-outcome>
+                       <to-view-id>/*</to-view-id>
+               </navigation-case>
        </navigation-rule>
-    <navigation-rule>
-        <from-view-id>/index.xhtml</from-view-id>
-        <navigation-case>
-            <from-outcome>item_added</from-outcome>
-            <to-view-id>/item_added.xhtml</to-view-id>
-        </navigation-case>
-    </navigation-rule>
+       <application>
+               <locale-config>
+                       <default-locale>de</default-locale>
+                       <supported-locale>en_US</supported-locale>
+               </locale-config>
+       </application>
 </faces-config>