Big honkin' merge from head. Sheesh!

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3617 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-08-27 01:01:30 +00:00
parent e2c66899cc
commit 8031cc6574
322 changed files with 20776 additions and 6550 deletions

View File

@@ -1,26 +1,32 @@
<alfresco-config area="file-servers">
<config evaluator="string-compare" condition="Filesystems">
<!-- Default share -->
<filesystem name="Alfresco">
<store>workspace://SpacesStore</store>
<rootPath>/app:company_home</rootPath>
<!-- Enable Web client launch shortcut in all folders -->
<urlFile>
<!-- Change the filename as required, keeping the .url extension -->
<filename>_Alfresco.url</filename>
<!-- Change 'localhost' to the name or IP of the Alfresco server -->
<webpath>http://localhost:8080/alfresco/</webpath>
</urlFile>
</filesystem>
<!-- To override the default Alfresco filesystem use replace="true", to -->
<!-- add additional filesystems remove the replace="true" attribute -->
<config evaluator="string-compare" condition="Filesystems" replace="true">
<filesystems>
<!-- Default share -->
<filesystem name="Alfresco">
<store>workspace://SpacesStore</store>
<rootPath>/app:company_home</rootPath>
<!-- Enable Web client launch shortcut in all folders -->
<urlFile>
<!-- Change the filename as required, keeping the .url extension -->
<filename>_Alfresco.url</filename>
<!-- Change 'localhost' to the name or IP of the Alfresco server -->
<webpath>http://localhost:8080/alfresco/</webpath>
</urlFile>
</filesystem>
</filesystems>
</config>
<!-- Allow guest access to file systems -->

View File

@@ -85,4 +85,17 @@
</property>
</bean>
<bean id="indexBackupJobDetail" class="org.springframework.scheduling.quartz.JobDetailBean">
<property name="jobClass">
<value>org.alfresco.repo.search.impl.lucene.LuceneIndexerAndSearcherFactory$LuceneIndexBackupJob</value>
</property>
<property name="jobDataAsMap">
<map>
<entry key="luceneIndexBackupComponent">
<ref bean="luceneIndexBackupComponent" />
</entry>
</map>
</property>
</bean>
</beans>