diff --git a/README.md b/README.md index 06ff74b..1840082 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ springProjectWithSeveralBranches ================================ +UPDATE +MYUPDAT \ No newline at end of file diff --git a/pom.xml b/pom.xml index 80cfb83..a5281ff 100644 --- a/pom.xml +++ b/pom.xml @@ -30,6 +30,6 @@ - greeting + ROOT diff --git a/src/main/java/helloworld/GreetingController.java b/src/main/java/helloworld/GreetingController.java index f7cb548..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 = "Hello, " + userName + "!"; + 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"); 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: