Index: lams_admin/conf/xdoclet/web-settings.xml
===================================================================
diff -u -r52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8 -rbb9853953ff8cc6e70017a866d94fc2cfcb2cc35
--- lams_admin/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 52f3ab1ab2051d0d28ca7d7f96dd28ed08624aa8)
+++ lams_admin/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision bb9853953ff8cc6e70017a866d94fc2cfcb2cc35)
@@ -12,7 +12,7 @@
 	<param-value>
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
Index: lams_admin/web/WEB-INF/web.xml
===================================================================
diff -u -r67646b18457731d989696559e4d87e1127702cb9 -rbb9853953ff8cc6e70017a866d94fc2cfcb2cc35
--- lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision 67646b18457731d989696559e4d87e1127702cb9)
+++ lams_admin/web/WEB-INF/web.xml	(.../web.xml)	(revision bb9853953ff8cc6e70017a866d94fc2cfcb2cc35)
@@ -15,7 +15,7 @@
 	<param-value>
 		classpath:/org/lamsfoundation/lams/applicationContext.xml
 		classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
-		classpath:/org/lamsfoundation/lams/tool/toolApplicationContext.xml
+		classpath:/org/lamsfoundation/lams/toolApplicationContext.xml
 		classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
   		classpath:/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r2c7b0845d981d238ce63a3e5d5a64d7351a16497 -rbb9853953ff8cc6e70017a866d94fc2cfcb2cc35
Binary files differ
Fisheye: Tag bb9853953ff8cc6e70017a866d94fc2cfcb2cc35 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/tool/toolApplicationContext.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml	(revision bb9853953ff8cc6e70017a866d94fc2cfcb2cc35)
@@ -0,0 +1,74 @@
+<?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.
+-->
+<beans>
+
+	<bean id="toolContentDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolContentDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="toolDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="toolSessionDAO" class="org.lamsfoundation.lams.tool.dao.hibernate.ToolSessionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="toolContentIDGeneratorTarget" class="org.lamsfoundation.lams.tool.ToolContentIDGenerator"
+		singleton="true"
+	>
+		<property name="toolContentDao"><ref local="toolContentDAO"/></property>
+	</bean>	
+	
+	<bean id="toolContentIDGenerator" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="toolContentIDGeneratorTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="getNextToolContentIDFor">PROPAGATION_REQUIRES_NEW</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="lamsCoreToolServiceTarget" class="org.lamsfoundation.lams.tool.service.LamsCoreToolService"
+		singleton="false"
+	>
+		<property name="toolSessionDAO"><ref bean="toolSessionDAO"/></property>
+		<property name="contentIDGenerator"><ref bean="toolContentIDGenerator"/></property>	
+	</bean>	
+	
+	<bean id="lamsCoreToolService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref local="lamsCoreToolServiceTarget"/></property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="createToolSession">PROPAGATION_REQUIRED</prop>
+				<prop key="createToolSessions">PROPAGATION_REQUIRED</prop>
+				<prop key="notifyToolsToCreateSession">PROPAGATION_REQUIRED</prop>
+			    <prop key="update*">PROPAGATION_REQUIRED</prop>
+			    <prop key="get*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>   	
+	
+	<bean id="lamsToolService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target">
+				<bean class="org.lamsfoundation.lams.tool.service.LamsToolService">
+					<property name="toolDAO"><ref bean="toolDAO"/></property>	
+				</bean>
+			</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
+			</props>
+		</property>
+	</bean>  
+		
+</beans>
+
+
+
+	
Index: lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java
===================================================================
diff -u -r34b959260a0f8f8285793a4481a95ca3580eabc5 -rbb9853953ff8cc6e70017a866d94fc2cfcb2cc35
--- lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision 34b959260a0f8f8285793a4481a95ca3580eabc5)
+++ lams_common/test/java/org/lamsfoundation/lams/tool/ToolDataAccessTestCase.java	(.../ToolDataAccessTestCase.java)	(revision bb9853953ff8cc6e70017a866d94fc2cfcb2cc35)
@@ -130,7 +130,7 @@
     protected String[] getContextConfigLocation()
     {
         return new String[] { "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
-                			  "/org/lamsfoundation/lams/tool/toolApplicationContext.xml",
+                			  "/org/lamsfoundation/lams/toolApplicationContext.xml",
                 			  "org/lamsfoundation/lams/localApplicationContext.xml"};
     }