diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 6173ef4e6986101da9a75b35182bd7f33bee36db..9a22d759f16b37a30e37413017ff34e33b6dbd5e 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -151,7 +151,7 @@
<include name="${build.info.filename}" />
</fileset>
<manifest>
- <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.rpc.client.cli.DssClient" />
+ <attribute name="Main-Class" value="ch.systemsx.cisd.openbis.dss.api.client.cli.DssClient" />
<attribute name="Class-Path"
value="cisd-base.jar cisd-args4j.jar stream-supporting-httpinvoker.jar log4j.jar commons-lang.jar commons-io.jar commons-logging.jar
commons-codec.jar commons-httpclient.jar spring.jar" />
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/AbstractCommand.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/AbstractCommand.java
similarity index 91%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/AbstractCommand.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/AbstractCommand.java
index 577fa5b1ec855ac8a463b026318e769e4f78ea09..04e9d25db0ddc2bc95153960155a51573914b2ca 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/AbstractCommand.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/AbstractCommand.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import java.io.PrintStream;
import ch.systemsx.cisd.args4j.CmdLineParser;
import ch.systemsx.cisd.args4j.ExampleMode;
-import ch.systemsx.cisd.openbis.dss.component.IDataSetDss;
-import ch.systemsx.cisd.openbis.dss.component.IDssComponent;
-import ch.systemsx.cisd.openbis.dss.component.impl.DssComponent;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDataSetDss;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDssComponent;
+import ch.systemsx.cisd.openbis.dss.component.v1.impl.DssComponent;
/**
* Superclass for dss command-line client commands.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandFactory.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactory.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandFactory.java
index cb360febe997d4e597f68e57469964c47ed1212e..1233e5f4235a98d3cbdd64a869d8b0a84c8bfaa1 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandFactory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import java.util.Arrays;
import java.util.List;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandGet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandGet.java
similarity index 95%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandGet.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandGet.java
index 99c33ddb10856c09d573ca4d3b67efbb543dc75e..cc32bf2a920de886cd56dd857f14a28fc5646a84 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandGet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandGet.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import java.io.File;
import java.io.FileOutputStream;
@@ -28,9 +28,9 @@ import ch.systemsx.cisd.args4j.Option;
import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.openbis.dss.component.IDataSetDss;
-import ch.systemsx.cisd.openbis.dss.component.IDssComponent;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDataSetDss;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDssComponent;
/**
* Comand that lists files in the data set.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandHelp.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandHelp.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandHelp.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandHelp.java
index 30ea4038395b75ae6fa52f8892312af30b6a14d8..9d08c9e4b198d65b0bd1afcf8648aa60a89b91fd 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandHelp.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandHelp.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import java.io.PrintStream;
import java.util.List;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandLs.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandLs.java
similarity index 93%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandLs.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandLs.java
index f62dc108a1a07407684ec6d4b6f514bf5e78c117..6cd10444a0e80e62d9fc7d51c6557dfa4c5e7b49 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandLs.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandLs.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import ch.systemsx.cisd.args4j.CmdLineParser;
import ch.systemsx.cisd.args4j.Option;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
-import ch.systemsx.cisd.openbis.dss.component.IDataSetDss;
-import ch.systemsx.cisd.openbis.dss.component.IDssComponent;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDataSetDss;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDssComponent;
/**
* Comand that lists files in the data set.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/DssClient.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/DssClient.java
similarity index 99%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/DssClient.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/DssClient.java
index 9f760ca84dc0d1896f033bb29356a93a0c75f702..226e493b775be0e9e1ee617dfaf576127ce624ea 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/DssClient.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/DssClient.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import java.net.UnknownHostException;
import java.util.Arrays;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/GlobalArguments.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/GlobalArguments.java
similarity index 98%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/GlobalArguments.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/GlobalArguments.java
index 95c3f43ba45c05d611226a3413cc5d0c7a84e8e2..d5ef4679332d0f765a1aabfa355ac1dbf85f6c3e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/GlobalArguments.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/GlobalArguments.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import java.util.ArrayList;
import java.util.List;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/ICommand.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/ICommand.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/ICommand.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/ICommand.java
index 3b7bd6a1b7af980cb5b115ca0590a47d41fd43b3..6b9932157df358b957db074d0b9b3e51ec317cfd 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/ICommand.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/client/cli/ICommand.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import java.io.PrintStream;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssBuilder.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/FileInfoDssBuilder.java
similarity index 98%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssBuilder.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/FileInfoDssBuilder.java
index a01679fe140008a9c8fc21ea70cc304e4121146d..6a40ba3d5c0f8b9cdb986f4f9300a84297118ccd 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssBuilder.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/FileInfoDssBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.shared;
+package ch.systemsx.cisd.openbis.dss.api.v1.shared;
import java.io.File;
import java.io.IOException;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssDTO.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/FileInfoDssDTO.java
similarity index 98%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssDTO.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/FileInfoDssDTO.java
index 0ec67dd8ae428cb3b182c1427559860fa4872968..41a9c95046173b143caa2c70cdfcf619d0f29b1a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssDTO.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/FileInfoDssDTO.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.shared;
+package ch.systemsx.cisd.openbis.dss.api.v1.shared;
import java.io.Serializable;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcGeneric.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/IDssServiceRpcGeneric.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcGeneric.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/IDssServiceRpcGeneric.java
index cafe217857c51859ba16823f1f16f5f4078b6dd1..09e5efd1a3ba338b07c3c055554b0e56db1aa30e 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcGeneric.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/api/v1/shared/IDssServiceRpcGeneric.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.shared;
+package ch.systemsx.cisd.openbis.dss.api.v1.shared;
import java.io.InputStream;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/DssComponentFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/DssComponentFactory.java
similarity index 92%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/DssComponentFactory.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/DssComponentFactory.java
index aaad87287e795884461c64ec6f66ab30c9a59861..0166b9a06b71fd910453b98446c7063e0563d03d 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/DssComponentFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/DssComponentFactory.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.component;
+package ch.systemsx.cisd.openbis.dss.component.v1;
-import ch.systemsx.cisd.openbis.dss.component.impl.DssComponent;
+import ch.systemsx.cisd.openbis.dss.component.v1.impl.DssComponent;
/**
* A class that creates DssComponents.
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDataSetDss.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/IDataSetDss.java
similarity index 93%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDataSetDss.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/IDataSetDss.java
index 54770b82cb2432032ec50e3b14734b0b50251cab..b7f881b79efebc83b87e1618b953eabe15a3eac5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDataSetDss.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/IDataSetDss.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.component;
+package ch.systemsx.cisd.openbis.dss.component.v1;
import java.io.InputStream;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
/**
* The representation of a Data Set managed by a DSS server. It is safe to use instances in multiple
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/IDssComponent.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDssComponent.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/IDssComponent.java
index f3f2229381baf58e569200a561e45daba6154690..381f9420b357e3a039f03b06a257f19530a69f3b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/IDssComponent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.component;
+package ch.systemsx.cisd.openbis.dss.component.v1;
import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DataSetDss.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DataSetDss.java
similarity index 86%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DataSetDss.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DataSetDss.java
index c4da886f11c072b12ca275b243fb7b5fd7326419..6ff5a6e41300d04a0a54d730f2e58ba54cde970a 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DataSetDss.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DataSetDss.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.component.impl;
+package ch.systemsx.cisd.openbis.dss.component.v1.impl;
import java.io.InputStream;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
-import ch.systemsx.cisd.openbis.dss.component.IDataSetDss;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcGeneric;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.IDssServiceRpcGeneric;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDataSetDss;
/**
* @author Chandrasekhar Ramakrishnan
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponent.java
similarity index 97%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponent.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponent.java
index 55170179799cba2a39d659554f7ae2171baa16e7..2ac11198257063db849d580e361e31e96b071a34 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponent.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.component.impl;
+package ch.systemsx.cisd.openbis.dss.component.v1.impl;
import java.io.InputStream;
import java.util.List;
@@ -29,12 +29,12 @@ import ch.systemsx.cisd.common.exceptions.EnvironmentFailureException;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.spring.HttpInvokerUtils;
-import ch.systemsx.cisd.openbis.dss.component.IDataSetDss;
-import ch.systemsx.cisd.openbis.dss.component.IDssComponent;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.IDssServiceRpcGeneric;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDataSetDss;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDssComponent;
import ch.systemsx.cisd.openbis.dss.rpc.client.DssServiceRpcFactory;
import ch.systemsx.cisd.openbis.dss.rpc.client.IDssServiceRpcFactory;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcGeneric;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
index 9b9ef96de4b4b3ab566532c9cd9a95566990cca3..a789351316bbaa69cdf0996933907dc4c36a1311 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreServer.java
@@ -52,11 +52,11 @@ import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.common.logging.LogInitializer;
import ch.systemsx.cisd.common.utilities.ExtendedProperties;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.IDssServiceRpcGeneric;
import ch.systemsx.cisd.openbis.dss.generic.server.ConfigParameters.PluginServlet;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider;
import ch.systemsx.cisd.openbis.dss.generic.shared.utils.DssPropertyParametersUtil;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcGeneric;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
/**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcGeneric.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcGeneric.java
index 3a918e3c6d18903d25e72c5a652c03ced59947fe..2e6ca6f83cb2438bb96178c805bad39eaf95a4da 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcGeneric.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcGeneric.java
@@ -23,10 +23,10 @@ import java.io.InputStream;
import java.util.ArrayList;
import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssBuilder;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.IDssServiceRpcGeneric;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssBuilder;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcGeneric;
/**
* Implementation of the generic RPC interface.
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactoryTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandFactoryTest.java
similarity index 84%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactoryTest.java
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandFactoryTest.java
index f2d6a9c31ee12aff7122131ed087c0f34523cf88..7780621e45426a7310ff30bd39a1f0e7c5ccb5d8 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactoryTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/api/client/cli/CommandFactoryTest.java
@@ -14,12 +14,17 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import org.testng.AssertJUnit;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
+import ch.systemsx.cisd.openbis.dss.api.client.cli.CommandFactory;
+import ch.systemsx.cisd.openbis.dss.api.client.cli.CommandGet;
+import ch.systemsx.cisd.openbis.dss.api.client.cli.CommandLs;
+import ch.systemsx.cisd.openbis.dss.api.client.cli.ICommand;
+
/**
* @author Chandrasekhar Ramakrishnan
*/
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/GlobalArgumentsTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/api/client/cli/GlobalArgumentsTest.java
similarity index 96%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/GlobalArgumentsTest.java
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/api/client/cli/GlobalArgumentsTest.java
index 839596cd21be8c68760c9940f46369f3496cc20e..c02111f1b6683ecc2dbf8ce895679a41b0c253c9 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/GlobalArgumentsTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/api/client/cli/GlobalArgumentsTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.rpc.client.cli;
+package ch.systemsx.cisd.openbis.dss.api.client.cli;
import org.testng.AssertJUnit;
import org.testng.annotations.BeforeMethod;
@@ -22,6 +22,7 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.args4j.CmdLineException;
import ch.systemsx.cisd.args4j.CmdLineParser;
+import ch.systemsx.cisd.openbis.dss.api.client.cli.GlobalArguments;
/**
* @author Chandrasekhar Ramakrishnan
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponentTest.java
similarity index 95%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponentTest.java
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponentTest.java
index c473f2c27ebffe73e4940e838f40b8edaff9e00f..9edac95645d09cfdb237c192dd1201163cc47715 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponentTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.component.impl;
+package ch.systemsx.cisd.openbis.dss.component.v1.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -33,11 +33,12 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
import ch.systemsx.cisd.common.api.RpcServiceInterfaceDTO;
import ch.systemsx.cisd.common.api.RpcServiceInterfaceVersionDTO;
-import ch.systemsx.cisd.openbis.dss.component.IDataSetDss;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssBuilder;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.IDssServiceRpcGeneric;
+import ch.systemsx.cisd.openbis.dss.component.v1.IDataSetDss;
+import ch.systemsx.cisd.openbis.dss.component.v1.impl.DssComponent;
import ch.systemsx.cisd.openbis.dss.rpc.client.IDssServiceRpcFactory;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssBuilder;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcGeneric;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponentTestClient.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponentTestClient.java
similarity index 92%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponentTestClient.java
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponentTestClient.java
index afee477100a8e8a368064d08b04de8892d6ece1b..ba3a577018c649d790886e722fee4fd57f347704 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponentTestClient.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/v1/impl/DssComponentTestClient.java
@@ -14,12 +14,14 @@
* limitations under the License.
*/
-package ch.systemsx.cisd.openbis.dss.component.impl;
+package ch.systemsx.cisd.openbis.dss.component.v1.impl;
import java.util.Properties;
import org.apache.log4j.PropertyConfigurator;
+import ch.systemsx.cisd.openbis.dss.component.v1.impl.DssComponent;
+
/**
* @author Chandrasekhar Ramakrishnan
*/
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
index 0a23ca0fc23c3ced83e97d94a50e08cacd0cc40f..c9a675f16125841e6b73114d412eabcab17c7149 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
@@ -30,9 +30,9 @@ import org.testng.annotations.Test;
import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
+import ch.systemsx.cisd.openbis.dss.api.v1.shared.FileInfoDssDTO;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.utils.DatasetLocationUtil;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssDTO;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DatabaseInstance;
/**