From b38afd205cf78600018d2dda7380a7c8191dd87c Mon Sep 17 00:00:00 2001 From: sinapam Date: Fri, 2 May 2014 23:02:18 +0700 Subject: [PATCH 01/16] change Hello World message to Hello Rangers --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index f163d33..6bb75c2 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -17,5 +17,5 @@ # This file is utf-8 header.title=Hello World! header.home=BAM! -hello.world=Hello World! +hello.world=Hello Rangers! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From 124799995beb9f9a614cf0e5753965b21f957be2 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 09:57:18 +0700 Subject: [PATCH 02/16] changed Header.Home --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index 6bb75c2..d97fdc4 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -16,6 +16,6 @@ # This file is utf-8 header.title=Hello World! -header.home=BAM! +header.home=BooYa! hello.world=Hello Rangers! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From 1171e8e54b646b0bff321418fbd85aa816837b1b Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 10:07:30 +0700 Subject: [PATCH 03/16] changed header.title --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index d97fdc4..688543c 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -15,7 +15,7 @@ # # This file is utf-8 -header.title=Hello World! +header.title=Hello Rangers! header.home=BooYa! hello.world=Hello Rangers! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From a79ee5a4c20b971416af3f396b19d3eaeeb20daa Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 17:01:48 +0700 Subject: [PATCH 04/16] changed header.title back to Hello World --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index 688543c..d97fdc4 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -15,7 +15,7 @@ # # This file is utf-8 -header.title=Hello Rangers! +header.title=Hello World! header.home=BooYa! hello.world=Hello Rangers! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From 23afcc86ac80e6aa132f8dc7147ceea1f9bfaaf0 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 17:04:43 +0700 Subject: [PATCH 05/16] Create README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..c4cdbec --- /dev/null +++ b/README.md @@ -0,0 +1,4 @@ +simple-ninja-web +================ + +Simple web application using Ninja framework From 876c6c713f0d3e921425f57c06f30ef687d551ff Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 17:13:04 +0700 Subject: [PATCH 06/16] changed text back to fix build --- src/main/java/conf/messages.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index d97fdc4..f163d33 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -16,6 +16,6 @@ # This file is utf-8 header.title=Hello World! -header.home=BooYa! -hello.world=Hello Rangers! +header.home=BAM! +hello.world=Hello World! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From 782e0335a4af18c807f54857bc2dbd29f54c0287 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 22:16:04 +0700 Subject: [PATCH 07/16] changed header.title to test --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index f163d33..7497d69 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -15,7 +15,7 @@ # # This file is utf-8 -header.title=Hello World! +header.title=Hello Rangers! header.home=BAM! hello.world=Hello World! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From cac17eee586c9489897d063c100608ab9c28d678 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 22:18:46 +0700 Subject: [PATCH 08/16] this should fail the build --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index 7497d69..1aba8aa 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -17,5 +17,5 @@ # This file is utf-8 header.title=Hello Rangers! header.home=BAM! -hello.world=Hello World! +hello.world=Hello Rangers! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From c11c7f544533d0c8fb645342865d6569b68d10a7 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 22:42:34 +0700 Subject: [PATCH 09/16] try to config test to not write output to file --- pom.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pom.xml b/pom.xml index e7b07f8..9c60f4c 100644 --- a/pom.xml +++ b/pom.xml @@ -124,6 +124,14 @@ + + org.apache.maven.plugins + maven-surefire-plugin + + false + + + From 46060520a528ebed62ed63ccb159a7a108aab9b0 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 22:56:27 +0700 Subject: [PATCH 10/16] fix build --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index 1aba8aa..7497d69 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -17,5 +17,5 @@ # This file is utf-8 header.title=Hello Rangers! header.home=BAM! -hello.world=Hello Rangers! +hello.world=Hello World! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From 3127b096e3e5a68dc95d1e8dc8ba0fe4873ab1f1 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sat, 3 May 2014 23:06:20 +0700 Subject: [PATCH 11/16] added version for maven surefire --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 9c60f4c..16d3d59 100644 --- a/pom.xml +++ b/pom.xml @@ -127,6 +127,7 @@ org.apache.maven.plugins maven-surefire-plugin + 2.17 false From eaa46452b2d0c64464247cc60b8ce7471d1c2e12 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sun, 4 May 2014 21:31:29 +0700 Subject: [PATCH 12/16] changed message to test CD --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index 7497d69..13d7eab 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -16,6 +16,6 @@ # This file is utf-8 header.title=Hello Rangers! -header.home=BAM! +header.home=BAM! Bam! hello.world=Hello World! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From 870c9bd4217b40d4a372435c7a6a0795fd962f59 Mon Sep 17 00:00:00 2001 From: sinapam Date: Sun, 4 May 2014 22:52:30 +0700 Subject: [PATCH 13/16] tried to rename war file --- pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/pom.xml b/pom.xml index 16d3d59..fa22424 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,7 @@ + ninja-pam.war From cab5a797a9abed34f0a06e1dc614bfbca762d45d Mon Sep 17 00:00:00 2001 From: sinapam Date: Sun, 4 May 2014 22:57:18 +0700 Subject: [PATCH 14/16] removed incorrect extra war --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fa22424..7661c04 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ - ninja-pam.war + ninja-pam From 6f1310507ec41b85b659b6685f31be3bb5c45ece Mon Sep 17 00:00:00 2001 From: sinapam Date: Mon, 5 May 2014 09:21:52 +0700 Subject: [PATCH 15/16] Changed Hello Rangers to Hello World --- src/main/java/conf/messages.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/conf/messages.properties b/src/main/java/conf/messages.properties index 13d7eab..d6785ae 100644 --- a/src/main/java/conf/messages.properties +++ b/src/main/java/conf/messages.properties @@ -15,7 +15,7 @@ # # This file is utf-8 -header.title=Hello Rangers! +header.title=Hello World! header.home=BAM! Bam! hello.world=Hello World! hello.world.json=There is also Json rendering you can check out! \ No newline at end of file From 67fbb1f5127d3019a4876da139092d3c2d309604 Mon Sep 17 00:00:00 2001 From: sinapam Date: Mon, 5 May 2014 13:58:41 +0700 Subject: [PATCH 16/16] Fixed asset path --- src/main/java/views/layout/defaultLayout.ftl.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/views/layout/defaultLayout.ftl.html b/src/main/java/views/layout/defaultLayout.ftl.html index ea23618..b822780 100644 --- a/src/main/java/views/layout/defaultLayout.ftl.html +++ b/src/main/java/views/layout/defaultLayout.ftl.html @@ -2,7 +2,7 @@ - + ${title} @@ -10,9 +10,9 @@ - + - + @@ -55,8 +55,8 @@ - - + +