From 6ea89373d6f885e6cdaad5fa611cfd16fce7a54a Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Wed, 17 Apr 2013 15:04:39 +0200 Subject: [PATCH] fix missing git index view --- .../src/main/java/sonia/scm/web/GitRepositoryViewer.java | 2 +- .../java/sonia/scm/template/ServletMustacheFactory.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java index c19281f54f..40cb637b34 100644 --- a/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java +++ b/scm-plugins/scm-git-plugin/src/main/java/sonia/scm/web/GitRepositoryViewer.java @@ -80,7 +80,7 @@ public class GitRepositoryViewer /** Field description */ public static final String RESOURCE_GITINDEX = - "/sonia/scm/git.index.mustache"; + "sonia/scm/git.index.mustache"; /** Field description */ private static final int CHANGESET_PER_BRANCH = 10; diff --git a/scm-webapp/src/main/java/sonia/scm/template/ServletMustacheFactory.java b/scm-webapp/src/main/java/sonia/scm/template/ServletMustacheFactory.java index 6c7c2e8c9f..eeaeedb101 100644 --- a/scm-webapp/src/main/java/sonia/scm/template/ServletMustacheFactory.java +++ b/scm-webapp/src/main/java/sonia/scm/template/ServletMustacheFactory.java @@ -106,6 +106,11 @@ public class ServletMustacheFactory extends DefaultMustacheFactory resourceName); } + if (resourceName.startsWith("/")) + { + resourceName = resourceName.substring(1); + } + ClassLoader classLoader = Thread.currentThread().getContextClassLoader(); if (classLoader == null) @@ -120,7 +125,7 @@ public class ServletMustacheFactory extends DefaultMustacheFactory { if (logger.isTraceEnabled()) { - logger.trace("found resoruce for {}, return reader", resourceName); + logger.trace("found resource for {}, return reader", resourceName); } reader = new BufferedReader(new InputStreamReader(is, Charsets.UTF_8));