From 0158056f8d7d5d58a7ee904c807d308739b379d9 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sun, 8 Nov 2009 16:37:00 +0000
Subject: [PATCH] [LMS-1254] change: replace
RPCServiceFactory.createServiceProxy() with
RPCServiceFactory.createCIFEXComponent() in DSS
SVN: 13263
---
.../openbis/dss/generic/server/DataStoreService.java | 6 +++---
.../dss/generic/server/ICIFEXRPCServiceFactory.java | 6 +++---
.../openbis/dss/generic/server/UploadingCommand.java | 10 +++++-----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java
index 2129a1278d9..3f6150ce92c 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/DataStoreService.java
@@ -25,7 +25,7 @@ import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.InitializingBean;
import ch.systemsx.cisd.base.exceptions.IOExceptionUnchecked;
-import ch.systemsx.cisd.cifex.rpc.ICIFEXRPCService;
+import ch.systemsx.cisd.cifex.rpc.client.ICIFEXComponent;
import ch.systemsx.cisd.common.exceptions.InvalidAuthenticationException;
import ch.systemsx.cisd.common.exceptions.InvalidSessionException;
import ch.systemsx.cisd.common.spring.AbstractServiceWithLogger;
@@ -176,10 +176,10 @@ public class DataStoreService extends AbstractServiceWithLogger<IDataStoreServic
ICIFEXRPCServiceFactory serviceFactory =
createCIFEXRPCServiceFactory(context.getCifexURL());
- ICIFEXRPCService service = serviceFactory.createService();
+ ICIFEXComponent cifex = serviceFactory.createCIFEXComponent();
String userID = context.getUserID();
String password = context.getPassword();
- if (service.login(userID, password) == null)
+ if (cifex.login(userID, password) == null)
{
throw new InvalidSessionException("User couldn't be authenticated at CIFEX.");
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java
index 4414a198317..65c310c054b 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/ICIFEXRPCServiceFactory.java
@@ -18,14 +18,14 @@ package ch.systemsx.cisd.openbis.dss.generic.server;
import java.io.Serializable;
-import ch.systemsx.cisd.cifex.rpc.ICIFEXRPCService;
+import ch.systemsx.cisd.cifex.rpc.client.ICIFEXComponent;
/**
- *
+ * Factory for {@link ICIFEXComponent}.
*
* @author Franz-Josef Elmer
*/
public interface ICIFEXRPCServiceFactory extends Serializable
{
- public ICIFEXRPCService createService();
+ public ICIFEXComponent createCIFEXComponent();
}
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java
index 29af549f840..1375fbe8c0f 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/UploadingCommand.java
@@ -37,8 +37,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import ch.rinn.restrictions.Private;
-import ch.systemsx.cisd.cifex.rpc.ICIFEXRPCService;
-import ch.systemsx.cisd.cifex.rpc.client.Uploader;
+import ch.systemsx.cisd.cifex.rpc.client.ICIFEXComponent;
+import ch.systemsx.cisd.cifex.rpc.client.ICIFEXUploader;
import ch.systemsx.cisd.cifex.rpc.client.gui.IProgressListener;
import ch.systemsx.cisd.cifex.shared.basic.Constants;
import ch.systemsx.cisd.common.logging.LogCategory;
@@ -297,9 +297,9 @@ class UploadingCommand implements IDataSetCommand
operationLog.info("Zip file " + zipFile + " with " + dataSets.size()
+ " data sets has been successfully created.");
}
- ICIFEXRPCService cifexService = cifexServiceFactory.createService();
- String sessionToken = cifexService.login(userID, password);
- Uploader uploader = new Uploader(cifexService, sessionToken);
+ ICIFEXComponent cifex = cifexServiceFactory.createCIFEXComponent();
+ String sessionToken = cifex.login(userID, password);
+ ICIFEXUploader uploader = cifex.createUploader(sessionToken);
uploader.addProgressListener(new ProgressListener(zipFile));
uploader.upload(Arrays.asList(zipFile), Constants.USER_ID_PREFIX + userID, comment);
} else
--
GitLab