Index: lams_build/3rdParty.userlibraries
===================================================================
diff -u -r5fa7969704b59c54a44ada555d2c43578c7eb42d -r59dec34e8cbb27c683d552094086fa33faa70ff1
--- lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
+++ lams_build/3rdParty.userlibraries	(.../3rdParty.userlibraries)	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
@@ -25,7 +25,6 @@
         <archive path="/lams_build/lib/xml-commons/xml-apis.jar"/>
         <archive path="/lams_build/lib/xml-commons/xml-apis-ext.jar"/>
         <archive path="/lams_build/lib/xstream/xstream-1.1.3.jar" source="/3rdParty_sources/xstream"/>
-        <archive path="/lams_build/lib/xstream/xom-1.0b3.jar"/>
         <archive path="/lams_build/lib/xstream/xpp3-1.1.3.4d_b4_min.jar"/>
         <archive path="/lams_build/lib/flagstone/transform.jar"/>
         <archive path="/lams_build/lib/flagstone/translate.jar"/>
Index: lams_build/build.xml
===================================================================
diff -u -r8995c96a584b0aee9a66c44b9b4b1e80a8052cd0 -r59dec34e8cbb27c683d552094086fa33faa70ff1
--- lams_build/build.xml	(.../build.xml)	(revision 8995c96a584b0aee9a66c44b9b4b1e80a8052cd0)
+++ lams_build/build.xml	(.../build.xml)	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
@@ -699,7 +699,33 @@
 		
 		
 		
+		<copy todir="${jboss.home}/modules/system/layers/base/org/xmlpull/main" overwrite="true" verbose="true">
+			<fileset dir="lib/xstream">
+				<include name="xpp3-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${jboss.home}/modules/system/layers/base/org/xmlpull/main/module.xml"
+			  file="lib/xstream/xpp.module.xml" overwrite="true" verbose="true" />
 		
+		<copy todir="${jboss.home}/modules/system/layers/base/org/joda/time/2.1" overwrite="true" verbose="true">
+			<fileset dir="lib/xstream">
+				<include name="joda-time-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${jboss.home}/modules/system/layers/base/org/joda/time/2.1/module.xml"
+			  file="lib/xstream/joda.module.xml" overwrite="true" verbose="true" />
+		
+		<copy todir="${jboss.home}/modules/system/layers/base/com/thoughtworks/xstream/main" overwrite="true" verbose="true">
+			<fileset dir="lib/xstream">
+				<include name="xstream-*.jar" />
+			</fileset>
+		</copy>
+		<copy tofile="${jboss.home}/modules/system/layers/base/com/thoughtworks/xstream/main/module.xml"
+			  file="lib/xstream/xstream.module.xml" overwrite="true" verbose="true" />
+		
+		
+		
+		
 		<echo>${ant.project.name}: Deploying configuration files</echo>
 		<copy todir="${jboss.home}/standalone/configuration" overwrite="true" verbose="true">
 			<fileset dir="${conf.dir}">
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
diff -u -r8995c96a584b0aee9a66c44b9b4b1e80a8052cd0 -r59dec34e8cbb27c683d552094086fa33faa70ff1
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 8995c96a584b0aee9a66c44b9b4b1e80a8052cd0)
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	(.../jboss-deployment-structure.xml)	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
@@ -49,7 +49,7 @@
       <module name="org.tuckey.urlrewrite" />
       <module name="com.allaire.wddx" />
       <module name="org.apache.xmlcommons" />
-       
+      <module name="com.thoughtworks.xstream" /> <!-- depends on: xom, xpp, joda -->
       
       <!-- Import META-INF/services for ServiceLoader impls as well
       <module name="myservicemodule" services="import"/>
Index: lams_build/lib/xstream/joda.module.xml
===================================================================
diff -u
--- lams_build/lib/xstream/joda.module.xml	(revision 0)
+++ lams_build/lib/xstream/joda.module.xml	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.joda.time" slot="2.1">
+  <resources>
+  	<resource-root path="joda-time-2.1.jar"/>
+  </resources>
+</module>
Index: lams_build/lib/xstream/xom-1.0b3.jar
===================================================================
diff -u -r3c4881947fb505c405de8165f49ebce7c3c674ac -r59dec34e8cbb27c683d552094086fa33faa70ff1
Binary files differ
Fisheye: Tag 59dec34e8cbb27c683d552094086fa33faa70ff1 refers to a dead (removed) revision in file `lams_build/lib/xstream/xom-license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_build/lib/xstream/xpp.module.xml
===================================================================
diff -u
--- lams_build/lib/xstream/xpp.module.xml	(revision 0)
+++ lams_build/lib/xstream/xpp.module.xml	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.3" name="org.xmlpull">
+  <resources>
+  	<resource-root path="xpp3-1.1.3.4d_b4_min.jar"/>
+  </resources>
+</module>
Index: lams_build/lib/xstream/xstream.module.xml
===================================================================
diff -u
--- lams_build/lib/xstream/xstream.module.xml	(revision 0)
+++ lams_build/lib/xstream/xstream.module.xml	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  ~ JBoss, Home of Professional Open Source.
+  ~ Copyright 2010, Red Hat, Inc., and individual contributors
+  ~ as indicated by the @author tags. See the copyright.txt file in the
+  ~ distribution for a full listing of individual contributors.
+  ~
+  ~ This is free software; you can redistribute it and/or modify it
+  ~ under the terms of the GNU Lesser General Public License as
+  ~ published by the Free Software Foundation; either version 2.1 of
+  ~ the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+  ~ Lesser General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU Lesser General Public
+  ~ License along with this software; if not, write to the Free
+  ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+  ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+  -->
+
+<module xmlns="urn:jboss:module:1.3" name="com.thoughtworks.xstream">
+  <resources>
+    <resource-root path="xstream-1.1.3.jar"/>
+  </resources>
+  <dependencies>
+    <module name="nu.xom"/>
+    <module name="org.xmlpull"/>
+    <module name="org.joda.time" slot="2.1"/>
+  </dependencies>
+</module>
Index: lams_build/liblist.txt
===================================================================
diff -u -r5fa7969704b59c54a44ada555d2c43578c7eb42d -r59dec34e8cbb27c683d552094086fa33faa70ff1
--- lams_build/liblist.txt	(.../liblist.txt)	(revision 5fa7969704b59c54a44ada555d2c43578c7eb42d)
+++ lams_build/liblist.txt	(.../liblist.txt)	(revision 59dec34e8cbb27c683d552094086fa33faa70ff1)
@@ -70,7 +70,6 @@
                   xml-apis-ext.jar                      1.3                    Apache License 2.0            Apache                           Common code and guidelines for xml projects
 
 xstream           joda-time-2.1.jar                     2.1                    Apache License 2.0       	 Joda.org                         Joda Time
-                  xom-1.0b3.jar                         1.0b3                                                                                 
                   xpp3-1.1.3.4d_b4_min.jar              1.1.3.4d_b4_min                                                                       
                   xstream-1.1.3.jar                     1.1.3