Skip to content
Snippets Groups Projects
Commit f2492bac authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '98-resource-link-include-git-version' into 'master'

git version is used when accessing frontend resources

Closes #98

See merge request !19
parents 6de5be39 0367dd9e
No related branches found
No related tags found
1 merge request!19git version is used when accessing frontend resources
......@@ -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);
......
......@@ -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);
}
......@@ -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";
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment