Merged V2.1-A to HEAD

7666: Support property placeholders in Alfresco xml config files.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8637 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

config/alfresco/file-servers.properties

@@ -0,0 +1,3 @@
+cifs.localname=${localname}
+cifs.domain=
+cifs.broadcast=255.255.255.255

config/alfresco/file-servers.xml

@@ -2,11 +2,11 @@
 
    <config evaluator="string-compare" condition="CIFS Server">
 	  <serverEnable enabled="true"/>
-      <host name="${localname}A"/>
+      <host name="${cifs.localname}A" domain="${cifs.domain}"/>
       <comment>Alfresco CIFS Server</comment>
 
       <!-- Set to the broadcast mask for the subnet -->
-      <broadcast>255.255.255.255</broadcast>
+      <broadcast>${cifs.broadcast}</broadcast>
 
       <!-- Use Java socket based NetBIOS over TCP/IP and native SMB on linux -->
       <tcpipSMB platforms="linux,solaris,macosx"/>

config/alfresco/network-protocol-context.xml

@@ -16,6 +16,11 @@
       <constructor-arg>
          <ref bean="fileServersConfigSource" />
       </constructor-arg>
+      <property name="properties">
+         <list>
+	        <value>classpath:alfresco/file-servers.properties</value>
+	      </list>
+      </property>
    </bean>
 
    <!-- File Server Configuration -->