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

Merged V2.2 to HEAD

Browse Source 
7690: Build fix
   7694: AVM permissions


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8443 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-03-06 21:53:29 +00:00
parent ecb74c1447
commit 4fc796b4a3
29 changed files with 658 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
config/alfresco/cache-context.xml
View File

@@ -424,7 +424,44 @@
<value>50</value>
</property>
</bean>
<!-- ===================================== -->
<!-- ACL cache -->
<!-- ===================================== -->
<!-- The cross-transaction shared cache for Acls -->
<bean name="aclSharedCache" class="org.alfresco.repo.cache.EhCacheAdapter">
<property name="cache">
<bean class="org.springframework.cache.ehcache.EhCacheFactoryBean" >
<property name="cacheManager">
<ref bean="internalEHCacheManager" />
</property>
<property name="cacheName">
<value>org.alfresco.cache.aclCache</value>
</property>
</bean>
</property>
</bean>
<!-- The transactional cache for Node Ownership -->
<bean name="aclCache" class="org.alfresco.repo.cache.TransactionalCache">
<property name="sharedCache">
<ref bean="aclSharedCache" />
</property>
<property name="cacheManager" >
<ref bean="transactionalEHCacheManager" />
</property>
<property name="name">
<value>org.alfresco.aclTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>10000</value>
</property>
</bean>
<!-- ===================================== -->
<!-- Messages Caches -->
<!-- ===================================== -->

2
config/alfresco/dbscripts/upgrade/2.2/org.hibernate.dialect.MySQLInnoDBDialect/AlfrescoSchemaUpdate-2.2-ACL.sql
View File

@@ -8,7 +8,7 @@
--
-- Add index support for AVM
-- Ideally we would have the indirection in the index but it is too long for mysql
-- Ideally we would have the indirection in the index but it is too long for mysql which needs additional options
-- CREATE INDEX idx_avm_lyr_indn on avm_nodes (primary_indirection, indirection(128));
-- This matches the hibernate schema and should be good enough for the standard WCM use cases
CREATE INDEX idx_avm_lyr_indn on avm_nodes (primary_indirection);

8
config/alfresco/ehcache-default.xml
View File

@@ -331,6 +331,12 @@
eternal="true"
overflowToDisk="false"
/>
<cache
name="org.alfresco.cache.aclCache"
maxElementsInMemory="50000"
eternal="true"
overflowToDisk="false"
/>
<!-- Web Client Config (tenant-based) -->
@@ -448,5 +454,5 @@
eternal="true"
overflowToDisk="false"
/>
</ehcache>

14
config/alfresco/extension/ehcache-custom.xml.sample.cluster
View File

@@ -526,6 +526,20 @@
replicateAsynchronously = false"/>
</cache>
<cache
name="org.alfresco.cache.aclCache"
maxElementsInMemory="50000"
eternal="true"
overflowToDisk="false">
<cacheEventListenerFactory
class="net.sf.ehcache.distribution.RMICacheReplicatorFactory"
properties="replicatePuts = false,
replicateUpdates = true,
replicateRemovals = true,
replicateUpdatesViaCopy = false,
replicateAsynchronously = false"/>
</cache>
<!-- Web Client Config (tenant-based) -->

3
config/alfresco/hibernate-context.xml
View File

@@ -259,6 +259,9 @@
<bean id="aclDaoComponent" class="org.alfresco.repo.domain.hibernate.AclDaoComponentImpl">
<property name="sessionFactory">
<ref bean="sessionFactory" />
</property>
<property name="aclCache">
<ref bean="aclCache" />
</property>
</bean>

3
config/alfresco/messages/patch-service.properties
View File

@@ -206,3 +206,6 @@ patch.updateAvmPermissionData.result=Changed {0} 'webfolder' access control entr
patch.updateAvmPermissions.description=Update ACLs on all avm objects to the new 2.2 permission model
patch.updateAvmPermissions.result=Updated ACLs. Created {0} defining and {1} layered ACLs.
patch.wcmPermissionPatch.description=Fix ACLs so they are only set on the staging area store.
patch.wcmPermissionPatch.result=Updated ACLs: ACLS are moved to the staging area store and removed from all other stores. They are now applied via layering.

37
config/alfresco/patch/patch-services-context.xml
View File

@@ -1268,8 +1268,8 @@
<property name="id"><value>patch.db-V2.2-QNames-0-CreateMissingTables</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="fixesToSchema"><value>120</value></property>
<property name="targetSchema"><value>121</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-0-create-missing-tables.sql</value>
</property>
@@ -1283,8 +1283,8 @@
<property name="id"><value>patch.db-V2.2-QNames-1-DropIndexesAndConstraints</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="fixesToSchema"><value>120</value></property>
<property name="targetSchema"><value>121</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-1-drop-indexes-and-constraints.sql</value>
</property>
@@ -1298,8 +1298,8 @@
<property name="id"><value>patch.db-V2.2-QNames-2-MoveQNames</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="fixesToSchema"><value>120</value></property>
<property name="targetSchema"><value>121</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-2-move-qnames.sql</value>
</property>
@@ -1313,8 +1313,8 @@
<property name="id"><value>patch.db-V2.2-QNames-3-PropTypes</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="fixesToSchema"><value>120</value></property>
<property name="targetSchema"><value>121</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-3-proptypes.sql</value>
</property>
@@ -1328,8 +1328,8 @@
<property name="id"><value>patch.db-V2.2-QNames-4-ExtraIndexesAndConstraints</value></property>
<property name="description"><value>patch.schemaUpgradeScript.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>85</value></property>
<property name="targetSchema"><value>86</value></property>
<property name="fixesToSchema"><value>120</value></property>
<property name="targetSchema"><value>121</value></property>
<property name="scriptUrl">
<value>classpath:alfresco/dbscripts/upgrade/2.2/${db.script.dialect}/upgrade-4-extra-indexes-and-constraints.sql</value>
</property>
@@ -1340,4 +1340,21 @@
</property>
</bean>
<bean id="patch.wcmPermissionPatch" class="org.alfresco.repo.admin.patch.impl.WCMPermissionPatch" parent="basePatch" >
<property name="id"><value>patch.wcmPermissionPatch</value></property>
<property name="description"><value>patch.wcmPermissionPatch.description</value></property>
<property name="fixesFromSchema"><value>0</value></property>
<property name="fixesToSchema"><value>121</value></property>
<property name="targetSchema"><value>122</value></property>
<!-- helper beans -->
<property name="avmService">
<ref bean="avmService" />
</property>
<property name="permissionService">
<ref bean="permissionService" />
</property>
<property name="avmSnapShotTriggeredIndexingMethodInterceptor">
<ref bean="avmSnapShotTriggeredIndexingMethodInterceptor" />
</property>
</bean>
</beans>

2
config/alfresco/version.properties
View File

@@ -19,4 +19,4 @@ version.build=@build-number@
# Schema number
version.schema=121
version.schema=122