Index: lams_build/build.xml
===================================================================
diff -u -rc6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8 -r4195e32352245e0ee2323b3d70ab3f23ef3f750e
--- lams_build/build.xml	(.../build.xml)	(revision c6b29814cfe36cd678a7cdd1d7ed0aab7d0fbec8)
+++ lams_build/build.xml	(.../build.xml)	(revision 4195e32352245e0ee2323b3d70ab3f23ef3f750e)
@@ -219,14 +219,24 @@
 		</copy>
 
 		<echo>Copying EAR configuration files</echo>
-		<copy tofile="assembly/lams.ear/META-INF/MANIFEST.MF" verbose="true">
+		<copy todir="assembly/lams.ear/META-INF" overwrite="true" verbose="true">
 			<fileset dir="${conf.dir}/j2ee">
-				<include name="MANIFEST-template.MF" />
+				<include name="*.xml" />
+				<exclude name="jboss-all.xml" />
 			</fileset>
+		</copy>
+		<copy tofile="assembly/lams.ear/META-INF/MANIFEST.MF" overwrite="true" verbose="true">
+			<fileset file="${conf.dir}/j2ee/MANIFEST-template.MF" />
 	        <filterset>
 	        	<filter token="version" value="${project.version}"/>
 	        </filterset>
 		</copy>
+		<copy todir="assembly/lams.ear/META-INF" overwrite="true" verbose="true">
+			<fileset file="${conf.dir}/j2ee/jboss-all.xml" />
+	        <filterset>
+	        	<filter token="secure.cookie" value="${secure.cookie}"/>
+	        </filterset>
+		</copy>
 		
 		<echo>Copying EAR static 3rd party dependencies (not included as modules)</echo>
 		<copy todir="assembly/lams.ear/lib" flatten="true">
@@ -235,12 +245,6 @@
 				<include name="*.jar" />
 			</fileset>
 		</copy>
-		
-		<copy todir="assembly/lams.ear/META-INF" verbose="true">
-			<fileset dir="${conf.dir}/j2ee">
-				<include name="*.xml" />
-			</fileset>
-		</copy>
 	</target>
 
 	
@@ -443,19 +447,9 @@
 		</copy>
 		<copy tofile="${server.home}/modules/system/layers/base/org/apache/aspirin/main/module.xml"
 			  file="lib/aspirin/aspirin.module.xml" overwrite="true" verbose="true" />
+
 		
 		
-		
-		<!--<copy todir="${server.home}/modules/system/layers/base/com/tacitknowledge/autopatch/main" overwrite="true" verbose="true">
-			<fileset dir="lib/autopatch">
-				<include name="tk-*.jar" />
-			</fileset>
-		</copy>
-		<copy tofile="${server.home}/modules/system/layers/base/com/tacitknowledge/autopatch/main/module.xml"
-			  file="lib/autopatch/autopatch.module.xml" overwrite="true" verbose="true" />-->
-		
-		
-		
 		<copy todir="${server.home}/modules/system/layers/base/javax/wsdl4j/api/1.5" overwrite="true" verbose="true">
 			<fileset dir="lib/axis">
 				<include name="wsdl4j-*.jar" />
@@ -737,9 +731,7 @@
 
 		<echo>${ant.project.name}: Deploying configuration files</echo>
 		<copy todir="${server.home}/standalone/configuration" overwrite="true" verbose="true">
-			<fileset dir="${conf.dir}">
-				<include name="standalone.xml" />
-			</fileset>
+			<fileset file="${conf.dir}/standalone.xml" />
 	        <filterset>
 	        	<filter token="db.url.run" value="${db.url.run}"/>
 	        	<filter token="db.location" value="${db.location}"/>
@@ -765,12 +757,6 @@
 	        </filterset>
 		</copy>
 		
-		<copy todir="${server.home}/standalone/deployments/lams.ear" overwrite="true" verbose="true">
-			<fileset dir="${conf.dir}/${osPropertiesName}/jboss/service">
-				<include name="treecache.xml" />
-			</fileset>
-		</copy>
-		
 		<copy todir="${server.home}/standalone/deploymentsers/jbossweb.deployer/META-INF" overwrite="true" verbose="true">
 			<fileset dir="${conf.dir}/${osPropertiesName}/jboss/jbossweb">
 				<include name="war-deployers-jboss-beans.xml" />