From 3863bc80acfb8db952c1a94066fab45fa97b486d Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Thu, 15 Oct 2015 16:56:10 +0200 Subject: [PATCH] Continued: - renamed login_user_list.xhtml to more generic user_list.xhtml (it can be done) - added debug logging --- nbproject/ant-deploy.xml | 212 +++++++++--------- nbproject/build-impl.xml | 72 +++--- nbproject/faces-config.NavData | 2 +- nbproject/genfiles.properties | 2 +- .../addressbook/beans/user/UserWebBean.java | 9 + .../localization/bundle_de_DE.properties | 12 +- .../localization/bundle_en_US.properties | 12 +- web/WEB-INF/faces-config.xml | 6 +- web/WEB-INF/templates/login/login_menu.tpl | 2 +- web/login/login_shared_addressbooks.xhtml | 2 +- .../user_list.xhtml} | 8 +- 11 files changed, 174 insertions(+), 165 deletions(-) rename web/{login/login_user_list.xhtml => user/user_list.xhtml} (88%) diff --git a/nbproject/ant-deploy.xml b/nbproject/ant-deploy.xml index 3c015605..2d5f8778 100644 --- a/nbproject/ant-deploy.xml +++ b/nbproject/ant-deploy.xml @@ -1,111 +1,111 @@ - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml index bd72160b..3240e969 100644 --- a/nbproject/build-impl.xml +++ b/nbproject/build-impl.xml @@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=<server_classpath> (where no properties f The libs.CopyLibs.classpath property is not set up. -This property must point to +This property must point to org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part -of NetBeans IDE installation and is usually located at +of NetBeans IDE installation and is usually located at <netbeans_installation>/java<version>/ant/extra folder. Either open the project in the IDE and make sure CopyLibs library exists or setup the property manually. For example like this: @@ -1372,7 +1372,7 @@ exists or setup the property manually. For example like this: @@ -1411,7 +1411,7 @@ exists or setup the property manually. For example like this: @@ -1447,7 +1447,7 @@ exists or setup the property manually. For example like this: @@ -1469,35 +1469,35 @@ exists or setup the property manually. For example like this: - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + CLEANUP SECTION + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData index d8adf687..574d0226 100644 --- a/nbproject/faces-config.NavData +++ b/nbproject/faces-config.NavData @@ -22,7 +22,7 @@ - + diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties index bddbeed8..47ed1958 100644 --- a/nbproject/genfiles.properties +++ b/nbproject/genfiles.properties @@ -3,6 +3,6 @@ build.xml.script.CRC32=be5f34f7 build.xml.stylesheet.CRC32=651128d4@1.68.1.1 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml. # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you. -nbproject/build-impl.xml.data.CRC32=794ded5f +nbproject/build-impl.xml.data.CRC32=94d00deb nbproject/build-impl.xml.script.CRC32=e6d84652 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1 diff --git a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java index de95d2ef..37dda6b2 100644 --- a/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java +++ b/src/java/org/mxchange/addressbook/beans/user/UserWebBean.java @@ -228,6 +228,9 @@ public class UserWebBean implements UserWebController { @Override public void afterRegistration (final @Observes UserRegisteredEvent event) { + // Trace message + System.out.println(MessageFormat.format("UserWebBean:afterRegistration: event={0} - CALLED!", event)); //NOI18N + // event should not be null if (null == event) { // Throw NPE @@ -246,6 +249,9 @@ public class UserWebBean implements UserWebController { // Get user instance User registeredUser = event.getUser(); + // Debug message + System.out.println(MessageFormat.format("UserWebBean:afterRegistration: registeredUser={0}", registeredUser)); //NOI18N + // Copy all data from registered->user this.copyUser(registeredUser); @@ -257,6 +263,9 @@ public class UserWebBean implements UserWebController { // Set user id again this.setUserId(registeredUser.getUserId()); + + // Trace message + System.out.println("UserWebBean:afterRegistration: EXIT!"); //NOI18N } @Override diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties index 5404747b..a0885892 100644 --- a/src/java/org/mxchange/localization/bundle_de_DE.properties +++ b/src/java/org/mxchange/localization/bundle_de_DE.properties @@ -134,10 +134,10 @@ LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE=Von anderen Benutzern freigegebene Adressb\u MENU_ADDRESSBOOKS_TITLE=Adressb\u00fccher verwalten PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Meine Adressb\u00fccher verwalten CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Verwalten Sie Ihre eigenen Adressb\u00fccher: -LINK_LOGIN_USER_LIST=Benutzerliste -LINK_LOGIN_USER_LIST_TITLE=Liste aller angemeldeten Benutzer -PAGE_TITLE_LOGIN_USER_LIST=Benutzerliste -CONTENT_TITLE_LOGIN_USER_LIST=Alle angemeldeten Benutzer: +LINK_USER_LIST=Benutzerliste +LINK_USER_LIST_TITLE=Liste aller angemeldeten Benutzer +PAGE_TITLE_USER_LIST=Benutzerliste +CONTENT_TITLE_USER_LIST=Alle angemeldeten Benutzer: PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Von anderen Benutzern mir freigegeben Adressb\u00fccher CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Von anderen Benutzern freigegebene Adressb\u00fccher auflisten: LINK_LOGIN_EDIT_ADDRESS=Kontaktdaten \u00e4ndern @@ -198,8 +198,8 @@ LINK_LOGIN_START_SHARING_ADDRESSBOOKS=Jetzt Ihre Adressb\u00fccher mit anderen M LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS=Meine mit anderen Benutzern geteilte Adressb\u00fccher TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS=Diese Tabelle listed alle von Ihnen mit anderen Benutzern geteilte Adressb\u00fccher auf. LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS=Derzeit teilen Sie keine Adressb\u00fccher mit anderen Benutzern. -LOGIN_TABLE_HEADER_USER_LIST=Alle Benutzer auflisten -TABLE_SUMMARY_LOGIN_USER_LIST=Diese Tabelle listet alle registrierten Benutzer aus, mit denen Sie Ihre Adressb\u00fccher teilen k\u00f6nnen. +TABLE_HEADER_USER_LIST=Alle Benutzer auflisten +TABLE_SUMMARY_USER_LIST=Diese Tabelle listet alle registrierten Benutzer aus, mit denen Sie Ihre Adressb\u00fccher teilen k\u00f6nnen. USER_PROFILE_LEGEND=\u00d6ffentlich einsehbares Profil: USER_PROFILE_LEGEND_TITLE=Machen Sie hier Einstellungen zu Ihrem im Internet \u00f6ffentlich einsehbarem Profil. PUBLIC_USER_PROFILE_FLAG=Soll Ihr Profil im Internet einsehbar sein? diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties index 47d5265d..8d59d3f9 100644 --- a/src/java/org/mxchange/localization/bundle_en_US.properties +++ b/src/java/org/mxchange/localization/bundle_en_US.properties @@ -134,10 +134,10 @@ LINK_LOGIN_OTHER_ADDRESSBOOKS_TITLE=From other users shared address books MENU_ADDRESSBOOKS_TITLE=Manage address books PAGE_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage my address books CONTENT_TITLE_LOGIN_OWN_ADDRESSBOOKS=Manage your own address books: -LINK_LOGIN_USER_LIST=User list -LINK_LOGIN_USER_LIST_TITLE=Liste aller angemeldeten Benutzer -PAGE_TITLE_LOGIN_USER_LIST=User list -CONTENT_TITLE_LOGIN_USER_LIST=Alle angemeldeten Benutzer: +LINK_USER_LIST=User list +LINK_USER_LIST_TITLE=Liste aller angemeldeten Benutzer +PAGE_TITLE_USER_LIST=User list +CONTENT_TITLE_USER_LIST=Alle angemeldeten Benutzer: PAGE_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Other user's addressbooks shared with me CONTENT_TITLE_LOGIN_OTHER_ADDRESSBOOKS=Manage other's shared address books LINK_LOGIN_EDIT_ADDRESS=Personal data @@ -198,8 +198,8 @@ LINK_LOGIN_START_SHARING_ADDRESSBOOKS=Start now sharing your address books with LOGIN_TABLE_HEADER_SHARED_ADDRESSBOOKS=My with other users shared address books TABLE_SUMMARY_LOGIN_SHARED_ADDRESSBOOKS=This table lists all your with other users shared address books. LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS=Currently you don't share any address books with other users. -LOGIN_TABLE_HEADER_USER_LIST=List all users -TABLE_SUMMARY_LOGIN_USER_LIST=This table lists all registered users you can share your address books with. +TABLE_HEADER_USER_LIST=List all users +TABLE_SUMMARY_USER_LIST=This table lists all registered users you can share your address books with. USER_PROFILE_LEGEND=Publicly visible profile: USER_PROFILE_LEGEND_TITLE=Do settings here for your in Internet publicly visible profile. PUBLIC_USER_PROFILE_FLAG=Should your profile be visible in Internet? diff --git a/web/WEB-INF/faces-config.xml b/web/WEB-INF/faces-config.xml index a3fc50e4..2c867026 100644 --- a/web/WEB-INF/faces-config.xml +++ b/web/WEB-INF/faces-config.xml @@ -92,8 +92,8 @@ /login/login_other_addressbooks.xhtml - login_user_list - /login/login_user_list.xhtml + user_user_list + /user/user_list.xhtml admin_logout @@ -153,7 +153,7 @@ - /login/login_user_list.xhtml + /user/user_list.xhtml login_list_sharing_addressbooks /login/login_list_sharing_addressbooks.xhtml diff --git a/web/WEB-INF/templates/login/login_menu.tpl b/web/WEB-INF/templates/login/login_menu.tpl index 173f7dd8..281c1800 100644 --- a/web/WEB-INF/templates/login/login_menu.tpl +++ b/web/WEB-INF/templates/login/login_menu.tpl @@ -16,7 +16,7 @@
  • - +
    • diff --git a/web/login/login_shared_addressbooks.xhtml b/web/login/login_shared_addressbooks.xhtml index e7b3b12a..07bb72d7 100644 --- a/web/login/login_shared_addressbooks.xhtml +++ b/web/login/login_shared_addressbooks.xhtml @@ -25,7 +25,7 @@
    - +
    diff --git a/web/login/login_user_list.xhtml b/web/user/user_list.xhtml similarity index 88% rename from web/login/login_user_list.xhtml rename to web/user/user_list.xhtml index f0f42a51..3a03a20c 100644 --- a/web/login/login_user_list.xhtml +++ b/web/user/user_list.xhtml @@ -7,19 +7,19 @@ > - #{msg.PAGE_TITLE_LOGIN_USER_LIST} + #{msg.PAGE_TITLE_USER_LIST} - #{msg.CONTENT_TITLE_LOGIN_USER_LIST} + #{msg.CONTENT_TITLE_USER_LIST}
    - #{msg.LOGIN_TABLE_HEADER_USER_LIST} + #{msg.TABLE_HEADER_USER_LIST}
    - + #{msg.USER_ID} -- 2.39.5