From 9d4cf7fb51af5c027a9d151e2f9c75b230a288e2 Mon Sep 17 00:00:00 2001 From: Michael Kearns Date: Fri, 20 Jan 2017 15:13:23 +0000 Subject: [PATCH 1/2] Enable luwak-server to be deployed to heroku Unfortunately, seems we have to put the Profile in the project root: http://stackoverflow.com/a/15187532 --- Procfile | 1 + luwak-server/README.md | 12 ++++++++++++ luwak-server/heroku.yml | 8 ++++++++ 3 files changed, 21 insertions(+) create mode 100644 Procfile create mode 100644 luwak-server/heroku.yml diff --git a/Procfile b/Procfile new file mode 100644 index 000000000..f3071884c --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: java $JAVA_OPTS -Ddw.server.connector.port=$PORT -jar luwak-server/target/luwak-server-1.5.0-SNAPSHOT.jar server luwak-server/configuration.yml \ No newline at end of file diff --git a/luwak-server/README.md b/luwak-server/README.md index 901bf789b..66c1ba04e 100644 --- a/luwak-server/README.md +++ b/luwak-server/README.md @@ -36,3 +36,15 @@ Then run ```./load-queries ``` **To match a document against the service** ./match "This is the contents of my document" + +## Deploying to Heroku +Roughly following the instructions at https://devcenter.heroku.com/articles/getting-started-with-java#introduction +* Install the Heroku CLI +* If you have a public SSH key, you can upload it to Heroku + to make your life easier: `heroku keys:add ~/.ssh/id_rsa.pub` +* Create a Heroku app: `heroku create` +* Push your current branch to heroku: `git push heroku HEAD:master` +* Once that succeeds, start the app via: `heroku ps:scale web=1` +* Run `heroku open` to get the URL of the running application. You should be able to + to post to the API by appending the correct path, e.g. + `POST https://my-app-name.herokuapp.com/update` \ No newline at end of file diff --git a/luwak-server/heroku.yml b/luwak-server/heroku.yml new file mode 100644 index 000000000..22406b4dd --- /dev/null +++ b/luwak-server/heroku.yml @@ -0,0 +1,8 @@ +# This configuration is required to be able to allow Heroku to override the port via e.g. +# -Ddw.server.connector.port=$PORT +server: + type: simple + applicationContextPath: / + connector: + type: http + port: 8080 From b1d8e755568dcbba7a335f2d3b834b359396ac72 Mon Sep 17 00:00:00 2001 From: Michael Kearns Date: Fri, 20 Jan 2017 15:13:23 +0000 Subject: [PATCH 2/2] Implement a basic UI obtained from https://github.com/thomasridd/fullfact-frontend --- Procfile | 2 +- luwak-server/README.md | 4 + luwak-server/pom.xml | 11 +- .../uk/co/flax/luwak/server/LuwakServer.java | 2 + .../src/main/resources/assets/css/style.css | 144 ++++++++++++++++++ .../src/main/resources/assets/img/Thumbs.db | Bin 0 -> 47616 bytes .../src/main/resources/assets/img/bg.gif | Bin 0 -> 1434 bytes .../src/main/resources/assets/img/blank.gif | Bin 0 -> 43 bytes .../main/resources/assets/img/creampaper.png | Bin 0 -> 12618 bytes .../main/resources/assets/img/new_window.png | Bin 0 -> 203 bytes .../main/resources/assets/img/not_found.png | Bin 0 -> 3779 bytes .../src/main/resources/assets/img/search.png | Bin 0 -> 1978 bytes .../src/main/resources/assets/img/top.gif | Bin 0 -> 1760 bytes .../src/main/resources/assets/index.html | 32 ++++ .../main/resources/assets/js/jquery.min.js | 4 + .../src/main/resources/assets/js/script.js | 90 +++++++++++ 16 files changed, 287 insertions(+), 2 deletions(-) create mode 100644 luwak-server/src/main/resources/assets/css/style.css create mode 100644 luwak-server/src/main/resources/assets/img/Thumbs.db create mode 100644 luwak-server/src/main/resources/assets/img/bg.gif create mode 100644 luwak-server/src/main/resources/assets/img/blank.gif create mode 100644 luwak-server/src/main/resources/assets/img/creampaper.png create mode 100644 luwak-server/src/main/resources/assets/img/new_window.png create mode 100644 luwak-server/src/main/resources/assets/img/not_found.png create mode 100644 luwak-server/src/main/resources/assets/img/search.png create mode 100644 luwak-server/src/main/resources/assets/img/top.gif create mode 100644 luwak-server/src/main/resources/assets/index.html create mode 100644 luwak-server/src/main/resources/assets/js/jquery.min.js create mode 100644 luwak-server/src/main/resources/assets/js/script.js diff --git a/Procfile b/Procfile index f3071884c..c76133f5a 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -Ddw.server.connector.port=$PORT -jar luwak-server/target/luwak-server-1.5.0-SNAPSHOT.jar server luwak-server/configuration.yml \ No newline at end of file +web: java $JAVA_OPTS -Ddw.server.connector.port=$PORT -jar luwak-server/target/luwak-server-1.5.0-SNAPSHOT.jar server luwak-server/heroku.yml \ No newline at end of file diff --git a/luwak-server/README.md b/luwak-server/README.md index 66c1ba04e..b490ce854 100644 --- a/luwak-server/README.md +++ b/luwak-server/README.md @@ -21,6 +21,10 @@ In `luwak-server`, Build the jar with `mvn package`, then run java -jar target/luwak-server-{version number here}-SNAPSHOT.jar +**UI** + +There is a basic UI accessible at `localhost:8080/ui` + **To add queries** Create a query input file in the following JSON format: diff --git a/luwak-server/pom.xml b/luwak-server/pom.xml index 87c257ec4..c7086965d 100644 --- a/luwak-server/pom.xml +++ b/luwak-server/pom.xml @@ -10,6 +10,10 @@ 4.0.0 + + 1.0.5 + + luwak-server @@ -21,7 +25,12 @@ io.dropwizard dropwizard-core - 1.0.5 + ${dropwizard.version} + + + io.dropwizard + dropwizard-assets + ${dropwizard.version}