From 8a2a6582b07f676e521b60b2e60a95e2953c5e91 Mon Sep 17 00:00:00 2001
From: Timothy Prepscius <tprepscius>
Date: Sat, 28 Sep 2013 19:00:01 -0400
Subject: [PATCH] minor changes for setup

---
 ext/.gitignore           |  4 +++-
 java/webserver/build.xml | 38 +++++++++++++++++++-------------------
 setup                    |  2 +-
 3 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/ext/.gitignore b/ext/.gitignore
index 28ab4ff..b500841 100644
--- a/ext/.gitignore
+++ b/ext/.gitignore
@@ -1 +1,3 @@
-apache-tomcat-7.0.37/
+*.tar.gz
+*.zip
+
diff --git a/java/webserver/build.xml b/java/webserver/build.xml
index dd9753c..dbc0d8e 100644
--- a/java/webserver/build.xml
+++ b/java/webserver/build.xml
@@ -14,25 +14,25 @@
     <property name="target" value="1.6"/>
     <property name="source" value="1.6"/>
     <path id="Apache Tomcat v7.0 [Apache Tomcat v7.0].libraryclasspath">
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/annotations-api.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/catalina-ant.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/catalina-ha.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/catalina-tribes.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/catalina.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/ecj-4.2.1.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/el-api.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/jasper-el.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/jasper.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/jsp-api.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/servlet-api.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-api.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-coyote.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-dbcp.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-es.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-fr.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-i18n-ja.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-jdbc.jar"/>
-        <pathelement location="../../ext/apache-tomcat-7.0.37/lib/tomcat-util.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/annotations-api.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/catalina-ant.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/catalina-ha.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/catalina-tribes.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/catalina.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/ecj-4.2.1.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/el-api.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/jasper-el.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/jasper.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/jsp-api.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/servlet-api.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-api.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-coyote.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-dbcp.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-i18n-es.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-i18n-fr.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-i18n-ja.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-jdbc.jar"/>
+        <pathelement location="../../ext/apache-tomcat/lib/tomcat-util.jar"/>
     </path>
     <path id="Web App Libraries.libraryclasspath">
         <pathelement location="../../../../../../Mailiverse.Ext.BouncyCastle"/>
diff --git a/setup b/setup
index cad0956..58af42a 100755
--- a/setup
+++ b/setup
@@ -1,5 +1,5 @@
 pushd ext
-tar -xzf apache-tomcat.tar.gz
+./setup
 popd
 
 pushd java/ext