mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
1) Merge issue - import/export spring config duplicated - fix build issue.
2) Addition of debug logging for trial eligibility git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2665 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
David Caruana
@@ -600,171 +600,6 @@
|
||||
<!-- Query collections should be loaded on demand using this component - once loaded thay are available for use -->
|
||||
</bean>
|
||||
|
||||
<!-- 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">
|
||||
<property name="nodeService">
|
||||
|
||||
@@ -179,6 +179,7 @@
|
||||
<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>
|
||||
|
||||
Reference in New Issue
Block a user