Index: lams_build/3rdParty.userlibraries
===================================================================
RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v
diff -u -r1.53 -r1.54
--- lams_build/3rdParty.userlibraries	25 Apr 2012 16:20:14 -0000	1.53
+++ lams_build/3rdParty.userlibraries	23 Jul 2012 19:25:38 -0000	1.54
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.102 -r1.103
--- lams_build/build.xml	25 Apr 2012 16:20:14 -0000	1.102
+++ lams_build/build.xml	23 Jul 2012 19:25:37 -0000	1.103
@@ -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/liblist.txt
===================================================================
RCS file: /usr/local/cvsroot/lams_build/liblist.txt,v
diff -u -r1.17 -r1.18
--- lams_build/liblist.txt	25 Apr 2012 16:20:14 -0000	1.17
+++ lams_build/liblist.txt	23 Jul 2012 19:25:37 -0000	1.18
@@ -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_build/lib/reload/reload-diva.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/reload/reload-diva.jar,v
diff -u
Binary files differ
Index: lams_build/lib/reload/reload-jdom.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/reload/reload-jdom.jar,v
diff -u
Binary files differ
Index: lams_build/lib/reload/reload-moonunit.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/reload/reload-moonunit.jar,v
diff -u
Binary files differ
Index: lams_tool_eadventure/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/.classpath,v
diff -u -r1.5 -r1.6
--- lams_tool_eadventure/.classpath	12 Dec 2011 09:21:50 -0000	1.5
+++ lams_tool_eadventure/.classpath	23 Jul 2012 19:25:29 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/build.xml,v
diff -u -r1.9 -r1.10
--- lams_tool_eadventure/build.xml	27 Mar 2012 10:37:54 -0000	1.9
+++ lams_tool_eadventure/build.xml	23 Jul 2012 19:25:29 -0000	1.10
@@ -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>
Fisheye: Tag 1.4 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 1.4 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 1.4 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 1.4 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 1.4 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 1.4 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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java,v
diff -u -r1.4 -r1.5
--- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java	11 Dec 2011 21:30:31 -0000	1.4
+++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java	23 Jul 2012 19:25:29 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/.classpath,v
diff -u -r1.4 -r1.5
--- lams_tool_imscc/.classpath	23 Mar 2012 11:16:07 -0000	1.4
+++ lams_tool_imscc/.classpath	23 Jul 2012 19:25:35 -0000	1.5
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/build.xml,v
diff -u -r1.6 -r1.7
--- lams_tool_imscc/build.xml	27 Mar 2012 10:37:34 -0000	1.6
+++ lams_tool_imscc/build.xml	23 Jul 2012 19:25:34 -0000	1.7
@@ -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>
Fisheye: Tag 1.2 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 1.2 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 1.2 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 1.2 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 1.2 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 1.2 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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/.classpath,v
diff -u -r1.9 -r1.10
--- lams_tool_larsrc/.classpath	26 Mar 2012 10:59:17 -0000	1.9
+++ lams_tool_larsrc/.classpath	23 Jul 2012 19:25:31 -0000	1.10
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/build.xml,v
diff -u -r1.30 -r1.31
--- lams_tool_larsrc/build.xml	27 Mar 2012 10:37:28 -0000	1.30
+++ lams_tool_larsrc/build.xml	23 Jul 2012 19:25:31 -0000	1.31
@@ -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>
Fisheye: Tag 1.2 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 1.2 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 1.2 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 1.2 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 1.2 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 1.2 refers to a dead (removed) revision in file `lams_tool_larsrc/licenses/xerces licence.txt'.
Fisheye: No comparison available.  Pass `N' to diff?