Index: deploy/build.xml
===================================================================
diff -u -r7a09956e81c0d7830336bde48a3df00dc9b64f3b -r20bc71cfeb36004324bd4d45294b11e8786a68bb
--- deploy/build.xml	(.../build.xml)	(revision 7a09956e81c0d7830336bde48a3df00dc9b64f3b)
+++ deploy/build.xml	(.../build.xml)	(revision 20bc71cfeb36004324bd4d45294b11e8786a68bb)
@@ -98,17 +98,16 @@
 		to the server.
 	-->
 	<target name="war">
-		<war destfile="${war-file}" webxml="${root}/WEB-INF/web.xml">
+		<war destfile="${war-file}" webxml="${deploy-dir}/web.xml">
 			<fileset dir="${root}">
 				<exclude name="**/_svn/**" />
 			<!--	<exclude name="**/.*" />
 				<exclude name="WEB-INF/classes/**" />-->
-				<!--<exclude name="${webapp.name}.war" />-->
-				<exclude name="deploy/web.xml" />
+				<exclude name="${webapp.name}.war" />
 				<exclude name="WEB-INF/lib/**" />
 				<exclude name="WEB-INF/src/**" />
 				<exclude name="WEB-INF/web.xml" />
-				<exclude name="deploy/logs/**" />
+				<exclude name="deploy/**" />
 				<exclude name="design/**" />
 				<exclude name="work/**" />
 				<exclude name="wireframe/**" />