From 76f02b169f444542e8fbc454ad5bb492cf8e3440 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Sat, 27 Apr 2013 09:23:41 +0200 Subject: [PATCH] bind new configuration entry store api --- .../src/main/java/sonia/scm/ScmServletModule.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java index dc1255eee2..84b27d8277 100644 --- a/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java +++ b/scm-webapp/src/main/java/sonia/scm/ScmServletModule.java @@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory; import sonia.scm.api.rest.UriExtensionsConfig; import sonia.scm.cache.CacheManager; -import sonia.scm.cache.EhCacheManager; +import sonia.scm.cache.GuavaCacheManager; import sonia.scm.config.ScmConfiguration; import sonia.scm.event.ScmEventBus; import sonia.scm.filter.AdminSecurityFilter; @@ -86,13 +86,17 @@ import sonia.scm.resources.ScriptResourceServlet; import sonia.scm.security.CipherHandler; import sonia.scm.security.CipherUtil; import sonia.scm.security.DefaultKeyGenerator; +import sonia.scm.security.DefaultSecuritySystem; import sonia.scm.security.EncryptionHandler; import sonia.scm.security.KeyGenerator; import sonia.scm.security.MessageDigestEncryptionHandler; import sonia.scm.security.SecurityContext; +import sonia.scm.security.SecuritySystem; import sonia.scm.store.BlobStoreFactory; +import sonia.scm.store.ConfigurationEntryStoreFactory; import sonia.scm.store.DataStoreFactory; import sonia.scm.store.FileBlobStoreFactory; +import sonia.scm.store.JAXBConfigurationEntryStoreFactory; import sonia.scm.store.JAXBDataStoreFactory; import sonia.scm.store.JAXBStoreFactory; import sonia.scm.store.ListenableStoreFactory; @@ -142,9 +146,6 @@ import java.util.HashSet; import java.util.Iterator; import java.util.Map; import java.util.Set; -import sonia.scm.cache.GuavaCacheManager; -import sonia.scm.security.DefaultSecuritySystem; -import sonia.scm.security.SecuritySystem; /** * @@ -254,6 +255,8 @@ public class ScmServletModule extends ServletModule // bind core bind(StoreFactory.class, JAXBStoreFactory.class); bind(ListenableStoreFactory.class, JAXBStoreFactory.class); + bind(ConfigurationEntryStoreFactory.class, + JAXBConfigurationEntryStoreFactory.class); bind(DataStoreFactory.class, JAXBDataStoreFactory.class); bind(BlobStoreFactory.class, FileBlobStoreFactory.class); bind(ScmConfiguration.class).toInstance(config);