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 3a50420acc8c7e16c5a3ab9b0d1632b67730aa31..b07f30230685b58123bf425bef0c86206c61f6c8 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 51f82c65258cae9e7cd75f697edb928dec1bad53..c3e0b9f22ca584a6b22159e9c7aa5b85912b1e63 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 62f3fa4ed7a73553442a45c90c4950b1d52115d7..2dfe9a8705aa80b4f51247674ea9e1e5e1c83e48 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 a11bbe118530f20ac30f5f7797936935dec8003c..db2818c57e992fc229b632217a94c06072bf174d 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 e7549cdf603023b2b440c59af40b7305de9d0629..7140e364434875a775df197adedf6f209fd09a9d 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 e2edaa7cd622a48238cd01f6d3f5cec2f0acf8fa..90281b1fc37e786a14b70fa4531f6bd2d210e24e 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 0145e330ff4dced208273d87ea16bb396bd2e143..674c714bac5a7260e2b907cc5924c029ecf4df79 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 856554f35d58d42e15d60274a4b6dbb7986b3661..5d36cb36c9970315180d33fe5fc4ca93fd929f5f 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 b27ec17646f087798656bf144a1c40fcb7e7e891..b1e523efa8cd4350a83f8bab28272b38e74f143d 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 4eda39e0ff7c3db8002d895c5f4f94dc9826fdff..761f6a0e692e2df48d92d46fb046023a06c8d8a4 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 4e4c538620c1edf15a77b77f6c1a9a2fbc6a9f25..6bf184252817271e4bbc6f7d9c84b632ea8f4eb1 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 3d1eec878421c15fdf5cb8e73c6c4be1af727bb0..3dcd99ea344fcde8721555371540b8485d25a735 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 bcceac0f1ef2ed45c313f83d85212d6a225a27d6..f148842fa6a0df7dc2f6a239e0a615a6d7c61e91 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 abcd0a4a1be1ede325c0822e100968b483808ed0..112ecdf9c8a9f7a03027a9498a9d425b6d6b62cc 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 42883633b89ed5e6eccae7c7bbe7451e5f8d0dd1..f06d7e2a2cf702fc59baba0d0d0b9fcc15a4948a 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 2cb37f46ac59d5ba4d026df62f0bdb691d362527..2af460be9974126d89386e70c491363adb3c038c 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 d97b2ea80fcc3bdb947b833e04ced2e23d6a2b91..4ea4bfa7a786fe270a39b47b3c86cb554c059bcc 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 6b17a32429d5abc37261869034a0587b69e80b1a..f5009fd67da40b1eb8e30941d0eabfc5cddf9649 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 3784c2532144ee575283f053104b064df49929d5..cf4b715294549733b04a4a21b62806468d076732 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 4d26a777f36e91b316b5fb0226ed49e0137d8de3..cc60f0c7aae9279ca57ac70b18e2fc408bff76eb 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 0a908e625f8093c99e05774d93ffbb43370dd27c..8a2864efb3816569dab9c4a249a24825c6543323 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 daa88d08c2fb5ddc34020179c2b85ace2189de1e..f17fe80da43ec9ce84d3f19674edd02e68c52a54 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 4b0299ea7e8105e4bd63275a318d7601c8a69822..b338fee4750f41633aed0e9acd9e7fa70264f3b8 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 1201c30f8d1101c5c5ac4ea3fac11b9852359fdf..29c4fa999e2bef6fdbb6ba5f36f678e2664c0e65 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 377f03b751748fdf6159578f77c86e4931c50f02..f58ad1847968d55ae10d0c91216e6a8f2b7229b7 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 c302b71990c5f65cb4b569773f92140ba607eae4..486a106616a4718171eb1f6224aa4a2511412663 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 8c536a4a38db029c773bd73787b43c9161c8279c..a4f922dc2333dbb43cae0e60999487be334fc85d 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 cd0161a4cdddfd819e8331e7dfcbd42045a8dc36..e7d10be1dc720e0782d0cf5dc14410a788459e7b 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 73e63525a10e47685ab2955749a17d13ef452924..b5b3802e8bcf80f162bd563f6526198c2b9ac9e2 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 144e05a6e313dd03ccc45e9520f608cb23ae56f9..450919165069dc9e4b925b5dbdc9507bff8ded27 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 b67c8722e94d4923652033d03b2446ad30415504..ed86145785ba8450febbf72160ad479e5d8a1a0a 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 0d425985ace9a8a7ad6dbb862c4ac725a4851cf2..c09fa2be1c96b4a9c9bce260778deb5d7d03cce6 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 2250e5d78b8b65200025e57ce6415d43450fea75..916390cd11fb67a59c55ab4f236db8d045fc8a18 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 4ea66a086df0b863e5b2d91bb76eed3b35fc841c..65535b009295f127ca314f1146c1b168fb11b68a 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