From 81c1f506ceb96d6b048dbaaa1a4cecf265f373f8 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Mon, 12 Sep 2011 13:12:21 +0000
Subject: [PATCH] [LMS-2506] move classes to a more appropriate place
SVN: 22885
---
.../client}/jython/api/v1/DataType.java | 2 +-
.../client}/jython/api/v1/IAbstractType.java | 2 +-
.../client}/jython/api/v1/IDataSetType.java | 2 +-
.../jython/api/v1/IDataSetTypeImmutable.java | 2 +-
.../jython/api/v1/IExperimentType.java | 2 +-
.../api/v1/IExperimentTypeImmutable.java | 2 +-
.../jython/api/v1/IJythonPluginService.java | 2 +-
.../IMasterDataRegistrationTransaction.java | 2 +-
.../client}/jython/api/v1/IMaterialType.java | 2 +-
.../jython/api/v1/IMaterialTypeImmutable.java | 2 +-
.../jython/api/v1/IPropertyAssignment.java | 2 +-
.../client}/jython/api/v1/IPropertyType.java | 2 +-
.../jython/api/v1/IPropertyTypeImmutable.java | 2 +-
.../client}/jython/api/v1/ISampleType.java | 2 +-
.../jython/api/v1/ISampleTypeImmutable.java | 2 +-
.../jython/api/v1/impl/DataSetType.java | 4 +--
.../api/v1/impl/DataSetTypeImmutable.java | 4 +--
.../api/v1/impl/EncapsulatedCommonServer.java | 2 +-
.../jython/api/v1/impl/ExperimentType.java | 4 +--
.../api/v1/impl/ExperimentTypeImmutable.java | 4 +--
.../api/v1/impl/JythonPluginScriptRunner.java | 4 +--
.../v1/impl/JythonPluginScriptStandalone.java | 2 +-
.../api/v1/impl/JythonPluginService.java | 6 ++--
.../impl/MasterDataRegistrationException.java | 2 +-
.../MasterDataRegistrationTransaction.java | 30 +++++++++----------
.../v1/impl/MasterDataTransactionErrors.java | 6 ++--
.../jython/api/v1/impl/MaterialType.java | 4 +--
.../api/v1/impl/MaterialTypeImmutable.java | 4 +--
.../api/v1/impl/PropertyAssignment.java | 4 +--
.../jython/api/v1/impl/PropertyType.java | 8 ++---
.../api/v1/impl/PropertyTypeImmutable.java | 8 ++---
.../jython/api/v1/impl/SampleType.java | 4 +--
.../api/v1/impl/SampleTypeImmutable.java | 4 +--
.../v1/impl/JythonPluginScriptRunnerTest.java | 2 +-
.../jython/api/v1/impl/simple-transaction.py | 0
35 files changed, 68 insertions(+), 68 deletions(-)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/DataType.java (93%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IAbstractType.java (93%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IDataSetType.java (93%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IDataSetTypeImmutable.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IExperimentType.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IExperimentTypeImmutable.java (91%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IJythonPluginService.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IMasterDataRegistrationTransaction.java (97%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IMaterialType.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IMaterialTypeImmutable.java (91%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IPropertyAssignment.java (95%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IPropertyType.java (96%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/IPropertyTypeImmutable.java (95%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/ISampleType.java (94%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/ISampleTypeImmutable.java (93%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/DataSetType.java (87%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/DataSetTypeImmutable.java (91%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/EncapsulatedCommonServer.java (98%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/ExperimentType.java (86%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/ExperimentTypeImmutable.java (90%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/JythonPluginScriptRunner.java (94%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/JythonPluginScriptStandalone.java (97%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/JythonPluginService.java (89%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/MasterDataRegistrationException.java (94%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/MasterDataRegistrationTransaction.java (87%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/MasterDataTransactionErrors.java (92%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/MaterialType.java (86%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/MaterialTypeImmutable.java (90%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/PropertyAssignment.java (93%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/PropertyType.java (86%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/PropertyTypeImmutable.java (90%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/SampleType.java (91%)
rename openbis/source/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/SampleTypeImmutable.java (92%)
rename openbis/sourceTest/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/JythonPluginScriptRunnerTest.java (99%)
rename openbis/sourceTest/java/ch/systemsx/cisd/openbis/{plugin => generic/client}/jython/api/v1/impl/simple-transaction.py (100%)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/DataType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/DataType.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/DataType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/DataType.java
index 3a50420acc8..b07f3023068 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/DataType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/DataType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
import ch.systemsx.cisd.openbis.generic.shared.basic.ISerializable;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IAbstractType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IAbstractType.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IAbstractType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IAbstractType.java
index 51f82c65258..c3e0b9f22ca 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IAbstractType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IAbstractType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* A super-interface for entity and property types.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IDataSetType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IDataSetType.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IDataSetType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IDataSetType.java
index 62f3fa4ed7a..2dfe9a8705a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IDataSetType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IDataSetType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IDataSetTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IDataSetTypeImmutable.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IDataSetTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IDataSetTypeImmutable.java
index a11bbe11853..db2818c57e9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IDataSetTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IDataSetTypeImmutable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IExperimentType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IExperimentType.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IExperimentType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IExperimentType.java
index e7549cdf603..7140e364434 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IExperimentType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IExperimentType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IExperimentTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IExperimentTypeImmutable.java
similarity index 91%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IExperimentTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IExperimentTypeImmutable.java
index e2edaa7cd62..90281b1fc37 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IExperimentTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IExperimentTypeImmutable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IJythonPluginService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IJythonPluginService.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IJythonPluginService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IJythonPluginService.java
index 0145e330ff4..674c714bac5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IJythonPluginService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IJythonPluginService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMasterDataRegistrationTransaction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMasterDataRegistrationTransaction.java
similarity index 97%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMasterDataRegistrationTransaction.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMasterDataRegistrationTransaction.java
index 856554f35d5..5d36cb36c99 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMasterDataRegistrationTransaction.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMasterDataRegistrationTransaction.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMaterialType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMaterialType.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMaterialType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMaterialType.java
index b27ec17646f..b1e523efa8c 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMaterialType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMaterialType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMaterialTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMaterialTypeImmutable.java
similarity index 91%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMaterialTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMaterialTypeImmutable.java
index 4eda39e0ff7..761f6a0e692 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IMaterialTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IMaterialTypeImmutable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyAssignment.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyAssignment.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyAssignment.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyAssignment.java
index 4e4c538620c..6bf18425281 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyAssignment.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyAssignment.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyType.java
similarity index 96%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyType.java
index 3d1eec87842..3dcd99ea344 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyTypeImmutable.java
similarity index 95%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyTypeImmutable.java
index bcceac0f1ef..f148842fa6a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/IPropertyTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/IPropertyTypeImmutable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/ISampleType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/ISampleType.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/ISampleType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/ISampleType.java
index abcd0a4a1be..112ecdf9c8a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/ISampleType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/ISampleType.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/ISampleTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/ISampleTypeImmutable.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/ISampleTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/ISampleTypeImmutable.java
index 42883633b89..f06d7e2a2cf 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/ISampleTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/ISampleTypeImmutable.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/DataSetType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/DataSetType.java
similarity index 87%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/DataSetType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/DataSetType.java
index 2cb37f46ac5..2af460be997 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/DataSetType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/DataSetType.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IDataSetType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IDataSetType;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/DataSetTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/DataSetTypeImmutable.java
similarity index 91%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/DataSetTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/DataSetTypeImmutable.java
index d97b2ea80fc..4ea4bfa7a78 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/DataSetTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/DataSetTypeImmutable.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IDataSetTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IDataSetTypeImmutable;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/EncapsulatedCommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/EncapsulatedCommonServer.java
similarity index 98%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/EncapsulatedCommonServer.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/EncapsulatedCommonServer.java
index 6b17a32429d..f5009fd67da 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/EncapsulatedCommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/EncapsulatedCommonServer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.util.ArrayList;
import java.util.List;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/ExperimentType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/ExperimentType.java
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/ExperimentType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/ExperimentType.java
index 3784c253214..cf4b7152945 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/ExperimentType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/ExperimentType.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IExperimentType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IExperimentType;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/ExperimentTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/ExperimentTypeImmutable.java
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/ExperimentTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/ExperimentTypeImmutable.java
index 4d26a777f36..cc60f0c7aae 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/ExperimentTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/ExperimentTypeImmutable.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IExperimentTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IExperimentTypeImmutable;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptRunner.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptRunner.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptRunner.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptRunner.java
index 0a908e625f8..8a2864efb38 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptRunner.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptRunner.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.io.File;
@@ -23,7 +23,7 @@ import org.python.util.PythonInterpreter;
import ch.systemsx.cisd.common.filesystem.FileUtilities;
import ch.systemsx.cisd.common.logging.ISimpleLogger;
import ch.systemsx.cisd.common.logging.LogLevel;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl.MasterDataTransactionErrors.TransactionError;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl.MasterDataTransactionErrors.TransactionError;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptStandalone.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptStandalone.java
similarity index 97%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptStandalone.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptStandalone.java
index daa88d08c2f..f17fe80da43 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptStandalone.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptStandalone.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.io.File;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginService.java
similarity index 89%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginService.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginService.java
index 4b0299ea7e8..b338fee4750 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginService.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.util.ArrayList;
import java.util.List;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IJythonPluginService;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMasterDataRegistrationTransaction;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IJythonPluginService;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMasterDataRegistrationTransaction;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataRegistrationException.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationException.java
similarity index 94%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataRegistrationException.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationException.java
index 1201c30f8d1..29c4fa999e2 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataRegistrationException.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.util.List;
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataRegistrationTransaction.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationTransaction.java
similarity index 87%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataRegistrationTransaction.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationTransaction.java
index 377f03b7517..f58ad184796 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataRegistrationTransaction.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataRegistrationTransaction.java
@@ -14,26 +14,26 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.util.ArrayList;
import java.util.List;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.DataType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IAbstractType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IDataSetType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IDataSetTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IExperimentType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IExperimentTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMasterDataRegistrationTransaction;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMaterialType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMaterialTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IPropertyAssignment;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IPropertyType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IPropertyTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.ISampleType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.ISampleTypeImmutable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.DataType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IAbstractType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IDataSetType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IDataSetTypeImmutable;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IExperimentType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IExperimentTypeImmutable;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMasterDataRegistrationTransaction;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMaterialType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMaterialTypeImmutable;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IPropertyAssignment;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IPropertyType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IPropertyTypeImmutable;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.ISampleType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.ISampleTypeImmutable;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataTransactionErrors.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataTransactionErrors.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataTransactionErrors.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataTransactionErrors.java
index c302b71990c..486a106616a 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MasterDataTransactionErrors.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MasterDataTransactionErrors.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IAbstractType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IPropertyAssignment;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IAbstractType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IPropertyAssignment;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MaterialType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MaterialType.java
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MaterialType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MaterialType.java
index 8c536a4a38d..a4f922dc233 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MaterialType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MaterialType.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMaterialType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMaterialType;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MaterialTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MaterialTypeImmutable.java
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MaterialTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MaterialTypeImmutable.java
index cd0161a4cdd..e7d10be1dc7 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/MaterialTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/MaterialTypeImmutable.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMaterialTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMaterialTypeImmutable;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyAssignment.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyAssignment.java
similarity index 93%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyAssignment.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyAssignment.java
index 73e63525a10..b5b3802e8bc 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyAssignment.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyAssignment.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IPropertyAssignment;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.NewETPTAssignment;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IPropertyAssignment;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyType.java
similarity index 86%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyType.java
index 144e05a6e31..45091916506 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyType.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.DataType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMaterialTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IPropertyType;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.DataType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMaterialTypeImmutable;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IPropertyType;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyTypeImmutable.java
similarity index 90%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyTypeImmutable.java
index b67c8722e94..ed86145785b 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/PropertyTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/PropertyTypeImmutable.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.DataType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IMaterialTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.IPropertyTypeImmutable;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataTypeCode;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.DataType;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IMaterialTypeImmutable;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.IPropertyTypeImmutable;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/SampleType.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/SampleType.java
similarity index 91%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/SampleType.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/SampleType.java
index 0d425985ace..c09fa2be1c9 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/SampleType.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/SampleType.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.ISampleType;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.ISampleType;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/SampleTypeImmutable.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/SampleTypeImmutable.java
similarity index 92%
rename from openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/SampleTypeImmutable.java
rename to openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/SampleTypeImmutable.java
index 2250e5d78b8..916390cd11f 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/SampleTypeImmutable.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/SampleTypeImmutable.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
-import ch.systemsx.cisd.openbis.plugin.jython.api.v1.ISampleTypeImmutable;
+import ch.systemsx.cisd.openbis.generic.client.jython.api.v1.ISampleTypeImmutable;
/**
* @author Kaloyan Enimanev
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptRunnerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptRunnerTest.java
similarity index 99%
rename from openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptRunnerTest.java
rename to openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptRunnerTest.java
index 4ea66a086df..65535b00929 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/JythonPluginScriptRunnerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/JythonPluginScriptRunnerTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.plugin.jython.api.v1.impl;
+package ch.systemsx.cisd.openbis.generic.client.jython.api.v1.impl;
import java.io.File;
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/simple-transaction.py b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/simple-transaction.py
similarity index 100%
rename from openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/jython/api/v1/impl/simple-transaction.py
rename to openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/jython/api/v1/impl/simple-transaction.py
--
GitLab