From 42d40841fa9dd34b8cc550b01d19d301c3f42559 Mon Sep 17 00:00:00 2001
From: cramakri <cramakri>
Date: Tue, 11 May 2010 08:35:29 +0000
Subject: [PATCH] LMS-1505 Added version numbers to DSS API.
SVN: 15893
---
datastore_server/build/build.xml | 2 +-
.../dss/{rpc => api}/client/cli/AbstractCommand.java | 8 ++++----
.../dss/{rpc => api}/client/cli/CommandFactory.java | 2 +-
.../dss/{rpc => api}/client/cli/CommandGet.java | 8 ++++----
.../dss/{rpc => api}/client/cli/CommandHelp.java | 2 +-
.../dss/{rpc => api}/client/cli/CommandLs.java | 8 ++++----
.../dss/{rpc => api}/client/cli/DssClient.java | 2 +-
.../dss/{rpc => api}/client/cli/GlobalArguments.java | 2 +-
.../openbis/dss/{rpc => api}/client/cli/ICommand.java | 2 +-
.../{rpc => api/v1}/shared/FileInfoDssBuilder.java | 2 +-
.../dss/{rpc => api/v1}/shared/FileInfoDssDTO.java | 2 +-
.../{rpc => api/v1}/shared/IDssServiceRpcGeneric.java | 2 +-
.../dss/component/{ => v1}/DssComponentFactory.java | 4 ++--
.../openbis/dss/component/{ => v1}/IDataSetDss.java | 4 ++--
.../openbis/dss/component/{ => v1}/IDssComponent.java | 2 +-
.../dss/component/{ => v1}/impl/DataSetDss.java | 8 ++++----
.../dss/component/{ => v1}/impl/DssComponent.java | 10 +++++-----
.../openbis/dss/generic/server/DataStoreServer.java | 2 +-
.../dss/generic/server/DssServiceRpcGeneric.java | 6 +++---
.../{rpc => api}/client/cli/CommandFactoryTest.java | 7 ++++++-
.../{rpc => api}/client/cli/GlobalArgumentsTest.java | 3 ++-
.../dss/component/{ => v1}/impl/DssComponentTest.java | 11 ++++++-----
.../{ => v1}/impl/DssComponentTestClient.java | 4 +++-
.../dss/generic/server/DssServiceRpcV1Test.java | 2 +-
24 files changed, 57 insertions(+), 48 deletions(-)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/AbstractCommand.java (91%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/CommandFactory.java (97%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/CommandGet.java (95%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/CommandHelp.java (97%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/CommandLs.java (93%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/DssClient.java (99%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/GlobalArguments.java (98%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/ICommand.java (97%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api/v1}/shared/FileInfoDssBuilder.java (98%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api/v1}/shared/FileInfoDssDTO.java (98%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/{rpc => api/v1}/shared/IDssServiceRpcGeneric.java (97%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/{ => v1}/DssComponentFactory.java (92%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/{ => v1}/IDataSetDss.java (93%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/{ => v1}/IDssComponent.java (97%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/{ => v1}/impl/DataSetDss.java (86%)
rename datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/{ => v1}/impl/DssComponent.java (97%)
rename datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/CommandFactoryTest.java (84%)
rename datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/{rpc => api}/client/cli/GlobalArgumentsTest.java (96%)
rename datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/{ => v1}/impl/DssComponentTest.java (95%)
rename datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/component/{ => v1}/impl/DssComponentTestClient.java (92%)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 6173ef4e698..9a22d759f16 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 577fa5b1ec8..04e9d25db0d 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 cb360febe99..1233e5f4235 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 99c33ddb108..cc32bf2a920 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 30ea4038395..9d08c9e4b19 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 f62dc108a1a..6cd10444a0e 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 9f760ca84dc..226e493b775 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 95c3f43ba45..d5ef4679332 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 3b7bd6a1b7a..6b9932157df 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 a01679fe140..6a40ba3d5c0 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 0ec67dd8ae4..41a9c950461 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 cafe217857c..09e5efd1a3b 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 aaad87287e7..0166b9a06b7 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 54770b82cb2..b7f881b79ef 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 f3f2229381b..381f9420b35 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 c4da886f11c..6ff5a6e4130 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 55170179799..2ac11198257 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 9b9ef96de4b..a789351316b 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 3a918e3c6d1..2e6ca6f83cb 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 f2d6a9c31ee..7780621e454 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 839596cd21b..c02111f1b66 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 c473f2c27eb..9edac95645d 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 afee477100a..ba3a577018c 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 0a23ca0fc23..c9a675f1612 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;
/**
--
GitLab