Permalink
Browse files

Tests to stop TatamiUserDetailsService from being launched twice

  • Loading branch information...
1 parent ce590c7 commit 4d2c35c8e417d97b7b8d3244908d3e7f5c309d28 @jdubois jdubois committed Aug 25, 2012
@@ -12,7 +12,10 @@
@Configuration
@PropertySource("classpath:/META-INF/tatami/tatami.properties")
-@ComponentScan(basePackages = {"fr.ippon.tatami.application", "fr.ippon.tatami.repository", "fr.ippon.tatami.service"})
+@ComponentScan(basePackages = {
+ "fr.ippon.tatami.repository",
+ "fr.ippon.tatami.service",
+ "fr.ippon.tatami.security"})
@Import(value = {
AsyncConfiguration.class,
CacheConfiguration.class,
@@ -10,7 +10,6 @@
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.1.xsd">
- <context:component-scan base-package="fr.ippon.tatami.security"/>
<context:property-placeholder location="classpath:/META-INF/tatami/tatami.properties"/>
<global-method-security pre-post-annotations="enabled"/>
@@ -8,7 +8,7 @@ tatami.google.analytics.key=${tatami.google.analytics.key}
tatami.message.reloading.enabled=${tatami.message.reloading.enabled}
#User configuration
-tatami.admin.users=jdubois@ippon.fr,julien.dubois@gmail.com
+tatami.admin.users=jdubois@ippon.fr,tatami@ippon.fr
tatami.ldapauth.domain=ippon.fr
tatami.ldapauth.url=ldap://directory:389/dc=ippon,dc=fr
@@ -13,7 +13,6 @@ log4j.appender.CONSOLE.layout.ConversionPattern=[%p] %c - %m%n
log4j.logger.monitoring=WARN
log4j.logger.fr.ippon.tatami=DEBUG
-log4j.org.springframework.scheduling=DEBUG
log4j.logger.me.prettyprint=WARN
log4j.logger.net.sf.ehcache=WARN
log4j.logger.org.apache=WARN

0 comments on commit 4d2c35c

Please sign in to comment.