From: Erik Brakkee <erik@brakkee.org> Date: Mon, 12 May 2008 20:17:21 +0000 (+0000) Subject: repositories voor usermgt in aparte file. X-Git-Tag: wamblee-utils-0.7~754 X-Git-Url: http://wamblee.org/gitweb/?a=commitdiff_plain;h=bd2d47d66f055ecbd7d1b1115bc9084ad9509ec0;p=utils repositories voor usermgt in aparte file. --- diff --git a/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java b/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java index e9c97d3f..c07a5b7c 100644 --- a/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java +++ b/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java @@ -31,6 +31,7 @@ public class UsermgtSpringConfigFiles extends SpringConfigFiles { super(new String[] { "spring/test.org.wamblee.security.properties.xml", "spring/test.org.wamblee.security.datasource.xml", "spring/test.org.wamblee.security.database.xml", + "spring/test.org.wamblee.security.usermgt-repositories.xml", "spring/test.org.wamblee.security.usermgt.xml" }); } diff --git a/security/src/test/resources/spring/test.org.wamblee.security.usermgt-repositories.xml b/security/src/test/resources/spring/test.org.wamblee.security.usermgt-repositories.xml new file mode 100644 index 00000000..99698c2b --- /dev/null +++ b/security/src/test/resources/spring/test.org.wamblee.security.usermgt-repositories.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd"> + + <beans> + + <bean id="cacheConfig" class="org.wamblee.io.ClassPathResource"> + <constructor-arg><value>properties/test.org.wamblee.security.ehcache.xml</value></constructor-arg> + </bean> + + <bean id="userCache" class="org.wamblee.cache.EhCache"> + <constructor-arg><ref local="cacheConfig"/></constructor-arg> + <constructor-arg><value>users</value></constructor-arg> + </bean> + + + <bean id="passwordValidator" + class="org.wamblee.usermgt.RegexpNameValidator"> + <constructor-arg><value>.{5,}</value></constructor-arg> + <constructor-arg><value>INVALID_PASSWORD</value></constructor-arg> + <constructor-arg><value>Password must have at least 5 characters</value></constructor-arg> + </bean> + + <bean id="passwordDigester" + class="org.wamblee.security.encryption.Md5HexMessageDigester"> + </bean> + + <bean id="org.wamblee.usermgt.UserSet" + class="org.wamblee.usermgt.hibernate.HibernateUserSet"> + <constructor-arg><ref local="userCache"/></constructor-arg> + <constructor-arg><ref local="passwordValidator"/></constructor-arg> + <constructor-arg><ref local="passwordDigester"/></constructor-arg> + + <property name="sessionFactory"><ref bean="sessionFactory"/></property> + + </bean> + + <bean id="org.wamblee.usermgt.GroupSet" + class="org.wamblee.usermgt.hibernate.HibernateGroupSet"> + + <property name="sessionFactory"><ref bean="sessionFactory"/></property> + </bean> + + </beans> \ No newline at end of file diff --git a/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml b/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml index 132d827f..443355f9 100644 --- a/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml +++ b/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml @@ -3,52 +3,15 @@ <beans> - <bean id="cacheConfig" class="org.wamblee.io.ClassPathResource"> - <constructor-arg><value>properties/test.org.wamblee.security.ehcache.xml</value></constructor-arg> - </bean> - - <bean id="userCache" class="org.wamblee.cache.EhCache"> - <constructor-arg><ref local="cacheConfig"/></constructor-arg> - <constructor-arg><value>users</value></constructor-arg> - </bean> - - - <bean id="passwordValidator" - class="org.wamblee.usermgt.RegexpNameValidator"> - <constructor-arg><value>.{5,}</value></constructor-arg> - <constructor-arg><value>INVALID_PASSWORD</value></constructor-arg> - <constructor-arg><value>Password must have at least 5 characters</value></constructor-arg> - </bean> - - <bean id="passwordDigester" - class="org.wamblee.security.encryption.Md5HexMessageDigester"> - </bean> - - <bean id="org.wamblee.usermgt.UserSet" - class="org.wamblee.usermgt.hibernate.HibernateUserSet"> - <constructor-arg><ref local="userCache"/></constructor-arg> - <constructor-arg><ref local="passwordValidator"/></constructor-arg> - <constructor-arg><ref local="passwordDigester"/></constructor-arg> - - <property name="sessionFactory"><ref bean="sessionFactory"/></property> - - </bean> - - <bean id="org.wamblee.usermgt.GroupSet" - class="org.wamblee.usermgt.hibernate.HibernateGroupSet"> - - <property name="sessionFactory"><ref bean="sessionFactory"/></property> - </bean> - <bean id="org.wamblee.usermgt.UserAdministration-target" class="org.wamblee.usermgt.UserAdministrationImpl"> <constructor-arg> - <ref local="org.wamblee.usermgt.UserSet"/> + <ref bean="org.wamblee.usermgt.UserSet"/> </constructor-arg> <constructor-arg> - <ref local="org.wamblee.usermgt.GroupSet"/> + <ref bean="org.wamblee.usermgt.GroupSet"/> </constructor-arg> <constructor-arg>