Index: lams_central/conf/xdoclet/filter-mappings.xml
===================================================================
diff -u -r2bc886ddb3dcf46f850b924948e6a9a15f497013 -r0badad92963e07de13c104187ca773f8d1abec70
--- lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 2bc886ddb3dcf46f850b924948e6a9a15f497013)
+++ lams_central/conf/xdoclet/filter-mappings.xml	(.../filter-mappings.xml)	(revision 0badad92963e07de13c104187ca773f8d1abec70)
@@ -1,4 +1,10 @@
   <filter-mapping>
     <filter-name>SystemSessionFilter</filter-name>
      <url-pattern>/*</url-pattern> 
-  </filter-mapping>
\ No newline at end of file
+  </filter-mapping>
+  
+    <filter-mapping>
+    <filter-name>hibernateFilter</filter-name>
+     <url-pattern>/*</url-pattern>
+  </filter-mapping>
+  
\ No newline at end of file
Index: lams_central/conf/xdoclet/filters.xml
===================================================================
diff -u -r2bc886ddb3dcf46f850b924948e6a9a15f497013 -r0badad92963e07de13c104187ca773f8d1abec70
--- lams_central/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 2bc886ddb3dcf46f850b924948e6a9a15f497013)
+++ lams_central/conf/xdoclet/filters.xml	(.../filters.xml)	(revision 0badad92963e07de13c104187ca773f8d1abec70)
@@ -5,3 +5,15 @@
          </filter-class>
   </filter>
    
+  <filter>
+    <filter-name>hibernateFilter</filter-name>
+    <filter-class>
+      org.lamsfoundation.lams.util.CustomizedOpenSessionInViewFilter
+    </filter-class>
+	<init-param>
+		<param-name>sessionFactoryBeanName</param-name>
+		<param-value>coreSessionFactory</param-value>
+	</init-param>
+   </filter>
+
+   
\ No newline at end of file
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r459fd5b7bac7f3333aa6beb51b1829128ac492b6 -r0badad92963e07de13c104187ca773f8d1abec70
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 459fd5b7bac7f3333aa6beb51b1829128ac492b6)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 0badad92963e07de13c104187ca773f8d1abec70)
@@ -187,6 +187,7 @@
 				set.add(activity);
 			}
 		}
+		// TODO: Need to double check that the toolID/toolContentID combinations match entries in lams_tool_content table, or put FK on table.
 		learningDesign.setActivities(set);
 		learningDesignDAO.update(learningDesign);
 	}
Index: lams_central/test/java/org/lamsfoundation/lams/workspace/service/TestWorkspaceManagement.java
===================================================================
diff -u -r1b22f6b7113cbdf0644492c4f287d720466d05b6 -r0badad92963e07de13c104187ca773f8d1abec70
--- lams_central/test/java/org/lamsfoundation/lams/workspace/service/TestWorkspaceManagement.java	(.../TestWorkspaceManagement.java)	(revision 1b22f6b7113cbdf0644492c4f287d720466d05b6)
+++ lams_central/test/java/org/lamsfoundation/lams/workspace/service/TestWorkspaceManagement.java	(.../TestWorkspaceManagement.java)	(revision 0badad92963e07de13c104187ca773f8d1abec70)
@@ -7,10 +7,9 @@
 import java.util.Map;
 
 import org.lamsfoundation.lams.contentrepository.NodeKey;
-import org.lamsfoundation.lams.learningdesign.LearningDesign;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
 import org.lamsfoundation.lams.workspace.WorkspaceFolderContent;
-import org.springframework.orm.hibernate.HibernateObjectRetrievalFailureException;
+import org.springframework.orm.hibernate3.HibernateObjectRetrievalFailureException;
 
 /**
  * @author Manpreet Minhas