Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-09 06:55:47 +01:00
Code Issues Packages Projects Releases Activity

replace DefaultEngine annotation with the new Default annotation

Browse Source
This commit is contained in:
Sebastian Sdorra
2014-08-24 14:54:35 +02:00
parent 50b0b6b2b8
commit be24164b88
6 changed files with 11 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scm-webapp/src/main/java/sonia/scm/ScmErrorModule.java
View File

@@ -38,7 +38,6 @@ package sonia.scm;
import com.google.inject.multibindings.Multibinder;
import com.google.inject.servlet.ServletModule;
import sonia.scm.template.DefaultEngine;
import sonia.scm.template.ErrorServlet;
import sonia.scm.template.MustacheTemplateEngine;
import sonia.scm.template.TemplateEngine;
@@ -66,7 +65,7 @@ public class ScmErrorModule extends ServletModule
Multibinder.newSetBinder(binder(), TemplateEngine.class);
engineBinder.addBinding().to(MustacheTemplateEngine.class);
bind(TemplateEngine.class).annotatedWith(DefaultEngine.class).to(
bind(TemplateEngine.class).annotatedWith(Default.class).to(
MustacheTemplateEngine.class);
bind(TemplateEngineFactory.class);

7
scm-webapp/src/main/java/sonia/scm/ScmServletModule.java
View File

@@ -105,7 +105,6 @@ import sonia.scm.store.JAXBConfigurationEntryStoreFactory;
import sonia.scm.store.JAXBDataStoreFactory;
import sonia.scm.store.JAXBStoreFactory;
import sonia.scm.store.StoreFactory;
import sonia.scm.template.DefaultEngine;
import sonia.scm.template.MustacheTemplateEngine;
import sonia.scm.template.TemplateEngine;
import sonia.scm.template.TemplateEngineFactory;
@@ -242,7 +241,7 @@ public class ScmServletModule extends JerseyServletModule
bind(SCMContextProvider.class).toInstance(context);
ScmConfiguration config = getScmConfiguration(context);
ScmConfiguration config = getScmConfiguration();
CipherUtil cu = CipherUtil.getInstance();
// bind repository provider
@@ -367,7 +366,7 @@ public class ScmServletModule extends JerseyServletModule
Multibinder.newSetBinder(binder(), TemplateEngine.class);
engineBinder.addBinding().to(MustacheTemplateEngine.class);
bind(TemplateEngine.class).annotatedWith(DefaultEngine.class).to(
bind(TemplateEngine.class).annotatedWith(Default.class).to(
MustacheTemplateEngine.class);
bind(TemplateEngineFactory.class);
@@ -494,7 +493,7 @@ public class ScmServletModule extends JerseyServletModule
*
* @return
*/
private ScmConfiguration getScmConfiguration(SCMContextProvider context)
private ScmConfiguration getScmConfiguration()
{
ScmConfiguration configuration = new ScmConfiguration();

2
scm-webapp/src/main/java/sonia/scm/template/MustacheTemplateEngine.java
View File

@@ -63,7 +63,7 @@ import javax.servlet.ServletContext;
*
* @author Sebastian Sdorra
*/
@DefaultEngine
@Default
public class MustacheTemplateEngine implements TemplateEngine
{