mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
svn merge -r 2570:2595 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root
svn merge -r 2597:2649 svn://www.alfresco.org/alfresco/BRANCHES/V1.2.0/root HEAD/root git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2650 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
@@ -13,6 +13,7 @@
|
||||
<sys:versionMajor>${version.major}</sys:versionMajor>
|
||||
<sys:versionMinor>${version.minor}</sys:versionMinor>
|
||||
<sys:versionRevision>${version.revision}</sys:versionRevision>
|
||||
<sys:versionEdition><view:values><view:value>${version.edition}</view:value></view:values></sys:versionEdition>
|
||||
<sys:versionLabel>${version.label}</sys:versionLabel>
|
||||
<sys:versionSchema>${version.schema}</sys:versionSchema>
|
||||
</sys:descriptor>
|
||||
|
||||
@@ -617,9 +617,170 @@
|
||||
<!-- Query collections should be loaded on demand using this component - once loaded thay are available for use -->
|
||||
</bean>
|
||||
|
||||
<!-- Security related beans -->
|
||||
<!-- Importers -->
|
||||
|
||||
|
||||
<bean id="viewParser" class="org.alfresco.repo.importer.view.ViewParser">
|
||||
<property name="namespaceService">
|
||||
<ref bean="namespaceService" />
|
||||
</property>
|
||||
<property name="dictionaryService">
|
||||
<ref bean="dictionaryService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="importerComponent" class="org.alfresco.repo.importer.ImporterComponent">
|
||||
<!-- For now, hard-wire the view parser -->
|
||||
<property name="namespaceService">
|
||||
<ref bean="NamespaceService" />
|
||||
</property>
|
||||
<property name="dictionaryService">
|
||||
<ref bean="DictionaryService" />
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="NodeService" />
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="SearchService" />
|
||||
</property>
|
||||
<property name="contentService">
|
||||
<ref bean="ContentService" />
|
||||
</property>
|
||||
<property name="ruleService">
|
||||
<ref bean="RuleService" />
|
||||
</property>
|
||||
<property name="permissionService">
|
||||
<ref bean="PermissionService" />
|
||||
</property>
|
||||
<property name="authorityService">
|
||||
<ref bean="AuthorityService" />
|
||||
</property>
|
||||
<property name="authenticationService">
|
||||
<ref bean="AuthenticationService" />
|
||||
</property>
|
||||
<property name="viewParser">
|
||||
<ref bean="viewParser" />
|
||||
</property>
|
||||
<property name="behaviourFilter">
|
||||
<ref bean="policyBehaviourFilter" />
|
||||
</property>
|
||||
<property name="ownableService">
|
||||
<ref bean="ownableService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="storeImporter" class="org.alfresco.repo.importer.ImporterBootstrap" abstract="true">
|
||||
<property name="transactionService">
|
||||
<ref bean="transactionComponent"/>
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="nodeService"/>
|
||||
</property>
|
||||
<property name="importerService">
|
||||
<ref bean="importerComponent"/>
|
||||
</property>
|
||||
<property name="namespaceService">
|
||||
<ref bean="namespaceService"/>
|
||||
</property>
|
||||
<property name="authenticationComponent">
|
||||
<ref bean="authenticationComponent" />
|
||||
</property>
|
||||
<property name="allowWrite">
|
||||
<value>${server.transaction.allow-writes}</value>
|
||||
</property>
|
||||
<!-- To specify a locale other than the system default, uncomment the following
|
||||
<property name="locale">
|
||||
<value>en_GB</value>
|
||||
</property>
|
||||
-->
|
||||
</bean>
|
||||
|
||||
<bean id="userStoreImporter" parent="storeImporter" abstract="true">
|
||||
<property name="storeUrl">
|
||||
<value>${alfresco_user_store.store}</value>
|
||||
</property>
|
||||
<property name="configuration">
|
||||
<props>
|
||||
<prop key="alfresco_user_store.system_container.childname">${alfresco_user_store.system_container.childname}</prop>
|
||||
<prop key="alfresco_user_store.user_container.childname">${alfresco_user_store.user_container.childname}</prop>
|
||||
<prop key="alfresco_user_store.authorities_container.childname">${alfresco_user_store.authorities_container.childname}</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="systemStoreImporter" parent="storeImporter" abstract="true">
|
||||
<property name="storeUrl">
|
||||
<value>${system.store}</value>
|
||||
</property>
|
||||
<property name="mustNotExistStoreUrls">
|
||||
<list>
|
||||
<value>${spaces.store}</value>
|
||||
</list>
|
||||
</property>
|
||||
<property name="configuration">
|
||||
<props>
|
||||
<prop key="version.major">${version.major}</prop>
|
||||
<prop key="version.minor">${version.minor}</prop>
|
||||
<prop key="version.revision">${version.revision}</prop>
|
||||
<prop key="version.label">${version.label}</prop>
|
||||
<prop key="version.schema">${version.schema}</prop>
|
||||
<prop key="version.edition">${version.edition}</prop>
|
||||
<prop key="system.descriptor.childname">${system.descriptor.childname}</prop>
|
||||
<prop key="system.descriptor.current.childname">${system.descriptor.current.childname}</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="spacesStoreImporter" parent="storeImporter" abstract="true">
|
||||
<property name="storeUrl">
|
||||
<value>${spaces.store}</value>
|
||||
</property>
|
||||
<property name="configuration">
|
||||
<props>
|
||||
<prop key="spaces.company_home.childname">${spaces.company_home.childname}</prop>
|
||||
<prop key="spaces.guest_home.childname">${spaces.guest_home.childname}</prop>
|
||||
<prop key="system.system_container.childname">${system.system_container.childname}</prop>
|
||||
<prop key="system.people_container.childname">${system.people_container.childname}</prop>
|
||||
<prop key="spaces.dictionary.childname">${spaces.dictionary.childname}</prop>
|
||||
<prop key="spaces.templates.childname">${spaces.templates.childname}</prop>
|
||||
<prop key="spaces.templates.content.childname">${spaces.templates.content.childname}</prop>
|
||||
<prop key="spaces.savedsearches.childname">${spaces.savedsearches.childname}</prop>
|
||||
</props>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<bean id="versionStoreImporter" parent="storeImporter" abstract="true">
|
||||
<property name="storeUrl">
|
||||
<value>workspace://lightWeightVersionStore</value>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Exporters -->
|
||||
<bean id="exporterComponent" class="org.alfresco.repo.exporter.ExporterComponent">
|
||||
<property name="namespaceService">
|
||||
<ref bean="NamespaceService" />
|
||||
</property>
|
||||
<property name="dictionaryService">
|
||||
<ref bean="DictionaryService" />
|
||||
</property>
|
||||
<property name="nodeService">
|
||||
<ref bean="NodeService" />
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="SearchService" />
|
||||
</property>
|
||||
<property name="contentService">
|
||||
<ref bean="ContentService" />
|
||||
</property>
|
||||
<property name="descriptorService">
|
||||
<ref bean="DescriptorService" />
|
||||
</property>
|
||||
<property name="authenticationService">
|
||||
<ref bean="AuthenticationService" />
|
||||
</property>
|
||||
<property name="permissionService">
|
||||
<ref bean="PermissionService" />
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
<!-- Audit -->
|
||||
<bean id="auditableAspect" class="org.alfresco.repo.audit.AuditableAspect" init-method="init">
|
||||
|
||||
@@ -60,3 +60,6 @@ patch.emailTemplatesFolder.result.created=The email templates folder was success
|
||||
|
||||
patch.emailTemplatesContent.description=Loads the email templates into the Email Templates folder.
|
||||
patch.emailTemplatesContent.result=Imported the Email Templates into the default folder.
|
||||
|
||||
patch.descriptorUpdate.description=Update Repository descriptor
|
||||
patch.descriptorUpdate.result=Repository descriptor updated
|
||||
|
||||
@@ -46,9 +46,10 @@
|
||||
<mandatory enforced="true">true</mandatory>
|
||||
<default>0</default>
|
||||
</property>
|
||||
<property name="sys:license">
|
||||
<type>d:content</type>
|
||||
</property>
|
||||
<property name="sys:versionEdition">
|
||||
<type>d:any</type>
|
||||
<multiple>true</multiple>
|
||||
</property>
|
||||
</properties>
|
||||
</type>
|
||||
|
||||
|
||||
@@ -320,4 +320,19 @@
|
||||
<!-- Note: targetSchema 11 is allocated for patching in an enterprise trial license -->
|
||||
<!-- A patch bean is not provided as this is handled by the license component internally (enterprise only) -->
|
||||
|
||||
<bean id="patch.descriptorUpdate" class="org.alfresco.repo.admin.patch.impl.DescriptorUpdatePatch" parent="basePatch" >
|
||||
<property name="id"><value>patch.descriptorUpdate</value></property>
|
||||
<property name="description"><value>patch.descriptorUpdate.description</value></property>
|
||||
<property name="fixesFromSchema"><value>0</value></property>
|
||||
<property name="fixesToSchema"><value>11</value></property>
|
||||
<property name="targetSchema"><value>12</value></property>
|
||||
<!-- helper beans for execution -->
|
||||
<property name="systemBootstrap">
|
||||
<ref bean="systemBootstrap"/>
|
||||
</property>
|
||||
<property name="searchService">
|
||||
<ref bean="searchService"/>
|
||||
</property>
|
||||
</bean>
|
||||
|
||||
</beans>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
version.major=1
|
||||
version.minor=3
|
||||
version.revision=0
|
||||
version.label=dev
|
||||
version.label=
|
||||
|
||||
# Edition label
|
||||
|
||||
@@ -15,4 +15,4 @@ version.edition=Community Network
|
||||
|
||||
# Schema number
|
||||
|
||||
version.schema=11
|
||||
version.schema=12
|
||||
|
||||
Reference in New Issue
Block a user