Index: CVSROOT/modules
===================================================================
diff -u -rc944848a81951f8657a3d85da98bae8fb2805a6e -r88fe2cb40e2b1e5c79ac5bae422decf0f37154de
--- CVSROOT/modules	(.../modules)	(revision c944848a81951f8657a3d85da98bae8fb2805a6e)
+++ CVSROOT/modules	(.../modules)	(revision 88fe2cb40e2b1e5c79ac5bae422decf0f37154de)
@@ -24,6 +24,6 @@
 # character to interpose another module into the current module.  This
 # can be useful for creating a module that consists of many directories
 # spread out over the entire source repository.
-all -a lams_admin lams_build lams_central lams_common lams_contentrepository lams_learning lams_monitoring lams_tool_chat lams_tool_deploy lams_tool_forum lams_tool_lamc lams_tool_laqa lams_tool_larsrc lams_tool_nb lams_tool_notebook lams_tool_sbmt lams_tool_scribe lams_tool_survey lams_tool_vote lams_tool_task lams_tool_gmap lams_tool_spreadsheet lams_www
+all -a lams_admin lams_build lams_central lams_common lams_contentrepository lams_learning lams_monitoring lams_tool_chat lams_tool_deploy lams_tool_forum lams_tool_lamc lams_tool_laqa lams_tool_larsrc lams_tool_nb lams_tool_notebook lams_tool_sbmt lams_tool_scribe lams_tool_survey lams_tool_vote lams_tool_task lams_tool_gmap lams_tool_spreadsheet lams_tool_daco lams_www
 core -a lams_admin lams_build lams_central lams_common lams_contentrepository lams_learning lams_monitoring lams_www
-tools -a lams_tool_chat lams_tool_deploy lams_tool_forum lams_tool_lamc lams_tool_laqa lams_tool_larsrc lams_tool_nb lams_tool_notebook lams_tool_sbmt lams_tool_scribe lams_tool_survey lams_tool_vote lams_tool_task lams_tool_gmap lams_tool_spreadsheet
\ No newline at end of file
+tools -a lams_tool_chat lams_tool_deploy lams_tool_forum lams_tool_lamc lams_tool_laqa lams_tool_larsrc lams_tool_nb lams_tool_notebook lams_tool_sbmt lams_tool_scribe lams_tool_survey lams_tool_vote lams_tool_task lams_tool_gmap lams_tool_spreadsheet lams_tool_daco
\ No newline at end of file
Index: lams_build/build.xml
===================================================================
diff -u -rc944848a81951f8657a3d85da98bae8fb2805a6e -r88fe2cb40e2b1e5c79ac5bae422decf0f37154de
--- lams_build/build.xml	(.../build.xml)	(revision c944848a81951f8657a3d85da98bae8fb2805a6e)
+++ lams_build/build.xml	(.../build.xml)	(revision 88fe2cb40e2b1e5c79ac5bae422decf0f37154de)
@@ -292,6 +292,11 @@
 			<property name="jboss.deploy" location="${jboss.deploy}"/>
 			<property name="generate.for.installers" value="${generate.for.installers}"/>
 		</ant>
+		<ant antfile="../${tool_daco_dir}/build.xml" target="deploy-tool"
+						inheritAll="false" >
+			<property name="jboss.deploy" location="${jboss.deploy}"/>
+			<property name="generate.for.installers" value="${generate.for.installers}"/>
+		</ant>
 	</target>
 
 	<target name="deploy-lams-tools" depends="test-application, deploy-common-tools" if="isLAMS"
Index: lams_build/common.properties
===================================================================
diff -u -r755a7e20f9bd45a3f42b822334e2f99279ac1238 -r88fe2cb40e2b1e5c79ac5bae422decf0f37154de
--- lams_build/common.properties	(.../common.properties)	(revision 755a7e20f9bd45a3f42b822334e2f99279ac1238)
+++ lams_build/common.properties	(.../common.properties)	(revision 88fe2cb40e2b1e5c79ac5bae422decf0f37154de)
@@ -26,7 +26,7 @@
 #conf.application=rams
 
 # which o/s related property file do you want? valid values "windows" or "unix"
-osPropertiesName=windows
+osPropertiesName=unix
 
 #Tool information
 name=lams_tool_${signature}
@@ -43,7 +43,7 @@
 tag.web.dir=../lams_central/web/WEB-INF
 
 #database access
-db.name=${conf.application}
+db.name=${conf.application}_nps
 db.driver=com.mysql.jdbc.Driver
 db.url=jdbc:mysql://localhost/${db.name}?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&autoReconnect=true&useUnicode=true
 db.encoding=utf8
Index: lams_build/shared.properties
===================================================================
diff -u -rc944848a81951f8657a3d85da98bae8fb2805a6e -r88fe2cb40e2b1e5c79ac5bae422decf0f37154de
--- lams_build/shared.properties	(.../shared.properties)	(revision c944848a81951f8657a3d85da98bae8fb2805a6e)
+++ lams_build/shared.properties	(.../shared.properties)	(revision 88fe2cb40e2b1e5c79ac5bae422decf0f37154de)
@@ -54,3 +54,4 @@
 tool_task_dir=lams_tool_task
 tool_gmap_dir=lams_tool_gmap
 tool_spreadsheet_dir=lams_tool_spreadsheet
+tool_daco_dir=lams_tool_daco