From ce2827ceee066f09e8d73ce98759e449ac21b778 Mon Sep 17 00:00:00 2001
From: Aaron Zeckoski <azeckoski@vt.edu>
Date: Wed, 7 Sep 2011 19:59:15 +0000
Subject: [PATCH] SAK-21120 fixing up pack demo to use default AND demo props
 files

git-svn-id: https://source.sakaiproject.org/svn/pack/trunk@97884 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
 pack/pack-demo/build.xml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pack/pack-demo/build.xml b/pack/pack-demo/build.xml
index 5a7c78266003..1477f7ee689b 100644
--- a/pack/pack-demo/build.xml
+++ b/pack/pack-demo/build.xml
@@ -121,10 +121,12 @@
 	        <fileset dir="${basedir}/target/pack-stage"> <include name="**/*" /> </fileset> 
 	        </copy> -->
 	
-	    <echo message="[INFO] Add demo.sakai.properties" />
-	    <copy file="${basedir}/../../config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/demo.sakai.properties"
+	    <echo message="[INFO] Add default and demo sakai.properties config" />
+            <copy file="${basedir}/../../config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties"
 	        tofile="${basedir}/target/pack/sakai/sakai.properties" />
-	
+	    <copy file="${basedir}/../../config/configuration/bundles/src/bundle/org/sakaiproject/config/bundle/demo.sakai.properties"
+	        tofile="${basedir}/target/pack/sakai/local.properties" />
+
 	    <echo message="[INFO] Add sakai.db.properties and script. " />
 	    <copy todir="${basedir}/target/pack/sakai/db">
 	        <fileset dir="${basedir}/../../reference/demo/db">
@@ -235,4 +237,4 @@
 	    
 		<echo message="[INFO] sakai-demo-${sakai.version} archives created." />
 	</target>
-</project>
\ No newline at end of file
+</project>