Index: lams_build/build.xml
===================================================================
diff -u -rc8b89fd7e7360e2f86eb56a02ad492ea42827a52 -r0a59287312232fe81ceb7426deb8f3bf98bf6d65
--- lams_build/build.xml	(.../build.xml)	(revision c8b89fd7e7360e2f86eb56a02ad492ea42827a52)
+++ lams_build/build.xml	(.../build.xml)	(revision 0a59287312232fe81ceb7426deb8f3bf98bf6d65)
@@ -217,7 +217,7 @@
 
 		<echo>Copying EAR configuration files</echo>
 		<copy tofile="assembly/lams.ear/META-INF/MANIFEST.MF" verbose="true">
-			<fileset dir="conf/j2ee">
+			<fileset dir="${conf.dir}/j2ee">
 				<include name="MANIFEST-template.MF" />
 			</fileset>
 	        <filterset>
@@ -226,7 +226,7 @@
 		</copy>
 		
 		<copy todir="assembly/lams.ear/META-INF" verbose="true">
-			<fileset dir="conf/j2ee">
+			<fileset dir="${conf.dir}/j2ee">
 				<include name="*.xml" />
 			</fileset>
 		</copy>
@@ -741,7 +741,7 @@
                 <filter token="db.password" value="${db.password}"/>
 	        </filterset>
 		</copy>
-		
+
 		<!-- 
 		<copy todir="${server.home}/standalone/configuration" overwrite="true" verbose="true">
 			<fileset dir="${conf.dir}/${osPropertiesName}/jboss">
@@ -753,15 +753,6 @@
 	        </filterset>
 		</copy>
 		
-		<copy todir="${server.home}/standalone/configuration/" overwrite="true" verbose="true">
-			<fileset dir="${conf.dir}/${osPropertiesName}/jboss">
-				<include name="jboss-log4j.xml" />
-			</fileset>
-			<filterset>
-				<filter token="application" value="lams"/>
-			</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" />