From 8f1ad3cc1b0521010db246d78e344e2259430378 Mon Sep 17 00:00:00 2001 From: felmer <felmer> Date: Tue, 11 Sep 2012 06:12:38 +0000 Subject: [PATCH] BIS-142 fix dependency failure SVN: 26575 --- .../openbis/generic/server/CommonBusinessObjectFactory.java | 2 ++ .../generic/server/{ => business}/EntityOperationChecker.java | 2 +- .../server/{ => business}/IEntityOperationChecker.java | 2 +- .../generic/server/{ => business}/IRelationshipService.java | 2 +- .../generic/server/{ => business}/RelationshipService.java | 2 +- .../server/business/bo/AbstractBusinessObjectFactory.java | 4 ++-- .../server/business/bo/AbstractDataSetBusinessObject.java | 2 +- .../server/business/bo/AbstractSampleBusinessObject.java | 4 ++-- .../cisd/openbis/generic/server/business/bo/DataBO.java | 2 +- .../cisd/openbis/generic/server/business/bo/DataSetTable.java | 2 +- .../generic/server/business/bo/DeletedDataSetTable.java | 2 +- .../cisd/openbis/generic/server/business/bo/ExperimentBO.java | 2 +- .../openbis/generic/server/business/bo/ExperimentTable.java | 2 +- .../cisd/openbis/generic/server/business/bo/ProjectBO.java | 2 +- .../cisd/openbis/generic/server/business/bo/SampleBO.java | 4 ++-- .../cisd/openbis/generic/server/business/bo/SampleTable.java | 4 ++-- .../openbis/generic/server/business/bo/AbstractBOTest.java | 4 ++-- .../ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java | 2 +- .../cisd/openbis/systemtest/base/RelationshipServiceStub.java | 2 +- 19 files changed, 25 insertions(+), 23 deletions(-) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/server/{ => business}/EntityOperationChecker.java (95%) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/server/{ => business}/IEntityOperationChecker.java (97%) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/server/{ => business}/IRelationshipService.java (99%) rename openbis/source/java/ch/systemsx/cisd/openbis/generic/server/{ => business}/RelationshipService.java (99%) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java index 34d040ef220..4f36c648447 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonBusinessObjectFactory.java @@ -17,6 +17,8 @@ package ch.systemsx.cisd.openbis.generic.server; import ch.systemsx.cisd.openbis.generic.server.business.IDataStoreServiceFactory; +import ch.systemsx.cisd.openbis.generic.server.business.IEntityOperationChecker; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.AbstractBusinessObjectFactory; import ch.systemsx.cisd.openbis.generic.server.business.bo.AttachmentBO; import ch.systemsx.cisd.openbis.generic.server.business.bo.AuthorizationGroupBO; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/EntityOperationChecker.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/EntityOperationChecker.java similarity index 95% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/EntityOperationChecker.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/EntityOperationChecker.java index 644ca156c60..66d3cef23c3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/EntityOperationChecker.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/EntityOperationChecker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.server; +package ch.systemsx.cisd.openbis.generic.server.business; import java.util.List; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityOperationChecker.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IEntityOperationChecker.java similarity index 97% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityOperationChecker.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IEntityOperationChecker.java index d33a09040e0..34f73f32298 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IEntityOperationChecker.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IEntityOperationChecker.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.server; +package ch.systemsx.cisd.openbis.generic.server.business; import java.util.List; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IRelationshipService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IRelationshipService.java similarity index 99% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IRelationshipService.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IRelationshipService.java index e62f739784e..2102221a768 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/IRelationshipService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/IRelationshipService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.server; +package ch.systemsx.cisd.openbis.generic.server.business; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/RelationshipService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/RelationshipService.java similarity index 99% rename from openbis/source/java/ch/systemsx/cisd/openbis/generic/server/RelationshipService.java rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/RelationshipService.java index daa35a98eb0..2f9bed61c50 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/RelationshipService.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/RelationshipService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.generic.server; +package ch.systemsx.cisd.openbis.generic.server.business; import ch.systemsx.cisd.common.exceptions.UserFailureException; import ch.systemsx.cisd.openbis.generic.server.business.bo.util.SampleUtils; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java index 756252fba1b..d983c274dd4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObjectFactory.java @@ -19,9 +19,9 @@ package ch.systemsx.cisd.openbis.generic.server.business.bo; import javax.annotation.Resource; import ch.systemsx.cisd.openbis.generic.server.ComponentNames; -import ch.systemsx.cisd.openbis.generic.server.IEntityOperationChecker; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.IDataStoreServiceFactory; +import ch.systemsx.cisd.openbis.generic.server.business.IEntityOperationChecker; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.java index b8c74e0a261..5d50b2a84eb 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractDataSetBusinessObject.java @@ -25,7 +25,7 @@ import java.util.Set; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityPropertiesConverter; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java index f872b73ab4d..e22cdde7429 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractSampleBusinessObject.java @@ -26,8 +26,8 @@ import java.util.Map.Entry; import java.util.Set; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IEntityOperationChecker; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IEntityOperationChecker; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.util.SampleOwner; import ch.systemsx.cisd.openbis.generic.server.business.bo.util.SampleUtils; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java index 80e9c583444..9fd045a73f8 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataBO.java @@ -28,7 +28,7 @@ import org.springframework.dao.DataAccessException; import ch.rinn.restrictions.Friend; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDataDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityPropertiesConverter; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java index 2ae341b5003..a7afbaf8304 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java @@ -43,8 +43,8 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException; import ch.systemsx.cisd.common.exceptions.UserFailureException; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.IDataStoreServiceFactory; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.exception.DataSetDeletionDisallowedTypesException; import ch.systemsx.cisd.openbis.generic.server.business.bo.exception.DataSetDeletionUnknownLocationsException; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java index aabd39580c6..d8a787a333e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DeletedDataSetTable.java @@ -29,8 +29,8 @@ import org.springframework.dao.DataAccessException; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.IDataStoreServiceFactory; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.exception.DataSetDeletionDisallowedTypesException; import ch.systemsx.cisd.openbis.generic.server.business.bo.exception.DataSetDeletionUnknownLocationsException; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java index a7255525140..b8757a47c9a 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentBO.java @@ -28,7 +28,7 @@ import org.springframework.dao.DataAccessException; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.util.SampleUtils; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAttachmentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java index 3458892ff32..953cc422b1c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ExperimentTable.java @@ -27,7 +27,7 @@ import java.util.Set; import org.springframework.dao.DataAccessException; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IEntityPropertiesConverter; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IExperimentDAO; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java index c4ef0d0b0d7..dedc8b275dc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/ProjectBO.java @@ -26,7 +26,7 @@ import org.springframework.orm.ObjectRetrievalFailureException; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAttachmentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDeletionDAO; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.java index 3491fa60ab2..2e238ecd53b 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleBO.java @@ -25,8 +25,8 @@ import org.springframework.dao.DataAccessException; import org.springframework.dao.DataIntegrityViolationException; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IEntityOperationChecker; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IEntityOperationChecker; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.util.SampleUtils; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IAttachmentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.java index 1345eb2d8b6..54fdd78c249 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/SampleTable.java @@ -29,8 +29,8 @@ import org.springframework.dao.DataAccessException; import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.generic.server.IEntityOperationChecker; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IEntityOperationChecker; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.util.SampleOwner; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.shared.basic.TechId; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java index 4f3ea35af62..bdebf5e2153 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBOTest.java @@ -25,8 +25,8 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import ch.rinn.restrictions.Friend; -import ch.systemsx.cisd.openbis.generic.server.IEntityOperationChecker; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IEntityOperationChecker; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.business.bo.ScriptBO.IScriptFactory; import ch.systemsx.cisd.openbis.generic.server.business.bo.datasetlister.IDatasetLister; import ch.systemsx.cisd.openbis.generic.server.business.bo.samplelister.ISampleLister; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java index 7dc09c3c702..96a60bff0c6 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/BaseTest.java @@ -33,7 +33,7 @@ import ch.systemsx.cisd.common.logging.LogInitializer; import ch.systemsx.cisd.common.servlet.SpringRequestContextProvider; import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientService; import ch.systemsx.cisd.openbis.generic.server.ICommonServerForInternalUse; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory; import ch.systemsx.cisd.openbis.generic.server.dataaccess.db.search.IndexMode; import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService; diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.java index 9a5992106f0..52777191325 100644 --- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.java +++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/base/RelationshipServiceStub.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.openbis.systemtest.base; -import ch.systemsx.cisd.openbis.generic.server.IRelationshipService; +import ch.systemsx.cisd.openbis.generic.server.business.IRelationshipService; import ch.systemsx.cisd.openbis.generic.shared.dto.DataPE; import ch.systemsx.cisd.openbis.generic.shared.dto.ExperimentPE; import ch.systemsx.cisd.openbis.generic.shared.dto.IAuthSession; -- GitLab