From 051e4ba67975c665e1cc807b1b9b3908addb4c29 Mon Sep 17 00:00:00 2001
From: Jon Cox <jon.cox@alfresco.com>
Date: Tue, 5 Dec 2006 00:38:17 +0000
Subject: [PATCH]  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
---
 config/alfresco/core-services-context.xml | 26 +++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/config/alfresco/core-services-context.xml b/config/alfresco/core-services-context.xml
index aa3e26d875..69b1f5aeb3 100644
--- a/config/alfresco/core-services-context.xml
+++ b/config/alfresco/core-services-context.xml
@@ -14,13 +14,13 @@
 
 
     <!-- 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">
             <value>true</value>
         </property>
         <property name="locations">
             <list>
-                <value>classpath:alfresco/alfresco-shared.properties</value>
                 <value>classpath:alfresco/repository.properties</value>
                 <value>classpath:alfresco/version.properties</value>
                 <value>classpath:alfresco/domain/transaction.properties</value>
@@ -29,6 +29,28 @@
     </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 -->
     <bean id="alfrescoMBeanServer" class="org.springframework.jmx.support.MBeanServerFactoryBean"/>