From 8ce0a685dd273140efe28cbdf8b5fd9af2c471d2 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Mon, 31 Aug 2015 21:35:05 +0300 Subject: [PATCH 01/20] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 06ff74b..6ddf6cf 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ springProjectWithSeveralBranches ================================ +UPDATE From 565f67abfe92331735bffc2ea34040f90504cf48 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 09:45:42 +0300 Subject: [PATCH 02/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index f7cb548..0b9d08c 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Hello, " + userName + "!"; + result = "Hello, " + userName + System.getenv('MYSQL_PORT'); } ModelAndView view = new ModelAndView("hello_view"); From c4dc0e124f4db3e338a2b1eae060db04a15ac32f Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 09:48:57 +0300 Subject: [PATCH 03/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 0b9d08c..c4122a2 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Hello, " + userName + System.getenv('MYSQL_PORT'); + result = "Hello, . " + userName + System.getenv('MYSQL_PORT'); } ModelAndView view = new ModelAndView("hello_view"); From 5e419aaad165b9654760afcf066462cebc5147a1 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 09:59:34 +0300 Subject: [PATCH 04/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index c4122a2..487db56 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Hello, . " + userName + System.getenv('MYSQL_PORT'); + result = "Hello" + userName + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From 44640477c7169d91a8671ef701c933ef9be5bac6 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:03:38 +0300 Subject: [PATCH 05/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 487db56..87fa925 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Hello" + userName + System.getenv("MYSQL_PORT"); + result = "Hello" + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From 73aafeb0e62adae5bf1717d86e0facffee668111 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:05:57 +0300 Subject: [PATCH 06/20] Update hello_view.jsp --- src/main/webapp/WEB-INF/jsp/hello_view.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/WEB-INF/jsp/hello_view.jsp b/src/main/webapp/WEB-INF/jsp/hello_view.jsp index fae223f..125d95e 100644 --- a/src/main/webapp/WEB-INF/jsp/hello_view.jsp +++ b/src/main/webapp/WEB-INF/jsp/hello_view.jsp @@ -1,7 +1,7 @@
- Enter your name:
+ Enter your name please:
From 6434f54d7202b7eb05804491ea6edc958fe8eb2a Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:09:56 +0300 Subject: [PATCH 07/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 87fa925..532c8fd 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Hello" + System.getenv("MYSQL_PORT"); + result = "Hello, " + "Your MySQL connection is available at: " System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From 02dc9c2be62d3d820d4aa2d8592d88be78b8e16a Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:32:03 +0300 Subject: [PATCH 08/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 532c8fd..f5d56f7 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Hello, " + "Your MySQL connection is available at: " System.getenv("MYSQL_PORT"); + result = "Howdy, " + "Your MySQL connection is available at: " System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From 65d768dd68da438fde25986a6d5e18feaf8532ae Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:32:59 +0300 Subject: [PATCH 09/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index f5d56f7..5ba1704 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + "Your MySQL connection is available at: " System.getenv("MYSQL_PORT"); + result = "Howdy, " + " Your MySQL connection is available at: " System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From d358d9585d11fdeae0b4afcd942b77a748fd19ec Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:35:24 +0300 Subject: [PATCH 10/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 5ba1704..9f0ba14 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + " Your MySQL connection is available at: " System.getenv("MYSQL_PORT"); + result = "Howdy, " + "\nYour MySQL connection is available at: " + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From a86fc8c1ad0d7fa4cb312b681c0ddf05fec025da Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:54:05 +0300 Subject: [PATCH 11/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 9f0ba14..32fdf4a 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + "\nYour MySQL connection is available at: " + System.getenv("MYSQL_PORT"); + result = "Howdy, " + "\nConnect to MYSQL at: " + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From e2efedd37010d1d4ba851149db1951c27980fdf0 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 10:57:42 +0300 Subject: [PATCH 12/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 32fdf4a..71f201b 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + "\nConnect to MYSQL at: " + System.getenv("MYSQL_PORT"); + result = "Howdy, " + "\nConnect to MYSQL: " + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From 782b0657a520733fea651ad3524147f57286e600 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 21:11:18 +0300 Subject: [PATCH 13/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 71f201b..c70b450 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + "\nConnect to MYSQL: " + System.getenv("MYSQL_PORT"); + result = "Howdy, " + userName + "\nConnect to MYSQL: " + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From a5d87ca35aafe8ffc8d0476d705902c9ef9e9b4b Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 21:14:35 +0300 Subject: [PATCH 14/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index c70b450..9ec8e48 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + userName + "\nConnect to MYSQL: " + System.getenv("MYSQL_PORT"); + result = "Howdy, " + userName + "!" + "Connect to MYSQL: " + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From 25949e2d783650e30050df22629a5fabfba801a4 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 21:19:43 +0300 Subject: [PATCH 15/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 9ec8e48..0a1abd2 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + userName + "!" + "Connect to MYSQL: " + System.getenv("MYSQL_PORT"); + result = "Howdy, " + userName + "! " + "Connect to MYSQL: " + System.getenv("MYSQL_PORT"); } ModelAndView view = new ModelAndView("hello_view"); From a79dc9f275eb3d54f961296d3f538d3c6ad9d72c Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Thu, 3 Sep 2015 21:22:34 +0300 Subject: [PATCH 16/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 0a1abd2..bcd3f16 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + userName + "! " + "Connect to MYSQL: " + System.getenv("MYSQL_PORT"); + result = "Howdy, " + userName + "! " + "Connect to MYSQL: " + System.getenv("MYSQL_PORT") + " and your MySQL user is: " + System.getenv("MYSQL_USER"); } ModelAndView view = new ModelAndView("hello_view"); From 340b1928177488194a0ba258e368a72f2f4259fa Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Fri, 4 Sep 2015 10:01:35 +0300 Subject: [PATCH 17/20] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 80cfb83..a5281ff 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,6 @@ - greeting + ROOT From 1f8f965e61b7517f6fa46d1a34d64ff67a844b34 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Sat, 21 Nov 2015 10:31:40 +0200 Subject: [PATCH 18/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index bcd3f16..3c9e3e5 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + userName + "! " + "Connect to MYSQL: " + System.getenv("MYSQL_PORT") + " and your MySQL user is: " + System.getenv("MYSQL_USER"); + result = "Howdy, " + userName + "! " + "Connect to MYSQL: " + System.getenv("MYSQL_PORT") + " with MySQL credentials are: " + System.getenv("MYSQL_USER") + "/" + System.getenv("MYSQL_PAWWSORD"); } ModelAndView view = new ModelAndView("hello_view"); From 0d1f2129d2caa2fd544a35f973b221b1a2a6a616 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Sat, 21 Nov 2015 10:35:43 +0200 Subject: [PATCH 19/20] Update GreetingController.java --- src/main/java/helloworld/GreetingController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index 3c9e3e5..d585c7b 100644 --- a/src/main/java/helloworld/GreetingController.java +++ b/src/main/java/helloworld/GreetingController.java @@ -19,7 +19,7 @@ public ModelAndView handleRequest(HttpServletRequest request, HttpServletRespons String result = ""; if (userName != null) { - result = "Howdy, " + userName + "! " + "Connect to MYSQL: " + System.getenv("MYSQL_PORT") + " with MySQL credentials are: " + System.getenv("MYSQL_USER") + "/" + System.getenv("MYSQL_PAWWSORD"); + result = "Howdy, " + userName + "! " + "Connect to MYSQL: " + System.getenv("MYSQL_PORT") + " with MySQL credentials are: " + System.getenv("MYSQL_USER") + "/" + System.getenv("MYSQL_PASSWORD"); } ModelAndView view = new ModelAndView("hello_view"); From 930d3bb07d9a53bb8957067ea733e1887cb0aa77 Mon Sep 17 00:00:00 2001 From: Eugene Ivantsov Date: Sat, 28 Nov 2015 06:54:51 +0000 Subject: [PATCH 20/20] contrib-11282015: hello --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 6ddf6cf..1840082 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ springProjectWithSeveralBranches ================================ UPDATE +MYUPDAT \ No newline at end of file