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 da93f6842010b98ed817c928fc6480095b7a3a30..237d7ce5db92e293eb8361451c91eb9a05266625 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 82d33d7993fa49d1c2a8923046619ba5ece99e0e..8d60c1629f2dfd4bc87ccc36116148da0bfd3233 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 32b2b7d8182ae4ab33e42947fc096cebf2309ea8..2d163f805f7b36b864009578af8fe8bfcedb0598 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 f6eb3c39383b00d7c9c75ccf3d80636da357b6b2..cecf50fd858ffd4bc81173401c5cf26d71142780 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 19d4258b3d96f7217fc8d39645aa92f83eeb4cf8..d43a90edce2d11caf0b2086e4d19af1c470f0998 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 4e512fd38b3ea5605596dd8a29cbf7590598ef4a..d85e6d339ba2fffd1800d2d263a26873938d840c 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 5956c43da6207aa45c135d5fd40c1cc8579d253d..cff99dd54e5070bb345cba2af0f4b01887321c16 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 339099e2b0e426b68396e107e98967b3d23fc530..c9185a46c92cb34e3c44461c668e623121814378 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;