Index: lams_build/deploy-tool/deploy.bat
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
--- lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/deploy-tool/deploy.bat	(.../deploy.bat)	(revision d8e2363e36ba4425b87f60de77f054d25c769f53)
@@ -1 +1 @@
-java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.0.jar;lib/commons-collections.jar;lib/commons-logging.jar;lib/commons-io-1.0.jar;lib/commons-dbutils-1.0.jar;lib/mysql-connector-java-8.0.11.jar;lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
+java -classpath lib/lams-tool-deploy.jar;lib/commons-configuration-1.1.jar;lib/commons-lang-2.6.jar;lib/commons-collections-3.2.2.jar;lib/commons-logging-1.2.jar;lib/commons-io-2.4.jar;lib/commons-dbutils-1.7.jar;lib/mysql-connector-java-8.0.11.jar;lib/xstream-1.5.0-SNAPSHOT.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
Index: lams_build/deploy-tool/deploy.sh
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
--- lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_build/deploy-tool/deploy.sh	(.../deploy.sh)	(revision d8e2363e36ba4425b87f60de77f054d25c769f53)
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.0.jar:lib/commons-collections.jar:lib/commons-logging.jar:lib/commons-io-1.0.jar:lib/commons-dbutils-1.0.jar:lib/mysql-connector-java-8.0.11.jar:lib/xstream-1.1.3.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
+java -classpath lib/lams-tool-deploy.jar:lib/commons-configuration-1.1.jar:lib/commons-lang-2.6.jar:lib/commons-collections-3.2.2.jar:lib/commons-logging-1.2.jar:lib/commons-io-2.4.jar:lib/commons-dbutils-1.7.jar:lib/mysql-connector-java-8.0.11.jar:lib/xstream-1.5.0-SNAPSHOT.jar org.lamsfoundation.lams.tool.deploy.Deploy ./deploy.xml
Index: lams_build/deploy-tool/lib/commons-collections-3.2.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/deploy-tool/lib/commons-collections.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_build/deploy-tool/lib/commons-dbutils-1.0.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_build/deploy-tool/lib/commons-dbutils-1.7.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/deploy-tool/lib/commons-io-1.0.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_build/deploy-tool/lib/commons-io-2.4.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/deploy-tool/lib/commons-lang-2.0.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_build/deploy-tool/lib/commons-lang-2.6.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/deploy-tool/lib/commons-logging-1.2.jar
===================================================================
diff -u
Binary files differ
Index: lams_build/deploy-tool/lib/commons-logging.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_build/deploy-tool/lib/lams-tool-deploy.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_build/deploy-tool/lib/xstream-1.1.3.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_build/deploy-tool/lib/xstream-1.5.0-SNAPSHOT.jar
===================================================================
diff -u
Binary files differ
Index: lams_tool_deploy/.classpath
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
--- lams_tool_deploy/.classpath	(.../.classpath)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_deploy/.classpath	(.../.classpath)	(revision d8e2363e36ba4425b87f60de77f054d25c769f53)
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/lams_common"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
+		<attributes>
+			<attribute name="module" value="true"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-configuration-1.1.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-dbutils-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/ant/ant.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-collections.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-io-1.0.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-lang-2.0.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/xstream-1.1.3.jar"/>
 	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/mysql-connector-java-8.0.11.jar" sourcepath="/3rdParty_sources/mysql-connector"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-io-2.4.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/xstream-1.5.0-SNAPSHOT.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-collections-3.2.2.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-dbutils-1.7.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-lang-2.6.jar"/>
+	<classpathentry kind="lib" path="/lams_build/deploy-tool/lib/commons-logging-1.2.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_deploy/lib/ant/ant.jar
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
Binary files differ
Index: lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rd8e2363e36ba4425b87f60de77f054d25c769f53
--- lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java	(.../DeployConfig.java)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java	(.../DeployConfig.java)	(revision d8e2363e36ba4425b87f60de77f054d25c769f53)
@@ -35,6 +35,9 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import org.lamsfoundation.lams.tool.deploy.libraryActivity.DeployLibraryConfig;
+import org.lamsfoundation.lams.tool.deploy.libraryActivity.LearningLibrary;
+import org.lamsfoundation.lams.tool.deploy.libraryActivity.ToolActivity;
 import org.xml.sax.SAXException;
 
 import com.thoughtworks.xstream.XStream;
@@ -119,6 +122,9 @@
     public DeployConfig(String outputPath) {
 	this.validationError = "";
 	xstream = new XStream(new DomDriver());
+	Class<?>[] classes = new Class[] { DeployToolConfig.class, DeployLibraryConfig.class, LearningLibrary.class,
+		ToolActivity.class };
+	xstream.allowTypes(classes);
 
 	this.outputPath = outputPath != null ? outputPath : "";
     }
@@ -127,7 +133,7 @@
      * In general, this method should read in the xml configuration file,
      * deserialise the xml string into an object, and copy the properties
      * to the calling object.
-     * 
+     *
      * @param configFilePath
      *            The file location of the configuration file deploy.xml.
      * @throws ParserConfigurationException
@@ -139,7 +145,7 @@
 
     /**
      * Check that all the properties have a value, will throw an exception if a property does not have a value
-     * 
+     *
      * @throws DeployException
      */
     public abstract void validateProperties() throws DeployException;
@@ -148,7 +154,7 @@
      * Validates the value of a property. If the property does not exist, or
      * the property doesn't have a value, it will return false.
      * Otherwise return true.
-     * 
+     *
      * @param property
      * @param key
      * @return
@@ -163,7 +169,7 @@
 
     /**
      * Will return false if the list property is empty or null. *
-     * 
+     *
      * @param property
      * @param key
      * @return
@@ -179,7 +185,7 @@
     /**
      * Reads in the deploy configuration xml file, and will return the xml
      * as a string.
-     * 
+     *
      * @param configFilePath
      * @return String. The xml contents as a String
      */
@@ -205,13 +211,13 @@
 
     /**
      * Takes in the xml string and deserialises it to an object
-     * 
+     *
      * @param xml
      *            The xml to deserialise
      * @return the object constructed from the xml
      */
     protected Object deserialiseXML(String xml) {
-	// System.out.println(xml);
+//	System.out.println(xml);
 	return xstream.fromXML(xml);
     }
 
@@ -268,7 +274,7 @@
 
     /**
      * Serialize an object to the given Writer as pretty-printed XML.
-     * 
+     *
      * @param writer
      */
     protected void writePropertiesToFile(Writer writer) {
@@ -380,7 +386,7 @@
      * Upon deserialisation of the xml string, a new object will be created.
      * The properties of this object will be copied to the calling object.
      * Only copy properties if the properties are not null
-     * 
+     *
      * @param config
      */
     protected void copyProperties(DeployConfig config) {