diff --git a/services/git-bridge/.gitignore b/services/git-bridge/.gitignore index 7e5a73dce2..7bf222c561 100644 --- a/services/git-bridge/.gitignore +++ b/services/git-bridge/.gitignore @@ -1,3 +1,3 @@ -out/ +target/ *.jar .idea/workspace.xml diff --git a/services/git-bridge/.idea/ant.xml b/services/git-bridge/.idea/ant.xml index 313b0c0cb8..f6e673adc2 100644 --- a/services/git-bridge/.idea/ant.xml +++ b/services/git-bridge/.idea/ant.xml @@ -1,7 +1,3 @@ - - - - - + diff --git a/services/git-bridge/.idea/compiler.xml b/services/git-bridge/.idea/compiler.xml index 217af471a9..db63218957 100644 --- a/services/git-bridge/.idea/compiler.xml +++ b/services/git-bridge/.idea/compiler.xml @@ -17,6 +17,13 @@ + + + + + + + diff --git a/services/git-bridge/.idea/encodings.xml b/services/git-bridge/.idea/encodings.xml index e206d70d85..74c0d0a52b 100644 --- a/services/git-bridge/.idea/encodings.xml +++ b/services/git-bridge/.idea/encodings.xml @@ -1,5 +1,7 @@ - + + + diff --git a/services/git-bridge/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml b/services/git-bridge/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml new file mode 100644 index 0000000000..55692b94d6 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__cglib_cglib_nodep_2_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml b/services/git-bridge/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml new file mode 100644 index 0000000000..d7b503804e --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__com_google_code_gson_gson_2_3_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_7_9.xml b/services/git-bridge/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_7_9.xml new file mode 100644 index 0000000000..10a0400728 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__com_googlecode_javaewah_JavaEWAH_0_7_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__com_jcraft_jsch_0_1_50.xml b/services/git-bridge/.idea/libraries/Maven__com_jcraft_jsch_0_1_50.xml new file mode 100644 index 0000000000..9784d1d645 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__com_jcraft_jsch_0_1_50.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__com_ning_async_http_client_1_9_3.xml b/services/git-bridge/.idea/libraries/Maven__com_ning_async_http_client_1_9_3.xml new file mode 100644 index 0000000000..40a209127e --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__com_ning_async_http_client_1_9_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml b/services/git-bridge/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml new file mode 100644 index 0000000000..2b149c4de2 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__commons_codec_commons_codec_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml b/services/git-bridge/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml new file mode 100644 index 0000000000..b770f56aa9 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__commons_logging_commons_logging_1_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__io_netty_netty_3_9_5_Final.xml b/services/git-bridge/.idea/libraries/Maven__io_netty_netty_3_9_5_Final.xml new file mode 100644 index 0000000000..fea82cc8f5 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__io_netty_netty_3_9_5_Final.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml b/services/git-bridge/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml new file mode 100644 index 0000000000..c24f7e3083 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__javax_servlet_javax_servlet_api_3_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_0.xml b/services/git-bridge/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_0.xml new file mode 100644 index 0000000000..cf43cc9dba --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__javax_websocket_javax_websocket_api_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__junit_junit_4_10.xml b/services/git-bridge/.idea/libraries/Maven__junit_junit_4_10.xml new file mode 100644 index 0000000000..ed8bf5fe7f --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__junit_junit_4_10.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__junit_junit_dep_4_4.xml b/services/git-bridge/.idea/libraries/Maven__junit_junit_dep_4_4.xml new file mode 100644 index 0000000000..12d72e92de --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__junit_junit_dep_4_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_1_3.xml b/services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_1_3.xml new file mode 100644 index 0000000000..1fe25f7cae --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpclient_4_1_3.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_1_4.xml b/services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_1_4.xml new file mode 100644 index 0000000000..02876d583d --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_apache_httpcomponents_httpcore_4_1_4.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_eclipse_jetty_aggregate_jetty_all_9_2_6_v20141205.xml b/services/git-bridge/.idea/libraries/Maven__org_eclipse_jetty_aggregate_jetty_all_9_2_6_v20141205.xml new file mode 100644 index 0000000000..16f61b6601 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_eclipse_jetty_aggregate_jetty_all_9_2_6_v20141205.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_3_6_0_201412230720_r.xml b/services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_3_6_0_201412230720_r.xml new file mode 100644 index 0000000000..6b8d4a7fe5 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_3_6_0_201412230720_r.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_http_server_3_6_0_201412230720_r.xml b/services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_http_server_3_6_0_201412230720_r.xml new file mode 100644 index 0000000000..70fb103b8a --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_eclipse_jgit_org_eclipse_jgit_http_server_3_6_0_201412230720_r.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml new file mode 100644 index 0000000000..acdf44300b --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml b/services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml new file mode 100644 index 0000000000..010812aef6 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_hamcrest_hamcrest_library_1_1.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_2_6_0.xml b/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_2_6_0.xml new file mode 100644 index 0000000000..ec8cc4024a --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_junit4_2_6_0.xml b/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_junit4_2_6_0.xml new file mode 100644 index 0000000000..eadd9dc0f6 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_junit4_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_legacy_2_6_0.xml b/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_legacy_2_6_0.xml new file mode 100644 index 0000000000..d1371a2a99 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_jmock_jmock_legacy_2_6_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml b/services/git-bridge/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml new file mode 100644 index 0000000000..c79fa27d22 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_objenesis_objenesis_1_0.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml b/services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml new file mode 100644 index 0000000000..1e672600f6 --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_nop_1_7_9.xml b/services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_nop_1_7_9.xml new file mode 100644 index 0000000000..10eeead84b --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_slf4j_slf4j_nop_1_7_9.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/Maven__org_xerial_sqlite_jdbc_3_8_7.xml b/services/git-bridge/.idea/libraries/Maven__org_xerial_sqlite_jdbc_3_8_7.xml new file mode 100644 index 0000000000..43556a381a --- /dev/null +++ b/services/git-bridge/.idea/libraries/Maven__org_xerial_sqlite_jdbc_3_8_7.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/async_http_client_1_8_14.xml b/services/git-bridge/.idea/libraries/async_http_client_1_8_14.xml deleted file mode 100644 index fda86f5b16..0000000000 --- a/services/git-bridge/.idea/libraries/async_http_client_1_8_14.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/betamax_core.xml b/services/git-bridge/.idea/libraries/betamax_core.xml new file mode 100644 index 0000000000..2b4ff458a2 --- /dev/null +++ b/services/git-bridge/.idea/libraries/betamax_core.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/betamax_junit.xml b/services/git-bridge/.idea/libraries/betamax_junit.xml new file mode 100644 index 0000000000..b21c3a3be6 --- /dev/null +++ b/services/git-bridge/.idea/libraries/betamax_junit.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/gson_2_3.xml b/services/git-bridge/.idea/libraries/gson_2_3.xml deleted file mode 100644 index 0053310073..0000000000 --- a/services/git-bridge/.idea/libraries/gson_2_3.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/hamcrest_core_1_3.xml b/services/git-bridge/.idea/libraries/hamcrest_core_1_3.xml deleted file mode 100644 index 694d5ff2a3..0000000000 --- a/services/git-bridge/.idea/libraries/hamcrest_core_1_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/hamcrest_library_1_3.xml b/services/git-bridge/.idea/libraries/hamcrest_library_1_3.xml deleted file mode 100644 index b034b94717..0000000000 --- a/services/git-bridge/.idea/libraries/hamcrest_library_1_3.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/javax_servlet_api_3_1_0.xml b/services/git-bridge/.idea/libraries/javax_servlet_api_3_1_0.xml deleted file mode 100644 index 6f925c329d..0000000000 --- a/services/git-bridge/.idea/libraries/javax_servlet_api_3_1_0.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/jetty_all_9_2_3_v20140905.xml b/services/git-bridge/.idea/libraries/jetty_all_9_2_3_v20140905.xml deleted file mode 100644 index 19f5e14d87..0000000000 --- a/services/git-bridge/.idea/libraries/jetty_all_9_2_3_v20140905.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/junit_4_11.xml b/services/git-bridge/.idea/libraries/junit_4_11.xml deleted file mode 100644 index 64af2e4049..0000000000 --- a/services/git-bridge/.idea/libraries/junit_4_11.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/org_eclipse_jgit_3_5_1_201410131835_r.xml b/services/git-bridge/.idea/libraries/org_eclipse_jgit_3_5_1_201410131835_r.xml deleted file mode 100644 index 54412085e6..0000000000 --- a/services/git-bridge/.idea/libraries/org_eclipse_jgit_3_5_1_201410131835_r.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/org_eclipse_jgit_http_server_3_5_1_201410131835_r.xml b/services/git-bridge/.idea/libraries/org_eclipse_jgit_http_server_3_5_1_201410131835_r.xml deleted file mode 100644 index c897b6ed97..0000000000 --- a/services/git-bridge/.idea/libraries/org_eclipse_jgit_http_server_3_5_1_201410131835_r.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml b/services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml deleted file mode 100644 index c8746170de..0000000000 --- a/services/git-bridge/.idea/libraries/slf4j_api_1_7_7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml b/services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml deleted file mode 100644 index a8b1b785d4..0000000000 --- a/services/git-bridge/.idea/libraries/slf4j_nop_1_7_7.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/sqlite_jdbc_3_7_2.xml b/services/git-bridge/.idea/libraries/sqlite_jdbc_3_7_2.xml deleted file mode 100644 index 4591a8c14f..0000000000 --- a/services/git-bridge/.idea/libraries/sqlite_jdbc_3_7_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/misc.xml b/services/git-bridge/.idea/misc.xml index 0cae957f9f..8a80acb0ff 100644 --- a/services/git-bridge/.idea/misc.xml +++ b/services/git-bridge/.idea/misc.xml @@ -3,6 +3,13 @@ + + + diff --git a/services/git-bridge/.travis.yml b/services/git-bridge/.travis.yml index 7ff1fb34a8..f5c99a7f66 100644 --- a/services/git-bridge/.travis.yml +++ b/services/git-bridge/.travis.yml @@ -1,2 +1 @@ -language: java -install: ant all \ No newline at end of file +language: java \ No newline at end of file diff --git a/services/git-bridge/README.md b/services/git-bridge/README.md index ffbf848a00..128e2b32e5 100644 --- a/services/git-bridge/README.md +++ b/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 ` to run the server. diff --git a/services/git-bridge/build.xml b/services/git-bridge/build.xml deleted file mode 100644 index 8fb11c5151..0000000000 --- a/services/git-bridge/build.xml +++ /dev/null @@ -1,368 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/services/git-bridge/install-deps.sh b/services/git-bridge/install-deps.sh deleted file mode 100755 index c619707d46..0000000000 --- a/services/git-bridge/install-deps.sh +++ /dev/null @@ -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 diff --git a/services/git-bridge/install.sh b/services/git-bridge/install.sh index 25fd30b034..47aa36973a 100755 --- a/services/git-bridge/install.sh +++ b/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 +} diff --git a/services/git-bridge/libs/async-http-client-1.8.14-javadoc.jar b/services/git-bridge/libs/async-http-client-1.8.14-javadoc.jar deleted file mode 100644 index 5b17502610..0000000000 Binary files a/services/git-bridge/libs/async-http-client-1.8.14-javadoc.jar and /dev/null differ diff --git a/services/git-bridge/libs/async-http-client-1.8.14.jar b/services/git-bridge/libs/async-http-client-1.8.14.jar deleted file mode 100644 index 7d07b3cf88..0000000000 Binary files a/services/git-bridge/libs/async-http-client-1.8.14.jar and /dev/null differ diff --git a/services/git-bridge/libs/gson-2.3-javadoc.jar b/services/git-bridge/libs/gson-2.3-javadoc.jar deleted file mode 100644 index b0acab4950..0000000000 Binary files a/services/git-bridge/libs/gson-2.3-javadoc.jar and /dev/null differ diff --git a/services/git-bridge/libs/gson-2.3.jar b/services/git-bridge/libs/gson-2.3.jar deleted file mode 100644 index a7f7ce5e99..0000000000 Binary files a/services/git-bridge/libs/gson-2.3.jar and /dev/null differ diff --git a/services/git-bridge/libs/hamcrest-core-1.3.jar b/services/git-bridge/libs/hamcrest-core-1.3.jar deleted file mode 100644 index 9d5fe16e3d..0000000000 Binary files a/services/git-bridge/libs/hamcrest-core-1.3.jar and /dev/null differ diff --git a/services/git-bridge/libs/hamcrest-library-1.3.jar b/services/git-bridge/libs/hamcrest-library-1.3.jar deleted file mode 100644 index 9eac80d7ba..0000000000 Binary files a/services/git-bridge/libs/hamcrest-library-1.3.jar and /dev/null differ diff --git a/services/git-bridge/libs/javax.servlet-api-3.1.0.jar b/services/git-bridge/libs/javax.servlet-api-3.1.0.jar deleted file mode 100644 index 6b14c3d267..0000000000 Binary files a/services/git-bridge/libs/javax.servlet-api-3.1.0.jar and /dev/null differ diff --git a/services/git-bridge/libs/jetty-all-9.2.3.v20140905.jar b/services/git-bridge/libs/jetty-all-9.2.3.v20140905.jar deleted file mode 100644 index 4f0d3092be..0000000000 Binary files a/services/git-bridge/libs/jetty-all-9.2.3.v20140905.jar and /dev/null differ diff --git a/services/git-bridge/libs/junit-4.11.jar b/services/git-bridge/libs/junit-4.11.jar deleted file mode 100644 index aaf7444849..0000000000 Binary files a/services/git-bridge/libs/junit-4.11.jar and /dev/null differ diff --git a/services/git-bridge/libs/org.eclipse.jgit-3.5.1.201410131835-r-javadoc.jar b/services/git-bridge/libs/org.eclipse.jgit-3.5.1.201410131835-r-javadoc.jar deleted file mode 100644 index 8fc60f86c0..0000000000 Binary files a/services/git-bridge/libs/org.eclipse.jgit-3.5.1.201410131835-r-javadoc.jar and /dev/null differ diff --git a/services/git-bridge/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar b/services/git-bridge/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar deleted file mode 100644 index 0d79847af3..0000000000 Binary files a/services/git-bridge/libs/org.eclipse.jgit-3.5.1.201410131835-r.jar and /dev/null differ diff --git a/services/git-bridge/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r-javadoc.jar b/services/git-bridge/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r-javadoc.jar deleted file mode 100644 index 8bc1ce309a..0000000000 Binary files a/services/git-bridge/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r-javadoc.jar and /dev/null differ diff --git a/services/git-bridge/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar b/services/git-bridge/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar deleted file mode 100644 index 741e0c3e71..0000000000 Binary files a/services/git-bridge/libs/org.eclipse.jgit.http.server-3.5.1.201410131835-r.jar and /dev/null differ diff --git a/services/git-bridge/libs/slf4j-api-1.7.7-javadoc.jar b/services/git-bridge/libs/slf4j-api-1.7.7-javadoc.jar deleted file mode 100644 index 16cb44db68..0000000000 Binary files a/services/git-bridge/libs/slf4j-api-1.7.7-javadoc.jar and /dev/null differ diff --git a/services/git-bridge/libs/slf4j-api-1.7.7.jar b/services/git-bridge/libs/slf4j-api-1.7.7.jar deleted file mode 100644 index bebabd9619..0000000000 Binary files a/services/git-bridge/libs/slf4j-api-1.7.7.jar and /dev/null differ diff --git a/services/git-bridge/libs/slf4j-nop-1.7.7-javadoc.jar b/services/git-bridge/libs/slf4j-nop-1.7.7-javadoc.jar deleted file mode 100644 index 2fa57d30f5..0000000000 Binary files a/services/git-bridge/libs/slf4j-nop-1.7.7-javadoc.jar and /dev/null differ diff --git a/services/git-bridge/libs/slf4j-nop-1.7.7.jar b/services/git-bridge/libs/slf4j-nop-1.7.7.jar deleted file mode 100644 index e9c65b3f89..0000000000 Binary files a/services/git-bridge/libs/slf4j-nop-1.7.7.jar and /dev/null differ diff --git a/services/git-bridge/libs/sqlite-jdbc-3.7.2-javadoc.jar b/services/git-bridge/libs/sqlite-jdbc-3.7.2-javadoc.jar deleted file mode 100644 index e5b8cf4772..0000000000 Binary files a/services/git-bridge/libs/sqlite-jdbc-3.7.2-javadoc.jar and /dev/null differ diff --git a/services/git-bridge/libs/sqlite-jdbc-3.7.2.jar b/services/git-bridge/libs/sqlite-jdbc-3.7.2.jar deleted file mode 100644 index b0bec7b000..0000000000 Binary files a/services/git-bridge/libs/sqlite-jdbc-3.7.2.jar and /dev/null differ diff --git a/services/git-bridge/pom.xml b/services/git-bridge/pom.xml new file mode 100644 index 0000000000..4cd40e9485 --- /dev/null +++ b/services/git-bridge/pom.xml @@ -0,0 +1,93 @@ + + + 4.0.0 + + groupId + writelatex-git-bridge + 1.0-SNAPSHOT + + UTF-8 + + + + + maven-assembly-plugin + 2.4 + + + package + + single + + + + + + + uk.ac.ic.wlgitbridge.Main + + + + jar-with-dependencies + + + + + + + + junit + junit + 4.10 + test + + + org.jmock + jmock-junit4 + 2.6.0 + + + org.jmock + jmock-legacy + 2.6.0 + + + org.eclipse.jetty.aggregate + jetty-all + 9.2.6.v20141205 + + + com.google.code.gson + gson + 2.3.1 + + + com.ning + async-http-client + 1.9.3 + + + org.eclipse.jgit + org.eclipse.jgit + 3.6.0.201412230720-r + + + org.eclipse.jgit + org.eclipse.jgit.http.server + 3.6.0.201412230720-r + + + org.xerial + sqlite-jdbc + 3.8.7 + + + org.slf4j + slf4j-nop + 1.7.9 + + + + \ No newline at end of file diff --git a/services/git-bridge/src/META-INF/MANIFEST.MF b/services/git-bridge/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from services/git-bridge/src/META-INF/MANIFEST.MF rename to services/git-bridge/src/main/java/META-INF/MANIFEST.MF diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/Main.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/Main.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/Main.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/Main.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/AttsResourceHandler.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/AttsResourceHandler.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/AttsResourceHandler.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/AttsResourceHandler.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/Config.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/Config.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/Config.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SSLConfig.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/SSLConfig.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SSLConfig.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/SSLConfig.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContents.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContents.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContents.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackContents.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/SnapshotPushPostbackHandler.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java similarity index 94% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java index e5bfdf3abc..0d6fd5c66b 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeApplication.java +++ b/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 { diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java similarity index 97% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java index 136ace338b..2482f9dda0 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/WLGitBridgeServer.java +++ b/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(); } } diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/exception/InvalidConfigFileException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/exception/InvalidConfigFileException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/exception/InvalidConfigFileException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/exception/InvalidConfigFileException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/exception/InvalidProgramArgumentsException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/application/jetty/NullLogger.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/jetty/NullLogger.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/application/jetty/NullLogger.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/application/jetty/NullLogger.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshot.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshotCallback.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshotCallback.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshotCallback.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/CandidateSnapshotCallback.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/RawDirectoryContents.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/RawDirectoryContents.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/RawDirectoryContents.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/RawDirectoryContents.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/RawFile.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/RawFile.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/RawFile.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/RawFile.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/RepositorySource.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/RepositorySource.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/RepositorySource.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/RepositorySource.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/WLBridgedProject.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/WritableRepositoryContents.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/bridge/WriteLatexDataSource.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/exception/InvalidRootDirectoryPathException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLReceivePackFactory.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLRepositoryResolver.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackFactory.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackFactory.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackFactory.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/WLUploadPackFactory.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/hook/WriteLatexPutHook.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/hook/exception/ForcedPushException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/exception/WrongBranchException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/hook/exception/WrongBranchException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/handler/hook/exception/WrongBranchException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/handler/hook/exception/WrongBranchException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/servlet/WLGitServlet.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/servlet/WLGitServlet.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/servlet/WLGitServlet.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/servlet/WLGitServlet.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfig.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfig.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfig.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/servlet/WLGitServletConfig.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContents.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContents.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContents.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/util/FileDirectoryContents.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalker.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalker.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalker.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/git/util/RepositoryObjectTreeWalker.java diff --git a/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/test/SnapshotDummyServer.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/test/SnapshotDummyServer.java new file mode 100644 index 0000000000..cd680bd5a8 --- /dev/null +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/test/SnapshotDummyServer.java @@ -0,0 +1,46 @@ +package uk.ac.ic.wlgitbridge.test; + +import org.eclipse.jetty.server.NetworkConnector; +import org.eclipse.jetty.server.Request; +import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.AbstractHandler; + +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; + +/** + * Created by Winston on 09/01/15. + */ +public class SnapshotDummyServer { + + private final Server server; + private int port; + + public SnapshotDummyServer() { + server = new Server(0); + server.setHandler(new AbstractHandler() { + @Override + public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + response.getWriter().println(target); + baseRequest.setHandled(true); + } + }); + } + + public void start() { + try { + server.start(); + } catch (Exception e) { + e.printStackTrace(); + } + port = ((NetworkConnector) server.getConnectors()[0]).getLocalPort(); + System.out.println(port); + } + + public static void main(String[] args) { + new SnapshotDummyServer().start(); + } + +} diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/util/Util.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Util.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/util/Util.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/util/Util.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/ProjectLock.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/ProjectLock.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/ProjectLock.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/ProjectLock.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcher.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcher.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcher.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotFetcher.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/SnapshotRepositoryBuilder.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/WLDirectoryNodeSnapshot.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/WriteLatexAPI.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethod.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethod.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethod.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/HTTPMethod.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/JSONSource.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/JSONSource.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/JSONSource.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/JSONSource.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java similarity index 74% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java index ba90592b11..b456ac3569 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Request.java @@ -9,7 +9,6 @@ import com.ning.http.client.Realm; import com.ning.http.client.Response; import uk.ac.ic.wlgitbridge.writelatex.api.request.exception.FailedConnectionException; -import java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -71,25 +70,21 @@ public abstract class Request { } private void request(BoundRequestBuilder boundRequestBuilder) { - try { - future = boundRequestBuilder.setRealm(buildRequestRealm()).execute(new AsyncCompletionHandler() { + future = boundRequestBuilder.setRealm(buildRequestRealm()).execute(new AsyncCompletionHandler() { - @Override - public T onCompleted(Response response) throws Exception { - System.out.println("Response: " + response.getResponseBody()); - return parseResponse(new Gson().fromJson(response.getResponseBody(), JsonElement.class)); - } + @Override + public T onCompleted(Response response) throws Exception { + System.out.println("Response: " + response.getResponseBody()); + return parseResponse(new Gson().fromJson(response.getResponseBody(), JsonElement.class)); + } - @Override - public void onThrowable(Throwable t) { - t.printStackTrace(); - error = true; - } + @Override + public void onThrowable(Throwable t) { + t.printStackTrace(); + error = true; + } - }); - } catch (IOException e) { - error = true; - } + }); } } diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Result.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Result.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Result.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/Result.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/base/SnapshotAPIRequest.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/exception/FailedConnectionException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequest.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequest.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequest.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocRequest.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResult.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResult.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResult.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/SnapshotGetDocResult.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getdoc/exception/InvalidProjectException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachment.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachment.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachment.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotAttachment.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotData.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotData.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotData.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotData.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFile.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFile.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFile.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotFile.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequest.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequest.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequest.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionRequest.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResult.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResult.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResult.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getforversion/SnapshotGetForVersionResult.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequest.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequest.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequest.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersRequest.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResult.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResult.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResult.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotGetSavedVersResult.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/SnapshotInfo.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/getsavedvers/WLUser.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContents.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContents.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContents.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackContents.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManager.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManager.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManager.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/PostbackManager.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequest.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequest.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequest.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequest.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResult.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResult.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResult.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/SnapshotPushRequestResult.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidFilesException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidPostbackKeyException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidPostbackKeyException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidPostbackKeyException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidPostbackKeyException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/InvalidProjectException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/OutOfDateException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilder.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilder.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilder.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/SnapshotPostExceptionBuilder.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedErrorException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackException.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackException.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackException.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/api/request/push/exception/UnexpectedPostbackException.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/GitDirectoryContents.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFile.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFile.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFile.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/RepositoryFile.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlob.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlob.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlob.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/AttachmentBlob.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/Blob.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/Blob.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/Blob.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/Blob.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlob.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlob.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlob.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ByteBlob.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlob.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlob.java similarity index 67% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlob.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlob.java index 30079c43d0..c4907ccbd8 100644 --- a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlob.java +++ b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/ExternalBlob.java @@ -9,7 +9,6 @@ import uk.ac.ic.wlgitbridge.writelatex.filestore.node.AttachmentNode; import uk.ac.ic.wlgitbridge.writelatex.model.db.PersistentStoreAPI; import java.io.ByteArrayOutputStream; -import java.io.IOException; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -38,26 +37,22 @@ public class ExternalBlob extends Blob { private void fetchContents(String url) throws FailedConnectionException { AsyncHttpClient asyncHttpClient = new AsyncHttpClient(); - try { - future = asyncHttpClient.prepareGet(url).execute(new AsyncCompletionHandler() { + future = asyncHttpClient.prepareGet(url).execute(new AsyncCompletionHandler() { - ByteArrayOutputStream bytes = new ByteArrayOutputStream(); + ByteArrayOutputStream bytes = new ByteArrayOutputStream(); - @Override - public STATE onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exception { - bytes.write(bodyPart.getBodyPartBytes()); - return STATE.CONTINUE; - } + @Override + public STATE onBodyPartReceived(HttpResponseBodyPart bodyPart) throws Exception { + bytes.write(bodyPart.getBodyPartBytes()); + return STATE.CONTINUE; + } - @Override - public byte[] onCompleted(Response response) throws Exception { - return bytes.toByteArray(); - } + @Override + public byte[] onCompleted(Response response) throws Exception { + return bytes.toByteArray(); + } - }); - } catch (IOException e) { - throw new FailedConnectionException(); - } + }); } @Override diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlob.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlob.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlob.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/blob/RawFileBlob.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNode.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNode.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNode.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/AttachmentNode.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNode.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNode.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNode.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/BlobNode.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNode.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNode.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNode.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNode.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeIndexer.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeIndexer.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeIndexer.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/FileNodeIndexer.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNode.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNode.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNode.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/node/WLDirectoryNode.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHash.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHash.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHash.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/store/BlobHash.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStore.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStore.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStore.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/store/FileIndexStore.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStore.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStore.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStore.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/filestore/store/WLFileStore.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/JSONModel.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/JSONModel.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/JSONModel.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/JSONModel.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/Snapshot.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/Snapshot.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/Snapshot.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/Snapshot.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/WLDataModel.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/WLProject.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStore.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStore.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStore.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/WLProjectStore.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreAPI.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreAPI.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreAPI.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreAPI.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreSource.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreSource.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreSource.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreSource.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreUpdater.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreUpdater.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreUpdater.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/PersistentStoreUpdater.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStore.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStore.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStore.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/WLGBPersistentStore.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLQuery.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLQuery.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabase.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabase.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabase.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/SQLiteWLDatabase.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQuery.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetFileNodesForProjectNameSQLQuery.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQuery.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetProjectNamesSQLQuery.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQuery.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetURLIndexTableForProjectNameSQLQuery.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQuery.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQuery.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQuery.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/query/GetVersionIDsForProjectNameSQLQuery.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateFileNodeTableSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateProjectsTableSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateSnapshotsTableSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/create/CreateURLIndexStoreSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteFileNodesForProjectNameSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/delete/DeleteURLIndexesForProjectNameSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeBlobSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddFileNodeExternalSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddProjectSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddSnapshotSQLUpdate.java diff --git a/services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdate.java b/services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdate.java similarity index 100% rename from services/git-bridge/src/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdate.java rename to services/git-bridge/src/main/java/uk/ac/ic/wlgitbridge/writelatex/model/db/sql/update/insert/AddURLIndexSQLUpdate.java diff --git a/services/git-bridge/writelatex-git-bridge.iml b/services/git-bridge/writelatex-git-bridge.iml index c629e0c9dd..b5203d9ca2 100644 --- a/services/git-bridge/writelatex-git-bridge.iml +++ b/services/git-bridge/writelatex-git-bridge.iml @@ -1,27 +1,48 @@ - - - + + + + - + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + +