From fd25311e986ccaf7f42d37d79e1e705b8097fe61 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sun, 10 Sep 2017 21:20:13 +0200 Subject: [PATCH] Continued: - moved these remote interfaces to 'model' package as they (by convention) should be in same package as the "main entity" (what the remote interface is all about) is. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder --- .../AdminBasicCompanyDataSessionBeanRemote.java} | 11 ++++++----- .../basicdata/BasicCompanyDataSessionBeanRemote.java} | 11 ++++++----- .../AdminBranchOfficeSessionBeanRemote.java | 3 ++- .../branchoffice/BranchOfficeSessionBeanRemote.java | 3 ++- .../AdminCompanyEmployeeSessionBeanRemote.java | 2 +- .../employee/CompanyEmployeeSessionBeanRemote.java | 3 ++- .../CompanyHeadquartersSessionBeanRemote.java | 3 ++- 7 files changed, 21 insertions(+), 15 deletions(-) rename src/org/mxchange/jcontactsbusiness/{basicdata/AdminBusinessDataSessionBeanRemote.java => model/basicdata/AdminBasicCompanyDataSessionBeanRemote.java} (72%) rename src/org/mxchange/jcontactsbusiness/{basicdata/BusinessDataSessionBeanRemote.java => model/basicdata/BasicCompanyDataSessionBeanRemote.java} (80%) rename src/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/AdminBranchOfficeSessionBeanRemote.java (92%) rename src/org/mxchange/jcontactsbusiness/{ => model}/branchoffice/BranchOfficeSessionBeanRemote.java (89%) rename src/org/mxchange/jcontactsbusiness/{ => model}/employee/AdminCompanyEmployeeSessionBeanRemote.java (94%) rename src/org/mxchange/jcontactsbusiness/{ => model}/employee/CompanyEmployeeSessionBeanRemote.java (93%) rename src/org/mxchange/jcontactsbusiness/{ => model}/headquarters/CompanyHeadquartersSessionBeanRemote.java (91%) diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/AdminBusinessDataSessionBeanRemote.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/AdminBasicCompanyDataSessionBeanRemote.java similarity index 72% rename from src/org/mxchange/jcontactsbusiness/basicdata/AdminBusinessDataSessionBeanRemote.java rename to src/org/mxchange/jcontactsbusiness/model/basicdata/AdminBasicCompanyDataSessionBeanRemote.java index aee3674..b5bff98 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/AdminBusinessDataSessionBeanRemote.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/AdminBasicCompanyDataSessionBeanRemote.java @@ -14,11 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; import java.io.Serializable; import javax.ejb.Remote; -import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAddedException; +import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataAlreadyAddedException; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; /** * A remote interface for business contact data @@ -26,7 +27,7 @@ import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataAlreadyAd * @author Roland Häder */ @Remote -public interface AdminBusinessDataSessionBeanRemote extends Serializable { +public interface AdminBasicCompanyDataSessionBeanRemote extends Serializable { /** * Adds basic business data to database, if not found. If found, a proper @@ -36,9 +37,9 @@ public interface AdminBusinessDataSessionBeanRemote extends Serializable { *

* @return Updated basic data *

- * @throws BusinessDataAlreadyAddedException If the company name was already + * @throws BasicCompanyDataAlreadyAddedException If the company name was already * found */ - BusinessBasicData addCompanyBasicData (final BusinessBasicData basicData) throws BusinessDataAlreadyAddedException; + BusinessBasicData addCompanyBasicData (final BusinessBasicData basicData) throws BasicCompanyDataAlreadyAddedException; } diff --git a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessDataSessionBeanRemote.java b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicCompanyDataSessionBeanRemote.java similarity index 80% rename from src/org/mxchange/jcontactsbusiness/basicdata/BusinessDataSessionBeanRemote.java rename to src/org/mxchange/jcontactsbusiness/model/basicdata/BasicCompanyDataSessionBeanRemote.java index a7c3fda..967fcb2 100644 --- a/src/org/mxchange/jcontactsbusiness/basicdata/BusinessDataSessionBeanRemote.java +++ b/src/org/mxchange/jcontactsbusiness/model/basicdata/BasicCompanyDataSessionBeanRemote.java @@ -14,12 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.basicdata; +package org.mxchange.jcontactsbusiness.model.basicdata; +import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData; import java.io.Serializable; import java.util.List; import javax.ejb.Remote; -import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundException; +import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataNotFoundException; /** * A remote interface for business contact data @@ -27,7 +28,7 @@ import org.mxchange.jcontactsbusiness.exceptions.basicdata.BusinessDataNotFoundE * @author Roland Häder */ @Remote -public interface BusinessDataSessionBeanRemote extends Serializable { +public interface BasicCompanyDataSessionBeanRemote extends Serializable { /** * Checks whether given company name already exists @@ -46,10 +47,10 @@ public interface BusinessDataSessionBeanRemote extends Serializable { *

* @return Business contact instance *

- * @throws BusinessDataNotFoundException If the id number could not be + * @throws BasicCompanyDataNotFoundException If the id number could not be * looked up and solved into an entity */ - BusinessBasicData findBasicDataById (final Long basicDataId) throws BusinessDataNotFoundException; + BusinessBasicData findBasicDataById (final Long basicDataId) throws BasicCompanyDataNotFoundException; /** * Returns a list, even empty if not thing found, from all business diff --git a/src/org/mxchange/jcontactsbusiness/branchoffice/AdminBranchOfficeSessionBeanRemote.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/AdminBranchOfficeSessionBeanRemote.java similarity index 92% rename from src/org/mxchange/jcontactsbusiness/branchoffice/AdminBranchOfficeSessionBeanRemote.java rename to src/org/mxchange/jcontactsbusiness/model/branchoffice/AdminBranchOfficeSessionBeanRemote.java index ddf6af4..c1eda41 100644 --- a/src/org/mxchange/jcontactsbusiness/branchoffice/AdminBranchOfficeSessionBeanRemote.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/AdminBranchOfficeSessionBeanRemote.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import java.io.Serializable; import javax.ejb.Remote; import org.mxchange.jcontactsbusiness.exceptions.branchoffice.BranchOfficeAlreadyAddedException; diff --git a/src/org/mxchange/jcontactsbusiness/branchoffice/BranchOfficeSessionBeanRemote.java b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeSessionBeanRemote.java similarity index 89% rename from src/org/mxchange/jcontactsbusiness/branchoffice/BranchOfficeSessionBeanRemote.java rename to src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeSessionBeanRemote.java index 029a1ce..862db15 100644 --- a/src/org/mxchange/jcontactsbusiness/branchoffice/BranchOfficeSessionBeanRemote.java +++ b/src/org/mxchange/jcontactsbusiness/model/branchoffice/BranchOfficeSessionBeanRemote.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.branchoffice; +package org.mxchange.jcontactsbusiness.model.branchoffice; +import org.mxchange.jcontactsbusiness.model.branchoffice.BranchOffice; import java.io.Serializable; import java.util.List; import javax.ejb.Remote; diff --git a/src/org/mxchange/jcontactsbusiness/employee/AdminCompanyEmployeeSessionBeanRemote.java b/src/org/mxchange/jcontactsbusiness/model/employee/AdminCompanyEmployeeSessionBeanRemote.java similarity index 94% rename from src/org/mxchange/jcontactsbusiness/employee/AdminCompanyEmployeeSessionBeanRemote.java rename to src/org/mxchange/jcontactsbusiness/model/employee/AdminCompanyEmployeeSessionBeanRemote.java index 3e9fb0d..0f8fd97 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/AdminCompanyEmployeeSessionBeanRemote.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/AdminCompanyEmployeeSessionBeanRemote.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.employee; +package org.mxchange.jcontactsbusiness.model.employee; import java.io.Serializable; import javax.ejb.Remote; diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployeeSessionBeanRemote.java b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployeeSessionBeanRemote.java similarity index 93% rename from src/org/mxchange/jcontactsbusiness/employee/CompanyEmployeeSessionBeanRemote.java rename to src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployeeSessionBeanRemote.java index 68da109..8c0479b 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployeeSessionBeanRemote.java +++ b/src/org/mxchange/jcontactsbusiness/model/employee/CompanyEmployeeSessionBeanRemote.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.employee; +package org.mxchange.jcontactsbusiness.model.employee; +import org.mxchange.jcontactsbusiness.model.employee.Employee; import java.io.Serializable; import java.util.List; import javax.ejb.Remote; diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadquartersSessionBeanRemote.java b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersSessionBeanRemote.java similarity index 91% rename from src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadquartersSessionBeanRemote.java rename to src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersSessionBeanRemote.java index a17fbad..4d968e0 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadquartersSessionBeanRemote.java +++ b/src/org/mxchange/jcontactsbusiness/model/headquarters/CompanyHeadquartersSessionBeanRemote.java @@ -14,8 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package org.mxchange.jcontactsbusiness.headquarters; +package org.mxchange.jcontactsbusiness.model.headquarters; +import org.mxchange.jcontactsbusiness.model.headquarters.HeadquartersData; import java.io.Serializable; import javax.ejb.Remote; import org.mxchange.jcontactsbusiness.exceptions.headquarters.CompanyHeadquartersNotFoundException; -- 2.39.5