X-Git-Url: http://wamblee.org/gitweb/?a=blobdiff_plain;f=security%2Fsrc%2Ftest%2Fresources%2Fspring%2Ftest.org.wamblee.security.usermgt.xml;h=443355f968c1730fbfc948fa8d3aa26b69476c15;hb=bd2d47d66f055ecbd7d1b1115bc9084ad9509ec0;hp=a7abe50d76a75dc6bbb8d61bd5ad0904373a17c5;hpb=162af365e45e54e5e8d656be276914df2005eaec;p=utils

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 a7abe50d..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>
@@ -71,7 +34,7 @@
     
     <bean id="usermanagement-lock" class="org.wamblee.concurrency.JvmLock"/>
     
-     <bean id="usermanagement-lock-advice" class="org.wamblee.concurrency.LockAdvice">
+     <bean id="usermanagement-lock-advice" class="org.wamblee.concurrency.spring.LockAdvice">
          <constructor-arg><ref bean="usermanagement-lock"/></constructor-arg>
      </bean>
      
@@ -82,30 +45,4 @@
          <property name="target"><ref bean="org.wamblee.usermgt.UserAdministration-target"/></property>
      </bean>
      
-     <bean id="usermgtInitializer"
-         class="org.wamblee.usermgt.UserAdminInitializer">
-         <constructor-arg><ref local="org.wamblee.usermgt.UserAdministration"/></constructor-arg>
-         <!-- users -->
-         <constructor-arg>
-             <list>
-                 <value>erik</value>
-                 <value>admin</value>
-             </list>
-         </constructor-arg>
-         <!-- groups -->
-         <constructor-arg>
-             <list>
-                 <value>users</value>
-                 <value>${org.wamblee.security.admingroup}</value>
-             </list>
-         </constructor-arg>
-         <!-- passwords -->
-         <constructor-arg>
-             <list>
-                 <value>abc123</value>
-                 <value>abc123</value>
-             </list>
-         </constructor-arg>
-     </bean>
-     
  </beans>
\ No newline at end of file