Index: lams_learning/build.properties
===================================================================
diff -u -rd5a1bb6a8f1d277a6d39b5866cabe0f45558a91a -rcc986867ccf2cb62e83508696af85b0f3f65a0ff
--- lams_learning/build.properties	(.../build.properties)	(revision d5a1bb6a8f1d277a6d39b5866cabe0f45558a91a)
+++ lams_learning/build.properties	(.../build.properties)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
@@ -29,6 +29,10 @@
 conf.struts.dir=${conf.web.dir}/WEB-INF/struts
 conf.xdoclet.dir=${conf.dir}/xdoclet
 
+#learning package definition
+learning.package=org.lamsfoundation.lams.learning
+learning.path=org/lamsfoundation/lams/learning
+
 #xdoclet version number
 xdoclet.version=1.2.2
 
Index: lams_learning/build.xml
===================================================================
diff -u -r7213f7efef305780b43d6d8f8c3f0616237ba8ec -rcc986867ccf2cb62e83508696af85b0f3f65a0ff
--- lams_learning/build.xml	(.../build.xml)	(revision 7213f7efef305780b43d6d8f8c3f0616237ba8ec)
+++ lams_learning/build.xml	(.../build.xml)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
@@ -90,6 +90,22 @@
 				<path refid="project.classpath" />
 			</classpath>
 		</javac>
+  		<copy overwrite="yes" todir="${build.classes.java}">
+  			<fileset dir="${src.dir.test}">
+  				<include name="*.hbm.xml"/>
+  			</fileset>
+  		</copy>	
+		<copy overwrite="yes"
+			todir="${build.classes.test}/${learning.path}">
+			<fileset dir="${src.dir.test}/${learning.path}">
+				<include name="*.xml" />
+			</fileset>
+		</copy>
+  		<copy overwrite="yes" todir="${build.classes.java}/${learning.path}">
+  			<fileset dir="${src.dir.java}/${learning.path}">
+  				<include name="**/*.properties"/>
+  			</fileset>
+  		</copy>	
 	</target>
 
 	<target name="compile.test" depends="compile.java">
@@ -100,12 +116,6 @@
 				<path refid="project.classpath" />
 			</classpath>
 		</javac>
-		<copy overwrite="yes"
-			todir="${build.classes.test}/${survey.path}">
-			<fileset dir="${src.dir.test}/${survey.path}">
-				<include name="*.xml" />
-			</fileset>
-		</copy>
 	</target>
 	<!-- ================================================================ -->
 	<!-- Make jar archive for deployment        		    	          -->
@@ -228,6 +238,11 @@
 			<lib dir="${conf.webinf.dir}/lib"/>
 			<fileset dir="${conf.web.dir}">
 				<include name="*"/>
+				<include name="css/*"/>
+				<include name="gate/*"/>
+				<include name="grouping/*"/>
+				<include name="images/*"/>
+				<include name="layout/*"/>
 			</fileset>
 		</war>
 	</target>
Index: lams_learning/web/WEB-INF/lib/lams-tool-survey.jar
===================================================================
diff -u -ra76f6c3883a0393255ec4af436307c649be073ea -rcc986867ccf2cb62e83508696af85b0f3f65a0ff
Binary files differ
Index: lams_learning/web/WEB-INF/lib/lams.jar
===================================================================
diff -u -ra76f6c3883a0393255ec4af436307c649be073ea -rcc986867ccf2cb62e83508696af85b0f3f65a0ff
Binary files differ
Index: lams_learning/web/WEB-INF/spring/surveyApplicationContext.xml
===================================================================
diff -u
--- lams_learning/web/WEB-INF/spring/surveyApplicationContext.xml	(revision 0)
+++ lams_learning/web/WEB-INF/spring/surveyApplicationContext.xml	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+
+<!--
+  - Application context definition for lams survey business layer.
+	- Contains bean references to the transaction manager and to the DAOs in
+	- dataAccessContext.xml (see web.xml's "contextConfigLocation").
+	-->
+<beans>
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ======================== -->
+
+	<!--
+		- A parent bean definition which is a base definition for transaction proxies.
+		- It's marked as abstract, since it's not supposed to be instantiated itself.
+		- We set shared transaction attributes here, following our naming patterns.
+		- The attributes can still be overridden in child bean definitions.
+    -->
+	<bean id="baseTransactionProxy" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean" 
+	  	  abstract="true">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="copy*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="leaveToolSession">PROPAGATION_REQUIRED,ISOLATION_READ_COMMITTED</prop>
+				<!-- prop key="remove*">PROPAGATION_REQUIRED</prop-->
+			</props>
+		</property>
+	</bean>
+
+	<!--
+	  - Lams survey primary business object (default implementation), as an inner bean wrapped
+		- by an outer transactional proxy. The two bean definitions could have been separate,
+		- but this is cleaner as there is no need to ever access the unwrapped object.
+		-->
+	<bean id="surveyService" parent="baseTransactionProxy">
+		<property name="target">
+			<bean class="org.lamsfoundation.lams.tool.survey.service.SurveyServicePOJO">
+				<property name="surveyDAO"><ref bean="surveyContentDAO"/></property>
+				<property name="surveySessionDAO"><ref bean="surveySessionDAO"/></property>				
+				<property name="surveyUsrRespDAO"><ref bean="surveyUsrRespDAO"/></property>			
+				<property name="questionTypeDAO"><ref bean="questionTypeDAO"/></property>			
+				<property name="userManagementService"><ref bean="userManagementService"/></property>			
+				<property name="learnerService"><ref bean="learnerService"/></property>
+			</bean>
+		</property>
+	</bean>  
+
+</beans>
Index: lams_learning/web/WEB-INF/struts/tiles-defs.xml
===================================================================
diff -u -r715f8fde307b93cafb4b879577610d159684aaf6 -rcc986867ccf2cb62e83508696af85b0f3f65a0ff
--- lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision 715f8fde307b93cafb4b879577610d159684aaf6)
+++ lams_learning/web/WEB-INF/struts/tiles-defs.xml	(.../tiles-defs.xml)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
@@ -67,7 +67,7 @@
 	</definition>
 	<definition name=".welcome" extends=".activityLayout">
 		<put name="title" value="Welcome"/>
-		<put name="body" value="welcome.jsp"/>
+		<put name="body" value="/welcome.jsp"/>
 	</definition>
 	
 	<!-- Journal definitions -->
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
diff -u -r715f8fde307b93cafb4b879577610d159684aaf6 -rcc986867ccf2cb62e83508696af85b0f3f65a0ff
--- lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision 715f8fde307b93cafb4b879577610d159684aaf6)
+++ lams_learning/web/WEB-INF/web.xml	(.../web.xml)	(revision cc986867ccf2cb62e83508696af85b0f3f65a0ff)
@@ -33,7 +33,9 @@
 	<param-value>
 		/WEB-INF/spring/dataAccessContext.xml  /WEB-INF/spring/applicationContext.xml /WEB-INF/spring/learningApplicationContext.xml
 		/WEB-INF/spring/lessonApplicationContext.xml /WEB-INF/spring/toolApplicationContext.xml	
-		/WEB-INF/spring/learningDesignApplicationContext.xml			  
+		/WEB-INF/spring/learningDesignApplicationContext.xml		
+		classpath:/org/lamsfoundation/lams/tool/survey/dataAccessContext.xml
+  		classpath:/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml	  
 	</param-value>
 </context-param>