Index: lams_tool_bbb/conf/xdoclet/web-settings.xml
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r3469ac37f4f0094274d92c25b84886995305d3df
--- lams_tool_bbb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/conf/xdoclet/web-settings.xml	(.../web-settings.xml)	(revision 3469ac37f4f0094274d92c25b84886995305d3df)
@@ -5,13 +5,17 @@
   	<param-value>org.lamsfoundation.lams.tool.bbb.ApplicationResources</param-value>
 </context-param>
 
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value>classpath:/org/lamsfoundation/lams/tool/bbb/dbupdates/autopatchContext.xml</param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
Index: lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
===================================================================
diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r3469ac37f4f0094274d92c25b84886995305d3df
--- lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	(.../BbbService.java)	(revision df5534fd49894e3369fc98f8273d9e2fefbb4817)
+++ lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java	(.../BbbService.java)	(revision 3469ac37f4f0094274d92c25b84886995305d3df)
@@ -295,6 +295,10 @@
 	}
     }
 
+    public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
+	return null;
+    }
+    
     /**
      * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
      * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created
@@ -303,7 +307,8 @@
      * 
      * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
      */
-    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId) throws ToolException {
+    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
+	    throws ToolException {
 	return new TreeMap<String, ToolOutputDefinition>();
     }
 
Index: lams_tool_imscc/.classpath
===================================================================
diff -u -r6756e16a1818195a439ae16309c8c960a86113b2 -r3469ac37f4f0094274d92c25b84886995305d3df
--- lams_tool_imscc/.classpath	(.../.classpath)	(revision 6756e16a1818195a439ae16309c8c960a86113b2)
+++ lams_tool_imscc/.classpath	(.../.classpath)	(revision 3469ac37f4f0094274d92c25b84886995305d3df)
@@ -2,25 +2,24 @@
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/castor-0.9.5.3-xml.jar"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/jdom.jar" sourcepath="C:/Java/tools/Source/jdom-1.0.zip"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/moonunitsrc.jar"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/reload-diva.jar"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/reload-editor.jar"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/reload-jdom.jar"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/reload-moonunit.jar"/>
-	<classpathentry kind="lib" path="lib/reload_2_0_1/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="lib/jaxen/jaxen-full.jar"/>
-	<classpathentry kind="lib" path="lib/jaxen/sax.jar"/>
-	<classpathentry kind="lib" path="lib/jaxen/saxpath.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/3rdParty"/>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/javax.servlet.jar"/>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/javax.servlet.jsp.jar"/>
-	<classpathentry kind="var" path="JBOSS_HOME/server/default/lib/jboss-j2ee.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/com.genuitec.eclipse.j2eedt.core.J2EE14_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_contentrepository"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_central"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_learning"/>
+	<classpathentry kind="var" path="JBOSS_HOME/common/lib/servlet-api.jar" sourcepath="/LOCAL_SOURCE_CODE_REPO/jbossweb">
+		<attributes>
+			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="var" path="JBOSS_HOME/common/lib/log4j.jar"/>
+	<classpathentry kind="var" path="JBOSS_HOME/common/lib/hibernate-core.jar" sourcepath="/lams_build/lib/hibernate/src/hibernate-src.zip">
+		<attributes>
+			<attribute name="javadoc_location" value="http://www.hibernate.org/hib_docs/v3/api/"/>
+		</attributes>
+	</classpathentry>
+	<classpathentry kind="lib" path="lib/reload_2_0_1/reload-jdom.jar"/>
+	<classpathentry kind="lib" path="lib/reload_2_0_1/reload-moonunit.jar"/>
 	<classpathentry kind="output" path="web/WEB-INF/classes"/>
 </classpath>
Index: lams_tool_imscc/build.xml
===================================================================
diff -u -r328bc2412c160bdfc2c09ce7cf3327893ff5b3bb -r3469ac37f4f0094274d92c25b84886995305d3df
--- lams_tool_imscc/build.xml	(.../build.xml)	(revision 328bc2412c160bdfc2c09ce7cf3327893ff5b3bb)
+++ lams_tool_imscc/build.xml	(.../build.xml)	(revision 3469ac37f4f0094274d92c25b84886995305d3df)
@@ -277,9 +277,6 @@
 				<include name="common/**"/> 
 				<include name="layout/**"/> 
 			</fileset>
-			<lib dir="${weblib}/jaxen">  
-				<include name="*.jar"/> 
-			</lib> 
 			<lib dir="${weblib}/reload_2_0_1">
 				<include name="*.jar"/>
 			</lib>
Index: lams_tool_imscc/lib/jaxen/jaxen-full.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/jaxen/sax.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/jaxen/saxpath.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/reload_2_0_1/castor-0.9.5.3-xml.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/reload_2_0_1/jdom.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/reload_2_0_1/moonunitsrc.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/reload_2_0_1/reload-diva.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/reload_2_0_1/reload-editor.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/lib/reload_2_0_1/xercesImpl.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
Binary files differ
Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
--- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java	(.../CommonCartridgeServiceImpl.java)	(revision 3469ac37f4f0094274d92c25b84886995305d3df)
@@ -916,6 +916,10 @@
 	}
     }
 
+    public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
+	return null;
+    }
+    
     /**
      * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions
      * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created
@@ -924,7 +928,8 @@
      * 
      * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition
      */
-    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId) throws ToolException {
+    public SortedMap<String, ToolOutputDefinition> getToolOutputDefinitions(Long toolContentId, int definitionType)
+	    throws ToolException {
 	return new TreeMap<String, ToolOutputDefinition>();
     }
 
Index: lams_tool_imscc/web/WEB-INF/web.xml
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r3469ac37f4f0094274d92c25b84886995305d3df
--- lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05)
+++ lams_tool_imscc/web/WEB-INF/web.xml	(.../web.xml)	(revision 3469ac37f4f0094274d92c25b84886995305d3df)
@@ -9,13 +9,18 @@
 	<param-name>javax.servlet.jsp.jstl.fmt.localizationContext</param-name>
 	<param-value>org.lamsfoundation.lams.tool.commonCartridge.ApplicationResources</param-value>
 </context-param>
+
+<context-param>
+    <param-name>contextClass</param-name>
+    <param-value>org.jboss.spring.factory.VFSXmlWebApplicationContext</param-value>
+</context-param> 
 <context-param> 
 	<param-name>contextConfigLocation</param-name>
 	<param-value>classpath:/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/autopatchContext.xml</param-value>
 </context-param>
 <context-param>
    <param-name>locatorFactorySelector</param-name>
-   <param-value>classpath*:/org/lamsfoundation/lams/**/beanRefContext.xml</param-value>
+   <param-value>classpath:/org/lamsfoundation/lams/beanRefContext.xml</param-value>
 </context-param>
 <context-param>
 	<param-name>parentContextKey</param-name>
@@ -223,10 +228,10 @@
 
    	<!--  Security Constraint -->
 	<security-constraint>
-	   	<web-commonCartridge-collection>
-	    	<web-commonCartridge-name>Secure Content</web-commonCartridge-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Secure Content</web-resource-name>
 			<url-pattern>/*</url-pattern>
-    	</web-commonCartridge-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>TEACHER</role-name>
@@ -239,61 +244,61 @@
     </security-constraint>
 
     <security-constraint>
-	   	<web-commonCartridge-collection>
-	    	<web-commonCartridge-name>Authoring Update</web-commonCartridge-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Authoring Update</web-resource-name>
 		    <url-pattern>/authoring/*</url-pattern>
-    	</web-commonCartridge-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>AUTHOR</role-name>
     		<role-name>AUTHOR ADMIN</role-name>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
-	   	<web-commonCartridge-collection>
-	    	<web-commonCartridge-name>Staff Content</web-commonCartridge-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
 		    <url-pattern>/monitoring.do</url-pattern>
-    	</web-commonCartridge-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
-	   	<web-commonCartridge-collection>
-	    	<web-commonCartridge-name>Staff Content</web-commonCartridge-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Staff Content</web-resource-name>
 		    <url-pattern>/definelater.do</url-pattern>
-    	</web-commonCartridge-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>MONITOR</role-name>
     		<role-name>TEACHER</role-name>
     	</auth-constraint>
     </security-constraint>
 
     <security-constraint>
-	   	<web-commonCartridge-collection>
-	    	<web-commonCartridge-name>Adminstrator Content</web-commonCartridge-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Adminstrator Content</web-resource-name>
 		    <url-pattern>/admin.do</url-pattern> 
-    	</web-commonCartridge-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>ADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
     <security-constraint>
-	   	<web-commonCartridge-collection>
-	    	<web-commonCartridge-name>LAMS System Adminstrator Content</web-commonCartridge-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>LAMS System Adminstrator Content</web-resource-name>
 		    <url-pattern>/sysadmin.do</url-pattern> 
-    	</web-commonCartridge-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>SYSADMIN</role-name>
     	</auth-constraint>
     </security-constraint>
 	<!--  some combine role security setting -->
     <security-constraint>
-	   	<web-commonCartridge-collection>
-	    	<web-commonCartridge-name>Download Files</web-commonCartridge-name>
+	   	<web-resource-collection>
+	    	<web-resource-name>Download Files</web-resource-name>
 		    <url-pattern>/download/</url-pattern>
-    	</web-commonCartridge-collection>
+    	</web-resource-collection>
     	<auth-constraint>
     		<role-name>LEARNER</role-name>
     		<role-name>AUTHOR</role-name>