Index: lams_build/3rdParty.userlibraries
===================================================================
RCS file: /usr/local/cvsroot/lams_build/3rdParty.userlibraries,v
diff -u -r1.71.2.8 -r1.71.2.9
--- lams_build/3rdParty.userlibraries	1 Aug 2014 12:40:34 -0000	1.71.2.8
+++ lams_build/3rdParty.userlibraries	1 Aug 2014 13:04:12 -0000	1.71.2.9
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.120.2.24 -r1.120.2.25
--- lams_build/build.xml	1 Aug 2014 12:52:32 -0000	1.120.2.24
+++ lams_build/build.xml	1 Aug 2014 13:04:12 -0000	1.120.2.25
@@ -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/liblist.txt
===================================================================
RCS file: /usr/local/cvsroot/lams_build/liblist.txt,v
diff -u -r1.25.2.12 -r1.25.2.13
--- lams_build/liblist.txt	1 Aug 2014 12:40:34 -0000	1.25.2.12
+++ lams_build/liblist.txt	1 Aug 2014 13:04:12 -0000	1.25.2.13
@@ -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                                                                                  
 
Index: lams_build/conf/j2ee/jboss-deployment-structure.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/conf/j2ee/Attic/jboss-deployment-structure.xml,v
diff -u -r1.1.2.22 -r1.1.2.23
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	1 Aug 2014 12:52:32 -0000	1.1.2.22
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	1 Aug 2014 13:04:12 -0000	1.1.2.23
@@ -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"/>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/lib/xstream/joda.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1.20.1 refers to a dead (removed) revision in file `lams_build/lib/xstream/xom-license.txt'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/lib/xstream/xpp.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_build/lib/xstream/xstream.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?