Merge V3.4 to HEAD

23487 : ALF-5539 - Deployment Installer missing I18NUtil
  23607 : ALF-5528 - reworking configuration of "filesystem" target.
  23674 : ALF-5557 - XSS attack occurs on start workflow with XSS properties.
  23684 : ALF-817 - Error occurs when you try to change name of locked file
  24119 : ALF-532 - restore-context.xml.sample is useless

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@24362 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
2010-12-09 13:31:25 +00:00
parent 9cbca7d313
commit e01738d72c
5 changed files with 40 additions and 120 deletions

View File

@@ -3,18 +3,10 @@
<!-- Built in deployment server target -->
<beans>
<!-- Sample file -->
<!-- Copy to <TOMCAT HOME>/shared/alfresco/extension/deployment and rename to filesystem-target.xml (remove the -sample) -->
<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="ignoreUnresolvablePlaceholders">
<value>true</value>
</property>
<property name="locations">
<list>
<value>classpath:alfresco/deployment/filesystem.properties</value>
</list>
</property>
</bean>
<beans>
<!-- This is the common configuration for all file system receivers -->
<bean id="fileSystemReceiverService" class="org.alfresco.deployment.impl.fsr.FileSystemReceiverServiceImpl"

View File

@@ -1,20 +0,0 @@
; Built in deployment receiver properties for the default
; filesystem receiver
; filesystem receiver configuration
deployment.filesystem.rootdir=./wcm
deployment.filesystem.datadir=${deployment.filesystem.rootdir}/depdata
deployment.filesystem.logdir=${deployment.filesystem.rootdir}/deplog
deployment.filesystem.metadatadir=${deployment.filesystem.rootdir}/depmetadata
deployment.filesystem.autofix=true
deployment.filesystem.errorOnOverwrite=false
; default filesystem target configuration
deployment.filesystem.default.rootdir=./www
deployment.filesystem.default.name=filesystem
deployment.filesystem.default.metadatadir=${deployment.filesystem.metadatadir}/default