Updated Branches: refs/heads/MARMOTTA-228 39deea295 -> c3221e6ae
safer code for the templates initialization Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/1aacc641 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/1aacc641 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/1aacc641 Branch: refs/heads/MARMOTTA-228 Commit: 1aacc6416afd988f5d3e0f563dbad46b75c27eec Parents: 39deea2 Author: Sergio Fernández <[email protected]> Authored: Sun May 19 22:33:18 2013 +0200 Committer: Sergio Fernández <[email protected]> Committed: Sun May 19 22:33:18 2013 +0200 ---------------------------------------------------------------------- .../core/api/templating/TemplatingService.java | 6 +++ .../services/templating/TemplatingServiceImpl.java | 28 ++++++++------ 2 files changed, 22 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aacc641/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java index 2e6c770..4437a53 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/api/templating/TemplatingService.java @@ -34,6 +34,12 @@ public interface TemplatingService { final static String PATH = "/templates/"; + final static String ADMIN_TPL = "admin.ftl"; + + final static String ERROR_404_TPL = "404.ftl"; + + final static String RDF_HTML_TPL = "rdfhtml.ftl"; + static final String DEFAULT_PROJECT = "marmotta"; static final String DEFAULT_STYLE = "blue"; http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/1aacc641/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java ---------------------------------------------------------------------- diff --git a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java index 2740442..0e85d83 100644 --- a/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java +++ b/platform/marmotta-core/src/main/java/org/apache/marmotta/platform/core/services/templating/TemplatingServiceImpl.java @@ -70,21 +70,25 @@ public class TemplatingServiceImpl implements TemplatingService { common.put("LOGO", configurationService.getStringConfiguration("kiwi.pages.project."+project+".logo", project+".png")); common.put("FOOTER", configurationService.getStringConfiguration("kiwi.pages.project."+project+".footer", "(footer not properly configured for project "+project+")")); - templateDir =new File(configurationService.getHome()+TemplatingService.PATH); + templateDir = new File(configurationService.getHome(), TemplatingService.PATH); if (!templateDir.exists()) templateDir.mkdirs(); - for (String fName: new String[] {"admin.ftl", "404.ftl", "rdfhtml.ftl"}) { - final File dT = new File(templateDir, fName); - if (!dT.exists()) { - try { - log.info("Default Template not found, using fallback..."); - final InputStream str = this.getClass().getResourceAsStream(TemplatingService.PATH+fName); - FileUtils.copyInputStreamToFile(str, dT); - } catch (IOException e) { - log.error("Could not create fallback template, templating might react weird!", e); - } - } } + for (String fName: new String[] { + TemplatingService.ADMIN_TPL, + TemplatingService.ERROR_404_TPL, + TemplatingService.RDF_HTML_TPL }) { + final File dT = new File(templateDir, fName); + if (!dT.exists()) { + try { + log.warn("Default template not found at {}, copying fallback...", dT.getAbsolutePath()); + final InputStream str = this.getClass().getResourceAsStream(TemplatingService.PATH + fName); + FileUtils.copyInputStreamToFile(str, dT); + } catch (IOException e) { + log.error("Could not create fallback template, templating might react weird!", e); + } + } + } } /**
