see ome#2025 - Fixing spring configuration for password providers

git-svn-id: file:///home/svn/omero/trunk@6555 05709c45-44f0-0310-885b-81a1db45b4a6
melissalinkert · Apr 8, 2010 · cf3bbaa · cf3bbaa
1 parent ee57e1c
commit cf3bbaa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/components/server/resources/ome/services/service-ome.api.IAdmin.xml b/components/server/resources/ome/services/service-ome.api.IAdmin.xml
@@ -45,13 +45,11 @@
         <bean class="ome.security.auth.LdapPasswordProvider">
           <constructor-arg ref="passwordUtil"/>
           <constructor-arg ref="internal-ome.api.LocalLdap"/>
-          <constructor-arg ref="simpleJdbcTemplate"/>
           <constructor-arg value="true"/>
         </bean>
         <bean class="ome.security.auth.JdbcPasswordProvider">
           <constructor-arg ref="passwordUtil"/>
-          <constructor-arg ref="simpleJdbcTemplate"/>
-        </bean>        
+        </bean>
       </list>
     </constructor-arg>
   </bean>
@@ -69,7 +67,7 @@
     <property name="proxyInterfaces">
       <list>
         <value>ome.api.IAdmin</value>
-        <value>ome.api.local.LocalAdmin</value>        
+        <value>ome.api.local.LocalAdmin</value>
       </list>
     </property>
     <property name="target" ref="internal-ome.api.IAdmin"/>
@@ -111,4 +109,4 @@
     <property name="from" value="${omero.resetpassword.from}" />
   </bean>
 
-</beans>
+</beans>
diff --git a/components/server/resources/ome/services/service-ome.api.ILdap.xml b/components/server/resources/ome/services/service-ome.api.ILdap.xml
@@ -27,10 +27,12 @@
 			Privileged bean which has several "private" references
 			injected. This is not an example of what should be done.
 		</description>
-      <constructor-arg ref="simpleJdbcTemplate"/>
-      <constructor-arg ref="ldapTemplate"/>
-      <constructor-arg ref="roles"/>
-      <constructor-arg ref="ldapConfig" />
+		<constructor-arg ref="contextSource"/>
+		<constructor-arg ref="ldapTemplate"/>
+		<constructor-arg ref="roles"/>
+		<constructor-arg ref="ldapConfig" />
+		<constructor-arg ref="roleProvider"/>
+		<constructor-arg ref="simpleJdbcTemplate"/>
 	</bean>
 
 	<bean name="managed-ome.api.ILdap" parent="managedService">