diff --git a/screening/resource/server/web.xml b/screening/resource/server/web.xml index 691602a7fb6482a2fb63b7b75ca3b93c2fd9676b..019c217688c58ad4e89a2634187779aa6f7cf362 100644 --- a/screening/resource/server/web.xml +++ b/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> diff --git a/screening/source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/BuildAndEnvironmentInfo.java similarity index 96% rename from screening/source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java rename to screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/BuildAndEnvironmentInfo.java index 5da72b36ba6fc8e7fa9cb860fae859275561d194..a5bf06acc148f96def3415f9fc057d404e134a42 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/BuildAndEnvironmentInfo.java +++ b/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; diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningClient.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningClient.java index dbc4c843858b6864d2df6870b137285ea38c91e3..c0c3e58b67f65bc3316b263858464f4ce873d5c1 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/client/application/ScreeningClient.java +++ b/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(); + } + } diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java index cedea34d7c4b99e0a955878a32a9ee0469c3d4eb..a83c47486114506464995c6c3edcdd0ce357738f 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/server/ScreeningClientService.java +++ b/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 {