From 5845bc853a47b057f80423272f1c0fbf0f5639b0 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sun, 5 Dec 2010 16:39:30 -0800
Subject: [PATCH 1/2] Updated build.xml to include META-INF

---
 guacamole/web-client/build.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/guacamole/web-client/build.xml b/guacamole/web-client/build.xml
index c9b3ff621..a454f2c5d 100644
--- a/guacamole/web-client/build.xml
+++ b/guacamole/web-client/build.xml
@@ -40,9 +40,7 @@
 		depends="compile">
 		<war destfile="${dist.dir}/guacamole.war"
 			webxml="${build.dir}/WEB-INF/web.xml">
-            <fileset dir="${build.dir}">
-                <exclude name="META-INF/**"/>
-            </fileset>
+            <fileset dir="${build.dir}"/>
 		</war>
 	</target>
 

From 312e9f3a7e8a4d3d46a453e597c186d12198367c Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sun, 5 Dec 2010 16:40:42 -0800
Subject: [PATCH 2/2] Updated build.xml to include proper example files

---
 guacamole/web-client/build.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guacamole/web-client/build.xml b/guacamole/web-client/build.xml
index a454f2c5d..326b7ca72 100644
--- a/guacamole/web-client/build.xml
+++ b/guacamole/web-client/build.xml
@@ -63,7 +63,7 @@
         <delete dir="${tar.src.dir}"/>
 
         <copy todir="${tar.dir}">
-            <fileset file="${doc.dir}/example/guacamole.xml"/>
+            <fileset file="${doc.dir}/example/guacamole.properties"/>
             <fileset file="${doc.dir}/example/user-mapping.xml"/>
             <fileset file="${dist.dir}/guacamole.war"/>
             <fileset file="LICENSE.txt"/>