From 56bb4a8a011a4b5e655bbc25089fddba660b06d1 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 19:41:09 +0200 Subject: [PATCH 01/45] Update pom.xml --- pom.xml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index df42fd7..8d821ab 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.7.0 1.8 1.8 @@ -54,7 +55,7 @@ org.projectlombok lombok - 1.16.6 + 1.16.18 com.fasterxml.jackson.core @@ -77,5 +78,10 @@ 0.3m - + + + projectlombok.org + http://projectlombok.org/mavenrepo + + From bd19e7e09a5d7154c6fc2efe3eec937a0d99d65b Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 20:02:37 +0200 Subject: [PATCH 02/45] Update pom.xml --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index 8d821ab..1b34ff6 100644 --- a/pom.xml +++ b/pom.xml @@ -28,6 +28,18 @@ + + com.heroku.sdk + heroku-maven-plugin + 1.2.2 + + 1.8 + spark-pbesze + + java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + + + From 890f3e2be86f217721ed76fa555be1bf73a2e364 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 20:21:40 +0200 Subject: [PATCH 03/45] Update pom.xml --- pom.xml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/pom.xml b/pom.xml index 1b34ff6..22a5d57 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,28 @@ 1.8 + + maven-assembly-plugin + + + package + + single + + + + + + + jar-with-dependencies + + + + app.Application + + + + org.codehaus.mojo exec-maven-plugin From 9fd49993b6d70e03bf761b3047e88c72191f83ea Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 20:44:37 +0200 Subject: [PATCH 04/45] Update Application.java --- src/main/java/app/Application.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/app/Application.java b/src/main/java/app/Application.java index 521b35d..e19b10e 100644 --- a/src/main/java/app/Application.java +++ b/src/main/java/app/Application.java @@ -25,7 +25,13 @@ public static void main(String[] args) { staticFiles.location("/public"); staticFiles.expireTime(600L); enableDebugScreen(); - + static int getHerokuAssignedPort() { + ProcessBuilder processBuilder = new ProcessBuilder(); + if (processBuilder.environment().get("PORT") != null) { + return Integer.parseInt(processBuilder.environment().get("PORT")); + } + return 4567; //return default port if heroku-port isn't set (i.e. on localhost) + } // Set up before-filters (called before each get/post) before("*", Filters.addTrailingSlashes); before("*", Filters.handleLocaleChange); From 8e5f66bf7c1c1acf91783cdffb90cf2fc3137844 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 20:45:04 +0200 Subject: [PATCH 05/45] Update Application.java --- src/main/java/app/Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/app/Application.java b/src/main/java/app/Application.java index e19b10e..3647a02 100644 --- a/src/main/java/app/Application.java +++ b/src/main/java/app/Application.java @@ -21,7 +21,7 @@ public static void main(String[] args) { userDao = new UserDao(); // Configure Spark - port(4567); + port(getHerokuAssignedPort()); staticFiles.location("/public"); staticFiles.expireTime(600L); enableDebugScreen(); From bd22cd24b812772f474ff0572f1091d8cf0b000b Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 20:47:59 +0200 Subject: [PATCH 06/45] Create Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..01be24b --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web:java $JAVA_OPTS -jar target/spark-pbesze-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 06f4d097fd5477df4a0d3de786d9e7162dc2d084 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 20:54:12 +0200 Subject: [PATCH 07/45] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index df42fd7..805dd1b 100644 --- a/pom.xml +++ b/pom.xml @@ -12,6 +12,7 @@ org.apache.maven.plugins maven-compiler-plugin + 3.7.0 1.8 1.8 From 54d97150ee7091f27ff744c3294f9202f23f5864 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 21:04:22 +0200 Subject: [PATCH 08/45] Update Application.java --- src/main/java/app/Application.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/app/Application.java b/src/main/java/app/Application.java index 3647a02..23ae42b 100644 --- a/src/main/java/app/Application.java +++ b/src/main/java/app/Application.java @@ -25,13 +25,7 @@ public static void main(String[] args) { staticFiles.location("/public"); staticFiles.expireTime(600L); enableDebugScreen(); - static int getHerokuAssignedPort() { - ProcessBuilder processBuilder = new ProcessBuilder(); - if (processBuilder.environment().get("PORT") != null) { - return Integer.parseInt(processBuilder.environment().get("PORT")); - } - return 4567; //return default port if heroku-port isn't set (i.e. on localhost) - } + // Set up before-filters (called before each get/post) before("*", Filters.addTrailingSlashes); before("*", Filters.handleLocaleChange); @@ -49,5 +43,12 @@ static int getHerokuAssignedPort() { after("*", Filters.addGzipHeader); } + static int getHerokuAssignedPort() { + ProcessBuilder processBuilder = new ProcessBuilder(); + if (processBuilder.environment().get("PORT") != null) { + return Integer.parseInt(processBuilder.environment().get("PORT")); + } + return 4567; //return default port if heroku-port isn't set (i.e. on localhost) + } } From 222994858891b944e8cf07cd099915994a721e88 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 21:12:02 +0200 Subject: [PATCH 09/45] Update pom.xml --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 22a5d57..b97a8f0 100644 --- a/pom.xml +++ b/pom.xml @@ -111,6 +111,11 @@ jbcrypt 0.3m + + com.heroku.sdk + heroku-maven-plugin + 1.2.2 + From a307e721da94feb30bb1acfd7ef1a8583c9a13a9 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Wed, 18 Oct 2017 21:52:56 +0200 Subject: [PATCH 10/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 01be24b..cf7fcb8 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web:java $JAVA_OPTS -jar target/spark-pbesze-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar +web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application From 40f13e98556c123140f0da2283d2db6d70513353 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 08:42:52 +0200 Subject: [PATCH 11/45] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b97a8f0..9635091 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.8 spark-pbesze - java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application From 6b9036fc80ddfdd04425a8f968088eb9e4099207 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 08:48:23 +0200 Subject: [PATCH 12/45] Delete Procfile --- Procfile | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Procfile diff --git a/Procfile b/Procfile deleted file mode 100644 index cf7fcb8..0000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application From 56d3963fb14bd78e96b90d2d41ad4c40190d5603 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 09:43:36 +0200 Subject: [PATCH 13/45] Create Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..9089225 --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application From df43eb3d6dc9c2653f6f009b338970b3122a9183 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 09:47:09 +0200 Subject: [PATCH 14/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 9089225..b7544ce 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application +-web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application From 4b40e097b742dd3be05b1e90fbf30ccba2bceab7 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 09:51:56 +0200 Subject: [PATCH 15/45] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9635091..b97a8f0 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.8 spark-pbesze - java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application + java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 1f3f63481e3a7e731539306e660a15f64b37b174 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 10:02:42 +0200 Subject: [PATCH 16/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index b7544ce..cf7fcb8 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ --web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application +web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application From fece3cff04d980e68b6c4b90e6fb7d3d58b8232d Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 11:46:01 +0200 Subject: [PATCH 17/45] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b97a8f0..538f28a 100644 --- a/pom.xml +++ b/pom.xml @@ -58,7 +58,7 @@ 1.8 spark-pbesze - java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 49ba60c0881ffc4377363d8863b6378093225df1 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 13:04:41 +0200 Subject: [PATCH 18/45] Update Procfile From 120545d55cfc847eaa69d8ac4358dc88995dad24 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 13:41:16 +0200 Subject: [PATCH 19/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index cf7fcb8..95f5b4f 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application +web: java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From fe785d645f21451d553678841cf1d2dec96daaa2 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 13:59:38 +0200 Subject: [PATCH 20/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 95f5b4f..885b6f0 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar +web: java -jar /target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 29c31570d819c83548ce0157c716a14b17f37d5c Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 14:12:32 +0200 Subject: [PATCH 21/45] Update pom.xml --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 538f28a..ce2327e 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,10 @@ 1.8 spark-pbesze + false + + target/my-app-1.0.jar + java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 60a906a544e42eb78d7d107bb288652b592843de Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 14:16:28 +0200 Subject: [PATCH 22/45] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index ce2327e..215f72c 100644 --- a/pom.xml +++ b/pom.xml @@ -59,10 +59,10 @@ spark-pbesze false - target/my-app-1.0.jar + target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar - java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + java -jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From a4324f5693c888bb5e980691e15dba43343cb60a Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 14:16:48 +0200 Subject: [PATCH 23/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 885b6f0..57ca555 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java -jar /target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar +web: java -jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From b098ec6c03a81c1b3b2f80e6115f66deed78a72a Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 14:19:29 +0200 Subject: [PATCH 24/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 57ca555..cf7fcb8 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java -jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar +web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application From 593dab802d907b75f42a42cbe88b69cc95045435 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 14:35:05 +0200 Subject: [PATCH 25/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index cf7fcb8..3a7430c 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -cp target/classes:target/dependency/* app.Application +web: java $JAVA_OPTS -jar target/spark-pbesze-0.1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 7cb4c3068ce86b370cd267c62146582d8bab84e8 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 14:35:38 +0200 Subject: [PATCH 26/45] Update pom.xml --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 215f72c..a22d78d 100644 --- a/pom.xml +++ b/pom.xml @@ -59,6 +59,7 @@ spark-pbesze false + target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 51d3af41cd0177a7dd6ee239d814aed42d5bb00e Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 14:42:56 +0200 Subject: [PATCH 27/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index 3a7430c..ff9b74b 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -jar target/spark-pbesze-0.1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar +web: java $JAVA_OPTS -jar target/spark-pbesze-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From 339a91e36c2c2e9af378fcb00500e42bce69ae60 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 15:04:32 +0200 Subject: [PATCH 28/45] Update pom.xml --- pom.xml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index a22d78d..d6481df 100644 --- a/pom.xml +++ b/pom.xml @@ -57,13 +57,8 @@ 1.8 spark-pbesze - false - - target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar - target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar - - java -jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + java -jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar From c957e59000630e1a928cb44436463fc00db87940 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 15:20:50 +0200 Subject: [PATCH 29/45] Update pom.xml --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index d6481df..831db6c 100644 --- a/pom.xml +++ b/pom.xml @@ -57,6 +57,11 @@ 1.8 spark-pbesze + false + + target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar + target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + java -jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar From f1ed82b64b5d1cb583aba4c193bbfe39d80f54ab Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 15:43:40 +0200 Subject: [PATCH 30/45] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 831db6c..4b8d583 100644 --- a/pom.xml +++ b/pom.xml @@ -63,7 +63,7 @@ target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar - java -jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar + java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar From f39401c09aefac18bff0770bf5e279729a5afcd9 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 15:44:00 +0200 Subject: [PATCH 31/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index ff9b74b..db982b3 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -jar target/spark-pbesze-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar +web: java $JAVA_OPTS -jar ./target/spark-pbesze-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From f3666ec7492d761732918c7d7f1a1ee773cb14fb Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 16:37:25 +0200 Subject: [PATCH 32/45] Update pom.xml --- pom.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 4b8d583..fcca1c0 100644 --- a/pom.xml +++ b/pom.xml @@ -57,10 +57,9 @@ 1.8 spark-pbesze - false - target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar - target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + spark-basic-structure-1.0.BUILD-SNAPSHOT.jar + spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar From 2a2d278b7217841aad2d2c5a46877d7c7fb8c393 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 16:45:49 +0200 Subject: [PATCH 33/45] Update Procfile --- Procfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Procfile b/Procfile index db982b3..f61581c 100644 --- a/Procfile +++ b/Procfile @@ -1 +1 @@ -web: java $JAVA_OPTS -jar ./target/spark-pbesze-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar +web: java $JAVA_OPTS -jar ./target/spark-basic-structure-1.0-SNAPSHOT-jar-with-dependencies.jar From c01059d1ded584c18ad376744ca0993fc47948c4 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 16:46:56 +0200 Subject: [PATCH 34/45] Update pom.xml --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index fcca1c0..7e67e12 100644 --- a/pom.xml +++ b/pom.xml @@ -58,8 +58,8 @@ 1.8 spark-pbesze - spark-basic-structure-1.0.BUILD-SNAPSHOT.jar - spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar + target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar From 4d2211b4af1770b319ed14ee1c38f98b32872d0b Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 18:01:45 +0200 Subject: [PATCH 35/45] Update pom.xml --- pom.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7e67e12..0b095c2 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,8 @@ 1.2.2 1.8 - spark-pbesze + target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar From e2d7de226defbe0b2142457dd9cecb7704cad4e2 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 19:28:53 +0200 Subject: [PATCH 36/45] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0b095c2..6dcaf92 100644 --- a/pom.xml +++ b/pom.xml @@ -60,7 +60,7 @@ spark-pbesze --> target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar - target/spark-basic-structure-1.0.BUILD-SNAPSHOT-jar-with-dependencies.jar + java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar From 646cc0c9dde824f84621162730374cfda2319095 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 19:31:44 +0200 Subject: [PATCH 37/45] Update pom.xml --- pom.xml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pom.xml b/pom.xml index 6dcaf92..6c5c0a9 100644 --- a/pom.xml +++ b/pom.xml @@ -56,11 +56,8 @@ 1.2.2 1.8 - target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar - java -jar ./target/spark-basic-structure-1.0.BUILD-SNAPSHOT.jar From 2535499a104915fd20bf307eb6934b5ad939b9cb Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 19:37:29 +0200 Subject: [PATCH 38/45] Delete Procfile --- Procfile | 1 - 1 file changed, 1 deletion(-) delete mode 100644 Procfile diff --git a/Procfile b/Procfile deleted file mode 100644 index f61581c..0000000 --- a/Procfile +++ /dev/null @@ -1 +0,0 @@ -web: java $JAVA_OPTS -jar ./target/spark-basic-structure-1.0-SNAPSHOT-jar-with-dependencies.jar From a5e7481028d835ac42b17337fc8c6bddf831b997 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 19:39:53 +0200 Subject: [PATCH 39/45] Create Procfile --- Procfile | 1 + 1 file changed, 1 insertion(+) create mode 100644 Procfile diff --git a/Procfile b/Procfile new file mode 100644 index 0000000..f61581c --- /dev/null +++ b/Procfile @@ -0,0 +1 @@ +web: java $JAVA_OPTS -jar ./target/spark-basic-structure-1.0-SNAPSHOT-jar-with-dependencies.jar From a7e5b0f0dd1ff0b5203983684f4efdf4cacda755 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 19:57:56 +0200 Subject: [PATCH 40/45] Update Application.java --- src/main/java/app/Application.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/app/Application.java b/src/main/java/app/Application.java index 23ae42b..cd7b279 100644 --- a/src/main/java/app/Application.java +++ b/src/main/java/app/Application.java @@ -37,6 +37,7 @@ public static void main(String[] args) { get(Path.Web.LOGIN, LoginController.serveLoginPage); post(Path.Web.LOGIN, LoginController.handleLoginPost); post(Path.Web.LOGOUT, LoginController.handleLogoutPost); + get("", IndexController.serveIndexPage); get("*", ViewUtil.notFound); //Set up after-filters (called after each get/post) From 6c9e4cf14767822cc076be8b3547d2d412077499 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 20:02:23 +0200 Subject: [PATCH 41/45] Update Application.java --- src/main/java/app/Application.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/app/Application.java b/src/main/java/app/Application.java index cd7b279..30c3b36 100644 --- a/src/main/java/app/Application.java +++ b/src/main/java/app/Application.java @@ -37,7 +37,7 @@ public static void main(String[] args) { get(Path.Web.LOGIN, LoginController.serveLoginPage); post(Path.Web.LOGIN, LoginController.handleLoginPost); post(Path.Web.LOGOUT, LoginController.handleLogoutPost); - get("", IndexController.serveIndexPage); + get(Path.Web.HOME, IndexController.serveIndexPage); get("*", ViewUtil.notFound); //Set up after-filters (called after each get/post) From 85c5c22614309bbe2fa4acb2c24375d8d9c17013 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 20:03:59 +0200 Subject: [PATCH 42/45] Update Path.java --- src/main/java/app/util/Path.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/app/util/Path.java b/src/main/java/app/util/Path.java index 32b7f66..f018256 100644 --- a/src/main/java/app/util/Path.java +++ b/src/main/java/app/util/Path.java @@ -12,6 +12,7 @@ public static class Web { @Getter public static final String LOGOUT = "/logout/"; @Getter public static final String BOOKS = "/books/"; @Getter public static final String ONE_BOOK = "/books/:isbn/"; + @Getter public static final String HOME = ""; } public static class Template { From 15db8b666574056c934a131f7fe5d8f29c4c4437 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 20:06:58 +0200 Subject: [PATCH 43/45] Update Path.java --- src/main/java/app/util/Path.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/app/util/Path.java b/src/main/java/app/util/Path.java index f018256..49c6474 100644 --- a/src/main/java/app/util/Path.java +++ b/src/main/java/app/util/Path.java @@ -12,7 +12,7 @@ public static class Web { @Getter public static final String LOGOUT = "/logout/"; @Getter public static final String BOOKS = "/books/"; @Getter public static final String ONE_BOOK = "/books/:isbn/"; - @Getter public static final String HOME = ""; + @Getter public static final String HOME = "/"; } public static class Template { From bc672d5a6fcc0d868f679e1dfe7ff04b12e6d3de Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 20:33:45 +0200 Subject: [PATCH 44/45] Update messages_de.properties --- .../resources/localization/messages_de.properties | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/resources/localization/messages_de.properties b/src/main/resources/localization/messages_de.properties index 92504d6..54e0879 100644 --- a/src/main/resources/localization/messages_de.properties +++ b/src/main/resources/localization/messages_de.properties @@ -17,14 +17,14 @@ INDEX_BOOK_OF_THE_DAY_LINK={0} von {1} ## Login -LOGIN_HEADING=Innlogg -LOGIN_INSTRUCTIONS=Please enter dein username und password.
(Zee ze index page if you need a hint) -LOGIN_AUTH_SUCCEEDED=You''re logged in as ''{0}''. +LOGIN_HEADING=Anmelden +LOGIN_INSTRUCTIONS=Bitte die Zugangsdaten eingeben!
(Zee ze index page if you need a hint) +LOGIN_AUTH_SUCCEEDED=Sie sind als ''{0}'' angemeldet. LOGIN_AUTH_FAILED=Ze login informazion you zuplied vas incorrect. LOGIN_LOGGED_OUT=You have been logged aus. -LOGIN_LABEL_USERNAME=Username -LOGIN_LABEL_PASSWORD=Password -LOGIN_BUTTON_LOGIN=Innlogg +LOGIN_LABEL_USERNAME=BenutzerIn +LOGIN_LABEL_PASSWORD=Passwort +LOGIN_BUTTON_LOGIN=Anmelden ## Books From f79221c3f74558d6425621e51e519b4f33781d47 Mon Sep 17 00:00:00 2001 From: Peter Besze Date: Thu, 19 Oct 2017 22:10:52 +0200 Subject: [PATCH 45/45] Update messages_de.properties --- src/main/resources/localization/messages_de.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/localization/messages_de.properties b/src/main/resources/localization/messages_de.properties index 54e0879..d890e23 100644 --- a/src/main/resources/localization/messages_de.properties +++ b/src/main/resources/localization/messages_de.properties @@ -2,14 +2,14 @@ COMMON_TITLE=Ze Spark Library COMMON_FOOTER_TEXT=Ze application uses OpenLibrary vor images. COMMON_NAV_ALLBOOKS=View all ze books -COMMON_NAV_LOGIN=Innlogg -COMMON_NAV_LOGOUT=Auslogg +COMMON_NAV_LOGIN=Anmelden +COMMON_NAV_LOGOUT=Abmelden ERROR_406_NOT_ACCEPTABLE=No zuitable content found. Please zpecify eizer 'html/text' or 'application/json'. ERROR_404_NOT_FOUND=Ve cannot find ze page you are looking for (error 404) ## Index -INDEX_HEADING=Velcome to ze Spark Library +INDEX_HEADING=Willkommen in den Spark Bibliothek! INDEX_REGISTERED_USERS=Zere are currently {0} users registered: INDEX_PASSWORD_INFO=It seems zey have all chosen ze password "password" for some reason. Hov silly. INDEX_BOOK_OF_THE_DAY_TEXT=Ze book of ze day is: