From dca8be14ddfe28f5e0c0c5fc50123dd118d4fa1f Mon Sep 17 00:00:00 2001
From: David Caruana <david.caruana@alfresco.com>
Date: Mon, 31 Mar 2008 14:00:19 +0000
Subject: [PATCH] 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      | 3 +++
 config/alfresco/file-servers.xml             | 4 ++--
 config/alfresco/network-protocol-context.xml | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)
 create mode 100644 config/alfresco/file-servers.properties

diff --git a/config/alfresco/file-servers.properties b/config/alfresco/file-servers.properties
new file mode 100644
index 0000000000..277a4b9a2f
--- /dev/null
+++ b/config/alfresco/file-servers.properties
@@ -0,0 +1,3 @@
+cifs.localname=${localname}
+cifs.domain=
+cifs.broadcast=255.255.255.255
diff --git a/config/alfresco/file-servers.xml b/config/alfresco/file-servers.xml
index 928307221c..6f85f0aa76 100644
--- a/config/alfresco/file-servers.xml
+++ b/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"/>
diff --git a/config/alfresco/network-protocol-context.xml b/config/alfresco/network-protocol-context.xml
index df6824a477..fa68975f92 100644
--- a/config/alfresco/network-protocol-context.xml
+++ b/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 -->