From 65a4f9d0d82e7a1cdff2ab51e4c8f342ce755556 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 16 Nov 2009 13:42:56 +0000
Subject: [PATCH] add BuildAndEnvironmentInfo.class from the project calling
the jar target revert adding method getBuildAndApplicationInfo()
SVN: 13423
---
.../client/web/server/AbstractClientService.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
index 3f3899cfcad..d2530c03217 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/AbstractClientService.java
@@ -25,7 +25,6 @@ import javax.servlet.http.HttpSession;
import org.apache.log4j.Logger;
-import ch.systemsx.cisd.base.utilities.AbstractBuildAndEnvironmentInfo;
import ch.systemsx.cisd.common.exceptions.UserFailureException;
import ch.systemsx.cisd.common.logging.LogCategory;
import ch.systemsx.cisd.common.logging.LogFactory;
@@ -251,15 +250,6 @@ public abstract class AbstractClientService implements IClientService
/** Returns the {@link IServer} implementation for this client service. */
protected abstract IServer getServer();
- /**
- * Returns the appropriate build and environment info. This method should be overridden in
- * subclasses of custom openBIS projects.
- */
- protected AbstractBuildAndEnvironmentInfo getBuildAndApplicationInfo()
- {
- return BuildAndEnvironmentInfo.INSTANCE;
- }
-
//
// IClientService
//
@@ -267,7 +257,7 @@ public abstract class AbstractClientService implements IClientService
public final ApplicationInfo getApplicationInfo()
{
final ApplicationInfo applicationInfo = new ApplicationInfo();
- applicationInfo.setVersion(getBuildAndApplicationInfo().getFullVersion());
+ applicationInfo.setVersion(BuildAndEnvironmentInfo.INSTANCE.getFullVersion());
applicationInfo.setCIFEXURL(cifexURL);
applicationInfo.setCifexRecipient(cifexRecipient);
return applicationInfo;
--
GitLab