From b7e5da904a94797573c7e344c385b31029ef6989 Mon Sep 17 00:00:00 2001
From: erik <erik@77661180-640e-0410-b3a8-9f9b13e6d0e0>
Date: Mon, 12 May 2008 20:17:21 +0000
Subject: [PATCH] repositories voor usermgt in aparte file.

---
 .../usermgt/UsermgtSpringConfigFiles.java     |  1 +
 ....wamblee.security.usermgt-repositories.xml | 43 +++++++++++++++++++
 .../test.org.wamblee.security.usermgt.xml     | 41 +-----------------
 3 files changed, 46 insertions(+), 39 deletions(-)
 create mode 100644 trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgt-repositories.xml

diff --git a/trunk/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java b/trunk/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java
index e9c97d3f..c07a5b7c 100644
--- a/trunk/security/src/test/java/org/wamblee/usermgt/UsermgtSpringConfigFiles.java
+++ b/trunk/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/trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgt-repositories.xml b/trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgt-repositories.xml
new file mode 100644
index 00000000..99698c2b
--- /dev/null
+++ b/trunk/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/trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml b/trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml
index 132d827f..443355f9 100644
--- a/trunk/security/src/test/resources/spring/test.org.wamblee.security.usermgt.xml
+++ b/trunk/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>
-- 
2.31.1