REPO-2724 Add repository.properties to ServerDescriptor configuration

src/main/java/org/alfresco/repo/descriptor/ServerDescriptorDAOImpl.java

@@ -62,15 +62,17 @@ public class ServerDescriptorDAOImpl implements DescriptorDAO
     /**
      * Sets the server descriptor from a resource file.
      * 
-     * @param descriptorResource
-     *            resource containing server descriptor meta-data
+     * @param locations
+     *            resources containing server descriptor meta-data
      * @throws IOException
      *             Signals that an I/O exception has occurred.
      */
-    public void setResource(final Resource descriptorResource) throws IOException
+    public void setResource(final Resource[] locations) throws IOException
     {
         this.serverProperties = new Properties();
-        InputStream is = descriptorResource.getInputStream();
+        for (int i=0; i< locations.length; i++)
+        {
+            InputStream is = locations[i].getInputStream();
             try
             {
                 this.serverProperties.load(is);
@@ -80,6 +82,7 @@ public class ServerDescriptorDAOImpl implements DescriptorDAO
                 if (is != null) try { is.close(); } catch (IOException e) {}
             }
         }
+    }
 
     public Descriptor getDescriptor()
     {

src/main/resources/alfresco/core-services-context.xml

@@ -859,7 +859,10 @@
             <value>${repository.name}</value>
         </property>
         <property name="resource">
+            <list>
                 <value>classpath:alfresco/version.properties</value>
+                <value>classpath:alfresco/repository.properties</value>
+            </list>
         </property>
     </bean>