Index: lams_build/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_build/build.xml,v
diff -u -r1.120.2.27 -r1.120.2.28
--- lams_build/build.xml	1 Aug 2014 13:28:48 -0000	1.120.2.27
+++ lams_build/build.xml	1 Aug 2014 13:35:47 -0000	1.120.2.28
@@ -723,9 +723,12 @@
 		<copy tofile="${server.home}/modules/system/layers/base/com/thoughtworks/xstream/main/module.xml"
 			  file="lib/xstream/xstream.module.xml" overwrite="true" verbose="true" />
 		
+
 		
+		<ant antfile="../lams_common/build.xml" target="deploy-libraries" inheritAll="false"/>
 		
 		
+		
 		<echo>${ant.project.name}: Deploying configuration files</echo>
 		<copy todir="${server.home}/standalone/configuration" overwrite="true" verbose="true">
 			<fileset dir="${conf.dir}">
@@ -783,9 +786,6 @@
 				<include name="*.jar" />
 			</fileset>
 		</copy>
-		
-		
-		<ant antfile="../lams_common/build.xml" target="deploy-libraries" inheritAll="false"/>
 		-->
 	</target>
 	
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.23 -r1.1.2.24
--- lams_build/conf/j2ee/jboss-deployment-structure.xml	1 Aug 2014 13:04:12 -0000	1.1.2.23
+++ lams_build/conf/j2ee/jboss-deployment-structure.xml	1 Aug 2014 13:35:47 -0000	1.1.2.24
@@ -50,6 +50,8 @@
       <module name="com.allaire.wddx" />
       <module name="org.apache.xmlcommons" />
       <module name="com.thoughtworks.xstream" /> <!-- depends on: xom, xpp, joda -->
+      <module name="org.lamsfoundation.lams.session" />
+      <module name="org.lamsfoundation.lams.valve" />
       
       <!-- Import META-INF/services for ServiceLoader impls as well
       <module name="myservicemodule" services="import"/>
Index: lams_common/build.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/build.xml,v
diff -u -r1.89.2.3 -r1.89.2.4
--- lams_common/build.xml	1 Aug 2014 13:06:18 -0000	1.89.2.3
+++ lams_common/build.xml	1 Aug 2014 13:35:48 -0000	1.89.2.4
@@ -72,13 +72,16 @@
 
 	
 	<target name="deploy-libraries" depends="_build-jar" description="Deploys library JARs.">
-		<echo>Deploying library JARs</echo>
-		<copy todir="${server.home}server/default/lib" overwrite="true" verbose="true">
-			<fileset dir="${basedir}/build/lib/">
-				<include name="lams-session.jar" />
-				<include name="lams-valve.jar" />
-			</fileset>
-		</copy>
+		<echo>Deploying library JARs as WildFly modules</echo>
+		<copy todir="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/session/main" 
+			  file="${basedir}/build/lib/lams-session.jar" overwrite="true" verbose="true" />
+		<copy tofile="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/session/main/module.xml"
+			  file="${basedir}/conf/module_descriptors/session.module.xml" overwrite="true" verbose="true" />
+		
+		<copy todir="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/valve/main" 
+			  file="${basedir}/build/lib/lams-valve.jar" overwrite="true" verbose="true" />
+		<copy tofile="${server.home}/modules/system/layers/base/org/lamsfoundation/lams/valve/main/module.xml"
+			  file="${basedir}/conf/module_descriptors/valve.module.xml" overwrite="true" verbose="true" />
 	</target>
 	
 	
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/conf/module_descriptors/session.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/conf/module_descriptors/valve.module.xml'.
Fisheye: No comparison available.  Pass `N' to diff?