SE-198 fix bug concerning wrong version shown

SVN: 14562

screening/resource/server/web.xml

@@ -17,7 +17,7 @@
 
     <context-param>
         <param-name>infoClass</param-name>
-        <param-value>ch.systemsx.cisd.openbis.BuildAndEnvironmentInfo</param-value>
+        <param-value>ch.systemsx.cisd.openbis.plugin.screening.BuildAndEnvironmentInfo</param-value>
     </context-param>
 
     <context-param>

screening/source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java → screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/BuildAndEnvironmentInfo.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package ch.systemsx.cisd.openbis;
+package ch.systemsx.cisd.openbis.plugin.screening;
 
 import ch.systemsx.cisd.base.utilities.AbstractBuildAndEnvironmentInfo;
 

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningClient.java

@@ -16,6 +16,7 @@
 
 package ch.systemsx.cisd.openbis.plugin.screening.client.web.client.application;
 
+import ch.systemsx.cisd.openbis.generic.client.web.client.IClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.ICommonClientServiceAsync;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.Client;
 import ch.systemsx.cisd.openbis.generic.client.web.client.application.IViewContext;
@@ -47,4 +48,11 @@ public class ScreeningClient extends Client
         return new ClientPluginFactoryProvider(commonContext);
     }
 
+    @Override
+    protected IClientServiceAsync getServiceForRetrievingApplicationInfo(
+            IViewContext<ICommonClientServiceAsync> context)
+    {
+        return new ScreeningViewContext(context).getService();
+    }
+
 }

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java

@@ -38,6 +38,7 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.GenericTableRow;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.SampleParentWithDerived;
 import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifierFactory;
+import ch.systemsx.cisd.openbis.plugin.screening.BuildAndEnvironmentInfo;
 import ch.systemsx.cisd.openbis.plugin.screening.client.web.client.IScreeningClientService;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.IScreeningServer;
 import ch.systemsx.cisd.openbis.plugin.screening.shared.ResourceNames;
@@ -83,6 +84,12 @@ public final class ScreeningClientService extends AbstractClientService implemen
     // IScreeningClientService
     //
 
+    @Override
+    protected String getVersion()
+    {
+        return BuildAndEnvironmentInfo.INSTANCE.getFullVersion();
+    }
+
     public final SampleParentWithDerived getSampleGenerationInfo(final TechId sampleId)
             throws UserFailureException
     {