Commit 8419a062 authored by iwakeh's avatar iwakeh
Browse files

More adaptions toward the general metrics project structure.

Removed obsolete git-submodule.
parent 0282b71d
[submodule "deps/metrics-lib"]
path = deps/metrics-lib
url = https://git.torproject.org/metrics-lib
......@@ -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
......
......@@ -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>
......
metrics-lib @ bd18dd0d
Subproject commit bd18dd0d2f788d1d4ee7acbac5032e97264bb855
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment