From 742c139d491f864e746435364ec4a0351267a35e Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Thu, 30 Jun 2011 12:19:35 +0000
Subject: [PATCH] refactoring: move shared.api.internal to
shared.api.internal.v1, because the classes are accessible via the Jython
Dropbox API
SVN: 21931
---
.../api/v1/IDataSetRegistrationTransaction.java | 14 +++++++-------
.../registrator/api/v1/IDataSetUpdatable.java | 6 +++---
.../etlserver/registrator/api/v1/IExperiment.java | 2 +-
.../etlserver/registrator/api/v1/IMaterial.java | 2 +-
.../etlserver/registrator/api/v1/IProject.java | 2 +-
.../cisd/etlserver/registrator/api/v1/ISample.java | 4 ++--
.../cisd/etlserver/registrator/api/v1/ISpace.java | 2 +-
.../api/v1/impl/AbstractTransactionState.java | 6 +++---
.../etlserver/registrator/api/v1/impl/DataSet.java | 6 +++---
.../registrator/api/v1/impl/DataSetImmutable.java | 6 +++---
.../v1/impl/DataSetRegistrationTransaction.java | 14 +++++++-------
.../registrator/api/v1/impl/DataSetUpdatable.java | 4 ++--
.../api/v1/impl/ExperimentImmutable.java | 2 +-
.../registrator/api/v1/impl/MaterialImmutable.java | 2 +-
.../registrator/api/v1/impl/ProjectImmutable.java | 2 +-
.../etlserver/registrator/api/v1/impl/Sample.java | 4 ++--
.../registrator/api/v1/impl/SampleImmutable.java | 4 ++--
.../registrator/api/v1/impl/SearchService.java | 12 ++++++------
.../registrator/api/v1/impl/SpaceImmutable.java | 2 +-
.../server/plugins/jython/PluginScriptRunner.java | 2 +-
.../dss/generic/shared/ServiceProvider.java | 2 +-
.../IAuthorizationGuardPredicate.java | 2 +-
.../api/internal/{ => v1}/IDataSetImmutable.java | 2 +-
.../api/internal/{ => v1}/IDataSetPredicate.java | 2 +-
.../internal/{ => v1}/IExperimentImmutable.java | 2 +-
.../api/internal/{ => v1}/IMaterialImmutable.java | 2 +-
.../api/internal/{ => v1}/IProjectImmutable.java | 2 +-
.../api/internal/{ => v1}/ISampleImmutable.java | 2 +-
.../api/internal/{ => v1}/ISearchService.java | 2 +-
.../api/internal/{ => v1}/ISpaceImmutable.java | 2 +-
.../{ => v1}/MaterialIdentifierCollection.java | 2 +-
.../impl/DataSetRegistrationTransactionTest.java | 2 +-
32 files changed, 61 insertions(+), 61 deletions(-)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/IDataSetImmutable.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/IDataSetPredicate.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/IExperimentImmutable.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/IMaterialImmutable.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/IProjectImmutable.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/ISampleImmutable.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/ISearchService.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/ISpaceImmutable.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/internal/{ => v1}/MaterialIdentifierCollection.java (99%)
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 5cdc0732632..cc4939d108f 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 26b95f30fc6..ab51cd279c3 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 405454ea2c8..94303cd8876 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 d8fc9d47fb0..ae91fdc29a1 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 8b7c6acd909..92639e21ce1 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 fb0c9230841..43b6271bf59 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 3f1249b821d..05972dfaa5f 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 5caea1835de..f10e2d5b847 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 add66ee3eb6..ca729064904 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 9efd793d870..f15079bc443 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 7a8640bd5ae..dd3b80f71b2 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 65c5ee2b8d4..4cd8c33f82a 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 12908f3a137..41f87a0bb4b 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 3b3c47adcd8..1e666ab52a0 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 302c4969a43..b0339878929 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 2587fc97079..fd27f855acf 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 d46e047e3c7..4c721bc4a62 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 f2fe226d2b3..31886fa5b2a 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 b23cb4bb3cc..757bb6d71e2 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 1ca236f2c1a..dae9dccbb95 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 e8cebba41a1..fbe06c54e8b 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 49e0955a8c9..524a601e791 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 64fdf5780d0..38f9a877966 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 bd56744a7fb..cf51d627564 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 29a28f3921a..7420b2b9ffe 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 feb4bc3491b..80bac17a1f1 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 849281eb038..bdb87255379 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 c7274686558..f015e758904 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 6f826654112..dfd0fd25851 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 868be59f9af..68e86b636fb 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 86493a56197..96ac36c812b 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 b59977aee08..c9176d967fa 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;
--
GitLab