From c74df4e8e5fe9fb4b20cffbf99f76cd3d220f018 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 11 Sep 2012 11:29:43 +0000
Subject: [PATCH] BIS-142 class in package
openbis.plugin.screening.shared.authorization and in sub packages moved to
openbis.plugin.screening.server.authorization.
SVN: 26590
---
.../plugin/screening/server/ScreeningServer.java | 12 ++++++------
.../authorization/DatasetReferencePredicate.java | 2 +-
.../ExperimentSearchCriteriaPredicate.java | 2 +-
...erialExperimentFeatureVectorSummaryValidator.java | 2 +-
.../MaterialFeaturesOneExpPredicate.java | 2 +-
.../authorization/SpaceValidator.java | 2 +-
.../authorization/WellContentValidator.java | 2 +-
.../authorization/WellSearchCriteriaPredicate.java | 2 +-
8 files changed, 13 insertions(+), 13 deletions(-)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared => server}/authorization/DatasetReferencePredicate.java (95%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared => server}/authorization/ExperimentSearchCriteriaPredicate.java (98%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared => server}/authorization/MaterialExperimentFeatureVectorSummaryValidator.java (94%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared => server}/authorization/MaterialFeaturesOneExpPredicate.java (97%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared => server}/authorization/SpaceValidator.java (97%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared => server}/authorization/WellContentValidator.java (93%)
rename screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/{shared => server}/authorization/WellSearchCriteriaPredicate.java (96%)
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 da93f684201..237d7ce5db9 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
@@ -73,6 +73,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ProjectIdentifier;
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.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.WellContentValidator;
+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;
import ch.systemsx.cisd.openbis.plugin.screening.server.logic.AnalysisSettings;
@@ -108,12 +114,6 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.PlateMetadata
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.PlateWellMaterialMapping;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.PlateWellReferenceWithDatasets;
import ch.systemsx.cisd.openbis.plugin.screening.shared.api.v1.dto.WellIdentifier;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.authorization.DatasetReferencePredicate;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.authorization.ExperimentSearchCriteriaPredicate;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.authorization.MaterialExperimentFeatureVectorSummaryValidator;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.authorization.MaterialFeaturesOneExpPredicate;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.authorization.WellContentValidator;
-import ch.systemsx.cisd.openbis.plugin.screening.shared.authorization.WellSearchCriteriaPredicate;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.AnalysisProcedures;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.DatasetReference;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.ExperimentFeatureVectorSummary;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/DatasetReferencePredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/DatasetReferencePredicate.java
similarity index 95%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/DatasetReferencePredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/DatasetReferencePredicate.java
index 82d33d7993f..8d60c1629f2 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/DatasetReferencePredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/DatasetReferencePredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.DataSetCodePredicate;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.DelegatedPredicate;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/ExperimentSearchCriteriaPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ExperimentSearchCriteriaPredicate.java
similarity index 98%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/ExperimentSearchCriteriaPredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ExperimentSearchCriteriaPredicate.java
index 32b2b7d8182..2d163f805f7 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/ExperimentSearchCriteriaPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/ExperimentSearchCriteriaPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.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/authorization/MaterialExperimentFeatureVectorSummaryValidator.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/MaterialExperimentFeatureVectorSummaryValidator.java
similarity index 94%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/MaterialExperimentFeatureVectorSummaryValidator.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/MaterialExperimentFeatureVectorSummaryValidator.java
index f6eb3c39383..cecf50fd858 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/MaterialExperimentFeatureVectorSummaryValidator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/MaterialExperimentFeatureVectorSummaryValidator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.MaterialSimpleFeatureVectorSummary;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/MaterialFeaturesOneExpPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/MaterialFeaturesOneExpPredicate.java
similarity index 97%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/MaterialFeaturesOneExpPredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/MaterialFeaturesOneExpPredicate.java
index 19d4258b3d9..d43a90edce2 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/MaterialFeaturesOneExpPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/MaterialFeaturesOneExpPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.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/authorization/SpaceValidator.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/SpaceValidator.java
similarity index 97%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/SpaceValidator.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/SpaceValidator.java
index 4e512fd38b3..d85e6d339ba 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/SpaceValidator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/SpaceValidator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.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/authorization/WellContentValidator.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellContentValidator.java
similarity index 93%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/WellContentValidator.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellContentValidator.java
index 5956c43da62..cff99dd54e5 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/WellContentValidator.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellContentValidator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellContent;
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/WellSearchCriteriaPredicate.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellSearchCriteriaPredicate.java
similarity index 96%
rename from screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/WellSearchCriteriaPredicate.java
rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellSearchCriteriaPredicate.java
index 339099e2b0e..c9185a46c92 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/authorization/WellSearchCriteriaPredicate.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/authorization/WellSearchCriteriaPredicate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.screening.shared.authorization;
+package ch.systemsx.cisd.openbis.plugin.screening.server.authorization;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.openbis.generic.server.authorization.predicate.DelegatedPredicate;
--
GitLab