Fix AR-436 - Error configuring the system to use NTLM

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2436 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
2006-02-17 18:08:55 +00:00
parent b8cf64b21a
commit af303ec519
2 changed files with 69 additions and 86 deletions

View File

@@ -82,26 +82,7 @@
<ref bean="transactionManager" /> <ref bean="transactionManager" />
</property> </property>
<property name="target"> <property name="target">
<bean class="org.alfresco.repo.security.authentication.RepositoryAuthenticationDao"> <ref bean="authenticationDao"/>
<property name="nodeService">
<ref bean="nodeService" />
</property>
<property name="dictionaryService">
<ref bean="dictionaryService" />
</property>
<property name="namespaceService">
<ref bean="namespaceService" />
</property>
<property name="searchService">
<ref bean="searchService" />
</property>
<property name="userNamesAreCaseSensitive">
<value>${user.name.caseSensitive}</value>
</property>
<property name="passwordEncoder">
<ref bean="passwordEncoder" />
</property>
</bean>
</property> </property>
<property name="transactionAttributes"> <property name="transactionAttributes">
<props> <props>
@@ -110,6 +91,27 @@
</property> </property>
</bean> </bean>
<bean id="authenticationDao" class="org.alfresco.repo.security.authentication.RepositoryAuthenticationDao">
<property name="nodeService">
<ref bean="nodeService" />
</property>
<property name="dictionaryService">
<ref bean="dictionaryService" />
</property>
<property name="namespaceService">
<ref bean="namespaceService" />
</property>
<property name="searchService">
<ref bean="searchService" />
</property>
<property name="userNamesAreCaseSensitive">
<value>${user.name.caseSensitive}</value>
</property>
<property name="passwordEncoder">
<ref bean="passwordEncoder" />
</property>
</bean>
<!-- The DAO also acts as a salt provider. --> <!-- The DAO also acts as a salt provider. -->
<alias alias="saltSource" name="alfDaoImpl"/> <alias alias="saltSource" name="alfDaoImpl"/>
@@ -222,71 +224,56 @@
<!-- The person service. --> <!-- The person service. -->
<bean id="personService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean"> <bean id="personService" class="org.alfresco.repo.security.person.PersonServiceImpl">
<property name="proxyInterfaces"> <property name="nodeService">
<value>org.alfresco.service.cmr.security.PersonService</value> <ref bean="nodeService" />
</property>
<property name="searchService">
<ref bean="searchService" />
</property>
<property name="permissionServiceSPI">
<ref bean="permissionServiceImpl" />
</property>
<property name="authorityService">
<ref bean="authorityService" />
</property> </property>
<property name="transactionManager"> <property name="namespacePrefixResolver">
<ref bean="transactionManager" /> <ref bean="namespaceService" />
</property>
<!-- Configurable properties. -->
<!-- -->
<!-- TODO: -->
<!-- Add support for creating real home spaces adn setting -->
<!-- permissions on the hame space and people created. -->
<!-- -->
<!-- The store in which people are persisted. -->
<property name="storeUrl">
<value>${spaces.store}</value>
</property> </property>
<property name="target"> <!-- The path to the company home space, used to set the -->
<bean id="personServiceImpl" class="org.alfresco.repo.security.person.PersonServiceImpl"> <!-- default home space for users that are created if -->
<property name="nodeService"> <!-- missing. -->
<ref bean="nodeService" /> <property name="companyHomePath">
</property> <value>/${spaces.company_home.childname}</value>
<property name="searchService">
<ref bean="searchService" />
</property>
<property name="permissionServiceSPI">
<ref bean="permissionServiceImpl" />
</property>
<property name="authorityService">
<ref bean="authorityService" />
</property>
<property name="namespacePrefixResolver">
<ref bean="namespaceService" />
</property>
<!-- Configurable properties. -->
<!-- -->
<!-- TODO: -->
<!-- Add support for creating real home spaces adn setting -->
<!-- permissions on the hame space and people created. -->
<!-- -->
<!-- The store in which people are persisted. -->
<property name="storeUrl">
<value>${spaces.store}</value>
</property>
<!-- The path to the company home space, used to set the -->
<!-- default home space for users that are created if -->
<!-- missing. -->
<property name="companyHomePath">
<value>/${spaces.company_home.childname}</value>
</property>
<!-- Some authentication mechanisms may need to create people -->
<!-- in the repository on demand. This enables that feature. -->
<!-- If dsiabled an error will be generated for missing -->
<!-- people. If enabled then a person will be created and -->
<!-- persisted. -->
<!-- -->
<!-- This value should be false or only true if the -->
<!-- repository is mutable; set from the property -->
<!-- ${server.transaction.allow-writes} -->
<property name="createMissingPeople">
<value>${server.transaction.allow-writes}</value>
</property>
<!-- Set is user names are case sensitive - taken from the -->
<!-- repository wide setting - you are advised not to change -->
<!-- this setting. -->
<!-- This value should be ${user.name.caseSensitive} -->
<property name="userNamesAreCaseSensitive">
<value>${user.name.caseSensitive}</value>
</property>
</bean>
</property> </property>
<property name="transactionAttributes"> <!-- Some authentication mechanisms may need to create people -->
<props> <!-- in the repository on demand. This enables that feature. -->
<prop key="*">${server.transaction.mode.default}</prop> <!-- If dsiabled an error will be generated for missing -->
</props> <!-- people. If enabled then a person will be created and -->
<!-- persisted. -->
<!-- -->
<!-- This value should be false or only true if the -->
<!-- repository is mutable; set from the property -->
<!-- ${server.transaction.allow-writes} -->
<property name="createMissingPeople">
<value>${server.transaction.allow-writes}</value>
</property>
<!-- Set is user names are case sensitive - taken from the -->
<!-- repository wide setting - you are advised not to change -->
<!-- this setting. -->
<!-- This value should be ${user.name.caseSensitive} -->
<property name="userNamesAreCaseSensitive">
<value>${user.name.caseSensitive}</value>
</property> </property>
</bean> </bean>

View File

@@ -103,10 +103,6 @@ public class PersonTest extends BaseSpringTest
System.out.println("Size ("+size+") : "+((end-start)/1000000.0f)); System.out.println("Size ("+size+") : "+((end-start)/1000000.0f));
} }
} }
} }
public void testCreateMissingPeople1() public void testCreateMissingPeople1()