Continued:

- fixed serial numbers
- updated project files
- updated monitor-cron.sh

diff --git a/monitor/monitor-cron.sh b/monitor/monitor-cron.sh
index 8596595bab75e61eceb4a3300b85cc46ff3ad162..d8449e726e04aeef54ee5a746300274ca01886cc 100755 (executable)
--- a/monitor/monitor-cron.sh
+++ b/monitor/monitor-cron.sh
@@ -12,7 +12,7 @@ CONFIG_FILE="${HOME}/.monitor-${PROJECT_NAME}-cron.sh"
 
 . "${CONFIG_FILE}"  || exit 255
 
-MONITOR_OUTPUT=`lynx -dump -head "${PROJECT_URL}" -auth="${PROJECT_USER}:${PROJECT_PASSWORD}" | head -n 1`
+MONITOR_OUTPUT=$(lynx -dump -head "${PROJECT_URL}" -auth="${PROJECT_USER}:${PROJECT_PASSWORD}" | head -n 1)
 
 if [ "${MONITOR_OUTPUT}" != "HTTP/1.1 200 OK" ]
 then
@@ -24,7 +24,7 @@ then
        fi
 elif [ -f "${MONITOR_TEMP_FILE}" ]
 then
-       PREVIOUS_STATUS=`cat "${MONITOR_TEMP_FILE}"`
+       PREVIOUS_STATUS=$(cat "${MONITOR_TEMP_FILE}")
        echo "$0: ${PROJECT_NAME} is UP again, old status was: '${PREVIOUS_STATUS}'"
        rm -f "${MONITOR_TEMP_FILE}"
 fi

diff --git a/nbproject/project.xml b/nbproject/project.xml
index dbe35262c913f082ebf2808a1ca153b6164352e0..4e908a92b2f59e5b069de1a1e2d4c6c93d02fdc9 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -1,122 +1,119 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.web.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/web-project/3">
-            <name>addressbook-war</name>
-            <minimum-ant-version>1.6.5</minimum-ant-version>
-            <web-module-libraries>
-                <library dirs="200">
-                    <file>${file.reference.jcoreee.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcore-logger-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcountry-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcountry-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcontacts-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcontacts-business-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcontacts-business-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jcontacts-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jphone-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jphone-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.juser-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.juser-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.juser-activity-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.juser-activity-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.juser-login-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.juser-login-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jaddressbook-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jaddressbook-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jaddressbook-share-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.jaddressbook-share-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${reference.addressbook-core.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${reference.addressbook-lib.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${file.reference.cdi-api.jar}</file>
-                </library>
-                <library dirs="200">
-                    <file>${libs.apache_poi.classpath}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
-                <library dirs="200">
-                    <file>${libs.primefaces.classpath}</file>
-                </library>
-                <library dirs="200">
-                    <file>${libs.cache.classpath}</file>
-                </library>
-                <library dirs="200">
-                    <file>${libs.payara-api.classpath}</file>
-                </library>
-            </web-module-libraries>
-            <web-module-additional-libraries/>
-            <source-roots>
-                <root id="src.dir"/>
-            </source-roots>
-            <test-roots>
-                <root id="test.src.dir"/>
-            </test-roots>
-        </data>
-        <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
-            <definitions>./lib/nblibraries.properties</definitions>
-        </libraries>
-        <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
-            <reference>
-                <foreign-project>addressbook-core</foreign-project>
-                <artifact-type>jar</artifact-type>
-                <script>build.xml</script>
-                <target>jar</target>
-                <clean-target>clean</clean-target>
-                <id>jar</id>
-            </reference>
-            <reference>
-                <foreign-project>addressbook-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>
+       <type>org.netbeans.modules.web.project</type>
+       <configuration>
+               <data xmlns="http://www.netbeans.org/ns/web-project/3">
+                       <name>addressbook-war</name>
+                       <minimum-ant-version>1.6.5</minimum-ant-version>
+                       <web-module-libraries>
+                               <library dirs="200">
+                                       <file>${file.reference.jcoreee.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcountry-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcountry-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcontacts-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcontacts-business-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcontacts-business-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jcontacts-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jphone-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jphone-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.juser-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.juser-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.juser-activity-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.juser-activity-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.juser-login-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.juser-login-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jaddressbook-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jaddressbook-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jaddressbook-share-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.jaddressbook-share-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${reference.addressbook-core.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${reference.addressbook-lib.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${file.reference.cdi-api.jar}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${libs.apache_poi.classpath}</file>
+                                       <path-in-war>WEB-INF/lib</path-in-war>
+                               </library>
+                               <library dirs="200">
+                                       <file>${libs.primefaces.classpath}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${libs.cache.classpath}</file>
+                               </library>
+                               <library dirs="200">
+                                       <file>${libs.payara-api.classpath}</file>
+                               </library>
+                       </web-module-libraries>
+                       <web-module-additional-libraries/>
+                       <source-roots>
+                               <root id="src.dir"/>
+                       </source-roots>
+                       <test-roots>
+                               <root id="test.src.dir"/>
+                       </test-roots>
+               </data>
+               <libraries xmlns="http://www.netbeans.org/ns/ant-project-libraries/1">
+                       <definitions>./lib/nblibraries.properties</definitions>
+               </libraries>
+               <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
+                       <reference>
+                               <foreign-project>addressbook-core</foreign-project>
+                               <artifact-type>jar</artifact-type>
+                               <script>build.xml</script>
+                               <target>jar</target>
+                               <clean-target>clean</clean-target>
+                               <id>jar</id>
+                       </reference>
+                       <reference>
+                               <foreign-project>addressbook-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/addressbook/beans/business/basicdata/AddressbookAdminBasicDataWebRequestController.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBasicDataWebRequestController.java
index 52cc00ea8e7b667f1a0cc35e9931b448ecdee884..ab05e4685a398cc8f23f140175de2cb6772226dc 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBasicDataWebRequestController.java
+++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookAdminBasicDataWebRequestController.java
@@ -19,7 +19,7 @@ package org.mxchange.addressbook.beans.business.basicdata;
 import java.io.Serializable;
 
 /**
- * An interface for session-scoped financial controller
+ * An interface for session-scoped company's basic data controller
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */

diff --git a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBasicDataWebRequestController.java b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBasicDataWebRequestController.java
index 0f9872710cc9fabab823cc050f7a02ef05da4887..72d81bf8dd5f5663d41e2e313195fbfc47be9401 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBasicDataWebRequestController.java
+++ b/src/java/org/mxchange/addressbook/beans/business/basicdata/AddressbookBasicDataWebRequestController.java
@@ -19,7 +19,7 @@ package org.mxchange.addressbook.beans.business.basicdata;
 import java.io.Serializable;
 
 /**
- * An interface for session-scoped financial controller
+ * An interface for session-scoped company's basic data controller
  * <p>
  * @author Roland Häder<roland@mxchange.org>
  */

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
index 11396494db84dc780b5229bd812ec6dd442fab3f..93af33a20247204eecf8901211404dc6af2253f6 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java
@@ -65,7 +65,7 @@ public class AddressbookAdminContactWebRequestBean extends BaseAddressbookBean i
        /**
         * Serial number
         */
-       private static final long serialVersionUID = 542_145_347_916L;
+       private static final long serialVersionUID = 542_145_351_001L;
 
        /**
         * Academic academicTitle

diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java
index 0c4fb638eaf6c706aa5566909be8224b4b1f71c3..e7aca702160a1c0c47224135f19b786352dc6669 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/AddressbookContactWebRequestBean.java
@@ -65,7 +65,7 @@ public class AddressbookContactWebRequestBean extends BaseAddressbookBean implem
        /**
         * Serial number
         */
-       private static final long serialVersionUID = 542_145_347_916L;
+       private static final long serialVersionUID = 542_145_352_001L;
 
        /**
         * Academic academicTitle

diff --git a/src/java/org/mxchange/addressbook/beans/contact/mobile/AddressbookContactMobileWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/mobile/AddressbookContactMobileWebRequestBean.java
index 9ab4ee860897004dbd8670eaaaebd82e2cf5646c..96638dc241cc0ec67cbd6009e2a1b510fb011e04 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/mobile/AddressbookContactMobileWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/mobile/AddressbookContactMobileWebRequestBean.java
@@ -46,7 +46,7 @@ public class AddressbookContactMobileWebRequestBean extends BaseAddressbookBean
        /**
         * Serial number
         */
-       private static final long serialVersionUID = 542_145_347_916L;
+       private static final long serialVersionUID = 542_145_353_001L;
 
        /**
         * An instance of a contact-list controller

diff --git a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java
index c34349b388b2866589d1cc1c7944c24a0c2a2036..e3a6d0c20a48689a0138344fa4cf3e811d6e5797 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookAdminContactPhoneWebRequestBean.java
@@ -71,7 +71,7 @@ public class AddressbookAdminContactPhoneWebRequestBean extends BaseAddressbookB
        /**
         * Serial number
         */
-       private static final long serialVersionUID = 542_145_347_916L;
+       private static final long serialVersionUID = 542_145_354_001L;
 
        /**
         * Administrative EJB for phone number

diff --git a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebRequestBean.java
index 3a2c9602f9a43957c78edf5870d4b51e0f09f547..dd7deca95e97d67e7d231ef15930c80e0e1c6a25 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/contact/phone/AddressbookContactPhoneWebRequestBean.java
@@ -48,7 +48,7 @@ public class AddressbookContactPhoneWebRequestBean extends BaseAddressbookBean i
        /**
         * Serial number
         */
-       private static final long serialVersionUID = 542_145_347_916L;
+       private static final long serialVersionUID = 542_145_355_001L;
 
        /**
         * An instance of a contact-list controller

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
index 1f8859b914b9373b9034d7d336ae4b17b6a6da6f..869bf580eaa00ec602af446eeed721b5de4f4b7b 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookAdminUserWebRequestBean.java
@@ -78,7 +78,7 @@ public class AddressbookAdminUserWebRequestBean extends BaseAddressbookBean impl
        /**
         * Serial number
         */
-       private static final long serialVersionUID = 542_145_347_916L;
+       private static final long serialVersionUID = 542_145_356_001L;
 
        /**
         * An event fired when the administrator has added a new user

diff --git a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebRequestBean.java
index ea917801dabc43cd7d63a676e49b4758721d446d..8e468b8a652bf65311373da045473cfdf2d3f273 100644 (file)
--- a/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/user/AddressbookUserWebRequestBean.java
@@ -32,7 +32,7 @@ public class AddressbookUserWebRequestBean extends BaseAddressbookBean implement
        /**
         * Serial number
         */
-       private static final long serialVersionUID = 542_145_347_916L;
+       private static final long serialVersionUID = 542_145_357_001L;
 
        /**
         * Default constructor

diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml
index e9f63a1f3d8028ecf6b76cdbf416b1e9a296f411..c8e17164b83fa485c85c04adca818f5a5a1beefd 100644 (file)
--- a/web/WEB-INF/web.xml
+++ b/web/WEB-INF/web.xml
@@ -182,11 +182,6 @@
                <param-name>min_user_password_score</param-name>
                <param-value>50</param-value>
        </context-param>
-       <context-param>
-               <description>Type of receipt barcode (see p:barcode)</description>
-               <param-name>receipt_barcode_type</param-name>
-               <param-value>codabar</param-value>
-       </context-param>
        <context-param>
                <description>Ignore menu items with only comments in it.</description>
                <param-name>javax.faces.FACELETS_SKIP_COMMENTS</param-name>