From: Roland Haeder Date: Tue, 5 Apr 2016 12:20:28 +0000 (+0200) Subject: Continued a bit: X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c63a39e24dfba53268522c7b845fdfaba102d181;p=jjobs-lib.git Continued a bit: - changed JNDI lookup to portable (long) version - renamed some interfaces to naming scheme - updated jar(s) --- diff --git a/lib/juser-lib.jar b/lib/juser-lib.jar index 89275c5..fdf6c73 100644 Binary files a/lib/juser-lib.jar and b/lib/juser-lib.jar differ diff --git a/src/org/mxchange/jjobs/model/addressbook/AddressbookSessionBeanRemote.java b/src/org/mxchange/jjobs/model/addressbook/AddressbookSessionBeanRemote.java deleted file mode 100644 index 1aa31b3..0000000 --- a/src/org/mxchange/jjobs/model/addressbook/AddressbookSessionBeanRemote.java +++ /dev/null @@ -1,101 +0,0 @@ -/* - * Copyright (C) 2016 Roland Haeder - * - * 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.model.addressbook; - -import java.io.Serializable; -import java.util.List; -import javax.ejb.Remote; -import org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException; -import org.mxchange.jjobs.exceptions.AddressbookNotFoundException; -import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry; -import org.mxchange.jusercore.model.user.User; - -/** - * A remote session interface for addressbook handling - *

- * @author Roland Haeder - */ -@Remote -public interface AddressbookSessionBeanRemote extends Serializable { - - /** - * Some getter for an address book instance from given id number. If the - * address book is not found, an exception is thrown. - *

- * @param addressbookId Id number for address book instance - *

- * @return Address book instance - *

- * @throws org.mxchange.jjobs.exceptions.AddressbookNotFoundException - * If the address book cannot be found by given id number - * @throws NullPointerException If addressbookId is null - * @throws IllegalArgumentException If the id number is below 1 - */ - Addressbook getAddressbookById (final Long addressbookId) throws AddressbookNotFoundException; - - /** - * Returns a list of all entries of given address book, whether the assigned - * user is the "owner" or "sharer" of the entry. - *

- * @param addressbook Address book instance - *

- * @return List of all entries - */ - List allEntries (final Addressbook addressbook); - - /** - * Some "getter" for a list of address books the logged-in user has created - *

- * @param loggedInUser Logged-in user - *

- * @return List of all address books - */ - List getUsersAddressbookList (final User loggedInUser); - - /** - * Creates given address book by persisting it. A User instance must be set, - * else an exception is thrown. - *

- * @param addressbook Address book instance to create - *

- * @return Updated address book instance - *

- * @throws - * org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException - * If the address book's name has already been used by the user. - */ - Addressbook createAddressbook (final Addressbook addressbook) throws AddressbookNameAlreadyUsedException; - - /** - * Checks whether the given address book id is used (means available). - *

- * @param addressbookId Address book id to check - *

- * @return Whether the id is valid - */ - boolean isAddressbookIdUsed (final Long addressbookId); - - /** - * Checks if the given address book's name is already used by the user. - *

- * @param addressbook Address bok instance to check - *

- * @return Whether the name has already been used by the user - */ - boolean isAddressbookNameUsed (final Addressbook addressbook); - -} diff --git a/src/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBeanRemote.java b/src/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBeanRemote.java new file mode 100644 index 0000000..6cd5780 --- /dev/null +++ b/src/org/mxchange/jjobs/model/addressbook/JobsAddressbookSessionBeanRemote.java @@ -0,0 +1,101 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * 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.model.addressbook; + +import java.io.Serializable; +import java.util.List; +import javax.ejb.Remote; +import org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException; +import org.mxchange.jjobs.exceptions.AddressbookNotFoundException; +import org.mxchange.jjobs.model.addressbook.entry.AddressbookEntry; +import org.mxchange.jusercore.model.user.User; + +/** + * A remote session interface for addressbook handling + *

+ * @author Roland Haeder + */ +@Remote +public interface JobsAddressbookSessionBeanRemote extends Serializable { + + /** + * Some getter for an address book instance from given id number. If the + * address book is not found, an exception is thrown. + *

+ * @param addressbookId Id number for address book instance + *

+ * @return Address book instance + *

+ * @throws org.mxchange.jjobs.exceptions.AddressbookNotFoundException + * If the address book cannot be found by given id number + * @throws NullPointerException If addressbookId is null + * @throws IllegalArgumentException If the id number is below 1 + */ + Addressbook getAddressbookById (final Long addressbookId) throws AddressbookNotFoundException; + + /** + * Returns a list of all entries of given address book, whether the assigned + * user is the "owner" or "sharer" of the entry. + *

+ * @param addressbook Address book instance + *

+ * @return List of all entries + */ + List allEntries (final Addressbook addressbook); + + /** + * Some "getter" for a list of address books the logged-in user has created + *

+ * @param loggedInUser Logged-in user + *

+ * @return List of all address books + */ + List getUsersAddressbookList (final User loggedInUser); + + /** + * Creates given address book by persisting it. A User instance must be set, + * else an exception is thrown. + *

+ * @param addressbook Address book instance to create + *

+ * @return Updated address book instance + *

+ * @throws + * org.mxchange.jjobs.exceptions.AddressbookNameAlreadyUsedException + * If the address book's name has already been used by the user. + */ + Addressbook createAddressbook (final Addressbook addressbook) throws AddressbookNameAlreadyUsedException; + + /** + * Checks whether the given address book id is used (means available). + *

+ * @param addressbookId Address book id to check + *

+ * @return Whether the id is valid + */ + boolean isAddressbookIdUsed (final Long addressbookId); + + /** + * Checks if the given address book's name is already used by the user. + *

+ * @param addressbook Address bok instance to check + *

+ * @return Whether the name has already been used by the user + */ + boolean isAddressbookNameUsed (final Addressbook addressbook); + +} diff --git a/src/org/mxchange/jjobs/validator/addressbook/AddressbookIdValidator.java b/src/org/mxchange/jjobs/validator/addressbook/AddressbookIdValidator.java index 2a08538..475986e 100644 --- a/src/org/mxchange/jjobs/validator/addressbook/AddressbookIdValidator.java +++ b/src/org/mxchange/jjobs/validator/addressbook/AddressbookIdValidator.java @@ -25,12 +25,12 @@ import javax.faces.validator.ValidatorException; import javax.naming.Context; import javax.naming.InitialContext; import javax.naming.NamingException; -import org.mxchange.jjobs.exceptions.AddressbookNotFoundException; -import org.mxchange.jjobs.model.addressbook.Addressbook; -import org.mxchange.jjobs.model.addressbook.AddressbookSessionBeanRemote; import org.mxchange.jcoreee.validator.number.BaseLongValidator; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; +import org.mxchange.jjobs.exceptions.AddressbookNotFoundException; +import org.mxchange.jjobs.model.addressbook.Addressbook; +import org.mxchange.jjobs.model.addressbook.JobsAddressbookSessionBeanRemote; /** * A validator for address book id verification @@ -48,7 +48,7 @@ public class AddressbookIdValidator extends BaseLongValidator { /** * Remote bean */ - private AddressbookSessionBeanRemote addressbookBean; + private JobsAddressbookSessionBeanRemote addressbookBean; /** * Logger instance @@ -69,7 +69,7 @@ public class AddressbookIdValidator extends BaseLongValidator { 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/addressbook-ejb/addressbook!org.mxchange.addressbook.model.addressbook.AddressbookSessionBeanRemote"); //NOI18N + this.addressbookBean = (JobsAddressbookSessionBeanRemote) context.lookup("java:global/addressbook-ejb/addressbook!org.mxchange.addressbook.model.addressbook.JobsAddressbookSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException("context.lookup() failed.", ex); //NOI18N diff --git a/src/org/mxchange/jjobs/validator/user/UserIdValidator.java b/src/org/mxchange/jjobs/validator/user/UserIdValidator.java index 8d0a4db..f653b2a 100644 --- a/src/org/mxchange/jjobs/validator/user/UserIdValidator.java +++ b/src/org/mxchange/jjobs/validator/user/UserIdValidator.java @@ -78,7 +78,7 @@ public class UserIdValidator extends BaseLongValidator implements Validator { this.loggerBeanLocal = (LoggerBeanLocal) context.lookup("java:global/jcore-logger-ejb/logger!org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal"); //NOI18N // ... and user controller - this.userBean = (UserSessionBeanRemote) context.lookup("java:global/juser-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N + this.userBean = (UserSessionBeanRemote) context.lookup("java:global/jjobs-ejb/user!org.mxchange.jusercore.model.user.UserSessionBeanRemote"); //NOI18N } catch (final NamingException ex) { // Continue to throw it throw new RuntimeException("context.lookup() failed.", ex); //NOI18N diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/AddressbookSmsProviderSingletonBeanRemote.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/AddressbookSmsProviderSingletonBeanRemote.java deleted file mode 100644 index b804700..0000000 --- a/src/org/mxchange/jphone/phonenumbers/smsprovider/AddressbookSmsProviderSingletonBeanRemote.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (C) 2016 Roland Haeder - * - * 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.jphone.phonenumbers.smsprovider; - -import java.io.Serializable; -import java.util.List; -import javax.ejb.Remote; - -/** - * A remote interface for cellphone carrier data retrieval - *

- * @author Roland Haeder - */ -@Remote -public interface AddressbookSmsProviderSingletonBeanRemote extends Serializable { - - /** - * All registered SMS providers - *

- * @return A list of all SMS providers - */ - List allSmsProvider (); -} diff --git a/src/org/mxchange/jphone/phonenumbers/smsprovider/JobsSmsProviderSingletonBeanRemote.java b/src/org/mxchange/jphone/phonenumbers/smsprovider/JobsSmsProviderSingletonBeanRemote.java new file mode 100644 index 0000000..4659a0b --- /dev/null +++ b/src/org/mxchange/jphone/phonenumbers/smsprovider/JobsSmsProviderSingletonBeanRemote.java @@ -0,0 +1,37 @@ +/* + * Copyright (C) 2016 Roland Haeder + * + * 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.jphone.phonenumbers.smsprovider; + +import java.io.Serializable; +import java.util.List; +import javax.ejb.Remote; + +/** + * A remote interface for cellphone carrier data retrieval + *

+ * @author Roland Haeder + */ +@Remote +public interface JobsSmsProviderSingletonBeanRemote extends Serializable { + + /** + * All registered SMS providers + *

+ * @return A list of all SMS providers + */ + List allSmsProvider (); +}