Fixd config - 1.4 merge confusion, changes from removing TX wrappers

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4743 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2007-01-05 15:59:18 +00:00
parent 225f69de01
commit 2747df2afa

View File

@@ -3,24 +3,14 @@
<beans> <beans>
<!-- DAO that rejects changes - LDAP is read only at the moment --> <!-- DAO that rejects changes - LDAP is read only at the moment. It does allow users to be deleted with out warnings from the UI. -->
<bean id="alfDaoImpl" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> <bean name="authenticationDao" class="org.alfresco.repo.security.authentication.DefaultMutableAuthenticationDao" >
<property name="proxyInterfaces"> <property name="allowDeleteUser">
<value>org.alfresco.repo.security.authentication.MutableAuthenticationDao</value> <value>true</value>
</property> </property>
<property name="transactionManager"> </bean>
<ref bean="transactionManager" />
</property>
<property name="target">
<bean class="org.alfresco.repo.security.authentication.ntlm.NullMutableAuthenticationDao" />
</property>
<property name="transactionAttributes">
<props>
<prop key="*">${server.transaction.mode.default}</prop>
</props>
</property>
</bean>
<!-- LDAP authentication configuration --> <!-- LDAP authentication configuration -->
@@ -32,7 +22,7 @@
--> -->
<bean id="authenticationComponentImpl" class="org.alfresco.repo.security.authentication.ldap.LDAPAuthenticationComponentImpl"> <bean id="authenticationComponent" class="org.alfresco.repo.security.authentication.ldap.LDAPAuthenticationComponentImpl">
<property name="LDAPInitialDirContextFactory"> <property name="LDAPInitialDirContextFactory">
<ref bean="ldapInitialDirContextFactory"/> <ref bean="ldapInitialDirContextFactory"/>
</property> </property>
@@ -164,14 +154,6 @@
<ref bean="namespaceService"/> <ref bean="namespaceService"/>
</property> </property>
<!--
The path to the location of a space to use as the default home folder.
This folder should be readable by all users, or a group to which all imported users belong.
-->
<property name="defaultHomeFolder">
<value>/app:company_home</value>
</property>
<!-- <!--
This property defines a mapping between attributes held on LDAP user objects and This property defines a mapping between attributes held on LDAP user objects and
the properties of user objects held in the repository. The key is the QName of an attribute in the properties of user objects held in the repository. The key is the QName of an attribute in
@@ -204,6 +186,19 @@
<!-- Active Directory: "???" --> <!-- Active Directory: "???" -->
<value>o</value> <value>o</value>
</entry> </entry>
<!-- Always use the default -->
<entry key="cm:homeFolderProvider">
<null/>
</entry>
</map>
</property>
<!-- Set a default home folder provider -->
<!-- Defaults only apply for values above -->
<property name="attributeDefaults">
<map>
<entry key="cm:homeFolderProvider">
<value>personalHomeFolderProvider</value>
</entry>
</map> </map>
</property> </property>
</bean> </bean>
@@ -317,9 +312,9 @@
</property> </property>
</bean> </bean>
</property> </property>
<!-- Start after 30 seconds of starting the repository --> <!-- Start after 5 minutes of starting the repository -->
<property name="startDelay"> <property name="startDelay">
<value>30000</value> <value>300000</value>
</property> </property>
<!-- Repeat every hour --> <!-- Repeat every hour -->
<property name="repeatInterval"> <property name="repeatInterval">
@@ -347,9 +342,9 @@
</property> </property>
</bean> </bean>
</property> </property>
<!-- Start after 30 seconds of starting the repository --> <!-- Start after 5 minutes of starting the repository -->
<property name="startDelay"> <property name="startDelay">
<value>30000</value> <value>300000</value>
</property> </property>
<!-- Repeat every hour --> <!-- Repeat every hour -->
<property name="repeatInterval"> <property name="repeatInterval">
@@ -366,7 +361,7 @@
<bean id="ldapPeopleImport" class="org.alfresco.repo.importer.ExportSourceImporter"> <bean id="ldapPeopleImport" class="org.alfresco.repo.importer.ExportSourceImporter">
<property name="importerService"> <property name="importerService">
<ref bean="importerComponent"/> <ref bean="importerComponentWithBehaviour"/>
</property> </property>
<property name="transactionService"> <property name="transactionService">
<ref bean="transactionComponent"/> <ref bean="transactionComponent"/>
@@ -414,7 +409,7 @@
<bean id="ldapGroupImport" class="org.alfresco.repo.importer.ExportSourceImporter"> <bean id="ldapGroupImport" class="org.alfresco.repo.importer.ExportSourceImporter">
<property name="importerService"> <property name="importerService">
<ref bean="importerComponent"/> <ref bean="importerComponentWithBehaviour"/>
</property> </property>
<property name="transactionService"> <property name="transactionService">
<ref bean="transactionComponent"/> <ref bean="transactionComponent"/>