From f77d40e45c007f2c5860c6c9d81e94916a4766a7 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 11 Sep 2012 12:00:08 +0000
Subject: [PATCH] BIS-142 classes in package
openbis.plugin.screening.shared.api.internal.authorization moved to
openbis.plugin.screening.server.authorization.
SVN: 26591
---
.../plugin/screening/server/ScreeningServer.java | 14 +++++++-------
.../ExperimentIdentifierPredicate.java | 2 +-
.../authorization/PlateIdentifierPredicate.java | 2 +-
.../PlateWellReferenceWithDatasetsValidator.java | 2 +-
.../ScreeningExperimentValidator.java | 2 +-
.../ScreeningPlateListReadOnlyPredicate.java | 2 +-
.../authorization/ScreeningPlateValidator.java | 2 +-
.../authorization/WellIdentifierPredicate.java | 2 +-
.../screening/server/logic/ScreeningApiImpl.java | 2 +-
9 files changed, 15 insertions(+), 15 deletions(-)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared/api/internal => server}/authorization/ExperimentIdentifierPredicate.java (96%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared/api/internal => server}/authorization/PlateIdentifierPredicate.java (97%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared/api/internal => server}/authorization/PlateWellReferenceWithDatasetsValidator.java (96%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared/api/internal => server}/authorization/ScreeningExperimentValidator.java (94%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared/api/internal => server}/authorization/ScreeningPlateListReadOnlyPredicate.java (98%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared/api/internal => server}/authorization/ScreeningPlateValidator.java (95%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared/api/internal => server}/authorization/WellIdentifierPredicate.java (94%)
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
index 237d7ce5db9..70bef696922 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
@@ -74,10 +74,17 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTranslator;
import ch.systemsx.cisd.openbis.generic.shared.translator.VocabularyTranslator;
import ch.systemsx.cisd.openbis.plugin.generic.shared.IGenericServer;
import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.DatasetReferencePredicate;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.ExperimentIdentifierPredicate;
import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.ExperimentSearchCriteriaPredicate;
import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.MaterialExperimentFeatureVectorSummaryValidator;
import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.MaterialFeaturesOneExpPredicate;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.PlateIdentifierPredicate;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.PlateWellReferenceWithDatasetsValidator;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.ScreeningExperimentValidator;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.ScreeningPlateListReadOnlyPredicate;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.ScreeningPlateValidator;
import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.WellContentValidator;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.WellIdentifierPredicate;
import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.WellSearchCriteriaPredicate;
import ch.systemsx.cisd.openbis.plugin.screening.server.dataaccess.AnalysisProcedureResult;
import ch.systemsx.cisd.openbis.plugin.screening.server.dataaccess.IScreeningQuery;
@@ -93,13 +100,6 @@ import ch.systemsx.cisd.openbis.plugin.screening.server.logic.ScreeningUtils;
import ch.systemsx.cisd.openbis.plugin.screening.server.logic.WellContentLoader;
import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.ExperimentIdentifierPredicate;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.PlateIdentifierPredicate;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.PlateWellReferenceWithDatasetsValidator;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.ScreeningExperimentValidator;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.ScreeningPlateListReadOnlyPredicate;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.ScreeningPlateValidator;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.WellIdentifierPredicate;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.IScreeningApiServer;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ExperimentImageMetadata;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ExperimentIdentifierPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ExperimentIdentifierPredicate.java
similarity index 96%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ExperimentIdentifierPredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ExperimentIdentifierPredicate.java
index fdae4408a98..2831effe062 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ExperimentIdentifierPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ExperimentIdentifierPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import java.util.List;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/PlateIdentifierPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/PlateIdentifierPredicate.java
similarity index 97%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/PlateIdentifierPredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/PlateIdentifierPredicate.java
index ec7b8083b45..7995c8947d1 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/PlateIdentifierPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/PlateIdentifierPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import java.util.List;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/PlateWellReferenceWithDatasetsValidator.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/PlateWellReferenceWithDatasetsValidator.java
similarity index 96%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/PlateWellReferenceWithDatasetsValidator.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/PlateWellReferenceWithDatasetsValidator.java
index e4531738db6..ba1f69d16bb 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/PlateWellReferenceWithDatasetsValidator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/PlateWellReferenceWithDatasetsValidator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import java.util.Set;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningExperimentValidator.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningExperimentValidator.java
similarity index 94%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningExperimentValidator.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningExperimentValidator.java
index ee7521a1218..f7b64fb7fb0 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningExperimentValidator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningExperimentValidator.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import java.util.Set;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateListReadOnlyPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningPlateListReadOnlyPredicate.java
similarity index 98%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateListReadOnlyPredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningPlateListReadOnlyPredicate.java
index 99a94c886cd..6b2099af7a7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateListReadOnlyPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningPlateListReadOnlyPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import java.util.ArrayList;
import java.util.Collection;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateValidator.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningPlateValidator.java
similarity index 95%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateValidator.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningPlateValidator.java
index 585a3d15011..20d519e0c15 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/ScreeningPlateValidator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ScreeningPlateValidator.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import java.util.Set;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/WellIdentifierPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellIdentifierPredicate.java
similarity index 94%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/WellIdentifierPredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellIdentifierPredicate.java
index c6a193a90b1..f0ff5dbe0aa 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/internal/authorization/WellIdentifierPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellIdentifierPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.DelegatedPredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.SamplePermIdPredicate;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java
index 492b50a4622..04e219c3be0 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/logic/ScreeningApiImpl.java
@@ -67,9 +67,9 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.SampleTypeTranslator;
import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
import ch.systemsx.cisd.openbis.generic.shared.util.SpaceCodeHelper;
import ch.systemsx.cisd.openbis.plugin.screening.server.IScreeningBusinessObjectFactory;
+import ch.systemsx.cisd.openbis.plugin.screening.server.authorization.ScreeningExperimentValidator;
import ch.systemsx.cisd.openbis.plugin.screening.server.dataaccess.IScreeningQuery;
import ch.systemsx.cisd.openbis.plugin.screening.server.dataaccess.PlateGeometryContainer;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.api.internal.authorization.ScreeningExperimentValidator;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.DatasetIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ExperimentIdentifier;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.ExperimentImageMetadata;
--
GitLab