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

Morning merge.

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@2851 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-05-11 17:01:57 +00:00
parent 6418bb6d23
commit a22ddfb666
74 changed files with 905 additions and 1190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
config/alfresco/action-services-context.xml
View File

@@ -14,6 +14,9 @@
</property>
<property name="authenticationComponent">
<ref bean="authenticationComponent" />
</property>
<property name="dictionaryService">
<ref bean="DictionaryService" />
</property>
<property name="asynchronousActionExecutionQueue">
<ref bean="asynchronousActionExecutionQueue"/>
@@ -203,6 +206,11 @@
<property name="mimetypeService">
<ref bean="mimetypeService" />
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="transform-image" class="org.alfresco.repo.action.executer.ImageTransformActionExecuter"
@@ -234,6 +242,11 @@
<property name="cociService">
<ref bean="checkOutCheckInService"></ref>
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="check-out" class="org.alfresco.repo.action.executer.CheckOutActionExecuter" parent="action-executer">
@@ -243,6 +256,11 @@
<property name="cociService">
<ref bean="checkOutCheckInService"></ref>
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="mail" class="org.alfresco.repo.action.executer.MailActionExecuter" parent="action-executer">
@@ -291,6 +309,11 @@
<property name="metadataExtracterRegistry">
<ref bean="metadataExtracterRegistry" />
</property>
<property name="applicableTypes">
<list>
<value>{http://www.alfresco.org/model/content/1.0}content</value>
</list>
</property>
</bean>
<bean id="import" class="org.alfresco.repo.action.executer.ImporterActionExecuter" parent="action-executer">

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

@@ -25,47 +25,6 @@
<bean name="internalEHCacheManager" class="org.alfresco.repo.cache.InternalEhCacheManagerFactoryBean" />
<!-- ================ -->
<!-- Null permissions -->
<!-- ================ -->
<!-- The cross-transaction shared cache for Null Node Permissions -->
<bean name="nullPermissionSharedCache" 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>nullPermissionCache</value>
</property>
<property name="maxElementsInMemory">
<value>10000</value> <!-- approx 8MB memory required -->
</property>
<property name="overflowToDisk">
<value>false</value>
</property>
</bean>
</property>
</bean>
<!-- The transactional cache for Null Node Permissions -->
<bean name="nullPermissionCache" class="org.alfresco.repo.cache.TransactionalCache">
<property name="sharedCache">
<ref bean="nullPermissionSharedCache" />
</property>
<property name="cacheManager" >
<ref bean="transactionalEHCacheManager" />
</property>
<property name="name">
<value>nullPermissionTransactionalCache</value>
</property>
<property name="maxCacheSize">
<value>5000</value>
</property>
</bean>
<!-- ===================================== -->
<!-- Authority container look up for users -->

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

@@ -151,14 +151,14 @@
<!-- Permission related caches -->
<!-- approx 40MB memory required -->
<cache
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl"
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"
maxElementsInMemory="10000"
eternal="true"
overflowToDisk="false"/>
<!-- approx 2MB memory required -->
<!-- approx ??MB memory required -->
<cache
name="org.alfresco.repo.domain.hibernate.DbPermissionImpl"
maxElementsInMemory="500"
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries"
maxElementsInMemory="10000"
eternal="true"
overflowToDisk="false"/>
<!-- approx 35MB memory required -->
@@ -167,9 +167,15 @@
maxElementsInMemory="25000"
eternal="true"
overflowToDisk="false"/>
<!-- approx 2MB memory required -->
<cache
name="org.alfresco.repo.domain.hibernate.DbPermissionImpl"
maxElementsInMemory="500"
eternal="true"
overflowToDisk="false"/>
<!-- approx 40MB memory required -->
<cache
name="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl"
name="org.alfresco.repo.domain.hibernate.DbAuthorityImpl"
maxElementsInMemory="10000"
eternal="true"
overflowToDisk="false"/>

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

@@ -65,6 +65,7 @@
<prop key="org.alfresco.repo.domain.hibernate.NodeImpl.sourceNodeAssocs">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.NodeImpl.targetNodeAssocs">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.DbAccessControlListImpl.entries">${cache.strategy}</prop>
<prop key="org.alfresco.repo.domain.hibernate.DbAuthorityImpl.externalKeys">${cache.strategy}</prop>
</props>
</property>
@@ -94,9 +95,6 @@
<property name="sessionFactory">
<ref bean="sessionFactory" />
</property>
<property name="nullPermissionCache">
<ref bean="nullPermissionCache" />
</property>
<property name="nodeDaoService">
<ref bean="nodeDaoService" />
</property>

4
config/alfresco/messages/content-model.properties
View File

@@ -100,8 +100,8 @@ cm_contentmodel.association.cm_formats.description=Transformed Items
cm_contentmodel.aspect.cm_templatable.title=Templatable
cm_contentmodel.aspect.cm_templatable.description=Templatable
cm_contentmodel.aspect.cm_template.title=Template
cm_contentmodel.aspect.cm_template.description=Template
cm_contentmodel.property.cm_template.title=Template
cm_contentmodel.property.cm_template.description=Template
cm_contentmodel.aspect.cm_complianceable.title=Complianceable
cm_contentmodel.aspect.cm_complianceable.description=Complianceable

9
config/alfresco/messages/system-model.properties
View File

@@ -29,3 +29,12 @@ sys_systemmodel.property.sys_store-identifier.title=Store Identifier
sys_systemmodel.property.sys_store-identifier.description=Store Identifier
sys_systemmodel.property.sys_node-uuid.title=Node Identifier
sys_systemmodel.property.sys_node-uuid.description=Node Identifier
sys_systemmodel.aspect.sys_archived.title=Archived
sys_systemmodel.aspect.sys_archived.description=Archived Node
sys_systemmodel.property.sys_archivedBy.title=Archived By
sys_systemmodel.property.sys_archivedBy.description=Archived By
sys_systemmodel.property.sys_archivedDate.title=Archived Date
sys_systemmodel.property.sys_archivedDate.description=Archived Date
sys_systemmodel.property.sys_archivedOriginalPath.title=Original Location
sys_systemmodel.property.sys_archivedOriginalPath.description=Original Location