diff --git a/service/src/main/java/lcsb/mapviewer/services/impl/ConfigurationService.java b/service/src/main/java/lcsb/mapviewer/services/impl/ConfigurationService.java index 0490328b47749d46eded83a34ba019929c970054..31b129af824b567af508b9ee745fc9e4c967eac4 100644 --- a/service/src/main/java/lcsb/mapviewer/services/impl/ConfigurationService.java +++ b/service/src/main/java/lcsb/mapviewer/services/impl/ConfigurationService.java @@ -119,6 +119,11 @@ public class ConfigurationService implements IConfigurationService { return lcsb.mapviewer.common.Configuration.getSystemVersion(baseDir); } + @Override + public String getSystemGitVersion(String baseDir) { + return lcsb.mapviewer.common.Configuration.getSystemBuildVersion(baseDir); + } + @Override public String getSystemBuild(String baseDir) { return lcsb.mapviewer.common.Configuration.getSystemBuild(baseDir); diff --git a/service/src/main/java/lcsb/mapviewer/services/interfaces/IConfigurationService.java b/service/src/main/java/lcsb/mapviewer/services/interfaces/IConfigurationService.java index 3a9ba4dae744d3db58ba9eb26f45514d5bea2a3c..fe2b4515b4e6af2fbe90b6e28b7d56d52870663f 100644 --- a/service/src/main/java/lcsb/mapviewer/services/interfaces/IConfigurationService.java +++ b/service/src/main/java/lcsb/mapviewer/services/interfaces/IConfigurationService.java @@ -101,4 +101,14 @@ public interface IConfigurationService { */ String getSystemBuild(String baseDir); + /** + * Returns {@link lcsb.mapviewer.common.Configuration#systemBuildVersion git + * hash} of build process. + * + * @param baseDir + * directory where the system is placed + * @return git hash + */ + String getSystemGitVersion(String baseDir); + } diff --git a/web/src/main/java/lcsb/mapviewer/bean/utils/VersionResourceHandler.java b/web/src/main/java/lcsb/mapviewer/bean/utils/VersionResourceHandler.java index a6732a85cedcb5780069d6dce124f5be4d6198b8..6f8e06e38d0cd79bff541fb2c62e84ae87b536e6 100644 --- a/web/src/main/java/lcsb/mapviewer/bean/utils/VersionResourceHandler.java +++ b/web/src/main/java/lcsb/mapviewer/bean/utils/VersionResourceHandler.java @@ -100,7 +100,7 @@ public class VersionResourceHandler extends ResourceHandlerWrapper { private String getVersion() { if (version == null) { try { - version = new ConfigurationService().getSystemSvnVersion(new PrimefacesUtils().getPath()); + version = new ConfigurationService().getSystemGitVersion(new PrimefacesUtils().getPath()); } catch (Exception e) { logger.error(e, e); version = "UNKNOWN";