diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java index 5cdc07326322f41e6337931c8395eabb6ef4bd02..cc4939d108f86ca6518254d0e6b3653f4623eb5f 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetRegistrationTransaction.java @@ -16,13 +16,13 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IMaterialImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IProjectImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISearchService; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISpaceImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMaterialImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IProjectImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISearchService; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISpaceImmutable; /** * Interface for a data set registration transaction. All actions that go through the transaction diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java index 26b95f30fc6c92f3459d3161d0cf542fcf5064e6..ab51cd279c3a8a6e65427c7a39e4e5e6ac63343b 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IDataSetUpdatable.java @@ -18,9 +18,9 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1; import java.util.List; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java index 405454ea2c832b92fd41da8366f4858c776c608d..94303cd88766e104da676b5343b5ea96e86e8a03 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IExperiment.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java index d8fc9d47fb05887544ce1079e2c23b710fb80382..ae91fdc29a1455823d46d9a376a2f9d1f22e9aae 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IMaterial.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IMaterialImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMaterialImmutable; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java index 8b7c6acd909f7ad7d246d646b96172c22acb0bb5..92639e21ce1d3f106e7cf915f404e6b3da10f078 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/IProject.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IProjectImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IProjectImmutable; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java index fb0c9230841875dd3afce7532f89041930b47e4f..43b6271bf598d41c48dc4ee7932b6fb696044b1e 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISample.java @@ -16,8 +16,8 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java index 3f1249b821d413999e5da69bf5640181fdc4c10d..05972dfaa5fc78e45c1ee0ec5ce3fc2ede403bc1 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/ISpace.java @@ -16,7 +16,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISpaceImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISpaceImmutable; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java index 5caea1835de4f193a7d929677bfdb117357c7571..f10e2d5b847894a65b4e7c3c54813a424e93e3c0 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/AbstractTransactionState.java @@ -37,9 +37,9 @@ import ch.systemsx.cisd.etlserver.registrator.api.v1.IProject; import ch.systemsx.cisd.etlserver.registrator.api.v1.ISample; import ch.systemsx.cisd.etlserver.registrator.api.v1.ISpace; import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.AtomicEntityOperationDetails; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetRegistrationInformation; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java index add66ee3eb63dfd35ac4a9d4557e0b61d17bfabd..ca7290649044c1e9052ba5afb4e8edee2afb1da2 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSet.java @@ -24,9 +24,9 @@ import java.util.List; import ch.systemsx.cisd.etlserver.registrator.DataSetRegistrationDetails; import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSet; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Space; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java index 9efd793d870cde8aa9208bb92499df5197762b77..f15079bc44379cd4b20e7b7c7b5ae9b428f7387a 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetImmutable.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Code; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java index 7a8640bd5ae653bda4467c187135e7fe06da440d..dd3b80f71b2147c64dfb26d7dcb4f12acf53c1a4 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransaction.java @@ -45,13 +45,13 @@ import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.AbstractTransactionSta import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.AbstractTransactionState.LiveTransactionState; import ch.systemsx.cisd.etlserver.registrator.api.v1.impl.AbstractTransactionState.RolledbackTransactionState; import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IMaterialImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IProjectImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISearchService; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISpaceImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMaterialImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IProjectImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISearchService; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISpaceImmutable; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.AtomicEntityOperationDetails; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetRegistrationInformation; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java index 65c5ee2b8d4dfe91844d7b788c5112ab326b8629..4cd8c33f82ae345db2d94ec83d0de3ceb59cf98e 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetUpdatable.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSetUpdatable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.FileFormatType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java index 12908f3a137dbc17f335a4d0ace3fd2f5590dc63..41f87a0bb4b4b078e831906ee4e712bab7869c8c 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ExperimentImmutable.java @@ -17,7 +17,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java index 3b3c47adcd8bca516e8a4d9c6da936efc075a2a9..1e666ab52a07bccbc1d3017549afa776bec113a6 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/MaterialImmutable.java @@ -17,7 +17,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IMaterialImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMaterialImmutable; import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java index 302c4969a43549c8c4cfa98570efd7102a8a0b97..b0339878929350a4932b7532713c0f629d34160d 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/ProjectImmutable.java @@ -17,7 +17,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IProjectImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IProjectImmutable; /** * @author Kaloyan Enimanev diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java index 2587fc97079fdac4c106085e351bd7edbbab6f4a..fd27f855acf46d097fd8c17d34d759fffd106fa7 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/Sample.java @@ -19,8 +19,8 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl; import java.util.ArrayList; import ch.systemsx.cisd.etlserver.registrator.api.v1.ISample; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IEntityProperty; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleType; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java index d46e047e3c7779f48b8337bb5b1ef545faa57919..4c721bc4a62f1af5ef6869f47bd80b6f774b8bca 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SampleImmutable.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.List; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java index f2fe226d2b308039e1109bccbac83e1b9ca9364e..31886fa5b2a69c9aa30e435383eb5d6af54b4ea2 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SearchService.java @@ -24,12 +24,12 @@ import java.util.Set; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.collections.CollectionUtils.ICollectionFilter; import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IMaterialImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISampleImmutable; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISearchService; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.MaterialIdentifierCollection; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IMaterialImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISampleImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISearchService; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.MaterialIdentifierCollection; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria.MatchClause; import ch.systemsx.cisd.openbis.generic.shared.api.v1.dto.SearchCriteria.MatchClauseAttribute; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java index b23cb4bb3ccad3ff856f30f2af6faaa969dac9a6..757bb6d71e238fb4e6f5156c9c1a5a476e0389fb 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/SpaceImmutable.java @@ -17,7 +17,7 @@ package ch.systemsx.cisd.etlserver.registrator.api.v1.impl; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISpaceImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISpaceImmutable; /** * @author Kaloyan Enimanev diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java index 1ca236f2c1a04dc0aa909a681096f69d9405b4e0..dae9dccbb95d18f6e5ec7a463c993a344ce8aeb5 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/plugins/jython/PluginScriptRunner.java @@ -32,7 +32,7 @@ import ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api.IDataSet; import ch.systemsx.cisd.openbis.dss.generic.server.plugins.jython.api.IMailService; import ch.systemsx.cisd.openbis.dss.generic.shared.DataSetProcessingContext; import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISearchService; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISearchService; import ch.systemsx.cisd.openbis.generic.shared.managed_property.api.ISimpleTableModelBuilderAdaptor; /** diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java index e8cebba41a12333c805d2f6336c5040cf2e684b5..fbe06c54e8b07cd6435d7889d73b16294140bf00 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/ServiceProvider.java @@ -26,7 +26,7 @@ import com.marathon.util.spring.StreamSupportingHttpInvokerServiceExporter; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.ISearchService; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.ISearchService; /** * Provider of remote service onto openBIS. diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IAuthorizationGuardPredicate.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IAuthorizationGuardPredicate.java index 49e0955a8c98e561f167383b5da2e9d9a2515bf6..524a601e79133d73ca364b4c368e720132737459 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IAuthorizationGuardPredicate.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/authorization/IAuthorizationGuardPredicate.java @@ -18,7 +18,7 @@ package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.authorization; import ch.systemsx.cisd.common.exceptions.Status; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IDataSetPredicate; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IDataSetPredicate; /** * Interface for objects that can function as guardClasses in an AuthorizationGuard. diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSetImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetImmutable.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSetImmutable.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetImmutable.java index 64fdf5780d0c5d1b1f7293da28f41fedc7c3833a..38f9a8779666f7e217d05fd6de2e41282885c98a 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSetImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetImmutable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; import java.util.List; diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSetPredicate.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetPredicate.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSetPredicate.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetPredicate.java index bd56744a7fb13a461a2ad1c0ce6b936f787f6212..cf51d627564b662c01367bed38bbd22a20ff8a71 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IDataSetPredicate.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IDataSetPredicate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; import java.util.List; diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IExperimentImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExperimentImmutable.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IExperimentImmutable.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExperimentImmutable.java index 29a28f3921a6bd631fbc47b1c9f9d73e19ec218b..7420b2b9ffe35f4d85323b13b203d50353e49369 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IExperimentImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IExperimentImmutable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; /** * Read-only interface to an existing experiment. diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IMaterialImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMaterialImmutable.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IMaterialImmutable.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMaterialImmutable.java index feb4bc3491bc313692bb8ad8083c5a66a6ca488d..80bac17a1f10c0c234ed6167909498281d82ba3f 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IMaterialImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IMaterialImmutable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; /** * @author Kaloyan Enimanev diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IProjectImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IProjectImmutable.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IProjectImmutable.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IProjectImmutable.java index 849281eb038d1e1a08c023c88e415e6fba4dde67..bdb87255379786dd0447b331c31dae2136d7cf31 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/IProjectImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/IProjectImmutable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; /** * @author Kaloyan Enimanev diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISampleImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISampleImmutable.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISampleImmutable.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISampleImmutable.java index c7274686558cc36d0013f928fb6dbca28b0b653e..f015e758904cdc09a3a3e3ce37e9dced56d18fdd 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISampleImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISampleImmutable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; import java.util.List; diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISearchService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISearchService.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISearchService.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISearchService.java index 6f826654112ef2c324466627bbcbc3231fb610f1..dfd0fd2585169e39ffe37dfb5550919487943bea 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISearchService.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISearchService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; import java.util.List; diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISpaceImmutable.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISpaceImmutable.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISpaceImmutable.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISpaceImmutable.java index 868be59f9af4c88d1a72a2c31444ab293169f0fa..68e86b636fbabee4156bcdac4e42c2d69f1f68e6 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/ISpaceImmutable.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/ISpaceImmutable.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; /** * An interface for spaces from the database that should not be altered. diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/MaterialIdentifierCollection.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/MaterialIdentifierCollection.java similarity index 99% rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/MaterialIdentifierCollection.java rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/MaterialIdentifierCollection.java index 86493a56197296af7a41630ec01043f0e82174bd..96ac36c812b7424695c64ff09a21bbfb20640178 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/MaterialIdentifierCollection.java +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/v1/MaterialIdentifierCollection.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal; +package ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1; import java.util.ArrayList; import java.util.Collections; diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java index b59977aee08a193925d8ec0498543bb296f345ce..c9176d967fa64ef63e53c9bf206f40a6d7dbb594 100644 --- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java +++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java @@ -49,7 +49,7 @@ import ch.systemsx.cisd.etlserver.registrator.IDataSetRegistrationDetailsFactory import ch.systemsx.cisd.etlserver.registrator.api.v1.IDataSet; import ch.systemsx.cisd.etlserver.validation.IDataSetValidator; import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService; -import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.IExperimentImmutable; +import ch.systemsx.cisd.openbis.dss.generic.shared.api.internal.v1.IExperimentImmutable; import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetType; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;