From da6b6a57d6d7e1b82549eab1d0c41ccafe00cdb3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Wed, 22 Apr 2020 01:59:56 +0200 Subject: [PATCH] Don't cherry-pick: - JJobs has no need for addressbooks, it can be done without them - renamed backing beans for JJobs - fixed (maybe?) some JNDI names - a lot other fixes, still something is not correct, some interfaces have some missing methods while they should be there MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- lib/jaddressbook-core.jar | Bin 21951 -> 0 bytes lib/jaddressbook-lib.jar | Bin 2541 -> 0 bytes nbproject/project.properties | 6 - nbproject/project.xml | 6 - .../JobsAddressbookWebSessionBean.java | 431 ------------------ .../JobsAddressbookWebSessionController.java | 201 -------- .../JobsAdminEmployeeWebRequestBean.java | 4 +- ....java => JobsEmployeeListWebViewBean.java} | 10 +- ...=> JobsEmployeeListWebViewController.java} | 4 +- ...va => JobsOpeningTimeListWebViewBean.java} | 10 +- ...JobsOpeningTimeListWebViewController.java} | 4 +- ...JobsAdminContactMobileWebRequestBean.java} | 17 +- ...minContactMobileWebRequestController.java} | 7 +- ...a => JobsContactMobileWebRequestBean.java} | 12 +- ...obsContactMobileWebRequestController.java} | 7 +- .../phone/list/JobsUserListWebViewBean.java | 6 +- .../list/JobsUserListWebViewController.java | 2 +- .../data/JobsDataWebApplicationBean.java | 4 +- .../beans/helper/JobsWebViewHelperBean.java | 4 +- .../FinancialsAdminMobileWebRequestBean.java | 10 +- ...ncialsAdminMobileWebRequestController.java | 2 +- .../list/FinancialsMobileListWebViewBean.java | 8 +- ...FinancialsMobileListWebViewController.java | 2 +- ...JobsAdminMobileProviderWebRequestBean.java | 2 +- ...nancialsMobileProviderListWebViewBean.java | 8 +- ...lsMobileProviderListWebViewController.java | 2 +- .../phone/JobsAdminPhoneWebRequestBean.java | 2 +- .../list/FinancialsPhoneListWebViewBean.java | 8 +- .../FinancialsPhoneListWebViewController.java | 2 +- .../user/JobsAdminUserWebRequestBean.java | 4 +- .../JobsUserActionWebRequestController.java} | 4 +- .../JobssUserActionWebRequestBean.java} | 22 +- .../JobsConfirmationLinkWebRequestBean.java | 2 +- .../JobsEmailChangeWebRequestBean.java | 5 +- .../list/JobsEmailChangeListWebViewBean.java} | 14 +- ...JobsEmailChangeListWebViewController.java} | 4 +- .../login/JobsUserLoginWebSessionBean.java | 9 +- .../JobsUserRegisterWebRequestBean.java | 14 +- .../JobsResendLinkWebRequestBean.java | 1 + .../JobsEmployeeConverter.java | 8 +- .../JobsCompanyOpeningTimeConverter.java | 12 +- .../converter/fax/JobsFaxNumberConverter.java | 6 +- .../landline/JobsLandLineNumberConverter.java | 6 +- .../mobile/JobsMobileNumberConverter.java | 7 +- .../JobsMobileProviderConverter.java | 6 +- .../JobsAddressbookIdValidator.java | 120 ----- 46 files changed, 123 insertions(+), 902 deletions(-) delete mode 100644 lib/jaddressbook-core.jar delete mode 100644 lib/jaddressbook-lib.jar delete mode 100644 src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java delete mode 100644 src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java rename src/java/org/mxchange/jjobs/beans/business/employee/list/{FinancialsEmployeeListWebViewBean.java => JobsEmployeeListWebViewBean.java} (94%) rename src/java/org/mxchange/jjobs/beans/business/employee/list/{FinancialsEmployeeListWebViewController.java => JobsEmployeeListWebViewController.java} (92%) rename src/java/org/mxchange/jjobs/beans/business/opening_time/list/{FinancialsOpeningTimeListWebViewBean.java => JobsOpeningTimeListWebViewBean.java} (93%) rename src/java/org/mxchange/jjobs/beans/business/opening_time/list/{FinancialsOpeningTimeListWebViewController.java => JobsOpeningTimeListWebViewController.java} (90%) rename src/java/org/mxchange/jjobs/beans/contact/mobile/{FinancialsAdminContactMobileWebRequestBean.java => JobsAdminContactMobileWebRequestBean.java} (96%) rename src/java/org/mxchange/jjobs/beans/contact/mobile/{FinancialsContactMobileWebRequestController.java => JobsAdminContactMobileWebRequestController.java} (81%) rename src/java/org/mxchange/jjobs/beans/contact/mobile/{FinancialsContactMobileWebRequestBean.java => JobsContactMobileWebRequestBean.java} (93%) rename src/java/org/mxchange/jjobs/beans/contact/mobile/{FinancialsAdminContactMobileWebRequestController.java => JobsContactMobileWebRequestController.java} (81%) rename src/java/org/mxchange/jjobs/beans/{contact/phone/action/FinancialsUserActionWebRequestController.java => user/action/JobsUserActionWebRequestController.java} (90%) rename src/java/org/mxchange/jjobs/beans/{contact/phone/action/FinancialsUserActionWebRequestBean.java => user/action/JobssUserActionWebRequestBean.java} (84%) rename src/java/org/mxchange/jjobs/beans/{contact/phone/email_address/list/FinancialsEmailChangeListWebViewBean.java => user/email_address/list/JobsEmailChangeListWebViewBean.java} (89%) rename src/java/org/mxchange/jjobs/beans/{contact/phone/email_address/list/FinancialsEmailChangeListWebViewController.java => user/email_address/list/JobsEmailChangeListWebViewController.java} (92%) delete mode 100644 src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java diff --git a/lib/jaddressbook-core.jar b/lib/jaddressbook-core.jar deleted file mode 100644 index 6578dc4f2635534cb17646532bbb32d1bf77f588..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 21951 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 Xbh8~U!Pb%B+0@Zbuqgkjms9@-J}2Q5 diff --git a/lib/jaddressbook-lib.jar b/lib/jaddressbook-lib.jar deleted file mode 100644 index 7347bb6faa37497c4bed37f64828b031bb859372..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2541 zcmbtVOHUI~6h0S93)L!65b;IbK}b7PVmd7L}v`|f$pDd&enQGii^>SC)5!Wx4R z6f-+=GFQq<$43BVUzMUN`}In5P@P{>c=@VDxs=OhDm$rSwn%mLEwk+8E;B9F&{q=a z)KV-e>%xxQqRJji;2wTVFQuNuqMIh8HmfB!+8nT)T6&Xynoce|{9a9`laKg4F~4O} zMPrFg!)zHQwUK`z7L7$aW`2pwT^@zdOv9{8=WE1HG@AR$9@XnCKy|iPmDXw|v#hFN zybFNM1;Ls|jcEe7HzkV~gZo>-iT?h3_G5hnfM3PIh~$oI6?73Jy}_uy&6*)CFH{^T_a}l@`fx8j7M_{tfYyrB_&eaIy=L-$`o=O_VS1K5KeRZM0lj4WGA-dp2 zMBEVwR|!Nj`wDCE+*=X2k22M?jBcAMv)rRD%e>$j>Da0!6;#W{qsA&~U8lBVG6J9G zFKu%#^V&d641H@$LJYXG?bUU(Zw90N(!xd)zH-wEtn^yzpqgTsO!C6ZMTtW(6>e@s zx1CFa2lGs@+I43_asL9sHUYcW7TPJy6JNv~0egiai@*Z{aa9a!u7=UVT8^Ks<<|tJ zyL3ym$vo|~D_D=T(Td@i3d^b*7T`m{x3ewDlSp88+tF>c$#zvst!hlxb;EXllh_)Q zZld=k)~HHeA7ceQ@9GvYl7Ve_=6nL@mhxeP9F5Er*JHGNz2O;$@G-)r|NC{r-2eap diff --git a/nbproject/project.properties b/nbproject/project.properties index a078f235..c03f2a43 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -35,8 +35,6 @@ dist.javadoc.dir=${dist.dir}/javadoc dist.war=${dist.dir}/${war.name} endorsed.classpath= excludes= -file.reference.jaddressbook-core.jar=lib/jaddressbook-core.jar -file.reference.jaddressbook-lib.jar=lib/jaddressbook-lib.jar file.reference.jcontacts-business-core.jar=lib/jcontacts-business-core.jar file.reference.jcontacts-business-lib.jar=lib/jcontacts-business-lib.jar file.reference.cdi-api.jar=lib/cdi-api.jar @@ -84,8 +82,6 @@ javac.classpath=\ ${file.reference.juser-activity-lib.jar}:\ ${file.reference.jcontacts-business-core.jar}:\ ${file.reference.jcontacts-business-lib.jar}:\ - ${file.reference.jaddressbook-core.jar}:\ - ${file.reference.jaddressbook-lib.jar}:\ ${reference.jjobs-core.jar}:\ ${reference.jjobs-lib.jar}:\ ${file.reference.cdi-api.jar}:\ @@ -154,8 +150,6 @@ source.reference.juser-activity-core.jar=../juser-activity-core/src/ source.reference.juser-activity-lib.jar=../juser-activity-lib/src/ source.reference.juser-core.jar=../juser-core/src/ source.reference.juser-lib.jar=../juser-lib/src/ -source.reference.jaddressbook-core.jar=../jaddressbook-core/src/ -source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src/ source.reference.juser-login-core.jar=../juser-login-core/src/ source.reference.juser-login-lib.jar=../juser-login-lib/src/ source.root=src diff --git a/nbproject/project.xml b/nbproject/project.xml index 39d6098d..1d1c7400 100644 --- a/nbproject/project.xml +++ b/nbproject/project.xml @@ -54,12 +54,6 @@ ${file.reference.jcontacts-business-lib.jar} - - ${file.reference.jaddressbook-core.jar} - - - ${file.reference.jaddressbook-lib.jar} - ${reference.jjobs-core.jar} diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java deleted file mode 100644 index 767b5f8b..00000000 --- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionBean.java +++ /dev/null @@ -1,431 +0,0 @@ -/* - * Copyright (C) 2016 - 2020 Free Software Foundation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.jjobs.beans.addressbook; - -import java.text.MessageFormat; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; -import java.util.Objects; -import javax.annotation.PostConstruct; -import javax.enterprise.context.SessionScoped; -import javax.enterprise.event.Event; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Any; -import javax.faces.view.facelets.FaceletException; -import javax.inject.Inject; -import javax.inject.Named; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote; -import org.mxchange.jaddressbook.events.addressbook.AddressbookLoadedEvent; -import org.mxchange.jaddressbook.events.addressbook.ObservableAddressbookLoadedEvent; -import org.mxchange.jaddressbook.exceptions.AddressbookNameAlreadyUsedException; -import org.mxchange.jaddressbook.exceptions.AddressbookNotFoundException; -import org.mxchange.jaddressbook.model.addressbook.Addressbook; -import org.mxchange.jaddressbook.model.addressbook.UserAddressbook; -import org.mxchange.jaddressbook.model.addressbook.entry.AddressbookEntry; -import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; -import org.mxchange.jusercore.model.user.User; -import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent; - -/** - * An address book bean (controller) - *

- * @author Roland Häder - */ -@Named ("addressbookController") -@SessionScoped -public class JobsAddressbookWebSessionBean extends BaseJobsBean implements JobsAddressbookWebSessionController { - - /** - * Serial number - */ - private static final long serialVersionUID = 185_781_756_712_969L; - - /** - * Address book instance - */ - private Addressbook addressbook; - - /** - * Remote address book bean - */ - private AddressbookSessionBeanRemote addressbookBean; - - /** - * When this address book has been created - */ - private Date addressbookCreated; - - /** - * Address book id number (from URL for example) - */ - private Long addressbookId; - - /** - * Name of the address book - */ - private String addressbookName; - - /** - * Who owns this address book - */ - private User addressbookUser; - - /** - * Event fired when user has logged in - */ - @Inject - @Any - private Event loadedEvent; - - /** - * Login controller - */ - @Inject - private JobsUserLoginWebSessionController userLoginController; - - /** - * A list of all user's address books - */ - private List usersAddressbooks; - - /** - * Default constructor - */ - public JobsAddressbookWebSessionBean () { - // Call super constructor - super(); - } - - @Override - public String addAddressbook () { - // Is this name already used? - if (!this.userLoginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } else if (this.getAddressbookName() == null) { - // Address book name is null - throw new NullPointerException("addressbookName is null"); //NOI18N - } else if (this.getAddressbookName().isEmpty()) { - // Address book name is empty - throw new IllegalStateException("addressbookName is empty."); //NOI18N - } else if (this.isAddressbookNameUsed(this.getAddressbookName())) { - // Already used by this user - throw new FaceletException(MessageFormat.format("Address book name {0} already used.", this.getAddressbookName())); //NOI18N - } - - // Create address book instance with name - Addressbook book = new UserAddressbook(this.getAddressbookName(), this.userLoginController.getLoggedInUser()); - - try { - // Register this address book - Addressbook updatedAddressbook = this.addressbookBean.createAddressbook(book); - - // Remove name - this.setAddressbookName(null); - - // Add address book entry to list - this.usersAddressbooks.add(updatedAddressbook); - - // All fine - return "login_own_addressbooks"; //NOI18N - } catch (final AddressbookNameAlreadyUsedException ex) { - // Throw again as cause - throw new FaceletException(ex); - } - } - - @Override - public void afterAddressbookLoadedEvent (@Observes final ObservableAddressbookLoadedEvent event) { - // event should not be null - if (null == event) { - // Throw NPE - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getAddressbook() == null) { - // Throw NPE again - throw new NullPointerException("event.addressbook is null"); //NOI18N - } else if (event.getAddressbook().getAddressbookId() == null) { - // And again a NPE - throw new NullPointerException("event.addressbook.addressbookId is null"); //NOI18N - } else if (event.getAddressbook().getAddressbookId() < 1) { - // Invalid id number - throw new IllegalArgumentException(MessageFormat.format("Address book instance {0} has invalid id number: {1}", event.getAddressbook(), event.getAddressbook().getAddressbookId())); //NOI18N - } else if (event.getAddressbook().getAddressbookUser() == null) { - // One more NPE ... - throw new NullPointerException("event.addressbook.addressbookUser is null"); //NOI18N - } - - // Get address book instance - final Addressbook book = event.getAddressbook(); - - // Set address book data - this.setAddressbookId(book.getAddressbookId()); - this.setAddressbookName(book.getAddressbookName()); - this.setAddressbookUser(book.getAddressbookUser()); - this.setAddressbookCreated(book.getAddressbookCreated()); - - // And instance ... - this.setAddressbook(book); - } - - @Override - public void afterLoginEvent (@Observes final ObservableUserLoggedInEvent event) { - // Is the user logged in? - if (null == event) { - // Is null - throw new NullPointerException("event is null"); //NOI18N - } else if (event.getLoggedInUser() == null) { - // user is null - throw new NullPointerException("event.user is null"); //NOI18N - } else if (!event.getLoggedInUser().equals(this.userLoginController.getLoggedInUser())) { - // Not matching - throw new IllegalStateException("event.user and userLoginController.loggedInUser don't match."); //NOI18N - } else if (!this.userLoginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - // Init user's address book list - this.initAddressbookList(); - } - - @Override - public List allAddressbooks () { - // Is the user logged in? - if (!this.userLoginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - return Collections.unmodifiableList(this.usersAddressbooks); - } - - @Override - public List allEntries (final Addressbook addressbook) { - // Is the user logged in? - if (!this.userLoginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - // Ask the bean - return this.addressbookBean.allEntries(addressbook); - } - - @Override - public int allEntriesSize (final Addressbook addressbook) { - // Ask the bean - return this.allEntries(addressbook).size(); - } - - @Override - public Addressbook getAddressbook () { - return this.addressbook; - } - - @Override - public void setAddressbook (final Addressbook addressbook) { - this.addressbook = addressbook; - } - - @Override - @SuppressWarnings ("ReturnOfDateField") - public Date getAddressbookCreated () { - return this.addressbookCreated; - } - - @Override - @SuppressWarnings ("AssignmentToDateFieldFromParameter") - public void setAddressbookCreated (final Date addressbookCreated) { - this.addressbookCreated = addressbookCreated; - } - - @Override - public Long getAddressbookId () { - return this.addressbookId; - } - - @Override - public void setAddressbookId (final Long addressbookId) { - this.addressbookId = addressbookId; - } - - @Override - public String getAddressbookName () { - return this.addressbookName; - } - - @Override - public void setAddressbookName (final String addressbookName) { - this.addressbookName = addressbookName; - } - - @Override - public User getAddressbookUser () { - return this.addressbookUser; - } - - @Override - public void setAddressbookUser (final User addressbookUser) { - this.addressbookUser = addressbookUser; - } - - @Override - public boolean hasCreatedAddressbooks () { - // Is the user logged in? - if (!this.userLoginController.isUserLoggedIn()) { - // Not logged in - throw new FaceletException("This method can only be called as logged-in user."); //NOI18N - } - - // Check if the list is filled - return (!this.usersAddressbooks.isEmpty()); - } - - /** - * Post-initialization of this class - */ - @PostConstruct - public void init () { - // Try it - try { - // Get initial context - Context context = new InitialContext(); - - // Try to lookup - this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("java:global/jjobs-ejb/jjobs-adr!org.mxchange.jjobs.model.addressbook.JobsAddressbookSessionBeanRemote"); //NOI18N - } catch (final NamingException e) { - // Throw again - throw new FaceletException(e); - } - - // Init list - this.usersAddressbooks = new LinkedList<>(); - - // Is the user logged-in? - if (this.userLoginController.isUserLoggedIn()) { - // Initialize list - this.initAddressbookList(); - } - - // TODO Initialize list from bean with just one call - //this.addressbookBean.getUserCountMap() - } - - @Override - public boolean isAddressbookLoaded () { - return ((this.getAddressbookId() instanceof Long) && - (this.getAddressbookName() instanceof String) && - (!this.getAddressbookName().isEmpty()) && - (this.getAddressbookUser() instanceof User)); - } - - @Override - public boolean isAddressbookNameUsed (final String addressbookName) { - // Is it zero size? - if (null == addressbookName) { - // Is null - throw new NullPointerException("addressbookName is null"); //NOI18N - } else if (this.usersAddressbooks.isEmpty()) { - // Not found! - return false; - } - - // Default is not found - boolean isFound = false; - - // Check all entries - for (final Addressbook book : this.usersAddressbooks) { - // Is the name same? - if (book.getAddressbookName().equals(addressbookName)) { - // Found a match - isFound = true; - break; - } - } - - // Return status - return isFound; - } - - @Override - public boolean isOtherAddressbook () { - // Just call the other method and invert it - return (!this.isOwnAddressbook()); - } - - @Override - public boolean isOwnAddressbook () { - // Is the user logged in? - if (!this.userLoginController.isUserLoggedIn()) { - // No, then no own address book - throw new IllegalStateException("isOwnAddressbook() has been invoked for a guest account"); //NOI18N - } - - // Is same user? - return Objects.equals(this.getAddressbookUser(), this.userLoginController.getLoggedInUser()); - } - - @Override - public boolean loadAddressbook () { - // Check if the id is set - if (this.getAddressbookId() == null) { - // Throw NPE - throw new NullPointerException("this.addressbookId is null"); - } else if (this.getAddressbookId() < 1) { - // Not valid id - throw new IllegalStateException(MessageFormat.format("this.addressbook={0} is invalid", this.getAddressbookId())); - } - - // Default is not found - boolean isFound = false; - - try { - // Then try to look it up - Addressbook a = this.addressbookBean.getAddressbookById(this.getAddressbookId()); - - // Fire event here - this.loadedEvent.fire(new AddressbookLoadedEvent(a)); - - // Found it - isFound = true; - } catch (final AddressbookNotFoundException ex) { - // Not found! - throw new FaceletException(ex); - } - - // Return status - return isFound; - } - - /** - * Initializes the user user's address book list - */ - private void initAddressbookList () { - // Get user instance - User user = this.userLoginController.getLoggedInUser(); - - // Fill list with entries - this.usersAddressbooks = this.addressbookBean.getUsersAddressbookList(user); - } - -} diff --git a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java b/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java deleted file mode 100644 index ff7db6a0..00000000 --- a/src/java/org/mxchange/jjobs/beans/addressbook/JobsAddressbookWebSessionController.java +++ /dev/null @@ -1,201 +0,0 @@ -/* - * Copyright (C) 2016 - 2020 Free Software Foundation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.mxchange.jjobs.beans.addressbook; - -import java.io.Serializable; -import java.util.Date; -import java.util.List; -import org.mxchange.jaddressbook.events.addressbook.ObservableAddressbookLoadedEvent; -import org.mxchange.jaddressbook.model.addressbook.Addressbook; -import org.mxchange.jaddressbook.model.addressbook.entry.AddressbookEntry; -import org.mxchange.jusercore.model.user.User; -import org.mxchange.juserlogincore.events.login.ObservableUserLoggedInEvent; - -/** - * An interface for address book beans - *

- * @author Roland Häder - */ -public interface JobsAddressbookWebSessionController extends Serializable { - - /** - * Checks whether the user has created addressbooks. For this method to work - * it is vital that the user is logged into his/her account. - *

- * @return Whether the user has created at least one addressbook - */ - boolean hasCreatedAddressbooks (); - - /** - * Creates a new address book with a name and redirects to proper target. - * For this method to work it is vital that the user is logged into his/her - * account. - *

- * @return Target to redirect to - */ - String addAddressbook (); - - /** - * Getter for address book name - *

- * @return Address book name - */ - String getAddressbookName (); - - /** - * Setter for address book name - *

- * @param addressbookName Address book name - */ - void setAddressbookName (final String addressbookName); - - /** - * Checks if the given address book name is already used by the user. - *

- * @param addressbookName Address book name to check - *

- * @return Whether the name has already been used by the user - */ - boolean isAddressbookNameUsed (final String addressbookName); - - /** - * Returns all address books with this user - *

- * @return A list of all address books by this user - */ - List allAddressbooks (); - - /** - * Returns a list of all address book entries for given address book - *

- * @param addressbook Address book instance - *

- * @return List of all entries - */ - List allEntries (final Addressbook addressbook); - - /** - * Size of all entries in given address book - *

- * @param addressbook Address book instance - *

- * @return Size of the entries in address book - */ - int allEntriesSize (final Addressbook addressbook); - - /** - * Getter for address book id number - *

- * @return Address book id number - */ - Long getAddressbookId (); - - /** - * Setter for address book id number - *

- * @param addressbookId Address book id number - */ - void setAddressbookId (final Long addressbookId); - - /** - * Getter for address book user (owner) - *

- * @return Address book user (owner) - */ - User getAddressbookUser (); - - /** - * Setter for address book user (owner) - *

- * @param addressbookUser Address book user (owner) - */ - void setAddressbookUser (final User addressbookUser); - - /** - * Getter for when the address book has been created - *

- * @return When the address book has been created - */ - Date getAddressbookCreated (); - - /** - * Setter for when the address book has been created - *

- * @param addressbookCreated When the address book has been created - */ - void setAddressbookCreated (final Date addressbookCreated); - - /** - * This method is called when an address book has been successfully loaded - * from JPA. - *

- * @param event Event with address book instance - */ - void afterAddressbookLoadedEvent (final ObservableAddressbookLoadedEvent event); - - /** - * This method is called when a user has successfully logged in his/her - * account. - *

- * @param event - */ - void afterLoginEvent (final ObservableUserLoggedInEvent event); - - /** - * Checks if the user is logged in and if so if it matches the current - * address book owner. - *

- * @return Whether the owner matches currently logged-in user - */ - boolean isOwnAddressbook (); - - /** - * Checks if the owner of the current address book is NOT matching the - * logged-in user. - *

- * @return Whether the user does NOT match - */ - boolean isOtherAddressbook (); - - /** - * Getter for address book instance - *

- * @return Address book instance - */ - Addressbook getAddressbook (); - - /** - * Setter for address book instance - *

- * @param addressbook Address book instance - */ - void setAddressbook (final Addressbook addressbook); - - /** - * Checks weather an address book has been loaded by checking the id number. - *

- * @return Whether the address book is loaded - */ - boolean isAddressbookLoaded (); - - /** - * Loads address book from current id - *

- * @return Whether the address book was found - */ - boolean loadAddressbook (); -} diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java index 2fb6b2fb..baa66ec8 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/JobsAdminEmployeeWebRequestBean.java @@ -40,7 +40,7 @@ import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jphone.model.phonenumbers.mobile.MobileNumber; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; import org.mxchange.jusercore.model.user.User; -import org.mxchange.jfinancials.beans.business.employee.list.FinancialsEmployeeListWebViewController; +import org.mxchange.jjobs.beans.business.employee.list.JobsEmployeeListWebViewController; /** * A request-scoped bean for administrative purposes for administrative employee @@ -74,7 +74,7 @@ public class JobsAdminEmployeeWebRequestBean extends BaseJobsBean implements Job * Administrative list-all-employees controller */ @Inject - private FinancialsEmployeeListWebViewController adminEmployeeListController; + private JobsEmployeeListWebViewController adminEmployeeListController; /** * Assigned basic data instance diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/list/FinancialsEmployeeListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/business/employee/list/JobsEmployeeListWebViewBean.java similarity index 94% rename from src/java/org/mxchange/jjobs/beans/business/employee/list/FinancialsEmployeeListWebViewBean.java rename to src/java/org/mxchange/jjobs/beans/business/employee/list/JobsEmployeeListWebViewBean.java index 966e4329..aba7e3ab 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/list/FinancialsEmployeeListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/list/JobsEmployeeListWebViewBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.business.employee.list; +package org.mxchange.jjobs.beans.business.employee.list; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; @@ -33,7 +33,7 @@ import org.mxchange.jcontactsbusiness.events.employee.added.ObservableEmployeeAd import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeNotFoundException; import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jcontactsbusiness.model.employee.EmployeeSessionBeanRemote; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A view-scoped bean for listing purposes for e.g. administrative employee @@ -43,7 +43,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsBean; */ @Named ("employeeListController") @ViewScoped -public class FinancialsEmployeeListWebViewBean extends BaseFinancialsBean implements FinancialsEmployeeListWebViewController { +public class JobsEmployeeListWebViewBean extends BaseJobsBean implements JobsEmployeeListWebViewController { /** * Serial number @@ -58,7 +58,7 @@ public class FinancialsEmployeeListWebViewBean extends BaseFinancialsBean implem /** * EJB for general company employee purposes */ - @EJB (lookup = "java:global/jfinancials-ejb/employee!org.mxchange.jcontactsbusiness.model.employee.EmployeeSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/employee!org.mxchange.jcontactsbusiness.model.employee.EmployeeSessionBeanRemote") private EmployeeSessionBeanRemote employeeBean; /** @@ -81,7 +81,7 @@ public class FinancialsEmployeeListWebViewBean extends BaseFinancialsBean implem /** * Default constructor */ - public FinancialsEmployeeListWebViewBean () { + public JobsEmployeeListWebViewBean () { // Call super constructor super(); diff --git a/src/java/org/mxchange/jjobs/beans/business/employee/list/FinancialsEmployeeListWebViewController.java b/src/java/org/mxchange/jjobs/beans/business/employee/list/JobsEmployeeListWebViewController.java similarity index 92% rename from src/java/org/mxchange/jjobs/beans/business/employee/list/FinancialsEmployeeListWebViewController.java rename to src/java/org/mxchange/jjobs/beans/business/employee/list/JobsEmployeeListWebViewController.java index 306bb460..b6e98384 100644 --- a/src/java/org/mxchange/jjobs/beans/business/employee/list/FinancialsEmployeeListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/business/employee/list/JobsEmployeeListWebViewController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.business.employee.list; +package org.mxchange.jjobs.beans.business.employee.list; import java.io.Serializable; import java.util.List; @@ -26,7 +26,7 @@ import org.mxchange.jcontactsbusiness.model.employee.Employable; *

* @author Roland Häder */ -public interface FinancialsEmployeeListWebViewController extends Serializable { +public interface JobsEmployeeListWebViewController extends Serializable { /** * Returns a list of all company employees diff --git a/src/java/org/mxchange/jjobs/beans/business/opening_time/list/FinancialsOpeningTimeListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/business/opening_time/list/JobsOpeningTimeListWebViewBean.java similarity index 93% rename from src/java/org/mxchange/jjobs/beans/business/opening_time/list/FinancialsOpeningTimeListWebViewBean.java rename to src/java/org/mxchange/jjobs/beans/business/opening_time/list/JobsOpeningTimeListWebViewBean.java index d82c0404..a9c1f9e9 100644 --- a/src/java/org/mxchange/jjobs/beans/business/opening_time/list/FinancialsOpeningTimeListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/business/opening_time/list/JobsOpeningTimeListWebViewBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.business.opening_time.list; +package org.mxchange.jjobs.beans.business.opening_time.list; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; @@ -32,7 +32,7 @@ import org.mxchange.jcontactsbusiness.events.opening_time.added.ObservableOpenin import org.mxchange.jcontactsbusiness.exceptions.opening_time.OpeningTimeNotFoundException; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTimeSessionBeanRemote; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; +import org.mxchange.jjobs.beans.BaseJobsBean; /** * A general bean for opening times @@ -41,7 +41,7 @@ import org.mxchange.jfinancials.beans.BaseFinancialsBean; */ @Named ("openingTimeListController") @ViewScoped -public class FinancialsOpeningTimeListWebViewBean extends BaseFinancialsBean implements FinancialsOpeningTimeListWebViewController { +public class JobsOpeningTimeListWebViewBean extends BaseJobsBean implements JobsOpeningTimeListWebViewController { /** * Serial number @@ -61,7 +61,7 @@ public class FinancialsOpeningTimeListWebViewBean extends BaseFinancialsBean imp /** * EJB for administrative purposes */ - @EJB (lookup = "java:global/jfinancials-ejb/openingTimes!org.mxchange.jcontactsbusiness.model.opening_time.OpeningTimeSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/openingTimes!org.mxchange.jcontactsbusiness.model.opening_time.OpeningTimeSessionBeanRemote") private OpeningTimeSessionBeanRemote openingTimesBean; /** @@ -79,7 +79,7 @@ public class FinancialsOpeningTimeListWebViewBean extends BaseFinancialsBean imp /** * Default constructor */ - public FinancialsOpeningTimeListWebViewBean () { + public JobsOpeningTimeListWebViewBean () { // Call super constructor super(); diff --git a/src/java/org/mxchange/jjobs/beans/business/opening_time/list/FinancialsOpeningTimeListWebViewController.java b/src/java/org/mxchange/jjobs/beans/business/opening_time/list/JobsOpeningTimeListWebViewController.java similarity index 90% rename from src/java/org/mxchange/jjobs/beans/business/opening_time/list/FinancialsOpeningTimeListWebViewController.java rename to src/java/org/mxchange/jjobs/beans/business/opening_time/list/JobsOpeningTimeListWebViewController.java index cadae503..016ea00d 100644 --- a/src/java/org/mxchange/jjobs/beans/business/opening_time/list/FinancialsOpeningTimeListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/business/opening_time/list/JobsOpeningTimeListWebViewController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.business.opening_time.list; +package org.mxchange.jjobs.beans.business.opening_time.list; import java.io.Serializable; import org.mxchange.jcontactsbusiness.exceptions.opening_time.OpeningTimeNotFoundException; @@ -25,7 +25,7 @@ import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; *

* @author Roland Häder */ -public interface FinancialsOpeningTimeListWebViewController extends Serializable { +public interface JobsOpeningTimeListWebViewController extends Serializable { /** * Retrieves a single opening-time entity for given id number or throws a diff --git a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsAdminContactMobileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsAdminContactMobileWebRequestBean.java similarity index 96% rename from src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsAdminContactMobileWebRequestBean.java rename to src/java/org/mxchange/jjobs/beans/contact/mobile/JobsAdminContactMobileWebRequestBean.java index bde080e6..5d5a4801 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsAdminContactMobileWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsAdminContactMobileWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.contact.mobile; +package org.mxchange.jjobs.beans.contact.mobile; import java.text.MessageFormat; import java.util.Date; @@ -35,8 +35,7 @@ import org.mxchange.jcontacts.events.mobile.unlinked.AdminUnlinkedMobileNumberEv import org.mxchange.jcontacts.events.mobile.unlinked.ObservableAdminUnlinkedMobileNumberEvent; import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; -import org.mxchange.jfinancials.beans.phone.FinancialsAdminPhoneWebRequestController; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent; import org.mxchange.jphone.exceptions.phone.PhoneNumberAlreadyLinkedException; import org.mxchange.jphone.exceptions.phone.PhoneNumberNotLinkedException; @@ -52,7 +51,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("adminContactMobileController") @RequestScoped -public class FinancialsAdminContactMobileWebRequestBean extends BaseFinancialsBean implements FinancialsAdminContactMobileWebRequestController { +public class JobsAdminContactMobileWebRequestBean extends BaseJobsBean implements JobsAdminContactMobileWebRequestController { /** * Serial number @@ -62,7 +61,7 @@ public class FinancialsAdminContactMobileWebRequestBean extends BaseFinancialsBe /** * Administrative EJB for phone number */ - @EJB (lookup = "java:global/jfinancials-ejb/adminContactPhone!org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/adminContactPhone!org.mxchange.jcontacts.model.phone.AdminContactsPhoneSessionBeanRemote") private AdminContactsPhoneSessionBeanRemote adminContactPhoneBean; /** @@ -72,12 +71,6 @@ public class FinancialsAdminContactMobileWebRequestBean extends BaseFinancialsBe @Any private Event adminLinkedMobileNumberEvent; - /** - * Administrative phone controller - */ - @Inject - private FinancialsAdminPhoneWebRequestController adminPhoneController; - /** * Contact instance */ @@ -118,7 +111,7 @@ public class FinancialsAdminContactMobileWebRequestBean extends BaseFinancialsBe /** * Default constructor */ - public FinancialsAdminContactMobileWebRequestBean () { + public JobsAdminContactMobileWebRequestBean () { // Call super constructor super(); diff --git a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsContactMobileWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsAdminContactMobileWebRequestController.java similarity index 81% rename from src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsContactMobileWebRequestController.java rename to src/java/org/mxchange/jjobs/beans/contact/mobile/JobsAdminContactMobileWebRequestController.java index 1501a46c..de54b875 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsContactMobileWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsAdminContactMobileWebRequestController.java @@ -1,3 +1,4 @@ + /* * Copyright (C) 2016 - 2020 Free Software Foundation * @@ -14,9 +15,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.contact.mobile; +package org.mxchange.jjobs.beans.contact.mobile; -import org.mxchange.jfinancials.beans.contact.phone.*; +import org.mxchange.jjobs.beans.contact.phone.*; import java.io.Serializable; /** @@ -24,6 +25,6 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface FinancialsContactMobileWebRequestController extends Serializable { +public interface JobsAdminContactMobileWebRequestController extends Serializable { } diff --git a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsContactMobileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsContactMobileWebRequestBean.java similarity index 93% rename from src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsContactMobileWebRequestBean.java rename to src/java/org/mxchange/jjobs/beans/contact/mobile/JobsContactMobileWebRequestBean.java index a3ef2762..25c0af4e 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsContactMobileWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsContactMobileWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.contact.mobile; +package org.mxchange.jjobs.beans.contact.mobile; import java.text.MessageFormat; import java.util.LinkedList; @@ -27,8 +27,8 @@ import javax.inject.Named; import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEvent; import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; -import org.mxchange.jfinancials.beans.contact.list.FinancialsContactListWebViewController; +import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.contact.list.JobsContactListWebViewController; import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent; import org.mxchange.jphone.model.phonenumbers.mobile.DialableMobileNumber; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; @@ -40,7 +40,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("contactMobileController") @RequestScoped -public class FinancialsContactMobileWebRequestBean extends BaseFinancialsBean implements FinancialsContactMobileWebRequestController { +public class JobsContactMobileWebRequestBean extends BaseJobsBean implements JobsContactMobileWebRequestController { /** * Serial number @@ -51,7 +51,7 @@ public class FinancialsContactMobileWebRequestBean extends BaseFinancialsBean im * An instance of a contact-list controller */ @Inject - private FinancialsContactListWebViewController contactListController; + private JobsContactListWebViewController contactListController; /** * Chosen mobile number @@ -61,7 +61,7 @@ public class FinancialsContactMobileWebRequestBean extends BaseFinancialsBean im /** * Default constructor */ - public FinancialsContactMobileWebRequestBean () { + public JobsContactMobileWebRequestBean () { // Call super constructor super(); } diff --git a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsAdminContactMobileWebRequestController.java b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsContactMobileWebRequestController.java similarity index 81% rename from src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsAdminContactMobileWebRequestController.java rename to src/java/org/mxchange/jjobs/beans/contact/mobile/JobsContactMobileWebRequestController.java index 0e0f0b20..696dfafe 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/mobile/FinancialsAdminContactMobileWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/mobile/JobsContactMobileWebRequestController.java @@ -1,4 +1,3 @@ - /* * Copyright (C) 2016 - 2020 Free Software Foundation * @@ -15,9 +14,9 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.contact.mobile; +package org.mxchange.jjobs.beans.contact.mobile; -import org.mxchange.jfinancials.beans.contact.phone.*; +import org.mxchange.jjobs.beans.contact.phone.*; import java.io.Serializable; /** @@ -25,6 +24,6 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface FinancialsAdminContactMobileWebRequestController extends Serializable { +public interface JobsContactMobileWebRequestController extends Serializable { } diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewBean.java index 232cbf58..945c09c4 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.user.list; +package org.mxchange.jjobs.beans.user.list; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; @@ -29,7 +29,7 @@ import javax.enterprise.event.Observes; import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.delete.ObservableAdminDeletedUserEvent; import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; @@ -77,7 +77,7 @@ public class JobsUserListWebViewBean extends BaseJobsBean implements JobsUserLis /** * Remote user bean */ - @EJB (lookup = "java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewController.java b/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewController.java index 82ef7df7..b76a562c 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/contact/phone/list/JobsUserListWebViewController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.user.list; +package org.mxchange.jjobs.beans.user.list; import java.io.Serializable; import java.util.List; diff --git a/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java index 0bfeb8b8..c8eed438 100644 --- a/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java +++ b/src/java/org/mxchange/jjobs/beans/data/JobsDataWebApplicationBean.java @@ -19,9 +19,8 @@ package org.mxchange.jjobs.beans.data; import javax.enterprise.context.ApplicationScoped; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.title.PersonalTitle; -import org.mxchange.jcontactsbusiness.model.opening_time.dayofweek.DayOfTheWeek; -import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jcoreee.dates.DayOfTheWeek; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jusercore.model.user.profilemodes.ProfileMode; import org.mxchange.jusercore.model.user.status.UserAccountStatus; @@ -69,6 +68,7 @@ public class JobsDataWebApplicationBean extends BaseJobsBean { * Returns an array of all profile modes

* @ * + * * return An array of all profile modes */ public ProfileMode[] getProfileModes () { diff --git a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java index ac672e79..c811a424 100644 --- a/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java +++ b/src/java/org/mxchange/jjobs/beans/helper/JobsWebViewHelperBean.java @@ -32,8 +32,8 @@ import org.mxchange.jcontactsbusiness.model.employee.Employable; import org.mxchange.jcontactsbusiness.model.headquarter.Headquarter; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.contact.list.JobsContactListWebViewController; import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; import org.mxchange.jphone.events.fax.created.CreatedFaxNumberEvent; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.landline.created.CreatedLandLineNumberEvent; @@ -78,7 +78,7 @@ public class JobsWebViewHelperBean extends BaseJobsBean implements JobsWebViewHe * Regular user controller */ @Inject - private FinancialsContactListWebViewController contactListController; + private JobsContactListWebViewController contactListController; /** * Fax number diff --git a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestBean.java index 8851f632..e6cbd863 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.mobile; +package org.mxchange.jjobs.beans.mobile; import java.text.MessageFormat; import java.util.Date; @@ -28,8 +28,8 @@ import javax.enterprise.inject.Any; import javax.faces.application.FacesMessage; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; -import org.mxchange.jfinancials.beans.mobile.list.FinancialsMobileListWebViewController; +import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.mobile.list.FinancialsMobileListWebViewController; import org.mxchange.jphone.events.mobile.created.ObservableCreatedMobileNumberEvent; import org.mxchange.jphone.events.mobile.deleted.AdminDeletedMobileNumberEvent; import org.mxchange.jphone.events.mobile.deleted.AdminMobileNumberDeletedEvent; @@ -49,7 +49,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; */ @Named ("adminMobileController") @RequestScoped -public class FinancialsAdminMobileWebRequestBean extends BaseFinancialsBean implements FinancialsAdminMobileWebRequestController { +public class FinancialsAdminMobileWebRequestBean extends BaseJobsBean implements FinancialsAdminMobileWebRequestController { /** * Serial number @@ -59,7 +59,7 @@ public class FinancialsAdminMobileWebRequestBean extends BaseFinancialsBean impl /** * Remote EJB for phone number (administrative) */ - @EJB (lookup = "java:global/jfinancials-ejb/adminMobile!org.mxchange.jphone.model.phonenumbers.mobile.AdminMobileSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/adminMobile!org.mxchange.jphone.model.phonenumbers.mobile.AdminMobileSessionBeanRemote") private AdminMobileSessionBeanRemote adminMobileBean; /** diff --git a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestController.java b/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestController.java index 3a5a8f7f..269629df 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/FinancialsAdminMobileWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.mobile; +package org.mxchange.jjobs.beans.mobile; import java.io.Serializable; diff --git a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewBean.java index 5c6a03f0..fdc286b3 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.mobile.list; +package org.mxchange.jjobs.beans.mobile.list; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; @@ -33,7 +33,7 @@ import org.mxchange.jcontacts.events.contact.add.ObservableAdminAddedContactEven import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContactEvent; import org.mxchange.jcontacts.events.mobile.linked.ObservableAdminLinkedMobileNumberEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.mobile.deleted.AdminDeletedMobileNumberEvent; import org.mxchange.jphone.events.mobile.updated.AdminUpdatedMobileNumberEvent; import org.mxchange.jphone.exceptions.mobile.MobileEntityNotFoundException; @@ -48,7 +48,7 @@ import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; */ @Named ("mobileListController") @ViewScoped -public class FinancialsMobileListWebViewBean extends BaseFinancialsBean implements FinancialsMobileListWebViewController { +public class FinancialsMobileListWebViewBean extends BaseJobsBean implements FinancialsMobileListWebViewController { /** * Serial number @@ -68,7 +68,7 @@ public class FinancialsMobileListWebViewBean extends BaseFinancialsBean implemen /** * General EJB for mobile numbers */ - @EJB (lookup = "java:global/jfinancials-ejb/mobile!org.mxchange.jphone.model.phonenumbers.mobile.MobileSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/mobile!org.mxchange.jphone.model.phonenumbers.mobile.MobileSessionBeanRemote") private MobileSessionBeanRemote mobileBean; /** diff --git a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewController.java b/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewController.java index 18a38fb6..1b45c3ab 100644 --- a/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/mobile/list/FinancialsMobileListWebViewController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.mobile.list; +package org.mxchange.jjobs.beans.mobile.list; import java.io.Serializable; import java.util.List; diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java index cc7067a8..f8e4b262 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/JobsAdminMobileProviderWebRequestBean.java @@ -27,7 +27,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jfinancials.beans.mobileprovider.list.FinancialsMobileProviderListWebViewController; +import org.mxchange.jjobs.beans.mobileprovider.list.FinancialsMobileProviderListWebViewController; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.events.mobileprovider.added.AdminMobileProviderAddedEvent; import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderAlreadyAddedException; diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java index 8a5e1f16..ab20ff88 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.mobileprovider.list; +package org.mxchange.jjobs.beans.mobileprovider.list; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; @@ -28,7 +28,7 @@ import javax.enterprise.event.Observes; import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.mobileprovider.added.AdminAddedMobileProviderEvent; import org.mxchange.jphone.exceptions.mobileprovider.MobileProviderNotFoundException; import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProvider; @@ -41,7 +41,7 @@ import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingl */ @Named ("mobileProviderListController") @ViewScoped -public class FinancialsMobileProviderListWebViewBean extends BaseFinancialsBean implements FinancialsMobileProviderListWebViewController { +public class FinancialsMobileProviderListWebViewBean extends BaseJobsBean implements FinancialsMobileProviderListWebViewController { /** * Serial number @@ -61,7 +61,7 @@ public class FinancialsMobileProviderListWebViewBean extends BaseFinancialsBean /** * Remote EJB for mobile providers (regular) */ - @EJB (lookup = "java:global/jfinancials-ejb/mobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/mobileProvider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote") private MobileProviderSingletonBeanRemote mobileProviderBean; /** diff --git a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewController.java b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewController.java index fa035528..f1e4568e 100644 --- a/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/mobileprovider/list/FinancialsMobileProviderListWebViewController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.mobileprovider.list; +package org.mxchange.jjobs.beans.mobileprovider.list; import java.io.Serializable; import java.util.List; diff --git a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java index 9901d763..07edf159 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/JobsAdminPhoneWebRequestBean.java @@ -30,7 +30,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcountry.model.data.Country; import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jfinancials.beans.phone.list.FinancialsPhoneListWebViewController; +import org.mxchange.jjobs.beans.phone.list.FinancialsPhoneListWebViewController; import org.mxchange.jphone.events.fax.created.ObservableCreatedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.deleted.AdminFaxNumberDeletedEvent; diff --git a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewBean.java index 58642aed..8c68bcdb 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.phone.list; +package org.mxchange.jjobs.beans.phone.list; import fish.payara.cdi.jsr107.impl.NamedCache; import java.text.MessageFormat; @@ -34,7 +34,7 @@ import org.mxchange.jcontacts.events.contact.update.ObservableAdminUpdatedContac import org.mxchange.jcontacts.events.fax.linked.ObservableAdminLinkedFaxNumberEvent; import org.mxchange.jcontacts.events.landline.linked.ObservableAdminLinkedLandLineNumberEvent; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; +import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jphone.events.fax.deleted.AdminDeletedFaxNumberEvent; import org.mxchange.jphone.events.fax.updated.AdminUpdatedFaxNumberEvent; import org.mxchange.jphone.events.landline.deleted.AdminDeletedLandLineNumberEvent; @@ -51,7 +51,7 @@ import org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote; */ @Named ("phoneListController") @ViewScoped -public class FinancialsPhoneListWebViewBean extends BaseFinancialsBean implements FinancialsPhoneListWebViewController { +public class FinancialsPhoneListWebViewBean extends BaseJobsBean implements FinancialsPhoneListWebViewController { /** * Serial number @@ -95,7 +95,7 @@ public class FinancialsPhoneListWebViewBean extends BaseFinancialsBean implement /** * General EJB for phone numbers */ - @EJB (lookup = "java:global/jfinancials-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/phone!org.mxchange.jphone.model.phonenumbers.phone.PhoneSessionBeanRemote") private PhoneSessionBeanRemote phoneBean; /** diff --git a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewController.java b/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewController.java index 24176e8f..421c5723 100644 --- a/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/phone/list/FinancialsPhoneListWebViewController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.phone.list; +package org.mxchange.jjobs.beans.phone.list; import java.io.Serializable; import java.util.List; diff --git a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java index fb901415..2e750756 100644 --- a/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/JobsAdminUserWebRequestBean.java @@ -27,7 +27,6 @@ import javax.enterprise.inject.Any; import javax.faces.FacesException; import javax.faces.application.FacesMessage; import javax.faces.context.FacesContext; -import javax.faces.view.facelets.FaceletException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; @@ -36,6 +35,7 @@ import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsAdminContactWebRequestController; import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; import org.mxchange.jusercore.events.user.add.AdminAddedUserEvent; import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; @@ -48,6 +48,7 @@ import org.mxchange.jusercore.events.user.locked.ObservableAdminLockedUserEvent; import org.mxchange.jusercore.events.user.unlocked.AdminUnlockedUserEvent; import org.mxchange.jusercore.events.user.unlocked.ObservableAdminUnlockedUserEvent; import org.mxchange.jusercore.events.user.update.post.AdminPostUserDataUpdatedEvent; +import org.mxchange.jusercore.events.user.update.post.ObservableAdminPostUserDataUpdatedEvent; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNotFoundException; @@ -64,7 +65,6 @@ import org.mxchange.juserlogincore.container.login.UserLoginContainer; import org.mxchange.juserlogincore.events.registration.ObservableUserRegisteredEvent; import org.mxchange.juserlogincore.exceptions.UserPasswordRepeatMismatchException; import org.mxchange.juserlogincore.login.UserLoginUtils; -import org.mxchange.jusercore.events.user.update.post.ObservableAdminPostUserDataUpdatedEvent; /** * A user controller (bean) diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestController.java b/src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestController.java similarity index 90% rename from src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestController.java rename to src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestController.java index ed6cd2d9..788e7166 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestController.java +++ b/src/java/org/mxchange/jjobs/beans/user/action/JobsUserActionWebRequestController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.user.action; +package org.mxchange.jjobs.beans.user.action; import java.io.Serializable; @@ -23,7 +23,7 @@ import java.io.Serializable; *

* @author Roland Häder */ -public interface FinancialsUserActionWebRequestController extends Serializable { +public interface JobsUserActionWebRequestController extends Serializable { /** * Minimum password length diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java similarity index 84% rename from src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestBean.java rename to src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java index effde46a..faace205 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/action/FinancialsUserActionWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/action/JobssUserActionWebRequestBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.user.action; +package org.mxchange.jjobs.beans.user.action; import java.text.MessageFormat; import javax.ejb.EJB; @@ -25,10 +25,10 @@ import javax.faces.FacesException; import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcontacts.model.contact.Contact; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; -import org.mxchange.jfinancials.beans.contact.FinancialsContactWebRequestController; -import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; -import org.mxchange.jfinancials.beans.user.login.FinancialsUserLoginWebSessionController; +import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; +import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; +import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; import org.mxchange.jusercore.events.user.update.post.ObservablePostUserPersonalDataUpdatedEvent; import org.mxchange.jusercore.events.user.update.post.PostUserPersonalDataUpdatedEvent; import org.mxchange.jusercore.events.user.update.pre.ObservablePreUserPersonalDataUpdatedEvent; @@ -44,7 +44,7 @@ import org.mxchange.juserlogincore.exceptions.UserPasswordMismatchException; */ @Named ("userActionController") @RequestScoped -public class FinancialsUserActionWebRequestBean extends BaseFinancialsBean implements FinancialsUserActionWebRequestController { +public class JobssUserActionWebRequestBean extends BaseJobsBean implements JobsUserActionWebRequestController { /** * Serial number @@ -55,13 +55,13 @@ public class FinancialsUserActionWebRequestBean extends BaseFinancialsBean imple * General contact controller */ @Inject - private FinancialsContactWebRequestController contactController; + private JobsContactWebRequestController contactController; /** * Features controller */ @Inject - private FinancialsFeaturesWebApplicationController featureController; + private JobsFeaturesWebApplicationController featureController; /** * Event being fired when user updated personal data @@ -80,19 +80,19 @@ public class FinancialsUserActionWebRequestBean extends BaseFinancialsBean imple /** * Remote user bean */ - @EJB (lookup = "java:global/jfinancials-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote") private UserSessionBeanRemote userBean; /** * Login controller (bean) */ @Inject - private FinancialsUserLoginWebSessionController userLoginController; + private JobsUserLoginWebSessionController userLoginController; /** * Default constructor */ - public FinancialsUserActionWebRequestBean () { + public JobssUserActionWebRequestBean () { // Call super constructor super(); } diff --git a/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java index 34da8b17..c03ac3ca 100644 --- a/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/confirmlink/JobsConfirmationLinkWebRequestBean.java @@ -29,7 +29,7 @@ import org.mxchange.jcoreee.events.helper.clear.HelperCleanupEvent; import org.mxchange.jcoreee.events.helper.clear.ObservableHelperCleanupEvent; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsBean; -import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; import org.mxchange.jusercore.events.user.created.CreatedUserEvent; import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; import org.mxchange.jusercore.exceptions.UserStatusConfirmedException; diff --git a/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java index 519a869a..89238fcb 100644 --- a/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/email_address/JobsEmailChangeWebRequestBean.java @@ -28,6 +28,7 @@ import org.mxchange.jcontacts.model.contact.Contact; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; +import org.mxchange.jjobs.beans.user.email_address.list.JobsEmailChangeListWebViewController; import org.mxchange.jjobs.beans.user.login.JobsUserLoginWebSessionController; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.email_address.EmailAddressChange; @@ -69,13 +70,13 @@ public class JobsEmailChangeWebRequestBean extends BaseJobsBean implements JobsE * Controller for listing email address changes */ @Inject - private FinancialsEmailChangeListWebViewController emailChangeListController; + private JobsEmailChangeListWebViewController emailChangeListController; /** * Features controller */ @Inject - private FinancialsFeaturesWebApplicationController featureController; + private JobsFeaturesWebApplicationController featureController; /** * Login controller (bean) diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/email_address/list/FinancialsEmailChangeListWebViewBean.java b/src/java/org/mxchange/jjobs/beans/user/email_address/list/JobsEmailChangeListWebViewBean.java similarity index 89% rename from src/java/org/mxchange/jjobs/beans/contact/phone/email_address/list/FinancialsEmailChangeListWebViewBean.java rename to src/java/org/mxchange/jjobs/beans/user/email_address/list/JobsEmailChangeListWebViewBean.java index 7c79cdf6..a5691a17 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/email_address/list/FinancialsEmailChangeListWebViewBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/email_address/list/JobsEmailChangeListWebViewBean.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.user.email_address.list; +package org.mxchange.jjobs.beans.user.email_address.list; import fish.payara.cdi.jsr107.impl.NamedCache; import java.util.Comparator; @@ -26,8 +26,8 @@ import javax.ejb.EJB; import javax.faces.view.ViewScoped; import javax.inject.Inject; import javax.inject.Named; -import org.mxchange.jfinancials.beans.BaseFinancialsBean; -import org.mxchange.jfinancials.beans.features.FinancialsFeaturesWebApplicationController; +import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; import org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote; @@ -38,7 +38,7 @@ import org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBea */ @Named ("emailChangeListController") @ViewScoped -public class FinancialsEmailChangeListWebViewBean extends BaseFinancialsBean implements FinancialsEmailChangeListWebViewController { +public class JobsEmailChangeListWebViewBean extends BaseJobsBean implements JobsEmailChangeListWebViewController { /** * Serial number @@ -53,14 +53,14 @@ public class FinancialsEmailChangeListWebViewBean extends BaseFinancialsBean imp /** * Remote email change bean */ - @EJB (lookup = "java:global/jfinancials-ejb/userEmailChange!org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote") + @EJB (lookup = "java:global/jjobs-ejb/userEmailChange!org.mxchange.jusercore.model.user.email_address.UserEmailChangeSessionBeanRemote") private UserEmailChangeSessionBeanRemote emailChangeBean; /** * Features controller */ @Inject - private FinancialsFeaturesWebApplicationController featureController; + private JobsFeaturesWebApplicationController featureController; /** * A list of filtered mobile numbers @@ -77,7 +77,7 @@ public class FinancialsEmailChangeListWebViewBean extends BaseFinancialsBean imp /** * Default constructor */ - public FinancialsEmailChangeListWebViewBean () { + public JobsEmailChangeListWebViewBean () { // Call super constructor super(); diff --git a/src/java/org/mxchange/jjobs/beans/contact/phone/email_address/list/FinancialsEmailChangeListWebViewController.java b/src/java/org/mxchange/jjobs/beans/user/email_address/list/JobsEmailChangeListWebViewController.java similarity index 92% rename from src/java/org/mxchange/jjobs/beans/contact/phone/email_address/list/FinancialsEmailChangeListWebViewController.java rename to src/java/org/mxchange/jjobs/beans/user/email_address/list/JobsEmailChangeListWebViewController.java index ca0fa540..9c90b24b 100644 --- a/src/java/org/mxchange/jjobs/beans/contact/phone/email_address/list/FinancialsEmailChangeListWebViewController.java +++ b/src/java/org/mxchange/jjobs/beans/user/email_address/list/JobsEmailChangeListWebViewController.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package org.mxchange.jfinancials.beans.user.email_address.list; +package org.mxchange.jjobs.beans.user.email_address.list; import java.io.Serializable; import java.util.List; @@ -25,7 +25,7 @@ import org.mxchange.jusercore.model.email_address.ChangeableEmailAddress; *

* @author Roland Häder */ -public interface FinancialsEmailChangeListWebViewController extends Serializable { +public interface JobsEmailChangeListWebViewController extends Serializable { /** * Returns a list of all email address changes. For performance reasons, the diff --git a/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java b/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java index 09aae448..b088ae80 100644 --- a/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/login/JobsUserLoginWebSessionBean.java @@ -31,9 +31,10 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; -import org.mxchange.jusercore.exceptions.UserNotFoundException; -import org.mxchange.jusercore.exceptions.UserStatusLockedException; -import org.mxchange.jusercore.exceptions.UserStatusUnconfirmedException; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; +import org.mxchange.jusercore.events.user.add.ObservableAdminAddedUserEvent; +import org.mxchange.jusercore.events.user.created.ObservableCreatedUserEvent; +import org.mxchange.jusercore.events.user.linked.ObservableAdminLinkedUserEvent; import org.mxchange.jusercore.model.user.User; import org.mxchange.jusercore.model.user.password_history.PasswordHistory; import org.mxchange.jusercore.model.user.password_history.UserPasswordHistorySessionBeanRemote; @@ -104,7 +105,7 @@ public class JobsUserLoginWebSessionBean extends BaseJobsBean implements JobsUse * Administrative user-list controller */ @Inject - private FinancialsUserListWebViewController userListController; + private JobsUserListWebViewController userListController; /** * Flag whether the user has logged-in, set only from inside diff --git a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java index fa9db991..114e0ec7 100644 --- a/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/register/JobsUserRegisterWebRequestBean.java @@ -32,11 +32,9 @@ import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsBean; import org.mxchange.jjobs.beans.contact.JobsContactWebRequestController; import org.mxchange.jjobs.beans.features.JobsFeaturesWebApplicationController; +import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; -import org.mxchange.jusercore.events.user.clear.password.ClearUserPasswordEvent; -import org.mxchange.jusercore.events.user.clear.password.ObservableClearUserPasswordEvent; -import org.mxchange.jusercore.events.user.clear.username.ClearUserNameEvent; -import org.mxchange.jusercore.events.user.clear.username.ObservableClearUserNameEvent; +import org.mxchange.jjobs.beans.user.list.JobsUserListWebViewController; import org.mxchange.jusercore.exceptions.DataRepeatMismatchException; import org.mxchange.jusercore.exceptions.EmailAddressAlreadyRegisteredException; import org.mxchange.jusercore.exceptions.UserNameAlreadyRegisteredException; @@ -84,7 +82,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs * Localization controller */ @Inject - private FinancialsLocalizationSessionController localizationController; + private JobsLocalizationSessionController localizationController; /** * Remote register session-scoped bean @@ -96,7 +94,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs * User list controller */ @Inject - private FinancialsUserListWebViewController userListController; + private JobsUserListWebViewController userListController; /** * User name @@ -328,7 +326,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs return ""; //NOI18N } else if (this.ifBothPasswordsEmptyAllowed()) { // Both passwords are left empty and is allowed, then generate a random password - final String randomPassword = UserLoginUtils.createRandomPassword(FinancialsUserWebRequestController.MINIMUM_PASSWORD_LENGTH); + final String randomPassword = UserLoginUtils.createRandomPassword(JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH); // Generate (ignored) password-history final PasswordHistory passwordHistory = new UserPasswordHistory(randomPassword, user); @@ -492,7 +490,7 @@ public class JobsUserRegisterWebRequestBean extends BaseJobsBean implements Jobs this.setUserProfileMode(ProfileMode.INVISIBLE); // Generate random password - final String randomPassword = UserLoginUtils.createRandomPassword(FinancialsUserWebRequestController.MINIMUM_PASSWORD_LENGTH); + final String randomPassword = UserLoginUtils.createRandomPassword(JobsUserWebRequestController.MINIMUM_PASSWORD_LENGTH); // Set random password this.setUserPassword(randomPassword); diff --git a/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java b/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java index cb8626ec..0d8a6707 100644 --- a/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java +++ b/src/java/org/mxchange/jjobs/beans/user/resendlink/JobsResendLinkWebRequestBean.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import javax.inject.Named; import org.mxchange.jcoreee.utils.FacesUtils; import org.mxchange.jjobs.beans.BaseJobsBean; +import org.mxchange.jjobs.beans.localization.JobsLocalizationSessionController; import org.mxchange.jjobs.beans.user.JobsUserWebRequestController; import org.mxchange.jusercore.exceptions.UserEmailAddressNotFoundException; import org.mxchange.jusercore.exceptions.UserNotFoundException; diff --git a/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java index 590cd203..19fdaa21 100644 --- a/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/company_employee/JobsEmployeeConverter.java @@ -24,8 +24,8 @@ import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; import org.mxchange.jcontactsbusiness.exceptions.employee.EmployeeNotFoundException; import org.mxchange.jcontactsbusiness.model.employee.Employable; -import org.mxchange.jjobs.beans.business.employee.JobsEmployeeWebRequestBean; -import org.mxchange.jjobs.beans.business.employee.JobsEmployeeWebRequestController; +import org.mxchange.jjobs.beans.business.employee.list.JobsEmployeeListWebViewBean; +import org.mxchange.jjobs.beans.business.employee.list.JobsEmployeeListWebViewController; /** * Converter for converting company employee to and from id number @@ -38,7 +38,7 @@ public class JobsEmployeeConverter implements Converter { /** * Employable EJB */ - private static FinancialsEmployeeListWebViewController EMPLOYEE_LIST_CONTROLLER; + private static JobsEmployeeListWebViewController EMPLOYEE_LIST_CONTROLLER; @Override public Employable getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { @@ -58,7 +58,7 @@ public class JobsEmployeeConverter implements Converter { // Is the instance there? if (null == EMPLOYEE_LIST_CONTROLLER) { // Get bean from CDI directly - EMPLOYEE_LIST_CONTROLLER = CDI.current().select(FinancialsEmployeeListWebViewBean.class).get(); + EMPLOYEE_LIST_CONTROLLER = CDI.current().select(JobsEmployeeListWebViewBean.class).get(); } // Try to get user instance from it diff --git a/src/java/org/mxchange/jjobs/converter/business/opening_time/JobsCompanyOpeningTimeConverter.java b/src/java/org/mxchange/jjobs/converter/business/opening_time/JobsCompanyOpeningTimeConverter.java index 26e6db1b..2d0a0c32 100644 --- a/src/java/org/mxchange/jjobs/converter/business/opening_time/JobsCompanyOpeningTimeConverter.java +++ b/src/java/org/mxchange/jjobs/converter/business/opening_time/JobsCompanyOpeningTimeConverter.java @@ -24,8 +24,8 @@ import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; import org.mxchange.jcontactsbusiness.exceptions.opening_time.OpeningTimeNotFoundException; import org.mxchange.jcontactsbusiness.model.opening_time.OpeningTime; -import org.mxchange.jjobs.beans.business.opening_time.JobsOpeningTimeWebRequestBean; -import org.mxchange.jjobs.beans.business.opening_time.JobsOpeningTimeWebRequestController; +import org.mxchange.jjobs.beans.business.opening_time.list.JobsOpeningTimeListWebViewBean; +import org.mxchange.jjobs.beans.business.opening_time.list.JobsOpeningTimeListWebViewController; /** * Converter for opening time id <-> instance @@ -38,7 +38,7 @@ public class JobsCompanyOpeningTimeConverter implements Converter { /** * Opening time backing bean */ - private static JobsOpeningTimeWebRequestController OPENING_TIMES_LIST_CONTROLLER; + private static JobsOpeningTimeListWebViewController OPENING_TIMES_LIST_CONTROLLER; @Override public OpeningTime getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { @@ -59,13 +59,13 @@ public class JobsCompanyOpeningTimeConverter implements Converter { final Long openingTimeId = Long.valueOf(submittedValue); // Is the instance there? - if (null == OPENING_TIME_LIST_CONTROLLER) { + if (null == OPENING_TIMES_LIST_CONTROLLER) { // Get bean from CDI directly - OPENING_TIME_LIST_CONTROLLER = CDI.current().select(FinancialsOpeningTimeListWebViewBean.class).get(); + OPENING_TIMES_LIST_CONTROLLER = CDI.current().select(JobsOpeningTimeListWebViewBean.class).get(); } // Try to get user instance from it - openingTime = OPENING_TIME_LIST_CONTROLLER.findOpeningTimeById(openingTimeId); + openingTime = OPENING_TIMES_LIST_CONTROLLER.findOpeningTimeById(openingTimeId); } catch (final NumberFormatException ex) { // Throw again throw new ConverterException(ex); diff --git a/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java index b2e43c39..c5f3f1b9 100644 --- a/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/fax/JobsFaxNumberConverter.java @@ -22,8 +22,6 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import org.mxchange.jjobs.beans.phone.JobsPhoneWebRequestBean; -import org.mxchange.jjobs.beans.phone.JobsPhoneWebRequestController; import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException; import org.mxchange.jphone.model.phonenumbers.fax.DialableFaxNumber; @@ -38,7 +36,7 @@ public class JobsFaxNumberConverter implements Converter { /** * Phone EJB */ - private static JobsPhoneWebRequestController PHONE_LIST_CONTROLLER; + private static JobsPhoneListWebViewController PHONE_LIST_CONTROLLER; @Override public DialableFaxNumber getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { @@ -58,7 +56,7 @@ public class JobsFaxNumberConverter implements Converter { // Is the instance there? if (null == PHONE_LIST_CONTROLLER) { // Get bean from CDI directly - PHONE_LIST_CONTROLLER = CDI.current().select(FinancialsPhoneListWebViewBean.class).get(); + PHONE_LIST_CONTROLLER = CDI.current().select(JobsPhoneListWebViewBean.class).get(); } // Try to get mobile instance from it diff --git a/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java index 73ad9e16..2a64a37a 100644 --- a/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java +++ b/src/java/org/mxchange/jjobs/converter/landline/JobsLandLineNumberConverter.java @@ -22,8 +22,6 @@ import javax.faces.context.FacesContext; import javax.faces.convert.Converter; import javax.faces.convert.ConverterException; import javax.faces.convert.FacesConverter; -import org.mxchange.jjobs.beans.phone.JobsPhoneWebRequestBean; -import org.mxchange.jjobs.beans.phone.JobsPhoneWebRequestController; import org.mxchange.jphone.exceptions.phone.PhoneEntityNotFoundException; import org.mxchange.jphone.model.phonenumbers.landline.DialableLandLineNumber; @@ -38,7 +36,7 @@ public class JobsLandLineNumberConverter implements Converter { /** * Mobile provider backing bean */ - private static JobsMobileProviderWebRequestController MOBILE_PROVIDER_LIST_CONTROLLER; + private static JobsMobileProviderListWebViewController MOBILE_PROVIDER_LIST_CONTROLLER; @Override public MobileProvider getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { @@ -59,7 +57,7 @@ public class JobsMobileProviderConverter implements Converter { // Is the instance there? if (null == MOBILE_PROVIDER_LIST_CONTROLLER) { // Get bean from CDI directly - MOBILE_PROVIDER_LIST_CONTROLLER = CDI.current().select(FinancialsMobileProviderListWebViewBean.class).get(); + MOBILE_PROVIDER_LIST_CONTROLLER = CDI.current().select(JobsMobileProviderListWebViewBean.class).get(); } // Lookup of mobile provider diff --git a/src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java b/src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java deleted file mode 100644 index 5b4df983..00000000 --- a/src/java/org/mxchange/jjobs/validator/addressbook/JobsAddressbookIdValidator.java +++ /dev/null @@ -1,120 +0,0 @@ -/* - * Copyright (C) 2016 - 2020 Free Software Foundation - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.jjobs.validator.addressbook; - -import java.text.MessageFormat; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.FacesValidator; -import javax.faces.validator.ValidatorException; -import javax.naming.Context; -import javax.naming.InitialContext; -import javax.naming.NamingException; -import org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote; -import org.mxchange.jaddressbook.exceptions.AddressbookNotFoundException; -import org.mxchange.jaddressbook.model.addressbook.Addressbook; -import org.mxchange.jcoreee.validator.number.BaseNumberValidator; -import org.mxchange.jcoreeelogger.beans.local.logger.Log; -import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; - -/** - * A validator for address book id verification - *

- * @author Roland Häder - */ -@FacesValidator ("AddressbookIdValidator") -public class JobsAddressbookIdValidator extends BaseNumberValidator { - - /** - * Serial number - */ - private static final long serialVersionUID = 158_768_467_186_951_809L; - - /** - * Remote bean - */ - private AddressbookSessionBeanRemote addressbookBean; - - /** - * Logger instance - */ - @Log - private LoggerBeanLocal loggerBeanLocal; - - /** - * Public consutructor - */ - public JobsAddressbookIdValidator () { - // Try to get it - try { - // Get initial context - Context context = new InitialContext(); - - // Lookup logger - this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N - - // ... and user controller - this.addressbookBean = (AddressbookSessionBeanRemote) context.lookup("java:global/jjobs-ejb/jjobs-adr!org.mxchange.jjobs.model.addressbook.JobsAddressbookSessionBeanRemote"); //NOI18N - } catch (final NamingException ex) { - // Continue to throw it - throw new RuntimeException(MessageFormat.format("context.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N - } - } - - @Override - public void validate (final FacesContext context, final UIComponent component, final Object value) throws ValidatorException { - // Trace message - this.loggerBeanLocal.logTrace(MessageFormat.format("validate: context={0},component={1},value={2} - CALLED!", context, component, value)); //NOI18N - - // All accepted, required fields - String[] requiredFields = {"addressbookId"}; //NOI18N - - // Pre-validation (example: not null, not a string, empty string ...) - super.preValidate(context, component, value, requiredFields, false); - - // Cast to long - Long addressbookId = (Long) value; - - // Is the address book id valid? - if (!this.addressbookBean.isAddressbookIdUsed(addressbookId)) { - // Is not valid - throw new ValidatorException(new FacesMessage(MessageFormat.format("No address book found with id {0}. Please check your link.", addressbookId))); //NOI18N - } - - // Init variable - Addressbook addressbook; - - // Try it - try { - // Get full data - addressbook = this.addressbookBean.getAddressbookById(addressbookId); - - // Is it set? - if (null == addressbook) { - // Is null?! - throw new NullPointerException(MessageFormat.format("addressbook for id={0} is null", addressbookId)); //NOI18N - } - } catch (final AddressbookNotFoundException ex) { - // Continue to throw - throw new ValidatorException(new FacesMessage(MessageFormat.format("Cannot find address book with id {0}", addressbookId)), ex); //NOI18N - } - - // Trace message - this.loggerBeanLocal.logTrace("validate: EXIT!"); //NOI18N - } -} -- 2.39.2