From 8e3d0607a865fa4be6c6fe2a415281a684d3b2f7 Mon Sep 17 00:00:00 2001
From: tpylak <tpylak>
Date: Tue, 9 Feb 2010 10:25:54 +0000
Subject: [PATCH] minor: constant refactoring
SVN: 14645
---
.../systemsx/cisd/openbis/generic/server/AbstractServer.java | 4 +++-
.../systemsx/cisd/openbis/generic/server/ComponentNames.java | 4 +---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
index bb41a7adb08..557f641f1a5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/AbstractServer.java
@@ -66,6 +66,7 @@ public abstract class AbstractServer<T extends IServer> extends AbstractServiceW
// For testing purpose.
private ISampleTypeSlaveServerPlugin sampleTypeSlaveServerPlugin;
+ // For testing purpose.
private IDataSetTypeSlaveServerPlugin dataSetTypeSlaveServerPlugin;
@Resource(name = ComponentNames.SESSION_MANAGER)
@@ -74,7 +75,8 @@ public abstract class AbstractServer<T extends IServer> extends AbstractServiceW
@Resource(name = ComponentNames.DAO_FACTORY)
private IDAOFactory daoFactory;
- @Resource(name = ComponentNames.COMMON_SERVICE)
+ // NOTE: we use the fact that the COMMON_SERVICE configured in XML implements provider interface
+ @Resource(name = ch.systemsx.cisd.openbis.generic.shared.ResourceNames.COMMON_SERVICE)
protected IDataStoreBaseURLProvider dataStoreBaseURLProvider;
protected AbstractServer()
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
index 50210f0cae2..5199e057b91 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/ComponentNames.java
@@ -36,10 +36,8 @@ public final class ComponentNames
public static final String LOG_INTERCEPTOR = "log-interceptor";
public static final String DAO_FACTORY = "dao-factory";
-
+
public static final String DSS_FACTORY = "dss-factory";
public static final String COMMON_BUSINESS_OBJECT_FACTORY = "common-business-object-factory";
-
- public static final String COMMON_SERVICE = "common-service";
}
--
GitLab