From 8419a062967efcf25359d7c3c88c972afac177c0 Mon Sep 17 00:00:00 2001
From: iwakeh <iwakeh@torproject.org>
Date: Tue, 1 Nov 2016 17:37:46 +0100
Subject: [PATCH] More adaptions toward the general metrics project structure.
 Removed obsolete git-submodule.

---
 .gitmodules                                   |   3 --
 README                                        |   2 +-
 build.xml                                     |  39 ++++++++++--------
 deps/metrics-lib                              |   1 -
 .../main/resources}/ExoneraTor.properties     |   0
 .../main/resources}/ExoneraTor_de.properties  |   0
 config.template => src/main/resources/config  |   0
 {db => src/main/resources/db}/exonerator.sql  |   0
 .../main/resources}/logging.properties        |   0
 .../main/webapp/context.xml                   |   0
 .../main/webapp}/css/bootstrap.min.css        |   0
 {web => src/main/webapp}/css/exonerator.css   |   0
 .../main/webapp}/images/exonerator-logo.png   | Bin
 .../webapp}/images/exonerator-wordmark.png    | Bin
 {web => src/main/webapp}/images/favicon.ico   | Bin
 {etc => src/main/webapp}/web.xml              |   0
 16 files changed, 22 insertions(+), 23 deletions(-)
 delete mode 160000 deps/metrics-lib
 rename {res => src/main/resources}/ExoneraTor.properties (100%)
 rename {res => src/main/resources}/ExoneraTor_de.properties (100%)
 rename config.template => src/main/resources/config (100%)
 rename {db => src/main/resources/db}/exonerator.sql (100%)
 rename {etc => src/main/resources}/logging.properties (100%)
 rename etc/context.xml.template => src/main/webapp/context.xml (100%)
 rename {web => src/main/webapp}/css/bootstrap.min.css (100%)
 rename {web => src/main/webapp}/css/exonerator.css (100%)
 rename {web => src/main/webapp}/images/exonerator-logo.png (100%)
 rename {web => src/main/webapp}/images/exonerator-wordmark.png (100%)
 rename {web => src/main/webapp}/images/favicon.ico (100%)
 rename {etc => src/main/webapp}/web.xml (100%)

diff --git a/.gitmodules b/.gitmodules
index c6b6388..e69de29 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "deps/metrics-lib"]
-	path = deps/metrics-lib
-	url = https://git.torproject.org/metrics-lib
diff --git a/README b/README
index 539e823..d756439 100644
--- a/README
+++ b/README
@@ -73,7 +73,7 @@ $ sudo -u postgres createdb -O exonerator exonerator
 
 Import the exonerator database schema.
 
-$ psql -f /srv/exonerator.torproject.org/exonerator/db/exonerator.sql \
+$ psql -f /srv/exonerator.torproject.org/exonerator/src/main/resources/db/exonerator.sql \
   exonerator
 
 Confirm that the database now contains tables to hold ExoneraTor data.  In
diff --git a/build.xml b/build.xml
index fc0eb58..246a87e 100644
--- a/build.xml
+++ b/build.xml
@@ -2,31 +2,30 @@
 
   <!-- Define build paths. -->
   <property name="sources" value="src/main/java"/>
-  <property name="resources" value="res"/>
+  <property name="resources" value="src/main/resources"/>
+  <property name="webapp" value="src/main/webapp"/>
   <property name="generated" value="generated/"/>
-  <property name="classes" value="classes"/>
+  <property name="classes" value="${generated}/classes"/>
+  <property name="dist" value="${generated}/dist"/>
   <property name="testresources" value="src/test/resources/"/>
   <property name="libs" value="lib"/>
-  <property name="config" value="etc"/>
-  <property name="webxmlfile" value="${config}/web.xml"/>
-  <property name="contextxmltemplate"
-            value="${config}/context.xml.template"/>
-  <property name="contextxml" value="${config}/context.xml"/>
-  <property name="warfile" value="exonerator.war"/>
+  <property name="webxmlfile" value="src/main/webapp/web.xml"/>
+  <property name="warfile" value="${dist}/exonerator.war"/>
   <property name="source-and-target-java-version" value="1.7" />
   <property name="descriptorversion" value="1.5.0" />
   <path id="classpath">
     <pathelement path="${classes}"/>
     <fileset dir="${libs}">
       <include name="descriptor-${descriptorversion}.jar"/>
+      <include name="commons-compress-1.9.jar"/>
       <include name="commons-codec-1.9.jar"/>
+      <include name="commons-lang-2.6.jar"/>
+      <include name="gson-2.2.4.jar" />
       <include name="postgresql-jdbc4-9.2.jar"/>
       <include name="servlet-api-3.0.jar"/>
-      <include name="commons-lang-2.6.jar"/>
       <include name="logback-core-1.1.2.jar" />
       <include name="logback-classic-1.1.2.jar" />
       <include name="slf4j-api-1.7.7.jar"/>
-      <include name="commons-compress-1.9.jar"/>
       <include name="xz-1.5.jar"/>
     </fileset>
   </path>
@@ -36,11 +35,16 @@
     </fileset>
   </path>
 
+  <target name="clean">
+    <delete includeEmptyDirs="true" quiet="true">
+      <fileset dir="${generated}" defaultexcludes="false" includes="**" />
+    </delete>
+  </target>
+
   <target name="init">
-    <copy file="${contextxmltemplate}" tofile="${contextxml}"/>
-    <copy file="config.template" tofile="config"/>
+    <copy file="${resources}/config" tofile="${basedir}/config"/>
     <mkdir dir="${classes}"/>
-    <mkdir dir="${generated}"/>
+    <mkdir dir="${dist}"/>
   </target>
 
   <!-- Compile all servlets and plain Java classes. -->
@@ -99,7 +103,8 @@
           depends="compile">
     <war destfile="${warfile}"
          webxml="${webxmlfile}">
-      <fileset dir="web"/>
+      <fileset dir="${webapp}" includes="css/*"/>
+      <fileset dir="${webapp}" includes="images/*"/>
       <lib dir="${libs}">
         <include name="commons-codec-1.9.jar"/>
         <include name="commons-lang-2.6.jar"/>
@@ -107,11 +112,9 @@
       </lib>
       <classes dir="${classes}"/>
       <zipfileset dir="${resources}"
-                  prefix="WEB-INF/classes"/>
-      <zipfileset dir="${config}"
                   prefix="WEB-INF/classes"
-                  includes="logging.properties"/>
-      <metainf dir="${config}"
+                  excludes="config **/db/* db" />
+      <metainf dir="${webapp}"
                includes="context.xml"/>
     </war>
   </target>
diff --git a/deps/metrics-lib b/deps/metrics-lib
deleted file mode 160000
index bd18dd0..0000000
--- a/deps/metrics-lib
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855
diff --git a/res/ExoneraTor.properties b/src/main/resources/ExoneraTor.properties
similarity index 100%
rename from res/ExoneraTor.properties
rename to src/main/resources/ExoneraTor.properties
diff --git a/res/ExoneraTor_de.properties b/src/main/resources/ExoneraTor_de.properties
similarity index 100%
rename from res/ExoneraTor_de.properties
rename to src/main/resources/ExoneraTor_de.properties
diff --git a/config.template b/src/main/resources/config
similarity index 100%
rename from config.template
rename to src/main/resources/config
diff --git a/db/exonerator.sql b/src/main/resources/db/exonerator.sql
similarity index 100%
rename from db/exonerator.sql
rename to src/main/resources/db/exonerator.sql
diff --git a/etc/logging.properties b/src/main/resources/logging.properties
similarity index 100%
rename from etc/logging.properties
rename to src/main/resources/logging.properties
diff --git a/etc/context.xml.template b/src/main/webapp/context.xml
similarity index 100%
rename from etc/context.xml.template
rename to src/main/webapp/context.xml
diff --git a/web/css/bootstrap.min.css b/src/main/webapp/css/bootstrap.min.css
similarity index 100%
rename from web/css/bootstrap.min.css
rename to src/main/webapp/css/bootstrap.min.css
diff --git a/web/css/exonerator.css b/src/main/webapp/css/exonerator.css
similarity index 100%
rename from web/css/exonerator.css
rename to src/main/webapp/css/exonerator.css
diff --git a/web/images/exonerator-logo.png b/src/main/webapp/images/exonerator-logo.png
similarity index 100%
rename from web/images/exonerator-logo.png
rename to src/main/webapp/images/exonerator-logo.png
diff --git a/web/images/exonerator-wordmark.png b/src/main/webapp/images/exonerator-wordmark.png
similarity index 100%
rename from web/images/exonerator-wordmark.png
rename to src/main/webapp/images/exonerator-wordmark.png
diff --git a/web/images/favicon.ico b/src/main/webapp/images/favicon.ico
similarity index 100%
rename from web/images/favicon.ico
rename to src/main/webapp/images/favicon.ico
diff --git a/etc/web.xml b/src/main/webapp/web.xml
similarity index 100%
rename from etc/web.xml
rename to src/main/webapp/web.xml