From 71f440ccafaacb6c04b571a1d01ec9e570ee49eb Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Wed, 28 Jul 2010 09:57:42 +0000
Subject: [PATCH] change: move minor version number from IScreeningApiServer to
 ScreeningServer to avoid mis-understandings

SVN: 17257
---
 .../openbis/plugin/screening/server/ScreeningServer.java     | 5 +++++
 .../plugin/screening/server/ScreeningServerLogger.java       | 2 +-
 .../plugin/screening/shared/api/v1/IScreeningApiServer.java  | 5 -----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
index eb50ebef70b..8acbd0242e8 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServer.java
@@ -72,6 +72,11 @@ import ch.systemsx.cisd.openbis.plugin.screening.shared.basic.dto.WellContent;
 public final class ScreeningServer extends AbstractServer<IScreeningServer> implements
         IScreeningServer, IScreeningApiServer
 {
+    /**
+     * The minor version of this service.
+     */
+    static final int MINOR_VERSION = 1;
+
     @Resource(name = ResourceNames.SCREENING_BUSINESS_OBJECT_FACTORY)
     private IScreeningBusinessObjectFactory businessObjectFactory;
 
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java
index fc6bb57074c..6482676832b 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/server/ScreeningServerLogger.java
@@ -190,7 +190,7 @@ final class ScreeningServerLogger extends AbstractServerLogger implements IScree
 
     public int getMinorVersion()
     {
-        return MINOR_VERSION;
+        return ScreeningServer.MINOR_VERSION;
     }
 
 }
diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/IScreeningApiServer.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/IScreeningApiServer.java
index 33742003623..66de4652e59 100644
--- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/IScreeningApiServer.java
+++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/api/v1/IScreeningApiServer.java
@@ -57,11 +57,6 @@ public interface IScreeningApiServer extends IRpcService
      */
     public static final int MAJOR_VERSION = 1;
 
-    /**
-     * The minor version of this service.
-     */
-    public static final int MINOR_VERSION = 1;
-
     /**
      * Service part of the URL to access this service remotely.
      */
-- 
GitLab