Converted build tool to Maven.

services/git-bridge/.gitignore

@@ -1,3 +1,3 @@
-out/
+target/
 *.jar
 .idea/workspace.xml

services/git-bridge/.idea/ant.xml

@@ -1,7 +1,3 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AntConfiguration">
-    <buildFile url="file://$PROJECT_DIR$/build.xml" />
-  </component>
-</project>
+<project version="4" />
 

services/git-bridge/.idea/compiler.xml

@@ -17,6 +17,13 @@
       <profile default="true" name="Default" enabled="false">
         <processorPath useClasspath="true" />
       </profile>
+      <profile default="false" name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <processorPath useClasspath="true" />
+        <module name="writelatex-git-bridge" />
+      </profile>
     </annotationProcessing>
   </component>
 </project>

services/git-bridge/.idea/encodings.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false" />
+  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
+    <file url="file://$PROJECT_DIR$" charset="UTF-8" />
+  </component>
 </project>
 

services/git-bridge/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: cglib:cglib-nodep:2.1_3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/cglib/cglib-nodep/2.1_3/cglib-nodep-2.1_3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.google.code.gson:gson:2.3.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.3.1/gson-2.3.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.3.1/gson-2.3.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/google/code/gson/gson/2.3.1/gson-2.3.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_7_9.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.googlecode.javaewah:JavaEWAH:0.7.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/googlecode/javaewah/JavaEWAH/0.7.9/JavaEWAH-0.7.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__com_jcraft_jsch_0_1_50.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.jcraft:jsch:0.1.50">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.50/jsch-0.1.50.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.50/jsch-0.1.50-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/jcraft/jsch/0.1.50/jsch-0.1.50-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__com_ning_async_http_client_1_9_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning:async-http-client:1.9.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/async-http-client/1.9.3/async-http-client-1.9.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/async-http-client/1.9.3/async-http-client-1.9.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/async-http-client/1.9.3/async-http-client-1.9.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-codec:commons-codec:1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: commons-logging:commons-logging:1.1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__io_netty_netty_3_9_5_Final.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: io.netty:netty:3.9.5.Final">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.9.5.Final/netty-3.9.5.Final.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.9.5.Final/netty-3.9.5.Final-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/io/netty/netty/3.9.5.Final/netty-3.9.5.Final-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.servlet:javax.servlet-api:3.1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/servlet/javax.servlet-api/3.1.0/javax.servlet-api-3.1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: javax.websocket:javax.websocket-api:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/websocket/javax.websocket-api/1.0/javax.websocket-api-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/websocket/javax.websocket-api/1.0/javax.websocket-api-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/javax/websocket/javax.websocket-api/1.0/javax.websocket-api-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__junit_junit_4_10.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit:4.10">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__junit_junit_dep_4_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: junit:junit-dep:4.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit-dep/4.4/junit-dep-4.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit-dep/4.4/junit-dep-4.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/junit/junit-dep/4.4/junit-dep-4.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_1_3.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpclient:4.1.3">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.1.3/httpclient-4.1.3.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.1.3/httpclient-4.1.3-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpclient/4.1.3/httpclient-4.1.3-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_1_4.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.httpcomponents:httpcore:4.1.4">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.1.4/httpcore-4.1.4.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.1.4/httpcore-4.1.4-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/httpcomponents/httpcore/4.1.4/httpcore-4.1.4-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_eclipse_jetty_aggregate_jetty_all_9_2_6_v20141205.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jetty.aggregate:jetty-all:9.2.6.v20141205">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/aggregate/jetty-all/9.2.6.v20141205/jetty-all-9.2.6.v20141205.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/aggregate/jetty-all/9.2.6.v20141205/jetty-all-9.2.6.v20141205-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jetty/aggregate/jetty-all/9.2.6.v20141205/jetty-all-9.2.6.v20141205-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_3_6_0_201412230720_r.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jgit:org.eclipse.jgit:3.6.0.201412230720-r">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit/3.6.0.201412230720-r/org.eclipse.jgit-3.6.0.201412230720-r.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit/3.6.0.201412230720-r/org.eclipse.jgit-3.6.0.201412230720-r-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit/3.6.0.201412230720-r/org.eclipse.jgit-3.6.0.201412230720-r-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_http_server_3_6_0_201412230720_r.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.eclipse.jgit:org.eclipse.jgit.http.server:3.6.0.201412230720-r">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit.http.server/3.6.0.201412230720-r/org.eclipse.jgit.http.server-3.6.0.201412230720-r.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit.http.server/3.6.0.201412230720-r/org.eclipse.jgit.http.server-3.6.0.201412230720-r-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/eclipse/jgit/org.eclipse.jgit.http.server/3.6.0.201412230720-r/org.eclipse.jgit.http.server-3.6.0.201412230720-r-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-core:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.hamcrest:hamcrest-library:1.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_2_6_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jmock:jmock:2.6.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock/2.6.0/jmock-2.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock/2.6.0/jmock-2.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock/2.6.0/jmock-2.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_junit4_2_6_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jmock:jmock-junit4:2.6.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-junit4/2.6.0/jmock-junit4-2.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-junit4/2.6.0/jmock-junit4-2.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-junit4/2.6.0/jmock-junit4-2.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_legacy_2_6_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.jmock:jmock-legacy:2.6.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-legacy/2.6.0/jmock-legacy-2.6.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-legacy/2.6.0/jmock-legacy-2.6.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/jmock/jmock-legacy/2.6.0/jmock-legacy-2.6.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.objenesis:objenesis:1.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/objenesis/objenesis/1.0/objenesis-1.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-api:1.7.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_nop_1_7_9.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.slf4j:slf4j-nop:1.7.9">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-nop/1.7.9/slf4j-nop-1.7.9.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-nop/1.7.9/slf4j-nop-1.7.9-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-nop/1.7.9/slf4j-nop-1.7.9-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/Maven__org_xerial_sqlite_jdbc_3_8_7.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.xerial:sqlite-jdbc:3.8.7">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.8.7/sqlite-jdbc-3.8.7.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.8.7/sqlite-jdbc-3.8.7-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/xerial/sqlite-jdbc/3.8.7/sqlite-jdbc-3.8.7-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

services/git-bridge/.idea/libraries/async_http_client_1_8_14.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="async-http-client-1.8.14">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/async-http-client-1.8.14.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/libs/async-http-client-1.8.14-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/betamax_core.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="betamax-core">
+    <CLASSES>
+      <root url="jar://$PROJECT_DIR$/bin/betamax-core.jar!/" />
+      <root url="jar://$PROJECT_DIR$/bin/betamax-httpclient.jar!/" />
+      <root url="jar://$PROJECT_DIR$/bin/betamax-proxy.jar!/" />
+      <root url="jar://$PROJECT_DIR$/bin/betamax-tck.jar!/" />
+      <root url="jar://$PROJECT_DIR$/bin/betamax-test-support.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES />
+  </library>
+</component>

services/git-bridge/.idea/libraries/junit_4_11.xml → services/git-bridge/.idea/libraries/betamax_junit.xml

@@ -1,7 +1,7 @@
 <component name="libraryTable">
-  <library name="junit-4.11">
+  <library name="betamax-junit">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/junit-4.11.jar!/" />
+      <root url="jar://$PROJECT_DIR$/bin/betamax-junit.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES />

services/git-bridge/.idea/libraries/gson_2_3.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="gson-2.3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/gson-2.3.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/libs/gson-2.3-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/hamcrest_core_1_3.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="hamcrest-core-1.3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/hamcrest-core-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/hamcrest_library_1_3.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="hamcrest-library-1.3">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/hamcrest-library-1.3.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/javax_servlet_api_3_1_0.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="javax.servlet-api-3.1.0">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/javax.servlet-api-3.1.0.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/jetty_all_9_2_3_v20140905.xml

@@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jetty-all-9.2.3.v20140905">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/jetty-all-9.2.3.v20140905.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/org_eclipse_jgit_3_5_1_201410131835_r.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="org.eclipse.jgit-3.5.1.201410131835-r">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/libs/org.eclipse.jgit-3.5.1.201410131835-r-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/org_eclipse_jgit_http_server_3_5_1_201410131835_r.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="org.eclipse.jgit.http.server-3.5.1.201410131835-r">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="slf4j-api-1.7.7">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/slf4j-api-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/libs/slf4j-api-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml

@@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="slf4j-nop-1.7.7">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/slf4j-nop-1.7.7.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/libs/slf4j-nop-1.7.7-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES />
-  </library>
-</component>

services/git-bridge/.idea/libraries/sqlite_jdbc_3_7_2.xml

@@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="sqlite-jdbc-3.7.2">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/libs/sqlite-jdbc-3.7.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/libs/sqlite-jdbc-3.7.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/libs/sqlite-jdbc-3.7.2.jar!/" />
-    </SOURCES>
-  </library>
-</component>

services/git-bridge/.idea/misc.xml

@@ -3,6 +3,13 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
   </component>

services/git-bridge/.travis.yml

@@ -1,2 +1 @@
-language: java
-install: ant all
+language: java

services/git-bridge/README.md

@@ -3,21 +3,21 @@ writelatex-git-bridge
 
 Required
 --------
-  * `ant` (for building)
+  * `maven` (for building)
   * `jdk-7` (for compiling and running)
 
 Installation
 ------------
 ### Ubuntu ###
-Run `install.sh` to get dependencies, build, test, package, and make it a service.
+Run `sudo install.sh` to get dependencies, build, test, package, and make it a service.
 
-Use `service wlgb start` and `service wlgb stop` to start and stop the server.
+Use `sudo service wlgb start` and `sudo service wlgb stop` to start and stop the server.
 
 The configuration file will be at `/etc/wlgb/config.json`.
 
-Run `uninstall.sh` to undo what `install.sh` did.
+Run `sudo uninstall.sh` to undo what `sudo install.sh` did.
 ### Manually ###
-Run `ant all` to build, test, and package it into a jar at `bin/writelatex-git-bridge.jar`.
+Run `mvn package` to build, test, and package it into a jar at `target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar`.
 
 Use `java -jar <path_to_jar> <path_to_config_file>` to run the server.
 

services/git-bridge/build.xml

@@ -1,368 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="writelatex-git-bridge" default="all">
-  
-  <!-- Compiler options -->
-  
-  <property name="compiler.debug" value="on"/>
-  <property name="compiler.generate.no.warnings" value="off"/>
-  <property name="compiler.args" value=""/>
-  <property name="compiler.max.memory" value="700m"/>
-  <patternset id="ignored.files">
-    <exclude name="**/CVS/**"/>
-    <exclude name="**/SCCS/**"/>
-    <exclude name="**/RCS/**"/>
-    <exclude name="**/rcs/**"/>
-    <exclude name="**/.DS_Store/**"/>
-    <exclude name="**/.svn/**"/>
-    <exclude name="**/.pyc/**"/>
-    <exclude name="**/.pyo/**"/>
-    <exclude name="**/*.pyc/**"/>
-    <exclude name="**/*.pyo/**"/>
-    <exclude name="**/.git/**"/>
-    <exclude name="**/*.hprof/**"/>
-    <exclude name="**/_svn/**"/>
-    <exclude name="**/.hg/**"/>
-    <exclude name="**/*.lib/**"/>
-    <exclude name="**/*~/**"/>
-    <exclude name="**/__pycache__/**"/>
-    <exclude name="**/.bundle/**"/>
-    <exclude name="**/*.rbc/**"/>
-  </patternset>
-  <patternset id="library.patterns">
-    <include name="*.zip"/>
-    <include name="*.apk"/>
-    <include name="*.war"/>
-    <include name="*.egg"/>
-    <include name="*.ear"/>
-    <include name="*.ane"/>
-    <include name="*.swc"/>
-    <include name="*.jar"/>
-  </patternset>
-  <patternset id="compiler.resources">
-    <exclude name="**/?*.java"/>
-    <exclude name="**/?*.form"/>
-    <exclude name="**/?*.class"/>
-    <exclude name="**/?*.groovy"/>
-    <exclude name="**/?*.scala"/>
-    <exclude name="**/?*.flex"/>
-    <exclude name="**/?*.kt"/>
-    <exclude name="**/?*.clj"/>
-  </patternset>
-  
-  
-  <!-- Project Libraries -->
-  
-  <path id="library.hamcrest-core-1.3.classpath">
-    <pathelement location="${basedir}/libs/hamcrest-core-1.3.jar"/>
-  </path>
-  
-  <path id="library.hamcrest-library-1.3.classpath">
-    <pathelement location="${basedir}/libs/hamcrest-library-1.3.jar"/>
-  </path>
-  
-  <path id="library.javax.servlet-api-3.1.0.classpath">
-    <pathelement location="${basedir}/libs/javax.servlet-api-3.1.0.jar"/>
-  </path>
-  
-  <path id="library.jetty-all-9.2.3.v20140905.classpath">
-    <pathelement location="${basedir}/libs/jetty-all-9.2.3.v20140905.jar"/>
-  </path>
-  
-  <path id="library.junit-4.11.classpath">
-    <pathelement location="${basedir}/libs/junit-4.11.jar"/>
-  </path>
-  
-  <path id="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath">
-    <pathelement location="${basedir}/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar"/>
-  </path>
-  
-  <path id="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath">
-    <pathelement location="${basedir}/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar"/>
-  </path>
-
-  <path id="library.gson-2.3.classpath">
-    <pathelement location="${basedir}/libs/gson-2.3.jar"/>
-  </path>
-
-  <path id="library.async-http-client-1.8.14.classpath">
-    <pathelement location="${basedir}/libs/async-http-client-1.8.14.jar"/>
-  </path>
-
-  <path id="library.slf4j-api-1.7.7.classpath">
-    <pathelement location="${basedir}/libs/slf4j-api-1.7.7.jar"/>
-  </path>
-
-  <path id="library.slf4j-nop-1.7.7.classpath">
-    <pathelement location="${basedir}/libs/slf4j-nop-1.7.7.jar"/>
-  </path>
-
-  <path id="library.sqlite-jdbc-3.7.2.classpath">
-    <pathelement location="${basedir}/libs/sqlite-jdbc-3.7.2.jar"/>
-  </path>
-  
-  <!-- Modules -->
-  
-  
-  <!-- Module writelatex-git-bridge -->
-  
-  <dirname property="module.writelatex-git-bridge.basedir" file="${ant.file}"/>
-  
-  
-  
-  <property name="compiler.args.writelatex-git-bridge" value="-encoding UTF-8 -source 1.6 ${compiler.args}"/>
-  
-  <property name="writelatex-git-bridge.output.dir" value="${module.writelatex-git-bridge.basedir}/out/production/writelatex-git-bridge"/>
-  <property name="writelatex-git-bridge.testoutput.dir" value="${module.writelatex-git-bridge.basedir}/out/test/writelatex-git-bridge"/>
-  <property name="writelatex-git-bridge.testoutput.unit.dir" value="${module.writelatex-git-bridge.basedir}/out/test/writelatex-git-bridge/unit"/>
-  <property name="writelatex-git-bridge.testoutput.system.dir" value="${module.writelatex-git-bridge.basedir}/out/test/writelatex-git-bridge/system"/>
-  
-  <path id="writelatex-git-bridge.module.bootclasspath">
-    <!-- Paths to be included in compilation bootclasspath -->
-  </path>
-  
-  <path id="writelatex-git-bridge.module.production.classpath">
-    <path refid="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.javax.servlet-api-3.1.0.classpath"/>
-    <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
-    <path refid="library.hamcrest-core-1.3.classpath"/>
-    <path refid="library.hamcrest-library-1.3.classpath"/>
-    <path refid="library.junit-4.11.classpath"/>
-    <path refid="library.gson-2.3.classpath"/>
-    <path refid="library.async-http-client-1.8.14.classpath"/>
-    <path refid="library.slf4j-api-1.7.7.classpath"/>
-    <path refid="library.slf4j-nop-1.7.7.classpath"/>
-    <path refid="library.sqlite-jdbc-3.7.2.classpath"/>
-  </path>
-  
-  <path id="writelatex-git-bridge.runtime.production.module.classpath">
-    <pathelement location="${writelatex-git-bridge.output.dir}"/>
-    <path refid="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.javax.servlet-api-3.1.0.classpath"/>
-    <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
-    <path refid="library.hamcrest-core-1.3.classpath"/>
-    <path refid="library.hamcrest-library-1.3.classpath"/>
-    <path refid="library.junit-4.11.classpath"/>
-    <path refid="library.gson-2.3.classpath"/>
-    <path refid="library.async-http-client-1.8.14.classpath"/>
-    <path refid="library.slf4j-api-1.7.7.classpath"/>
-    <path refid="library.slf4j-nop-1.7.7.classpath"/>
-    <path refid="library.sqlite-jdbc-3.7.2.classpath"/>
-  </path>
-  
-  <path id="writelatex-git-bridge.module.classpath">
-    <pathelement location="${writelatex-git-bridge.output.dir}"/>
-    <path refid="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.javax.servlet-api-3.1.0.classpath"/>
-    <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
-    <path refid="library.hamcrest-core-1.3.classpath"/>
-    <path refid="library.hamcrest-library-1.3.classpath"/>
-    <path refid="library.junit-4.11.classpath"/>
-    <path refid="library.gson-2.3.classpath"/>
-    <path refid="library.async-http-client-1.8.14.classpath"/>
-    <path refid="library.slf4j-api-1.7.7.classpath"/>
-    <path refid="library.slf4j-nop-1.7.7.classpath"/>
-    <path refid="library.sqlite-jdbc-3.7.2.classpath"/>
-  </path>
-  
-  <path id="writelatex-git-bridge.runtime.module.classpath">
-    <pathelement location="${writelatex-git-bridge.testoutput.dir}"/>
-    <pathelement location="${writelatex-git-bridge.output.dir}"/>
-    <path refid="library.org.eclipse.jgit-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.org.eclipse.jgit.http.server-3.5.1.201410131835-r.classpath"/>
-    <path refid="library.javax.servlet-api-3.1.0.classpath"/>
-    <path refid="library.jetty-all-9.2.3.v20140905.classpath"/>
-    <path refid="library.hamcrest-core-1.3.classpath"/>
-    <path refid="library.hamcrest-library-1.3.classpath"/>
-    <path refid="library.junit-4.11.classpath"/>
-    <path refid="library.gson-2.3.classpath"/>
-    <path refid="library.async-http-client-1.8.14.classpath"/>
-    <path refid="library.slf4j-api-1.7.7.classpath"/>
-    <path refid="library.slf4j-nop-1.7.7.classpath"/>
-    <path refid="library.sqlite-jdbc-3.7.2.classpath"/>
-  </path>
-  
-  
-  <patternset id="excluded.from.module.writelatex-git-bridge">
-    <patternset refid="ignored.files"/>
-  </patternset>
-  
-  <patternset id="excluded.from.compilation.writelatex-git-bridge">
-    <patternset refid="excluded.from.module.writelatex-git-bridge"/>
-  </patternset>
-  
-  <path id="writelatex-git-bridge.module.sourcepath">
-    <dirset dir="${module.writelatex-git-bridge.basedir}">
-      <include name="src"/>
-    </dirset>
-  </path>
-  
-  <path id="writelatex-git-bridge.module.test.unit.sourcepath">
-    <dirset dir="${module.writelatex-git-bridge.basedir}/test">
-      <include name="unit"/>
-    </dirset>
-  </path>
-
-  <path id="writelatex-git-bridge.module.test.system.sourcepath">
-    <dirset dir="${module.writelatex-git-bridge.basedir}/test">
-      <include name="system"/>
-    </dirset>
-  </path>
-  
-  
-  <target name="compile.module.writelatex-git-bridge" depends="compile.module.writelatex-git-bridge.production,compile.module.writelatex-git-bridge.tests.unit" description="Compile module writelatex-git-bridge"/>
-  
-  <target name="compile.module.writelatex-git-bridge.production" description="Compile module writelatex-git-bridge; production classes">
-    <mkdir dir="${writelatex-git-bridge.output.dir}"/>
-    <javac destdir="${writelatex-git-bridge.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
-      <compilerarg line="${compiler.args.writelatex-git-bridge}"/>
-      <bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
-      <classpath refid="writelatex-git-bridge.module.production.classpath"/>
-      <src refid="writelatex-git-bridge.module.sourcepath"/>
-      <patternset refid="excluded.from.compilation.writelatex-git-bridge"/>
-    </javac>
-    
-    <copy todir="${writelatex-git-bridge.output.dir}">
-      <fileset dir="${module.writelatex-git-bridge.basedir}/src">
-        <patternset refid="compiler.resources"/>
-        <type type="file"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="compile.module.writelatex-git-bridge.tests.unit" depends="compile.module.writelatex-git-bridge.production" description="compile module writelatex-git-bridge; test classes" unless="skip.tests">
-    <mkdir dir="${writelatex-git-bridge.testoutput.unit.dir}"/>
-    <javac destdir="${writelatex-git-bridge.testoutput.unit.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
-      <compilerarg line="${compiler.args.writelatex-git-bridge}"/>
-      <bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
-      <classpath refid="writelatex-git-bridge.module.classpath"/>
-      <src refid="writelatex-git-bridge.module.test.unit.sourcepath"/>
-      <patternset refid="excluded.from.compilation.writelatex-git-bridge"/>
-    </javac>
-    
-    <copy todir="${writelatex-git-bridge.testoutput.unit.dir}">
-      <fileset dir="${module.writelatex-git-bridge.basedir}/test">
-        <patternset refid="compiler.resources"/>
-        <type type="file"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="compile.module.writelatex-git-bridge.tests.system" depends="compile.module.writelatex-git-bridge.production" description="compile module writelatex-git-bridge; test classes" unless="skip.tests">
-    <mkdir dir="${writelatex-git-bridge.testoutput.system.dir}"/>
-    <javac destdir="${writelatex-git-bridge.testoutput.system.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
-      <compilerarg line="${compiler.args.writelatex-git-bridge}"/>
-      <bootclasspath refid="writelatex-git-bridge.module.bootclasspath"/>
-      <classpath refid="writelatex-git-bridge.module.classpath"/>
-      <src refid="writelatex-git-bridge.module.test.system.sourcepath"/>
-      <patternset refid="excluded.from.compilation.writelatex-git-bridge"/>
-    </javac>
-
-    <copy todir="${writelatex-git-bridge.testoutput.system.dir}">
-      <fileset dir="${module.writelatex-git-bridge.basedir}/test">
-        <patternset refid="compiler.resources"/>
-        <type type="file"/>
-      </fileset>
-    </copy>
-  </target>
-  
-  <target name="clean.module.writelatex-git-bridge" description="cleanup module">
-    <delete dir="${writelatex-git-bridge.output.dir}"/>
-    <delete dir="${writelatex-git-bridge.testoutput.dir}"/>
-  </target>
-
-  <target name="clean.modules" depends="clean.module.writelatex-git-bridge">
-    <delete dir="${module.writelatex-git-bridge.basedir}/out" />
-  </target>
-  
-  <target name="init" description="Build initialization">
-    <!-- Perform any build initialization in this target -->
-  </target>
-  
-  <target name="clean" depends="clean.modules" description="cleanup all">
-      <delete file="${module.writelatex-git-bridge.basedir}/bin/writelatex-git-bridge.jar" />
-  </target>
-  
-  <target name="build.modules" depends="init, clean, compile.module.writelatex-git-bridge" description="build all modules"/>
-  
-  <target name="init.artifacts">
-    <property name="artifacts.temp.dir" value="${basedir}/__artifacts_temp"/>
-    <property name="artifact.output.writelatex-git-bridge:jar" value="${basedir}/out/artifacts/writelatex_git_bridge_jar"/>
-    <mkdir dir="${artifacts.temp.dir}"/>
-    <property name="temp.jar.path.writelatex-git-bridge.jar" value="${artifacts.temp.dir}/writelatex-git-bridge.jar"/>
-  </target>
-  
-  <target name="artifact.writelatex-git-bridge:jar" depends="init.artifacts, compile.module.writelatex-git-bridge, compile.module.writelatex-git-bridge" description="Build &#39;writelatex-git-bridge:jar&#39; artifact">
-    <property name="artifact.temp.output.writelatex-git-bridge:jar" value="${artifacts.temp.dir}/writelatex_git_bridge_jar"/>
-    <mkdir dir="${artifact.temp.output.writelatex-git-bridge:jar}"/>
-    <jar destfile="${temp.jar.path.writelatex-git-bridge.jar}" duplicate="preserve" filesetmanifest="mergewithoutmain">
-      <manifest>
-        <attribute name="Main-Class" value="uk.ac.ic.wlgitbridge.Main" />
-      </manifest>
-      <zipfileset dir="${writelatex-git-bridge.output.dir}"/>
-      <zipfileset dir="${writelatex-git-bridge.testoutput.dir}"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/junit-4.11.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/javax.servlet-api-3.1.0.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/hamcrest-core-1.3.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/jetty-all-9.2.3.v20140905.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/hamcrest-library-1.3.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/gson-2.3.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/async-http-client-1.8.14.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/slf4j-api-1.7.7.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/slf4j-nop-1.7.7.jar"/>
-      <zipfileset excludes="META-INF/**/*" src="${basedir}/libs/sqlite-jdbc-3.7.2.jar"/>
-    </jar>
-    <copy file="${temp.jar.path.writelatex-git-bridge.jar}" tofile="${artifact.temp.output.writelatex-git-bridge:jar}/writelatex-git-bridge.jar"/>
-  </target>
-  
-  <target name="build.all.artifacts" depends="artifact.writelatex-git-bridge:jar" description="Build all artifacts">
-    <mkdir dir="${artifact.output.writelatex-git-bridge:jar}"/>
-    <copy todir="${artifact.output.writelatex-git-bridge:jar}">
-      <fileset dir="${artifact.temp.output.writelatex-git-bridge:jar}"/>
-    </copy>
-    
-    <!-- Delete temporary files -->
-    <delete dir="${artifacts.temp.dir}"/>
-  </target>
-
-  <target name="test.unit" depends="compile.module.writelatex-git-bridge.tests.unit">
-    <junit>
-      <classpath>
-        <path refid="writelatex-git-bridge.module.classpath"/>
-        <pathelement location="${writelatex-git-bridge.testoutput.unit.dir}"/>
-      </classpath>
-      <batchtest>
-        <fileset dir="${writelatex-git-bridge.testoutput.unit.dir}">
-        </fileset>
-      </batchtest>
-      <formatter type="brief" usefile="false"/>
-    </junit>
-  </target>
-
-  <target name="test.system" depends="compile.module.writelatex-git-bridge.tests.system">
-    <junit>
-      <classpath>
-        <path refid="writelatex-git-bridge.module.classpath"/>
-        <pathelement location="${writelatex-git-bridge.testoutput.system.dir}"/>
-      </classpath>
-      <batchtest>
-        <fileset dir="${writelatex-git-bridge.testoutput.system.dir}">
-        </fileset>
-      </batchtest>
-      <formatter type="brief" usefile="false"/>
-    </junit>
-  </target>
-
-  <target name="test" depends="test.unit, test.system, clean" />
-
-  <target name="package" depends="build.all.artifacts">
-    <mkdir dir="${module.writelatex-git-bridge.basedir}/bin" />
-    <copy file="${artifact.output.writelatex-git-bridge:jar}/writelatex-git-bridge.jar" tofile="${module.writelatex-git-bridge.basedir}/bin/writelatex-git-bridge.jar" />
-  </target>
-  
-  <target name="all" depends="build.modules, test.unit, test.system, package, clean.modules" description="build all"/>
-</project>

services/git-bridge/install-deps.sh

@@ -1,9 +0,0 @@
-if [ "$(id -u)" != "0" ]; then
-	echo "You must be root to install deps" 1>&2
-	exit 1
-fi
-apt-get update
-apt-get install -y ant
-apt-get install -y openjdk-7-jdk
-update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
-update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/javac

services/git-bridge/install.sh

@@ -2,11 +2,20 @@ if [ "$(id -u)" != "0" ]; then
 	echo "You must be root to install" 1>&2
 	exit 1
 fi
-command -v ant >/dev/null 2>&1 && command -v /usr/lib/jvm/java-7-openjdk-amd64/bin/javac >/dev/null 2>&1 || ./install-deps.sh
-ant all &&\
-mv ./bin/writelatex-git-bridge.jar /usr/local/sbin/ &&\
+command -v ant >/dev/null 2>&1 && command -v /usr/lib/jvm/java-7-openjdk-amd64/bin/javac >/dev/null 2>&1 || installDeps()
+mvn package &&\
+mv ./target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar /usr/local/sbin/ &&\
 cp ./bin/wlgb /etc/init.d/ &&\
 mkdir -p /var/log/wlgb &&\
 mkdir -p /etc/wlgb &&\
 cp ./bin/config.json /etc/wlgb/ &&\
 /usr/sbin/update-rc.d -f wlgb defaults
+
+installDeps() {
+	apt-get update
+	apt-get install -y maven2
+	apt-get install -y openjdk-7-jdk
+	update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java
+	update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/javac
+	return 1
+}

services/git-bridge/pom.xml

@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>groupId</groupId>
+    <artifactId>writelatex-git-bridge</artifactId>
+    <version>1.0-SNAPSHOT</version>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-assembly-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>single</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>uk.ac.ic.wlgitbridge.Main</mainClass>
+                        </manifest>
+                    </archive>
+                    <descriptorRefs>
+                        <descriptorRef>jar-with-dependencies</descriptorRef>
+                    </descriptorRefs>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.10</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.jmock</groupId>
+            <artifactId>jmock-junit4</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jmock</groupId>
+            <artifactId>jmock-legacy</artifactId>
+            <version>2.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty.aggregate</groupId>
+            <artifactId>jetty-all</artifactId>
+            <version>9.2.6.v20141205</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.3.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.ning</groupId>
+            <artifactId>async-http-client</artifactId>
+            <version>1.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit</artifactId>
+            <version>3.6.0.201412230720-r</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jgit</groupId>
+            <artifactId>org.eclipse.jgit.http.server</artifactId>
+            <version>3.6.0.201412230720-r</version>
+        </dependency>
+        <dependency>
+            <groupId>org.xerial</groupId>
+            <artifactId>sqlite-jdbc</artifactId>
+            <version>3.8.7</version>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-nop</artifactId>
+            <version>1.7.9</version>
+        </dependency>
+    </dependencies>
+
+</project>

services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java

@@ -21,6 +21,7 @@ public class WLGitBridgeApplication {
 
     private String configFilePath;
     private Config config;
+    private WLGitBridgeServer server;
 
     /**
      * Constructs an instance of the WriteLatex-Git Bridge application.
@@ -40,14 +41,8 @@ public class WLGitBridgeApplication {
             System.out.println("Invalid config file. Check the file path.");
             System.exit(EXIT_CODE_FAILED);
         }
-    }
-
-    /**
-     * Starts the server with the port number and root directory path given in the command-line arguments.
-     */
-    public void run() {
         try {
-            new WLGitBridgeServer(config).start();
+            server = new WLGitBridgeServer(config);
         } catch (ServletException e) {
             e.printStackTrace();
         } catch (InvalidRootDirectoryPathException e) {
@@ -56,6 +51,17 @@ public class WLGitBridgeApplication {
         }
     }
 
+    /**
+     * Starts the server with the port number and root directory path given in the command-line arguments.
+     */
+    public void run() {
+        server.start();
+    }
+
+    public void stop() {
+        server.stop();
+    }
+
     /* Helper methods */
 
     private void parseArguments(String[] args) throws InvalidProgramArgumentsException {

services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java → services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java

@@ -75,9 +75,12 @@ public class WLGitBridgeServer {
         } catch (Exception e) {
             e.printStackTrace();
         }
+    }
+
+    public void stop() {
         try {
-            jettyServer.join();
-        } catch (InterruptedException e) {
+            jettyServer.stop();
+        } catch (Exception e) {
             e.printStackTrace();
         }
     }