merge with branch 1.x

This commit is contained in:
Sebastian Sdorra
2014-04-28 13:48:11 +02:00
17 changed files with 338 additions and 59 deletions

View File

@@ -202,7 +202,7 @@ public class ScmServletModule extends JerseyServletModule
PATTERN_STYLESHEET, "*.json", "*.xml", "*.txt" };
/** Field description */
private static Logger logger =
private static final Logger logger =
LoggerFactory.getLogger(ScmServletModule.class);
//~--- constructors ---------------------------------------------------------
@@ -356,7 +356,7 @@ public class ScmServletModule extends JerseyServletModule
bind(TemplateEngine.class).annotatedWith(DefaultEngine.class).to(
MustacheTemplateEngine.class);
bind(TemplateEngineFactory.class);
// jersey
Map<String, String> params = new HashMap<String, String>();