From 426abb4dd8d29d23ec7d3b9e5bb919192fff32bb Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 11 Sep 2012 11:28:13 +0000
Subject: [PATCH] BIS-142 class in package
openbis.plugin.proteomics.shared.authorization and in sub packages moved to
openbis.plugin.proteomics.server.authorization.
SVN: 26589
---
.../proteomics/server/ProteomicsDataServiceInternal.java | 4 ++--
.../authorization/validator/ParentSampleValidator.java | 2 +-
.../authorization/validator/RawDataSampleValidator.java | 2 +-
.../authorization/validator/RawDataSampleValidatorTest.java | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
rename rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/{shared => server}/authorization/validator/ParentSampleValidator.java (96%)
rename rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/{shared => server}/authorization/validator/RawDataSampleValidator.java (93%)
rename rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/{shared => server}/authorization/validator/RawDataSampleValidatorTest.java (98%)
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java
index e40c6146523..2007f7e904a 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/ProteomicsDataServiceInternal.java
@@ -60,12 +60,12 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.translator.DataSetTranslator;
import ch.systemsx.cisd.openbis.generic.shared.translator.ExperimentTranslator;
+import ch.systemsx.cisd.openbis.plugin.proteomics.server.authorization.validator.ParentSampleValidator;
+import ch.systemsx.cisd.openbis.plugin.proteomics.server.authorization.validator.RawDataSampleValidator;
import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.ExperimentLoader;
import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.IBusinessObjectFactory;
import ch.systemsx.cisd.openbis.plugin.proteomics.server.business.ISampleLoader;
import ch.systemsx.cisd.openbis.plugin.proteomics.shared.IProteomicsDataServiceInternal;
-import ch.systemsx.cisd.openbis.plugin.proteomics.shared.authorization.validator.ParentSampleValidator;
-import ch.systemsx.cisd.openbis.plugin.proteomics.shared.authorization.validator.RawDataSampleValidator;
import ch.systemsx.cisd.openbis.plugin.proteomics.shared.basic.CommonConstants;
import ch.systemsx.cisd.openbis.plugin.proteomics.shared.dto.MsInjectionSample;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/ParentSampleValidator.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/ParentSampleValidator.java
similarity index 96%
rename from rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/ParentSampleValidator.java
rename to rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/ParentSampleValidator.java
index 40ff1d83885..4500e154a68 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/ParentSampleValidator.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/ParentSampleValidator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.proteomics.shared.authorization.validator;
+package ch.systemsx.cisd.openbis.plugin.proteomics.server.authorization.validator;
import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
import ch.systemsx.cisd.openbis.generic.server.authorization.validator.IValidator;
diff --git a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/RawDataSampleValidator.java b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/RawDataSampleValidator.java
similarity index 93%
rename from rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/RawDataSampleValidator.java
rename to rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/RawDataSampleValidator.java
index 54fbed37926..9fe223b1e2d 100644
--- a/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/RawDataSampleValidator.java
+++ b/rtd_phosphonetx/source/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/RawDataSampleValidator.java
@@ -1,4 +1,4 @@
-package ch.systemsx.cisd.openbis.plugin.proteomics.shared.authorization.validator;
+package ch.systemsx.cisd.openbis.plugin.proteomics.server.authorization.validator;
import ch.systemsx.cisd.openbis.generic.server.authorization.IAuthorizationDataProvider;
import ch.systemsx.cisd.openbis.generic.server.authorization.validator.IValidator;
diff --git a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/RawDataSampleValidatorTest.java b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/RawDataSampleValidatorTest.java
similarity index 98%
rename from rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/RawDataSampleValidatorTest.java
rename to rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/RawDataSampleValidatorTest.java
index f9a67b8bd92..2b048380698 100644
--- a/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/shared/authorization/validator/RawDataSampleValidatorTest.java
+++ b/rtd_phosphonetx/sourceTest/java/ch/systemsx/cisd/openbis/plugin/proteomics/server/authorization/validator/RawDataSampleValidatorTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.proteomics.shared.authorization.validator;
+package ch.systemsx.cisd.openbis.plugin.proteomics.server.authorization.validator;
import java.util.Arrays;
import java.util.LinkedHashSet;
@@ -34,7 +34,7 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceId
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifier;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SampleIdentifierFactory;
import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.SpaceIdentifier;
-import ch.systemsx.cisd.openbis.plugin.proteomics.shared.authorization.validator.RawDataSampleValidator;
+import ch.systemsx.cisd.openbis.plugin.proteomics.server.authorization.validator.RawDataSampleValidator;
import ch.systemsx.cisd.openbis.plugin.proteomics.shared.dto.MsInjectionSample;
/**
--
GitLab