inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge V3.4 to HEAD

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

14
config/alfresco/deployment/filesystem-target.xml → config/alfresco/deployment/filesystem-target-sample.xml
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"

20
config/alfresco/deployment/filesystem.properties
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

85
config/alfresco/extension/restore-context.xml.sample
View File

@@ -1,85 +0,0 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE beans PUBLIC '-//SPRING//DTD BEAN//EN' 'http://www.springframework.org/dtd/spring-beans.dtd'>
<beans>
<bean id="systemInfoBootstrap" parent="systemInfoImporter">
<property name="bootstrapView">
<value>alfresco/extension/restore/export_systeminfo.xml</value>
</property>
</bean>
<bean id="userBootstrap" parent="userStoreImporter">
<property name="bootstrapViews">
<list>
<props>
<prop key="path">/</prop>
<prop key="location">alfresco/extension/restore/export_users.acp</prop>
</props>
</list>
</property>
<property name="log"><value>true</value></property>
</bean>
<bean id="systemBootstrap" parent="systemStoreImporter">
<property name="bootstrapViews">
<list>
<props>
<prop key="path">/</prop>
<prop key="location">alfresco/extension/restore/export_system.acp</prop>
</props>
</list>
</property>
<property name="log"><value>true</value></property>
</bean>
<bean id="versionBootstrap" parent="versionStoreImporter">
<property name="bootstrapViews">
<list>
<props>
<prop key="path">/</prop>
<prop key="location">alfresco/extension/restore/export_versions.acp</prop>
</props>
</list>
</property>
<property name="log"><value>true</value></property>
</bean>
<bean id="spacesArchiveBootstrap" parent="spacesArchiveStoreImporter">
<property name="bootstrapViews">
<list>
<props>
<prop key="path">/</prop>
<prop key="location">alfresco/extension/restore/export_spaces_archive.acp</prop>
</props>
</list>
</property>
</bean>
<bean id="spacesModelsBootstrap" parent="spacesStoreImporter">
<property name="bootstrapViews">
<list>
<props>
<prop key="path"></prop>
<prop key="location">alfresco/extension/restore/export_models.acp</prop>
</props>
</list>
</property>
<property name="log"><value>true</value></property>
</bean>
<bean id="spacesBootstrap" parent="spacesStoreImporter">
<property name="useExistingStore"><value>true</value></property>
<property name="bootstrapViews">
<list>
<props>
<prop key="path">/</prop>
<prop key="location">alfresco/extension/restore/export_spaces.acp</prop>
<prop key="uuidBinding">UPDATE_EXISTING</prop>
</props>
</list>
</property>
<property name="log"><value>true</value></property>
</bean>
</beans>

33
config/alfresco/repository.properties
View File

@@ -532,3 +532,36 @@ transferservice.receiver.lockRetryWait=100
# time" for both source and destination. Default 5 minutes.
transferservice.receiver.lockTimeOut=300000
; DM Receiever Properties
;
; The name of the DM Receiver target - you deploy to this target name
deployment.dmr.name=alfresco
; consolidate staging, author and workflow sandboxes to one
deployment.dmr.consolidate=true
; The name of the Alfresco receiver targer
deployment.avm.name=avm
;Where should the root of the web project be stored, by default /www/avm_webapps
deployment.avm.rootPath=/www/avm_webapps
; Pattern for live stores deployment by the alfresco receiver
deployment.avm.storeNamePattern=%storeName%-live
; 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

4
source/java/org/alfresco/repo/avm/MultiTAVMService.java
View File

@@ -865,7 +865,7 @@ public class MultiTAVMService implements AVMService
private String getTenantPath(String avmPath)
{
if ((avmPath == null) || (! isTenantServiceEnabled()))
if ((avmPath == null) || (! isTenantServiceEnabled()) || avmPath.equals("UNKNOWN/UNKNOWN"))
{
return avmPath;
}
@@ -877,7 +877,7 @@ public class MultiTAVMService implements AVMService
private String getBasePath(String avmPath)
{
// note: ALFCOM-2893 - getCommonAncestor can return node with path = "/"
if ((avmPath == null) || (! isTenantServiceEnabled()) || (avmPath.equals("/")))
if ((avmPath == null) || (! isTenantServiceEnabled()) || (avmPath.equals("/")) || avmPath.equals("UNKNOWN/UNKNOWN"))
{
return avmPath;
}