From 168758de04262648ab70199d9c0dbfa26cff1d86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 19 Jan 2023 06:07:35 +0100 Subject: [PATCH] Continued: - fixed serial numbers - updated project files - updated monitor-cron.sh --- monitor/monitor-cron.sh | 4 +- nbproject/project.xml | 235 +++++++++--------- ...ookAdminBasicDataWebRequestController.java | 2 +- ...ressbookBasicDataWebRequestController.java | 2 +- ...AddressbookAdminContactWebRequestBean.java | 2 +- .../AddressbookContactWebRequestBean.java | 2 +- ...ddressbookContactMobileWebRequestBean.java | 2 +- ...ssbookAdminContactPhoneWebRequestBean.java | 2 +- ...AddressbookContactPhoneWebRequestBean.java | 2 +- .../AddressbookAdminUserWebRequestBean.java | 2 +- .../user/AddressbookUserWebRequestBean.java | 2 +- web/WEB-INF/web.xml | 5 - 12 files changed, 127 insertions(+), 135 deletions(-) diff --git a/monitor/monitor-cron.sh b/monitor/monitor-cron.sh index 8596595b..d8449e72 100755 --- 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 dbe35262..4e908a92 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -1,122 +1,119 @@ - org.netbeans.modules.web.project - - - addressbook-war - 1.6.5 - - - ${file.reference.jcoreee.jar} - - - ${file.reference.jcore-logger-lib.jar} - - - ${file.reference.jcountry-core.jar} - - - ${file.reference.jcountry-lib.jar} - - - ${file.reference.jcontacts-core.jar} - - - ${file.reference.jcontacts-business-core.jar} - - - ${file.reference.jcontacts-business-lib.jar} - - - ${file.reference.jcontacts-lib.jar} - - - ${file.reference.jphone-core.jar} - - - ${file.reference.jphone-lib.jar} - - - ${file.reference.juser-core.jar} - - - ${file.reference.juser-lib.jar} - - - ${file.reference.juser-activity-core.jar} - - - ${file.reference.juser-activity-lib.jar} - - - ${file.reference.juser-login-core.jar} - - - ${file.reference.juser-login-lib.jar} - - - ${file.reference.jaddressbook-core.jar} - - - ${file.reference.jaddressbook-lib.jar} - - - ${file.reference.jaddressbook-share-core.jar} - - - ${file.reference.jaddressbook-share-lib.jar} - - - ${reference.addressbook-core.jar} - - - ${reference.addressbook-lib.jar} - - - ${file.reference.cdi-api.jar} - - - ${libs.apache_poi.classpath} - WEB-INF/lib - - - ${libs.primefaces.classpath} - - - ${libs.cache.classpath} - - - ${libs.payara-api.classpath} - - - - - - - - - - - - ./lib/nblibraries.properties - - - - addressbook-core - jar - - jar - clean - jar - - - addressbook-lib - jar - - jar - clean - jar - - - + org.netbeans.modules.web.project + + + addressbook-war + 1.6.5 + + + ${file.reference.jcoreee.jar} + + + ${file.reference.jcountry-core.jar} + + + ${file.reference.jcountry-lib.jar} + + + ${file.reference.jcontacts-core.jar} + + + ${file.reference.jcontacts-business-core.jar} + + + ${file.reference.jcontacts-business-lib.jar} + + + ${file.reference.jcontacts-lib.jar} + + + ${file.reference.jphone-core.jar} + + + ${file.reference.jphone-lib.jar} + + + ${file.reference.juser-core.jar} + + + ${file.reference.juser-lib.jar} + + + ${file.reference.juser-activity-core.jar} + + + ${file.reference.juser-activity-lib.jar} + + + ${file.reference.juser-login-core.jar} + + + ${file.reference.juser-login-lib.jar} + + + ${file.reference.jaddressbook-core.jar} + + + ${file.reference.jaddressbook-lib.jar} + + + ${file.reference.jaddressbook-share-core.jar} + + + ${file.reference.jaddressbook-share-lib.jar} + + + ${reference.addressbook-core.jar} + + + ${reference.addressbook-lib.jar} + + + ${file.reference.cdi-api.jar} + + + ${libs.apache_poi.classpath} + WEB-INF/lib + + + ${libs.primefaces.classpath} + + + ${libs.cache.classpath} + + + ${libs.payara-api.classpath} + + + + + + + + + + + + ./lib/nblibraries.properties + + + + addressbook-core + jar + + jar + clean + jar + + + addressbook-lib + jar + + jar + clean + jar + + + 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 52cc00ea..ab05e468 100644 --- 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 *

* @author Roland Häder */ 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 0f987271..72d81bf8 100644 --- 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 *

* @author Roland Häder */ diff --git a/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/contact/AddressbookAdminContactWebRequestBean.java index 11396494..93af33a2 100644 --- 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 0c4fb638..e7aca702 100644 --- 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 9ab4ee86..96638dc2 100644 --- 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 c34349b3..e3a6d0c2 100644 --- 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 3a2c9602..dd7deca9 100644 --- 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 1f8859b9..869bf580 100644 --- 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 ea917801..8e468b8a 100644 --- 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 e9f63a1f..c8e17164 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -182,11 +182,6 @@ min_user_password_score 50 - - Type of receipt barcode (see p:barcode) - receipt_barcode_type - codabar - Ignore menu items with only comments in it. javax.faces.FACELETS_SKIP_COMMENTS -- 2.39.5