]> git.mxchange.org Git - addressbook-war.git/commitdiff
Continued:
authorRoland Haeder <roland@mxchange.org>
Thu, 15 Oct 2015 14:56:10 +0000 (16:56 +0200)
committerRoland Haeder <roland@mxchange.org>
Thu, 15 Oct 2015 14:56:10 +0000 (16:56 +0200)
- renamed login_user_list.xhtml to more generic user_list.xhtml (it can be done)
- added debug logging

12 files changed:
nbproject/ant-deploy.xml
nbproject/build-impl.xml
nbproject/faces-config.NavData
nbproject/genfiles.properties
src/java/org/mxchange/addressbook/beans/user/UserWebBean.java
src/java/org/mxchange/localization/bundle_de_DE.properties
src/java/org/mxchange/localization/bundle_en_US.properties
web/WEB-INF/faces-config.xml
web/WEB-INF/templates/login/login_menu.tpl
web/login/login_shared_addressbooks.xhtml
web/login/login_user_list.xhtml [deleted file]
web/user/user_list.xhtml [new file with mode: 0644]

index 3c01560598dfb6e9553a981b2c724a341cd8a592..2d5f8778d18757ea5ded4eea4da13ca1adc51093 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <project default="-deploy-ant" basedir=".">
-       <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
-               <property file="${deploy.ant.properties.file}" />
-               <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
-               <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
-               <available file="${deploy.ant.resource.dir}" property="has.setup"/>
-               <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
-       </target>
+    <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <property file="${deploy.ant.properties.file}" />
+        <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
+        <available file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" property="glassfish.web.present"/>
+        <available file="${deploy.ant.resource.dir}" property="has.setup"/>
+        <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
+    </target>
+    
+    <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
+        <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
+        <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
+        <!-- The doctype triggers resolution which can fail -->
+        <replace file="${temp.sun.web}">
+            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+        </replace>
+        <replace file="${temp.sun.web}">
+            <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
+            <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
+        </replace>
+        <xmlproperty file="${temp.sun.web}" validate="false">
+        </xmlproperty>    
+        <delete file="${temp.sun.web}"/>
+        <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+            <isset property="sun-web-app.context-root"/>
+        </condition>
+        <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
+            <isset property="sun-web-app.context-root"/>
+        </condition>
+    </target>
+    <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
+        <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
+        <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
+        <!-- The doctype triggers resolution which can fail -->
+        <replace file="${temp.gf.web}">
+            <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
+            <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
+        </replace>
+        <replace file="${temp.gf.web}">
+            <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
+            <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
+        </replace>
+        <xmlproperty file="${temp.gf.web}" validate="false">
+        </xmlproperty>
+        <delete file="${temp.gf.web}"/>
+        <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
+            <isset property="glassfish-web-app.context-root"/>
+        </condition>
+        <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
+            <isset property="glassfish-web-app.context-root"/>
+        </condition>
+    </target>
+    <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
+        <property name="deploy.context.root.argument" value=""/>
+    </target>
+    <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
+        <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
+        <mkdir dir="${gfv3.resources.dir}"/>
+        <mkdir dir="${gfv3.resources.dir}/META-INF"/>
+        <copy todir="${gfv3.resources.dir}/META-INF">
+            <fileset dir="${deploy.ant.resource.dir}"/>
+        </copy>
+        <jar destfile="${deploy.ant.archive}" update="true">
+            <fileset dir="${gfv3.resources.dir}"/>
+        </jar>
+        <delete dir="${gfv3.resources.dir}"/>
+    </target>
+    <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
+        <antcall target="-deploy-without-pw"/>
+        <antcall target="-deploy-with-pw"/>
+    </target>
 
-       <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
-               <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
-               <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
-               <!-- The doctype triggers resolution which can fail -->
-               <replace file="${temp.sun.web}">
-                       <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-                       <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-               </replace>
-               <replace file="${temp.sun.web}">
-                       <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
-                       <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
-               </replace>
-               <xmlproperty file="${temp.sun.web}" validate="false">
-               </xmlproperty>
-               <delete file="${temp.sun.web}"/>
-               <condition property="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-                       <isset property="sun-web-app.context-root"/>
-               </condition>
-               <condition property="deploy.context.root.argument" value="&amp;contextroot=${sun-web-app.context-root}" else="/${ant.project.name}">
-                       <isset property="sun-web-app.context-root"/>
-               </condition>
-       </target>
-       <target name="-parse-glassfish-web" depends="-init-cl-deployment-env" if="glassfish.web.present">
-               <tempfile prefix="gfv3" property="temp.gf.web" destdir="${java.io.tmpdir}"/>
-               <copy file="${deploy.ant.docbase.dir}/WEB-INF/glassfish-web.xml" tofile="${temp.gf.web}"/>
-               <!-- The doctype triggers resolution which can fail -->
-               <replace file="${temp.gf.web}">
-                       <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
-                       <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
-               </replace>
-               <replace file="${temp.gf.web}">
-                       <replacetoken><![CDATA[<glassfish-web-app]]></replacetoken>
-                       <replacevalue><![CDATA[--> <glassfish-web-app]]></replacevalue>
-               </replace>
-               <xmlproperty file="${temp.gf.web}" validate="false">
-               </xmlproperty>
-               <delete file="${temp.gf.web}"/>
-               <condition property="deploy.ant.client.url" value="${gfv3.url}${glassfish-web-app.context-root}" else="${gfv3.url}/${ant.project.name}">
-                       <isset property="glassfish-web-app.context-root"/>
-               </condition>
-               <condition property="deploy.context.root.argument" value="&amp;contextroot=${glassfish-web-app.context-root}" else="/${ant.project.name}">
-                       <isset property="glassfish-web-app.context-root"/>
-               </condition>
-       </target>
-       <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
-               <property name="deploy.context.root.argument" value=""/>
-       </target>
-       <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
-               <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
-               <mkdir dir="${gfv3.resources.dir}"/>
-               <mkdir dir="${gfv3.resources.dir}/META-INF"/>
-               <copy todir="${gfv3.resources.dir}/META-INF">
-                       <fileset dir="${deploy.ant.resource.dir}"/>
-               </copy>
-               <jar destfile="${deploy.ant.archive}" update="true">
-                       <fileset dir="${gfv3.resources.dir}"/>
-               </jar>
-               <delete dir="${gfv3.resources.dir}"/>
-       </target>
-       <target name="-deploy-ant" depends="-parse-glassfish-web, -parse-sun-web, -no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
-               <antcall target="-deploy-without-pw"/>
-               <antcall target="-deploy-with-pw"/>
-       </target>
+    <target name="-deploy-without-pw" unless="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>    
+    </target>
+    <target name="-deploy-with-pw" if="gfv3.password">
+        <echo message="Deploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
+    <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
+        <antcall target="-undeploy-without-pw"/>
+        <antcall target="-undeploy-with-pw"/>
+    </target>
 
-       <target name="-deploy-without-pw" unless="gfv3.password">
-               <echo message="Deploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-               <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
-       <target name="-deploy-with-pw" if="gfv3.password">
-               <echo message="Deploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
-               <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&amp;force=true&amp;name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
-       <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
-               <antcall target="-undeploy-without-pw"/>
-               <antcall target="-undeploy-with-pw"/>
-       </target>
-
-       <target name="-undeploy-without-pw" unless="gfv3.password">
-               <echo message="Undeploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
-       <target name="-undeploy-with-pw" if="gfv3.password">
-               <echo message="Undeploying ${deploy.ant.archive}"/>
-               <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
-               <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
-                        dest="${gfv3.results.file}"/>
-               <delete file="${gfv3.results.file}"/>
-       </target>
+    <target name="-undeploy-without-pw" unless="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>    
+    </target>
+    <target name="-undeploy-with-pw" if="gfv3.password">
+        <echo message="Undeploying ${deploy.ant.archive}"/>
+        <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/>  <!-- do not forget to delete this! -->
+        <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
+            dest="${gfv3.results.file}"/>
+        <delete file="${gfv3.results.file}"/>
+    </target>
 </project>
index bd72160bd38069fe30c91118af4cd3cea882b872..3240e9692b48ecf251fb4d1953eaf72117657fca 100644 (file)
@@ -821,9 +821,9 @@ or ant -Dj2ee.platform.classpath=&lt;server_classpath&gt; (where no properties f
     <target name="-init-taskdefs">
         <fail unless="libs.CopyLibs.classpath">
 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 
 &lt;netbeans_installation&gt;/java&lt;version&gt;/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:
     </target>
     <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
     <!--
-
+                
                 TEST COMPILATION SECTION
             -->
     <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -1411,7 +1411,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
     <!--
-
+                
                 TEST EXECUTION SECTION
             -->
     <target depends="init" if="have.tests" name="-pre-test-run">
@@ -1447,7 +1447,7 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single-method,-post-test-run-single-method" description="Run single unit test." name="test-single-method"/>
     <!--
-
+                
                 TEST DEBUGGING SECTION
             -->
     <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-debug-start-debuggee-test">
@@ -1469,35 +1469,35 @@ exists or setup the property manually. For example like this:
     </target>
     <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
     <!--
-
-               CLEANUP SECTION
-       -->
-       <target depends="init" name="deps-clean" unless="no.deps">
-               <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="clean"/>
-       </target>
-       <target depends="init" name="do-clean">
-               <condition property="build.dir.to.clean" value="${build.web.dir}">
-                       <isset property="dist.ear.dir"/>
-               </condition>
-               <property name="build.dir.to.clean" value="${build.web.dir}"/>
-               <delete includeEmptyDirs="true" quiet="true">
-                       <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
-               </delete>
-               <delete dir="${build.dir}"/>
-               <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
-               <delete dir="${dist.dir}"/>
-       </target>
-       <target depends="do-clean" if="status.clean-failed" name="check-clean">
-               <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
-               <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
-       </target>
-       <target depends="init" if="netbeans.home" name="undeploy-clean">
-               <nbundeploy failOnError="false" startServer="false"/>
-       </target>
-       <target name="-post-clean">
-               <!-- Empty placeholder for easier customization. -->
-               <!-- You can override this target in the ../build.xml file. -->
-       </target>
-       <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
-       <target depends="clean" description="Clean build products." name="clean-ear"/>
+                
+                CLEANUP SECTION
+            -->
+    <target depends="init" name="deps-clean" unless="no.deps">
+        <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="clean"/>
+    </target>
+    <target depends="init" name="do-clean">
+        <condition property="build.dir.to.clean" value="${build.web.dir}">
+            <isset property="dist.ear.dir"/>
+        </condition>
+        <property name="build.dir.to.clean" value="${build.web.dir}"/>
+        <delete includeEmptyDirs="true" quiet="true">
+            <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
+        </delete>
+        <delete dir="${build.dir}"/>
+        <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
+        <delete dir="${dist.dir}"/>
+    </target>
+    <target depends="do-clean" if="status.clean-failed" name="check-clean">
+        <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
+        <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
+    </target>
+    <target depends="init" if="netbeans.home" name="undeploy-clean">
+        <nbundeploy failOnError="false" startServer="false"/>
+    </target>
+    <target name="-post-clean">
+        <!-- Empty placeholder for easier customization. -->
+        <!-- You can override this target in the ../build.xml file. -->
+    </target>
+    <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
+    <target depends="clean" description="Clean build products." name="clean-ear"/>
 </project>
index d8adf6879314596970762224afaf95ea8baea89f..574d022620f7723e2198a18aca500540a31ee457 100644 (file)
@@ -22,7 +22,7 @@
                <Node id="user/login_error.xhtml" x="1400" y="150" zoom="true"/>
                <Node id="privacy.xhtml" x="400" y="750" zoom="true"/>
                <Node id="admin/admin_index.xhtml" x="400" y="450" zoom="true"/>
-               <Node id="login/login_user_list.xhtml" x="150" y="150" zoom="true"/>
+               <Node id="user/user_list.xhtml" x="150" y="150" zoom="true"/>
                <Node id="user/user_profile.xhtml" x="1400" y="300" zoom="true"/>
                <Node id="login/login_list_sharing_addressbooks.xhtml" x="900" y="600" zoom="true"/>
                <Node id="admin/admin_logout.xhtml" x="400" y="600" zoom="true"/>
index bddbeed8802ffb1ae2e25e11072fa0d39f85aca3..47ed195819325d80fe8cb2c89aac17f61bd41ea6 100644 (file)
@@ -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
index de95d2ef7fdf747421f1d4e6ec0f709ee9bacb95..37dda6b2d5d4ee2f61db35b54663b8416c035626 100644 (file)
@@ -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
index 5404747b3927fc610952229867a8ce8fbe8ab5f4..a088589226e50a9713d827ccd13fb31e932ffce2 100644 (file)
@@ -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?
index 47d5265d69dca13aa476fa6f624838c5d5e7675b..8d59d3f9a3d755791be1545259b6fea3a77cd366 100644 (file)
@@ -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?
index a3fc50e452f2b1bf9d2a47f3f874b37c6d5853fd..2c86702601468cd09605d9471103ff24a19d968c 100644 (file)
@@ -92,8 +92,8 @@
                        <to-view-id>/login/login_other_addressbooks.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
-                       <from-outcome>login_user_list</from-outcome>
-                       <to-view-id>/login/login_user_list.xhtml</to-view-id>
+                       <from-outcome>user_user_list</from-outcome>
+                       <to-view-id>/user/user_list.xhtml</to-view-id>
                </navigation-case>
                <navigation-case>
                        <from-outcome>admin_logout</from-outcome>
                </navigation-case>
        </navigation-rule>
        <navigation-rule>
-               <from-view-id>/login/login_user_list.xhtml</from-view-id>
+               <from-view-id>/user/user_list.xhtml</from-view-id>
                <navigation-case>
                        <from-outcome>login_list_sharing_addressbooks</from-outcome>
                        <to-view-id>/login/login_list_sharing_addressbooks.xhtml</to-view-id>
index 173f7dd8b48e5ae25e729326a49e01e57e18c22b..281c18002f1d592f7605b249c541feec0fdb3782 100644 (file)
@@ -16,7 +16,7 @@
                                        <h:link title="#{msg.LINK_LOGIN_HOME_TITLE}" outcome="login_index" value="#{msg.LINK_LOGIN_HOME}" />
                                </li>
                                <li>
-                                       <h:link title="#{msg.LINK_LOGIN_USER_LIST_TITLE}" outcome="login_user_list" value="#{msg.LINK_LOGIN_USER_LIST}" />
+                                       <h:link title="#{msg.LINK_USER_LIST_TITLE}" outcome="user_user_list" value="#{msg.LINK_USER_LIST}" />
                                </li>
                        </ul>
 
index e7b3b12a29fbd75ec8cdb6de92cc8af9e48f1561..07bb72d78d9200d331f94c230169bd0d76fb4bc4 100644 (file)
@@ -25,7 +25,7 @@
                                <h:outputText class="notice" value="#{msg.LOGIN_USER_HAS_NOT_SHARED_ADDRESSBOOKS}" rendered="#{shareController.isSharingAddressbooks() == false}" />
 
                                <div class="table_footer">
-                                       <h:link id="shareAddressbook" outcome="login_user_list" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE}" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS}" />
+                                       <h:link id="shareAddressbook" outcome="user_user_list" title="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS_TITLE}" value="#{msg.LINK_LOGIN_START_SHARING_ADDRESSBOOKS}" />
                                </div>
                        </div>
                </ui:define>
diff --git a/web/login/login_user_list.xhtml b/web/login/login_user_list.xhtml
deleted file mode 100644 (file)
index f0f42a5..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-         xmlns:ui="http://java.sun.com/jsf/facelets"
-         xmlns:h="http://xmlns.jcp.org/jsf/html"
-         xmlns:f="http://xmlns.jcp.org/jsf/core"
-         >
-
-       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
-               <ui:define name="login_title">#{msg.PAGE_TITLE_LOGIN_USER_LIST}</ui:define>
-
-               <ui:define name="content_header">
-                       #{msg.CONTENT_TITLE_LOGIN_USER_LIST}
-               </ui:define>
-
-               <ui:define name="content">
-                       <div class="table_big">
-                               <div class="table_header">
-                                       #{msg.LOGIN_TABLE_HEADER_USER_LIST}
-                               </div>
-
-                               <h:dataTable id="userList" var="user" value="#{userController.allPublicUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_LOGIN_USER_LIST}" rendered="#{userController.isPublicUserRegistered()}">
-                                       <h:column>
-                                               <f:facet name="header">#{msg.USER_ID}</f:facet>
-                                               <h:link outcome="user_profile" value="#{user.userId}">
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">#{msg.USER_NAME}</f:facet>
-                                               <h:link outcome="user_profile" value="#{user.userName}">
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">#{msg.USER_CREATED}</f:facet>
-                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}">
-                                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
-                                               </h:outputFormat>
-                                       </h:column>
-
-                                       <h:column>
-                                               <f:facet name="header">#{msg.USER_LIST_SHARING_ADDRESSBOOKS}</f:facet>
-                                               <h:link outcome="login_list_sharing_addressbooks" value="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS}" title="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE}">
-                                                       <f:param name="userId" value="#{user.userId}" />
-                                               </h:link>
-                                       </h:column>
-                               </h:dataTable>
-                       </div>
-               </ui:define>
-       </ui:composition>
-</html>
diff --git a/web/user/user_list.xhtml b/web/user/user_list.xhtml
new file mode 100644 (file)
index 0000000..3a03a20
--- /dev/null
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+         xmlns:ui="http://java.sun.com/jsf/facelets"
+         xmlns:h="http://xmlns.jcp.org/jsf/html"
+         xmlns:f="http://xmlns.jcp.org/jsf/core"
+         >
+
+       <ui:composition template="/WEB-INF/templates/login/login_base.tpl">
+               <ui:define name="login_title">#{msg.PAGE_TITLE_USER_LIST}</ui:define>
+
+               <ui:define name="content_header">
+                       #{msg.CONTENT_TITLE_USER_LIST}
+               </ui:define>
+
+               <ui:define name="content">
+                       <div class="table_big">
+                               <div class="table_header">
+                                       #{msg.TABLE_HEADER_USER_LIST}
+                               </div>
+
+                               <h:dataTable id="userList" var="user" value="#{userController.allPublicUsers()}" headerClass="table_header_column25" summary="#{msg.TABLE_SUMMARY_USER_LIST}" rendered="#{userController.isPublicUserRegistered()}">
+                                       <h:column>
+                                               <f:facet name="header">#{msg.USER_ID}</f:facet>
+                                               <h:link outcome="user_profile" value="#{user.userId}">
+                                                       <f:param name="userId" value="#{user.userId}" />
+                                               </h:link>
+                                       </h:column>
+
+                                       <h:column>
+                                               <f:facet name="header">#{msg.USER_NAME}</f:facet>
+                                               <h:link outcome="user_profile" value="#{user.userName}">
+                                                       <f:param name="userId" value="#{user.userId}" />
+                                               </h:link>
+                                       </h:column>
+
+                                       <h:column>
+                                               <f:facet name="header">#{msg.USER_CREATED}</f:facet>
+                                               <h:outputFormat id="userCreated" value="#{user.userCreated.time}" title="#{msg.USER_CREATED_TITLE}">
+                                                       <f:convertDateTime for="addressbookCreated" type="both" timeStyle="short" dateStyle="medium" />
+                                               </h:outputFormat>
+                                       </h:column>
+
+                                       <h:column>
+                                               <f:facet name="header">#{msg.USER_LIST_SHARING_ADDRESSBOOKS}</f:facet>
+                                               <h:link outcome="login_list_sharing_addressbooks" value="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS}" title="#{msg.LINK_LOGIN_LIST_SHARING_ADDRESSBOOKS_TITLE}">
+                                                       <f:param name="userId" value="#{user.userId}" />
+                                               </h:link>
+                                       </h:column>
+                               </h:dataTable>
+                       </div>
+               </ui:define>
+       </ui:composition>
+</html>