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 237d7ce5db92e293eb8361451c91eb9a05266625..70bef6969228eb4fed953b556a4781fcf58590c9 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 fdae4408a98f0cc538eedab3a7dacf47b48600f5..2831effe0628953532edc1d9ea1a9c14bbc06933 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 ec7b8083b45a13ff414d286fe044d9f8fc192ea9..7995c8947d1dd32e24e0a7d703676a68593171c0 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 e4531738db617e06b030ce5d60004173741c5ce4..ba1f69d16bb521d63f447694e275a478fe55ea34 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 ee7521a121899188c3818911d5bcc618637f3729..f7b64fb7fb0786564f0e4674f40dad77e49604d1 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 99a94c886cd5643e02cff7297678b789a87b83ed..6b2099af7a7bfd16f121dbd346b4524cb8639847 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 585a3d150118cc8ebc71b3fc80b3d87179f3c4b3..20d519e0c153ca884f991d2a14baabe1d9dc301e 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 c6a193a90b166586529b4a196e3080cb8c90feb3..f0ff5dbe0aa009d30716f2982eff45f889eb0dfe 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 492b50a4622a173f4d412f803be340a25fe9b283..04e219c3be0224a30f5c076111d89f03912f7ab4 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;