From 3b1a89f87f036c9155d92ce2e47714a94ca541dc Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 17 May 2010 13:44:29 +0000
Subject: [PATCH] LMS-1527 Refactoring: Moving stuff from OpenBisServiceFactory
to a new class: ServiceFinder in project server-common
SVN: 16000
---
.../cisd/openbis/dss/client/api/v1/impl/DssComponent.java | 5 ++---
.../dss/generic/server/EncapsulatedOpenBISService.java | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
index 039e04ca6fa..4cdbcc43e33 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/client/api/v1/impl/DssComponent.java
@@ -32,9 +32,9 @@ import ch.systemsx.cisd.openbis.dss.client.api.v1.IDataSetDss;
import ch.systemsx.cisd.openbis.dss.client.api.v1.IDssComponent;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.FileInfoDssDTO;
import ch.systemsx.cisd.openbis.dss.generic.shared.api.v1.IDssServiceRpcGeneric;
-import ch.systemsx.cisd.openbis.generic.shared.DefaultLimsServiceStubFactory;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.OpenBisServiceFactory;
+import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataStore;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ExternalData;
import ch.systemsx.cisd.openbis.generic.shared.dto.SessionContextDTO;
@@ -100,8 +100,7 @@ public class DssComponent implements IDssComponent
private static IETLLIMSService createOpenBisService(String openBISURL)
{
- return new OpenBisServiceFactory(openBISURL, new DefaultLimsServiceStubFactory())
- .createService();
+ return new OpenBisServiceFactory(openBISURL, ResourceNames.ETL_SERVICE_URL).createService();
}
/**
diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
index 8478db5b6e3..ef838f78b33 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/EncapsulatedOpenBISService.java
@@ -29,9 +29,9 @@ import ch.systemsx.cisd.common.logging.LogFactory;
import ch.systemsx.cisd.openbis.dss.generic.server.plugins.tasks.PluginTaskProviders;
import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService;
import ch.systemsx.cisd.openbis.dss.generic.shared.dto.DataSetInformation;
-import ch.systemsx.cisd.openbis.generic.shared.DefaultLimsServiceStubFactory;
import ch.systemsx.cisd.openbis.generic.shared.IETLLIMSService;
import ch.systemsx.cisd.openbis.generic.shared.OpenBisServiceFactory;
+import ch.systemsx.cisd.openbis.generic.shared.ResourceNames;
import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ArchiverDataSetCriteria;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DataSetArchivingStatus;
@@ -106,8 +106,7 @@ public final class EncapsulatedOpenBISService implements IEncapsulatedOpenBISSer
private static IETLLIMSService createOpenBisService(String openBISURL)
{
- return new OpenBisServiceFactory(openBISURL, new DefaultLimsServiceStubFactory())
- .createService();
+ return new OpenBisServiceFactory(openBISURL, ResourceNames.ETL_SERVICE_URL).createService();
}
public EncapsulatedOpenBISService(SessionTokenManager sessionTokenManager, String serverURL,
--
GitLab