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/impl/DataSetDss.java
index d285ce53aa772c87bd3c50703913e6e2f8ce21c0..76a95c35f951c0547b165357b18eb930ac808de3 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/impl/DataSetDss.java
@@ -21,7 +21,7 @@ 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.FileInfoDss;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcV1;
+import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcGeneric;
/**
* @author Chandrasekhar Ramakrishnan
@@ -30,13 +30,13 @@ public class DataSetDss implements IDataSetDss
{
private final String code;
- private final IDssServiceRpcV1 service;
+ private final IDssServiceRpcGeneric service;
private final AuthenticatedState parent;
// private String ownerUrl;
- public DataSetDss(String code, IDssServiceRpcV1 service, AuthenticatedState parent)
+ public DataSetDss(String code, IDssServiceRpcGeneric service, AuthenticatedState parent)
{
this.code = code;
this.service = service;
@@ -60,7 +60,7 @@ public class DataSetDss implements IDataSetDss
return parent.listFiles(this, startPath, isRecursive);
}
- IDssServiceRpcV1 getService()
+ IDssServiceRpcGeneric getService()
{
return service;
}
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/impl/DssComponent.java
index 57407364453341557ea188e963f46b2a21f6412e..961ace6cfecc4fe333650094db8a382087e19a65 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/impl/DssComponent.java
@@ -32,7 +32,7 @@ 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.DssServiceRpcInterface;
import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDss;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcV1;
+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;
@@ -241,7 +241,7 @@ class AuthenticatedState extends AbstractDssComponentState
String url = dataStore.getDownloadUrl();
- IDssServiceRpcV1 dssService = getDssServiceForUrl(url);
+ IDssServiceRpcGeneric dssService = getDssServiceForUrl(url);
// Return a proxy to the data set
return new DataSetDss(code, dssService, this);
@@ -271,13 +271,13 @@ class AuthenticatedState extends AbstractDssComponentState
/**
* Create a connection to the DSS server referenced by url
*/
- private IDssServiceRpcV1 getDssServiceForUrl(String url)
+ private IDssServiceRpcGeneric getDssServiceForUrl(String url)
{
// Get an RPC service for the DSS server
String serverURL = url;
try
{
- IDssServiceRpcV1 dssService = basicGetDssServiceForUrl(serverURL);
+ IDssServiceRpcGeneric dssService = basicGetDssServiceForUrl(serverURL);
return dssService;
} catch (RemoteAccessException e)
{
@@ -286,7 +286,7 @@ class AuthenticatedState extends AbstractDssComponentState
{
// https:// has 8 characters
serverURL = "http://" + serverURL.substring(8);
- IDssServiceRpcV1 dssService = basicGetDssServiceForUrl(serverURL);
+ IDssServiceRpcGeneric dssService = basicGetDssServiceForUrl(serverURL);
return dssService;
}
@@ -298,9 +298,9 @@ class AuthenticatedState extends AbstractDssComponentState
/**
* A less sophisticated implementation of getDssServiceForUrl
*/
- private IDssServiceRpcV1 basicGetDssServiceForUrl(String serverURL)
+ private IDssServiceRpcGeneric basicGetDssServiceForUrl(String serverURL)
{
- IDssServiceRpcV1 dssService = null;
+ IDssServiceRpcGeneric dssService = null;
DssServiceRpcInterface[] ifaces =
dssServiceFactory.getSupportedInterfaces(serverURL, false);
for (DssServiceRpcInterface iface : ifaces)
@@ -308,7 +308,7 @@ class AuthenticatedState extends AbstractDssComponentState
if (V1_INTERFACE_NAME.equals(iface.getInterfaceName()))
{
dssService =
- dssServiceFactory.getService(iface, IDssServiceRpcV1.class, serverURL,
+ dssServiceFactory.getService(iface, IDssServiceRpcGeneric.class, serverURL,
false);
break;
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcGeneric.java
similarity index 92%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcGeneric.java
index 1e8f74fe909d0cf4df1e73f646478410aa3aee77..432a62125cf5f57c928a1efb2b0fcf7d39500c63 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcGeneric.java
@@ -26,14 +26,16 @@ import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDss;
import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssBuilder;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcV1;
+import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcGeneric;
/**
+ * Implementation of the generic RPC interface.
+ *
* @author Chandrasekhar Ramakrishnan
*/
-public class DssServiceRpcV1 extends AbstractDssServiceRpc implements IDssServiceRpcV1
+public class DssServiceRpcGeneric extends AbstractDssServiceRpc implements IDssServiceRpcGeneric
{
- public DssServiceRpcV1(IEncapsulatedOpenBISService openBISService)
+ public DssServiceRpcGeneric(IEncapsulatedOpenBISService openBISService)
{
super(openBISService);
operationLog.info("Started RPC V1 service.");
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java
index db15a3004a79a3229907a00ed82c69547a225f31..a800ed4ba7171d3b8c84646d8d06914cc8be91eb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/client/DssServiceRpcFactory.java
@@ -233,7 +233,7 @@ class SslCertificateHelper
keyStore.load(null, null);
for (int i = 0; i < certificates.length; i++)
{
- keyStore.setCertificateEntry("cifex" + i, certificates[i]);
+ keyStore.setCertificateEntry("dss" + i, certificates[i]);
}
} catch (Exception ex)
{
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcV1.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcGeneric.java
similarity index 94%
rename from datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcV1.java
rename to datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcGeneric.java
index 186dae891b2329ad8a887520dde9766b50ddd484..8b867c90c94977d182313f97597080c457f1afcb 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcV1.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/rpc/shared/IDssServiceRpcGeneric.java
@@ -21,9 +21,11 @@ import java.io.InputStream;
import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
/**
+ * Generic functionality for interacting with the DSS.
+ *
* @author Chandrasekhar Ramakrishnan
*/
-public interface IDssServiceRpcV1 extends IDssServiceRpc
+public interface IDssServiceRpcGeneric extends IDssServiceRpc
{
//
// Protocol versioning
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/impl/DssComponentTest.java
index e8ef40f61cb3a75f6e85130b46da8a3e6fd505bc..297140da63a6c0ea4528f150d3335e6881ffeac9 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/impl/DssComponentTest.java
@@ -36,7 +36,7 @@ import ch.systemsx.cisd.openbis.dss.rpc.client.IDssServiceRpcFactory;
import ch.systemsx.cisd.openbis.dss.rpc.shared.DssServiceRpcInterface;
import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDss;
import ch.systemsx.cisd.openbis.dss.rpc.shared.FileInfoDssBuilder;
-import ch.systemsx.cisd.openbis.dss.rpc.shared.IDssServiceRpcV1;
+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;
@@ -149,7 +149,7 @@ public class DssComponentTest extends AbstractFileSystemTestCase
DataStore dataStore = new DataStore();
dataStore.setDownloadUrl(DUMMY_DSS_URL);
dataSetExternalData.setDataStore(dataStore);
- final IDssServiceRpcV1 dssService = context.mock(IDssServiceRpcV1.class);
+ final IDssServiceRpcGeneric dssService = context.mock(IDssServiceRpcGeneric.class);
ArrayList<FileInfoDss> list = new ArrayList<FileInfoDss>();
FileInfoDssBuilder builder = new FileInfoDssBuilder(workingDirectory.getCanonicalPath());
builder.appendFileInfosForFile(workingDirectory, list, true);
@@ -173,7 +173,7 @@ public class DssComponentTest extends AbstractFileSystemTestCase
will(returnValue(dataSetExternalData));
allowing(dssServiceFactory).getSupportedInterfaces(DUMMY_DSS_URL, false);
will(returnValue(ifaces));
- allowing(dssServiceFactory).getService(iface, IDssServiceRpcV1.class,
+ allowing(dssServiceFactory).getService(iface, IDssServiceRpcGeneric.class,
DUMMY_DSS_URL, false);
will(returnValue(dssService));
allowing(dssService).listFilesForDataSet(DUMMY_SESSSION_TOKEN, dataSetCode,
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 585d528d4ce68c116a846c47177574681daf1956..d74f4cc4881d93ee026618c890df1faee75c3006 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
@@ -42,7 +42,7 @@ public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
{
private Mockery context;
- private DssServiceRpcV1 rpcService;
+ private DssServiceRpcGeneric rpcService;
private IEncapsulatedOpenBISService openBisService;
@@ -59,7 +59,7 @@ public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
super.setUp();
context = new Mockery();
openBisService = context.mock(IEncapsulatedOpenBISService.class);
- rpcService = new DssServiceRpcV1(openBisService);
+ rpcService = new DssServiceRpcGeneric(openBisService);
rpcService.setStoreDirectory(workingDirectory);
initializeDirectories();
}