Tests to stop TatamiUserDetailsService from being launched twice

ippontech · Aug 25, 2012 · 4d2c35c · 4d2c35c
1 parent ce590c7
commit 4d2c35c
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/fr/ippon/tatami/config/ApplicationConfiguration.java b/src/main/java/fr/ippon/tatami/config/ApplicationConfiguration.java
@@ -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,

diff --git a/src/main/resources/META-INF/spring/applicationContext-security.xml b/src/main/resources/META-INF/spring/applicationContext-security.xml
@@ -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"/>

diff --git a/src/main/resources/META-INF/tatami/tatami.properties b/src/main/resources/META-INF/tatami/tatami.properties
@@ -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
 

diff --git a/src/main/resources/log4j.properties b/src/main/resources/log4j.properties
@@ -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