From e17d57a43b37ed5a562897684a0e16b4fbca9d6a Mon Sep 17 00:00:00 2001
From: Jon Cox <jon.cox@alfresco.com>
Date: Thu, 21 Dec 2006 19:22:53 +0000
Subject: [PATCH]  Prior to the merge you could have a dev-context.xml file
 within:

     root/projects/repository/config/alfresco/extension

 That got clobbered within root/projects/web-client/project-build.xml
 by an "excludes" without a special case for dev-context.xml.
 Fixed it so now dev-context.xml works again.


 Also, added some svn:ignore props to root/projects/records-mgmt/build
 so that build output dirs don't show up in "svn status" anymore.




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@4684 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 project-build.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/project-build.xml b/project-build.xml
index 94ba7b573e..d709d2a8fd 100644
--- a/project-build.xml
+++ b/project-build.xml
@@ -79,6 +79,14 @@
          <fileset dir="${dir.config.repository}" excludes="**/extension/**" />
          <fileset dir="${dir.config.repository}" includes="**/extension/dev-context.xml" />
          <fileset dir="${dir.config.webclient}" excludes="**/extension/**" />
+         <!-- 
+              Add dev-context.xml (if present) to WEB-INF/classes.
+              This allows developers doing private builds to override
+              default values in a repeatable way.  An individual's
+              dev-context.xml does not become part of the normal source
+              code tree (it's excluded from check-in automatically).
+         -->
+         <fileset dir="${dir.config.repository}" includes="**/extension/dev-context.xml"/>
       </copy>
       
       <!-- clean up previously generated properties files -->