Continued rewriting:

- added new project dependency jaddressbook-lib (remote interfaces)
- remove remote interfaces as they have been moved to upper mentioned lib

diff --git a/lib/jaddressbook-lib.jar b/lib/jaddressbook-lib.jar
new file mode 100644 (file)
index 0000000..5a076de
Binary files /dev/null and b/lib/jaddressbook-lib.jar differ

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 2e8327e97931522c610fbd02a1fb9d61c5fa7dc3..07caaaa56afdf11a05a47a5350fb1c6f1737b345 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -31,6 +31,7 @@ dist.javadoc.dir=${dist.dir}/javadoc
 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-core.jar=lib/jcontacts-core.jar
 file.reference.jcore-logger-lib.jar=lib/jcore-logger-lib.jar
@@ -55,6 +56,7 @@ javac.classpath=\
     ${file.reference.juser-core.jar}:\
     ${file.reference.juser-lib.jar}:\
     ${file.reference.jaddressbook-core.jar}:\
+    ${file.reference.jaddressbook-lib.jar}:\
     ${libs.javaee-api-7.0.classpath}:\
     ${libs.jpa20-persistence.classpath}
 # Space-separated list of extra javac options
@@ -107,6 +109,7 @@ run.test.classpath=\
     ${build.test.classes.dir}
 source.encoding=UTF-8
 source.reference.jaddressbook-core.jar=../jaddressbook-core/src/
+source.reference.jaddressbook-lib.jar=../jaddressbook-lib/src/
 source.reference.jcontacts-business-core.jar=../jcontacts-business-core/src/
 source.reference.jcontacts-core.jar=../jcontacts-core/src/
 source.reference.jcore-logger-lib.jar=../jcore-logger-lib/src/

diff --git a/src/org/mxchange/addressbook/model/addressbook/AddressbookSessionBeanRemote.java b/src/org/mxchange/addressbook/model/addressbook/AddressbookSessionBeanRemote.java
deleted file mode 100644 (file)
index bfc99a4..0000000
--- a/src/org/mxchange/addressbook/model/addressbook/AddressbookSessionBeanRemote.java
+++ /dev/null
@@ -1,121 +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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.addressbook;
-
-import java.io.Serializable;
-import java.util.List;
-import javax.ejb.Remote;
-import org.mxchange.jaddressbookcore.exceptions.AddressbookNameAlreadyUsedException;
-import org.mxchange.jaddressbookcore.exceptions.AddressbookNotFoundException;
-import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
-import org.mxchange.jaddressbookcore.model.addressbook.entry.AddressbookEntry;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A remote session interface for addressbook handling
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Remote
-public interface AddressbookSessionBeanRemote extends Serializable {
-
-       /**
-        * Retrieves a list of all users this user is not sharing the given address
-        * book with.
-        * <p>
-        * @param user User instance
-        * @param addressbook Address book instance
-        * <p>
-        * @return List of users
-        */
-       List<User> allUsersNotSharing (final User user, final Addressbook addressbook);
-
-       /**
-        * Count all shared address books by given user
-        * <p>
-        * @param user User instance
-        * <p>
-        * @return Count of all user's shared address books
-        */
-       Integer countAllUserSharedAddressbooks (final User user);
-
-       /**
-        * Some getter for an address book instance from given id number. If the
-        * address book is not found, an exception is thrown.
-        * <p>
-        * @param addressbookId Id number for address book instance
-        * <p>
-        * @return Address book instance
-        * <p>
-        * @throws org.mxchange.jaddressbookcore.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.
-        * <p>
-        * @param addressbook Address book instance
-        * <p>
-        * @return List of all entries
-        */
-       List<AddressbookEntry> allEntries (final Addressbook addressbook);
-
-       /**
-        * Some "getter" for a list of address books the logged-in user has created
-        * <p>
-        * @param loggedInUser Logged-in user
-        * <p>
-        * @return List of all address books
-        */
-       List<Addressbook> getUsersAddressbookList (final User loggedInUser);
-
-       /**
-        * Creates given address book by persisting it. A User instance must be set,
-        * else an exception is thrown.
-        * <p>
-        * @param addressbook Address book instance to create
-        * <p>
-        * @return Updated address book instance
-        * <p>
-        * @throws
-        * org.mxchange.jaddressbookcore.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).
-        * <p>
-        * @param addressbookId Address book id to check
-        * <p>
-        * @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.
-        * <p>
-        * @param addressbook Address bok instance to check
-        * <p>
-        * @return Whether the name has already been used by the user
-        */
-       boolean isAddressbookNameUsed (final Addressbook addressbook);
-}

diff --git a/src/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBeanRemote.java b/src/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBeanRemote.java
deleted file mode 100644 (file)
index c0e0bc0..0000000
--- a/src/org/mxchange/addressbook/model/shared/SharedAddressbooksSessionBeanRemote.java
+++ /dev/null
@@ -1,71 +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 <http://www.gnu.org/licenses/>.
- */
-package org.mxchange.addressbook.model.shared;
-
-import java.io.Serializable;
-import java.util.List;
-import javax.ejb.Remote;
-import org.mxchange.jaddressbookcore.exceptions.UserAlreadySharingAddressbookException;
-import org.mxchange.jaddressbookcore.model.addressbook.Addressbook;
-import org.mxchange.jaddressbookcore.model.addressbook.shared.ShareableAddressbook;
-import org.mxchange.jusercore.model.user.User;
-
-/**
- * A remote interface for sharing address books
- * <p>
- * @author Roland Haeder<roland@mxchange.org>
- */
-@Remote
-public interface SharedAddressbooksSessionBeanRemote extends Serializable {
-
-       /**
-        * Retrieves a list of all user's shared address books. The list contains
-        * only the shares. But the address books and sharee can be easily
-        * extracted.
-        * <p>
-        * @param user User instance to get list of shared address books (shares)
-        * from
-        *
-        * @return List of shares (= shared address book entries)
-        */
-       List<ShareableAddressbook> allSharedAddressbooks (final User user);
-
-       /**
-        * Starts an address book share between currently logged-in user and
-        * assigned user for current address book.
-        * <p>
-        * @param sharee User sharee instance
-        * @param addressbook Address book instance
-        *
-        * @return Updated share instance
-        *
-        * @throws
-        * org.mxchange.addressbook.exceptions.UserAlreadySharingAddressbookException
-        * When the user is already sharing the address book
-        */
-       ShareableAddressbook startSharing (final User sharee, final Addressbook addressbook) throws UserAlreadySharingAddressbookException;
-
-       /**
-        * Checks if the given user is sharing address books with others
-        * <p>
-        * @param user User instance
-        *
-        * @return Whether the user is sharing address books
-        */
-       Boolean isUserSharingAddressbooks (final User user);
-
-}