LMS-1505 Added version numbers to DSS API.

SVN: 15893

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" />

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/AbstractCommand.java → 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.

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactory.java → 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;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandGet.java → 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.

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandHelp.java → 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;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandLs.java → 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.

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/DssClient.java → 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;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/GlobalArguments.java → 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;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/ICommand.java → 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;
 

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssBuilder.java → 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;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/FileInfoDssDTO.java → 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;
 

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcGeneric.java → 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;
 

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/DssComponentFactory.java → 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.

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDataSetDss.java → 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

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/IDssComponent.java → 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;

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DataSetDss.java → 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

datastore_server/source/java/ch/systemsx/cisd/openbis/dss/component/impl/DssComponent.java → 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;

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;
 
 /**

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.

datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/rpc/client/cli/CommandFactoryTest.java → 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
  */