Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -r27c930cf8794f09648a13f5ce950914a8d67b3d1 -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 27c930cf8794f09648a13f5ce950914a8d67b3d1)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -36,6 +36,9 @@
         <archive path="/lams_build/lib/middlegen/middlegen-hibernate-plugin-2.1.jar"/>
         <archive path="/lams_build/lib/mysql/mysql-connector-java-5.0.8-bin.jar"/>
         <archive path="/lams_build/lib/odmg/odmg-3.0.jar"/>
+        <archive path="/lams_build/lib/reload/reload-diva.jar"/>
+        <archive path="/lams_build/lib/reload/reload-jdom.jar"/>
+        <archive path="/lams_build/lib/reload/reload-moonunit.jar"/>
         <archive javadoc="http://static.springframework.org/spring/docs/2.5.x/api/" path="/lams_build/lib/spring/spring.jar"/>
         <archive path="/lams_build/lib/struts/struts-el.jar"/>
         <archive javadoc="http://struts.apache.org/1.x/apidocs/" path="/lams_build/lib/struts/struts.jar" source="/lams_build/lib/struts/src/struts-1.2.9-src.zip"/>
Index: lams_build/build.xml
===================================================================
diff -u -r27c930cf8794f09648a13f5ce950914a8d67b3d1 -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_build/build.xml	(.../build.xml)	(revision 27c930cf8794f09648a13f5ce950914a8d67b3d1)
+++ lams_build/build.xml	(.../build.xml)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -167,6 +167,7 @@
 					<include name="jfreechart/*.jar" />
 					<include name="mysql/mysql-connector-java-*.jar" />
 					<include name="odmg/*.jar" />
+					<include name="reload/*.jar" />
 					<include name="smack/smack.jar"/>
 					<include name="smack/smackx.jar"/>
 					<include name="spring/*.jar" />
Index: lams_build/lib/reload/reload-diva.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/reload/reload-jdom.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/lib/reload/reload-moonunit.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/liblist.txt
===================================================================
diff -u -r27c930cf8794f09648a13f5ce950914a8d67b3d1 -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_build/liblist.txt	(.../liblist.txt)	(revision 27c930cf8794f09648a13f5ce950914a8d67b3d1)
+++ lams_build/liblist.txt	(.../liblist.txt)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -78,6 +78,10 @@
 
 odmg              odmg-3.0.jar                          3.0                                                                                   
 
+reload			  reload-diva.jar						2.0.1				   MIT License					 Reload							  Suite of tools for viewing, editing and creating IMS and SCORM Content Packages
+				  reload-jdom.jar
+				  reload-moonunit.jar 
+
 quartz            quartz.jar                            1.5.2                                                OpenSymphony                     Quartz Enterprise Job Scheduler
 
 smack             smack.jar                                                                                                                   
Index: lams_tool_eadventure/.classpath
===================================================================
diff -u -r6ea6b66ee54c1f8523ca68af071fcf82caeb5e98 -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_tool_eadventure/.classpath	(.../.classpath)	(revision 6ea6b66ee54c1f8523ca68af071fcf82caeb5e98)
+++ lams_tool_eadventure/.classpath	(.../.classpath)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -15,8 +15,5 @@
 			<attribute name="javadoc_location" value="http://tomcat.apache.org/tomcat-5.5-doc/servletapi/"/>
 		</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="lib" path="lib/reload_2_0_1/castor-0.9.5.3-xml.jar"/>
 	<classpathentry kind="output" path="build/classes"/>
 </classpath>
Index: lams_tool_eadventure/build.xml
===================================================================
diff -u -r8414502d9f238a8c92419b8604a20e74c26793fb -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_tool_eadventure/build.xml	(.../build.xml)	(revision 8414502d9f238a8c92419b8604a20e74c26793fb)
+++ lams_tool_eadventure/build.xml	(.../build.xml)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -16,9 +16,6 @@
 		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
-		<fileset dir="lib">
-			<include name="**/*.jar"/>
-		</fileset>
 		<fileset dir="${j2eelibs}">
 			<include name="**/*.jar"/>
 		</fileset>
Index: lams_tool_eadventure/lib/reload_2_0_1/castor-0.9.5.3-xml.jar
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_eadventure/lib/reload_2_0_1/reload-jdom.jar
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_eadventure/lib/reload_2_0_1/reload-moonunit.jar
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_eadventure/licenses/Jaxen LICENSE.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_eadventure/licenses/castor license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_eadventure/licenses/jdom licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_eadventure/licenses/library_licenses.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_eadventure/licenses/reload licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_eadventure/licenses/xerces licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java
===================================================================
diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java	(.../AuthoringEadventureConditionAction.java)	(revision 7322054ababd8f5387c3424cdd38d99c3ab49e02)
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java	(.../AuthoringEadventureConditionAction.java)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -24,8 +24,6 @@
 package org.eucm.lams.tool.eadventure.web.action; 
 
 import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 import java.util.SortedSet;
@@ -38,15 +36,13 @@
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.NumberUtils;
-import org.apache.log4j.Logger;
 import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionErrors;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.apache.struts.util.LabelValueBean;
 import org.eucm.lams.tool.eadventure.EadventureConstants;
 import org.eucm.lams.tool.eadventure.dto.ExpressionInfo;
 import org.eucm.lams.tool.eadventure.model.EadventureCondition;
@@ -57,13 +53,10 @@
 import org.eucm.lams.tool.eadventure.web.form.EadventureConditionForm;
 import org.eucm.lams.tool.eadventure.web.form.EadventureExpressionForm;
 import org.eucm.lams.tool.eadventure.web.form.EadventureForm;
-import org.exolab.castor.util.Iterator;
 import org.lamsfoundation.lams.tool.ToolAccessMode;
 import org.lamsfoundation.lams.util.WebUtil;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.lamsfoundation.lams.web.util.SessionMap;
-import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.context.support.WebApplicationContextUtils;
  
 /**
  * Auxiliary action in author mode. It contains operations with EadventureCondition. The rest of operations are located in
Index: lams_tool_imscc/.classpath
===================================================================
diff -u -re6c1de60efb315e488cefc70b30b1f8e444f1189 -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_tool_imscc/.classpath	(.../.classpath)	(revision e6c1de60efb315e488cefc70b30b1f8e444f1189)
+++ lams_tool_imscc/.classpath	(.../.classpath)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -19,7 +19,5 @@
 			<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="build/classes/java"/>
 </classpath>
Index: lams_tool_imscc/build.xml
===================================================================
diff -u -r8414502d9f238a8c92419b8604a20e74c26793fb -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_tool_imscc/build.xml	(.../build.xml)	(revision 8414502d9f238a8c92419b8604a20e74c26793fb)
+++ lams_tool_imscc/build.xml	(.../build.xml)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -16,9 +16,6 @@
 		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
-		<fileset dir="lib">
-			<include name="**/*.jar"/>
-		</fileset>
 		<fileset dir="${j2eelibs}">
 			<include name="**/*.jar"/>
 		</fileset>
Index: lams_tool_imscc/lib/reload_2_0_1/reload-jdom.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_imscc/lib/reload_2_0_1/reload-moonunit.jar
===================================================================
diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_imscc/licenses/Jaxen LICENSE.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_imscc/licenses/castor license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_imscc/licenses/jdom licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_imscc/licenses/library_licenses.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_imscc/licenses/reload licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_imscc/licenses/xerces licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_larsrc/.classpath
===================================================================
diff -u -rfef4ca260c9733eb10f19d00e6015a86493810d0 -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_tool_larsrc/.classpath	(.../.classpath)	(revision fef4ca260c9733eb10f19d00e6015a86493810d0)
+++ lams_tool_larsrc/.classpath	(.../.classpath)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -2,16 +2,6 @@
 <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"/>
-	<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/xml-apis.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/common/lib/hibernate-core.jar" sourcepath="/lams_build/lib/hibernate/src/hibernate-src.zip">
 		<attributes>
Index: lams_tool_larsrc/build.xml
===================================================================
diff -u -r8414502d9f238a8c92419b8604a20e74c26793fb -rd52979b91e7990b87bee9415ec03930afd36713b
--- lams_tool_larsrc/build.xml	(.../build.xml)	(revision 8414502d9f238a8c92419b8604a20e74c26793fb)
+++ lams_tool_larsrc/build.xml	(.../build.xml)	(revision d52979b91e7990b87bee9415ec03930afd36713b)
@@ -16,9 +16,6 @@
 		<fileset dir="${sharedlib}">
 			<include name="**/*.jar"/>
 		</fileset>
-		<fileset dir="lib">
-			<include name="**/*.jar"/>
-		</fileset>
 		<fileset dir="${j2eelibs}">
 			<include name="**/*.jar"/>
 		</fileset>
Index: lams_tool_larsrc/lib/jaxen/sax.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/jaxen/saxpath.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/castor-0.9.5.3-xml.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/jdom.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/moonunitsrc.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/reload-diva.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/reload-editor.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/reload-jdom.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/reload-moonunit.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Index: lams_tool_larsrc/lib/reload_2_0_1/xml-apis.jar
===================================================================
diff -u -r0a704617c31a5847217132f6b7cd73a4b9b43c9f -rd52979b91e7990b87bee9415ec03930afd36713b
Binary files differ
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_larsrc/licenses/Jaxen LICENSE.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_larsrc/licenses/castor license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_larsrc/licenses/jdom licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_larsrc/licenses/library_licenses.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_larsrc/licenses/reload licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag d52979b91e7990b87bee9415ec03930afd36713b refers to a dead (removed) revision in file `lams_tool_larsrc/licenses/xerces licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?