Continued:

- removed double-reference on juser-lib.jar
- re-aligned navigation cases (graphical)
- added missing language string
Signed-off-by:Roland Häder <roland@mxchange.org>

diff --git a/nbproject/build-impl.xml b/nbproject/build-impl.xml
index 695ae3639746dc32d8bd56c9683edec375f7760a..f151f5a3d17d76a7c36ff033b7cdab59eb663196 100644 (file)
--- a/nbproject/build-impl.xml
+++ b/nbproject/build-impl.xml
@@ -881,17 +881,11 @@ exists or setup the property manually. For example like this:
         <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.juser-lib}/build.xml" inheritall="false" target="jar">
-            <property name="deploy.on.save" value="false"/>
-        </ant>
     </target>
     <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps">
         <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="jar">
             <property name="deploy.on.save" value="false"/>
         </ant>
-        <ant antfile="${project.juser-lib}/build.xml" inheritall="false" target="jar">
-            <property name="deploy.on.save" value="false"/>
-        </ant>
     </target>
     <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
     <target depends="init,deps-jar" name="-pre-pre-compile">
@@ -1047,7 +1041,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${reference.addressbook-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <copyfiles files="${file.reference.gf-client.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
-        <copyfiles files="${reference.juser-lib.jar}" iftldtodir="${build.web.dir}/WEB-INF" todir="${dist.ear.dir}/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
     </target>
@@ -1063,7 +1056,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${reference.addressbook-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.cdi-api.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.gf-client.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${reference.juser-lib.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
         <delete dir="${build.web.dir}/WEB-INF/lib"/>
@@ -1478,7 +1470,6 @@ exists or setup the property manually. For example like this:
             -->
     <target depends="init" name="deps-clean" unless="no.deps">
         <ant antfile="${project.addressbook-lib}/build.xml" inheritall="false" target="clean"/>
-        <ant antfile="${project.juser-lib}/build.xml" inheritall="false" target="clean"/>
     </target>
     <target depends="init" name="do-clean">
         <condition property="build.dir.to.clean" value="${build.web.dir}">

diff --git a/nbproject/faces-config.NavData b/nbproject/faces-config.NavData
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..8107f5ad7cff812ff1ce0462808cacf8246b6dca 100644 (file)
--- a/nbproject/faces-config.NavData
+++ b/nbproject/faces-config.NavData
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scene Scope="Project" version="2">
+    <Scope Scope="Faces Configuration Only">
+        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="*" x="1150" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="index.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
+    </Scope>
+    <Scope Scope="Project">
+        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="*" x="1150" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="user/login_error.xhtml" x="400" y="600" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="index.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
+    </Scope>
+    <Scope Scope="All Faces Configurations">
+        <Node id="admin/admin_logout.xhtml" x="650" y="150" zoom="true"/>
+        <Node id="user/login.xhtml" x="150" y="300" zoom="true"/>
+        <Node id="admin/index.xhtml" x="400" y="300" zoom="true"/>
+        <Node id="user/lost_passwd.xhtml" x="400" y="450" zoom="true"/>
+        <Node id="*" x="1150" y="150" zoom="true"/>
+        <Node id="terms.xhtml" x="400" y="150" zoom="true"/>
+        <Node id="bye.xhtml" x="150" y="450" zoom="true"/>
+        <Node id="privacy.xhtml" x="650" y="300" zoom="true"/>
+        <Node id="index.xhtml" x="900" y="150" zoom="true"/>
+        <Node id="imprint.xhtml" x="150" y="600" zoom="true"/>
+        <Node id="admin/category.xhtml" x="650" y="450" zoom="true"/>
+        <Node id="user/register.xhtml" x="150" y="150" zoom="true"/>
+        <Node id="admin/product.xhtml" x="900" y="300" zoom="true"/>
+    </Scope>
+</Scene>

diff --git a/nbproject/genfiles.properties b/nbproject/genfiles.properties
index 87bf09460b118a77d1cd69b846405f445e8fe472..8245c23834d8476722ad1d12088c7d46a2f58a80 100644 (file)
--- a/nbproject/genfiles.properties
+++ b/nbproject/genfiles.properties
@@ -1,8 +1,8 @@
-build.xml.data.CRC32=f85eb01a
+build.xml.data.CRC32=d8bc4ea8
 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=f85eb01a
-nbproject/build-impl.xml.script.CRC32=045dff2a
+nbproject/build-impl.xml.data.CRC32=d8bc4ea8
+nbproject/build-impl.xml.script.CRC32=855e3438
 nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.68.1.1

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 2f55c202d783889cc17095c5dd95d35c93c0b4ca..ced13a96efa3d9848d23665bf1d593ca35b4da47 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -69,8 +69,7 @@ javac.classpath=\
     ${file.reference.juser-lib.jar}:\
     ${reference.addressbook-lib.jar}:\
     ${file.reference.cdi-api.jar}:\
-    ${file.reference.gf-client.jar}:\
-    ${reference.juser-lib.jar}
+    ${file.reference.gf-client.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=-Xlint:unchecked -Xlint:deprecation
 javac.debug=true
@@ -100,10 +99,8 @@ lib.dir=${web.docbase.dir}/WEB-INF/lib
 persistence.xml.dir=${conf.dir}
 platform.active=default_platform
 project.addressbook-lib=../addressbook-lib
-project.juser-lib=../juser-lib
 project.license=gpl30
 reference.addressbook-lib.jar=${project.addressbook-lib}/dist/addressbook-lib.jar
-reference.juser-lib.jar=${project.juser-lib}/dist/juser-lib.jar
 resource.dir=setup
 run.test.classpath=\
     ${javac.test.classpath}:\

diff --git a/nbproject/project.xml b/nbproject/project.xml
index b80d72346152351651f91f5de7111bd49c119fb4..8a21668fe9e4dad17a53b2308fda225e50390404 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -50,10 +50,6 @@
                     <file>${file.reference.gf-client.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library dirs="200">
-                    <file>${reference.juser-lib.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
             </web-module-libraries>
             <web-module-additional-libraries/>
             <source-roots>
@@ -75,14 +71,6 @@
                 <clean-target>clean</clean-target>
                 <id>jar</id>
             </reference>
-            <reference>
-                <foreign-project>juser-lib</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
         </references>
     </configuration>
 </project>

diff --git a/src/java/org/mxchange/localization/bundle_de_DE.properties b/src/java/org/mxchange/localization/bundle_de_DE.properties
index f1df412fc15fda8b99b30606e674c61a5ddfb821..3b8d9d9a67990373c5a37ebdff6a87cc3c4d24b9 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_de_DE.properties
+++ b/src/java/org/mxchange/localization/bundle_de_DE.properties
@@ -108,3 +108,4 @@ ENTER_USER_NAME=Benutzernamen:
 BUTTON_USER_LOGIN=Einloggen
 BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2
 GUEST_REGISTRATION_ENTER_USER_NAME=Benutzernamen eingeben:
+GUEST_REGISTRATION_USER_NAME_NOTICE=Der Benutzername darf nur einmal vorkommen.

diff --git a/src/java/org/mxchange/localization/bundle_en_US.properties b/src/java/org/mxchange/localization/bundle_en_US.properties
index 53fbc1d2de943e75795e2254b9caae56480d23e4..66f79f5ec778570c185d84faab35021414fc59b2 100644 (file)
--- a/src/java/org/mxchange/localization/bundle_en_US.properties
+++ b/src/java/org/mxchange/localization/bundle_en_US.properties
@@ -108,3 +108,4 @@ ENTER_USER_NAME=User name:
 BUTTON_USER_LOGIN=Login
 BUTTON_CONTINUE_STEP_2=Weiter zu Schritt 2
 GUEST_REGISTRATION_ENTER_USER_NAME=Enter user name:
+GUEST_REGISTRATION_USER_NAME_NOTICE=The user name must only exist once.

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index c270f5248302332f3b4b5d6128ebb4743bd87d02..ddd10b75a1b3de31d4c74d7bef4c141aa16196f0 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app version="3.1" xmlns="http://xmlns.jcp.org/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd">
+       <display-name>Addressbook Application v1.0</display-name>
        <context-param>
                <param-name>javax.faces.PROJECT_STAGE</param-name>
                <param-value>Development</param-value>