mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-07-24 17:32:48 +00:00
Moved alfresco-shared.properties into its own bean
within core-services-context.xml to make it easier for people with a private dev-context.xml to upgrade. Also, made cosmetic changes to avm-remote-context.xml (renamed a bean, removed tabs, etc.). git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4512 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -14,13 +14,13 @@
|
|||||||
|
|
||||||
|
|
||||||
<!-- load common properties -->
|
<!-- load common properties -->
|
||||||
<bean id="repository-properties" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
<bean id="repository-properties"
|
||||||
|
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||||
<property name="ignoreUnresolvablePlaceholders">
|
<property name="ignoreUnresolvablePlaceholders">
|
||||||
<value>true</value>
|
<value>true</value>
|
||||||
</property>
|
</property>
|
||||||
<property name="locations">
|
<property name="locations">
|
||||||
<list>
|
<list>
|
||||||
<value>classpath:alfresco/alfresco-shared.properties</value>
|
|
||||||
<value>classpath:alfresco/repository.properties</value>
|
<value>classpath:alfresco/repository.properties</value>
|
||||||
<value>classpath:alfresco/version.properties</value>
|
<value>classpath:alfresco/version.properties</value>
|
||||||
<value>classpath:alfresco/domain/transaction.properties</value>
|
<value>classpath:alfresco/domain/transaction.properties</value>
|
||||||
@@ -29,6 +29,28 @@
|
|||||||
</bean>
|
</bean>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Load properties that must be shared between the -->
|
||||||
|
<!-- Alfresco server and its remote clients. -->
|
||||||
|
<!-- -->
|
||||||
|
<!-- Note: This is done in a seperate bean to make it -->
|
||||||
|
<!-- for users who have alrady overridden their -->
|
||||||
|
<!-- "repository-properties" in a dev-context.xml -->
|
||||||
|
<!-- or custom-db-and-data-context.xml file. -->
|
||||||
|
|
||||||
|
<bean id="shared-properties"
|
||||||
|
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
|
||||||
|
<property name="ignoreUnresolvablePlaceholders">
|
||||||
|
<value>true</value>
|
||||||
|
</property>
|
||||||
|
<property name="locations">
|
||||||
|
<list>
|
||||||
|
<value>classpath:alfresco/alfresco-shared.properties</value>
|
||||||
|
</list>
|
||||||
|
</property>
|
||||||
|
</bean>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<!-- Custom MBeanServer -->
|
<!-- Custom MBeanServer -->
|
||||||
<bean id="alfrescoMBeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
|
<bean id="alfrescoMBeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user