no shortening

[addressbook-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 c7261f8009b06d5a00bb6ee3b7012f05afce87da..e4a0b39911d463a3b71c23359a3fd61cec43cdb6 100644 (file)
--- a/web/WEB-INF/faces-config.xml
+++ b/web/WEB-INF/faces-config.xml
@@ -5,7 +5,7 @@
                          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd">
        <application>
                <locale-config>
-                       <default-locale>de</default-locale>
+                       <default-locale>de_DE</default-locale>
                        <supported-locale>en_US</supported-locale>
                </locale-config>
        </application>
@@ -73,11 +73,11 @@
                </navigation-case>
                <navigation-case>
                        <from-outcome>logout</from-outcome>
-                       <to-view-id>/bye.xhtml</to-view-id>
+                       <to-view-id>/logout.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_index</from-outcome>
-                       <to-view-id>/admin/admin_index.xhtml</to-view-id>
+                       <to-view-id>/admin/index.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>login_index</from-outcome>
@@ -92,28 +92,32 @@
                        <to-view-id>/login/login_own_addressbooks.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_other_addressbooks</from-outcome>
-                       <to-view-id>/login/login_other_addressbooks.xhtml</to-view-id>
+                       <from-outcome>basket</from-outcome>
+                       <to-view-id>/basket.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>user_list</from-outcome>
-                       <to-view-id>/user/user_list.xhtml</to-view-id>
+                       <from-outcome>item_not_changed</from-outcome>
+                       <to-view-id>/errorHandler.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>admin_logout</from-outcome>
-                       <to-view-id>/admin/admin_logout.xhtml</to-view-id>
+                       <from-outcome>admin_delete_user</from-outcome>
+                       <to-view-id>/admin/admin_user_delete.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_edit_user_data</from-outcome>
-                       <to-view-id>/login/login_edit_user_data.xhtml</to-view-id>
+                       <from-outcome>admin_list_user</from-outcome>
+                       <to-view-id>/admin/admin_user_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_shared_addressbooks</from-outcome>
-                       <to-view-id>/login/login_shared_addressbooks.xhtml</to-view-id>
+                       <from-outcome>admin_edit_user</from-outcome>
+                       <to-view-id>/admin/admin_user_edit.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>user_profile</from-outcome>
-                       <to-view-id>/user/user_profile.xhtml</to-view-id>
+                       <from-outcome>admin_unlock_user</from-outcome>
+                       <to-view-id>/admin/admin_user_unlock.xhtml</to-view-id>
+               </navigation-case>
+               <navigation-case>
+                       <from-outcome>admin_add_user</from-outcome>
+                       <to-view-id>/admin/admin_user_add.xhtml</to-view-id>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>