From c2a07780d5ba2e80e2d1acd47d019ca99665a806 Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 9 Aug 2017 17:17:27 -0600 Subject: [PATCH 01/29] added joespipeline --- joespipeline | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 joespipeline diff --git a/joespipeline b/joespipeline new file mode 100644 index 000000000..e746be512 --- /dev/null +++ b/joespipeline @@ -0,0 +1,14 @@ +echo 'Hello from Pipeline Demo' + stage 'Compile' + node { + git url: 'https://github.com/mitesh51/spring-petclinic.git' + sh "/usr/bin/mvn -B compile" + } + stage 'Test' + node('TestServer') { + git url: 'https://github.com/mitesh51/spring-petclinic.git' + sh "/usr/bin/mvn -B verify" + + step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) + step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml']) + } From 40a0a87e93666d67eb673a9c498612ac1b99df7f Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 9 Aug 2017 17:22:18 -0600 Subject: [PATCH 02/29] test push --- foo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 foo.txt diff --git a/foo.txt b/foo.txt new file mode 100644 index 000000000..6aae500bb --- /dev/null +++ b/foo.txt @@ -0,0 +1 @@ +asdkfjk From 1ddebc7fdc6af71b753e7df1f3645c06c695753b Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 9 Aug 2017 17:23:56 -0600 Subject: [PATCH 03/29] added my pipeline script --- joespipeline | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 joespipeline diff --git a/joespipeline b/joespipeline new file mode 100644 index 000000000..e746be512 --- /dev/null +++ b/joespipeline @@ -0,0 +1,14 @@ +echo 'Hello from Pipeline Demo' + stage 'Compile' + node { + git url: 'https://github.com/mitesh51/spring-petclinic.git' + sh "/usr/bin/mvn -B compile" + } + stage 'Test' + node('TestServer') { + git url: 'https://github.com/mitesh51/spring-petclinic.git' + sh "/usr/bin/mvn -B verify" + + step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) + step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml']) + } From cc21a072f2f879020fa9acef88f8cab8217bd8f9 Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 9 Aug 2017 17:58:02 -0600 Subject: [PATCH 04/29] update joespipeline --- joespipeline | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/joespipeline b/joespipeline index e746be512..7eaf6a7ea 100644 --- a/joespipeline +++ b/joespipeline @@ -1,12 +1,12 @@ echo 'Hello from Pipeline Demo' stage 'Compile' node { - git url: 'https://github.com/mitesh51/spring-petclinic.git' + git url: 'https://github.com/nachofree/spring-petclinic.git' sh "/usr/bin/mvn -B compile" } stage 'Test' node('TestServer') { - git url: 'https://github.com/mitesh51/spring-petclinic.git' + git url: 'https://github.com/nachofree/spring-petclinic.git' sh "/usr/bin/mvn -B verify" step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) From b3a4676780628fa628c670a346c97661cb427f87 Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 10 Aug 2017 13:31:04 -0600 Subject: [PATCH 05/29] update joespipeline --- joespipeline | 1 - 1 file changed, 1 deletion(-) diff --git a/joespipeline b/joespipeline index 7eaf6a7ea..27917dfc2 100644 --- a/joespipeline +++ b/joespipeline @@ -10,5 +10,4 @@ echo 'Hello from Pipeline Demo' sh "/usr/bin/mvn -B verify" step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) - step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml']) } From c4d09bba52f3ad9080c49b8a41071e051493cebf Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 10 Aug 2017 13:37:51 -0600 Subject: [PATCH 06/29] back to main node --- joespipeline | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/joespipeline b/joespipeline index 27917dfc2..c659ba26a 100644 --- a/joespipeline +++ b/joespipeline @@ -5,9 +5,10 @@ echo 'Hello from Pipeline Demo' sh "/usr/bin/mvn -B compile" } stage 'Test' - node('TestServer') { + node{ git url: 'https://github.com/nachofree/spring-petclinic.git' sh "/usr/bin/mvn -B verify" step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) + step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml']) } From acc5c43a1086d8607de951499812e15f4664795d Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 10 Aug 2017 13:43:13 -0600 Subject: [PATCH 07/29] update --- joespipeline | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/joespipeline b/joespipeline index e746be512..c659ba26a 100644 --- a/joespipeline +++ b/joespipeline @@ -1,12 +1,12 @@ echo 'Hello from Pipeline Demo' stage 'Compile' node { - git url: 'https://github.com/mitesh51/spring-petclinic.git' + git url: 'https://github.com/nachofree/spring-petclinic.git' sh "/usr/bin/mvn -B compile" } stage 'Test' - node('TestServer') { - git url: 'https://github.com/mitesh51/spring-petclinic.git' + node{ + git url: 'https://github.com/nachofree/spring-petclinic.git' sh "/usr/bin/mvn -B verify" step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) From 5dac10f44423f2361c2017bd14b3eef0547ad484 Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 13:35:27 -0600 Subject: [PATCH 08/29] updated pipeline commands --- joespipeline | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/joespipeline b/joespipeline index c659ba26a..5ef199d6c 100644 --- a/joespipeline +++ b/joespipeline @@ -2,7 +2,7 @@ echo 'Hello from Pipeline Demo' stage 'Compile' node { git url: 'https://github.com/nachofree/spring-petclinic.git' - sh "/usr/bin/mvn -B compile" + sh "/usr/bin/mvn -B compile war:war" } stage 'Test' node{ @@ -12,3 +12,4 @@ echo 'Hello from Pipeline Demo' step([$class: 'ArtifactArchiver', artifacts: '**/target/*.war', fingerprint: true]) step([$class: 'JUnitResultArchiver', testResults: '**/target/surefire-reports/TEST-*.xml']) } + From 4b7eaeb77dc666c92af52a11e59d68dc7dd880bb Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 18:01:54 -0600 Subject: [PATCH 09/29] updated pom.xml --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index f64e6d122..d8ccced30 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,18 @@ + + + org.apache.tomcat.maven + tomcat7-maven-plugin + 2.2 + + tomcat-development-server + http://144.38.196.10:8080/manager/text + target\petclinic.war + /petclinic + + org.codehaus.mojo cobertura-maven-plugin From 5e6668e95cce722583c058272f38f566b5877366 Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 18:06:02 -0600 Subject: [PATCH 10/29] remove tomcat from pom.xml --- pom.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pom.xml b/pom.xml index d8ccced30..1f933484a 100644 --- a/pom.xml +++ b/pom.xml @@ -141,17 +141,6 @@ - - org.apache.tomcat.maven - tomcat7-maven-plugin - 2.2 - - tomcat-development-server - http://144.38.196.10:8080/manager/text - target\petclinic.war - /petclinic - - org.codehaus.mojo cobertura-maven-plugin From d50e51519a834c087a7ed35bfe0100515c7eab1b Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 18:32:17 -0600 Subject: [PATCH 11/29] update pom.xml again --- pom.xml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pom.xml b/pom.xml index 1f933484a..c748ffe6a 100644 --- a/pom.xml +++ b/pom.xml @@ -141,6 +141,18 @@ + + org.apache.tomcat.maven + tomcat8-maven-plugin + 2.2 + + tomcat-development-server + http://144.38.196.10:8080/manager/text + target\petclinic.war + /petclinic + + + org.codehaus.mojo cobertura-maven-plugin From 42a960fe40de72f230871de611855aaa3e9f999b Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 18:35:36 -0600 Subject: [PATCH 12/29] update pom again --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c748ffe6a..a95799d61 100644 --- a/pom.xml +++ b/pom.xml @@ -143,7 +143,7 @@ org.apache.tomcat.maven - tomcat8-maven-plugin + tomcat7-maven-plugin 2.2 tomcat-development-server From dbc6cec300067f452ec4d6f98712b6244f4ddfee Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 19:02:24 -0600 Subject: [PATCH 13/29] update pom.xml to include packaging line --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a95799d61..693f17ec2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.samples spring-petclinic 1.5.1 - + war org.springframework.boot spring-boot-starter-parent From 6191253ddbc2d2887deb88091958890b8dd1329d Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 19:06:28 -0600 Subject: [PATCH 14/29] update pom.xml to include packaging line --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 693f17ec2..46b1c4466 100644 --- a/pom.xml +++ b/pom.xml @@ -148,7 +148,7 @@ tomcat-development-server http://144.38.196.10:8080/manager/text - target\petclinic.war + target\spring-petclinic-1.5.1.war /petclinic From f443f491baf332164df0009c6f774efe6532f647 Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 17 Aug 2017 19:37:02 -0600 Subject: [PATCH 15/29] add username password to pom file --- pom.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pom.xml b/pom.xml index 46b1c4466..be160f005 100644 --- a/pom.xml +++ b/pom.xml @@ -150,6 +150,8 @@ http://144.38.196.10:8080/manager/text target\spring-petclinic-1.5.1.war /petclinic + foo + dude From 22a38f740bfb87c74782c5b2ad27d251f1675e0a Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 19 Sep 2017 13:35:27 -0600 Subject: [PATCH 16/29] tweaked sonar properties --- sonar-project.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sonar-project.properties b/sonar-project.properties index d84ed7c2d..ffe4dc3b2 100755 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -5,9 +5,10 @@ sonar.projectVersion=1.0 # Comma-separated paths to directories with sources (required) sonar.sources=src +sonar.java.binaries=src # Language sonar.language=java # Encoding of the source files -sonar.sourceEncoding=UTF-8 \ No newline at end of file +sonar.sourceEncoding=UTF-8 From 9846c961717099543608d04e0891ac36929231ed Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 21 Sep 2017 10:42:19 -0600 Subject: [PATCH 17/29] update --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index ac30d6392..41b2ca206 100644 --- a/readme.md +++ b/readme.md @@ -100,6 +100,6 @@ The [issue tracker](https://github.com/spring-projects/spring-petclinic/issues) For pull requests, editor preferences are available in the [editor config](.editorconfig) for easy use in common text editors. Read more and download plugins at . - +# foo From 77aa5dabac8edd192ac92a05186a44562014353b Mon Sep 17 00:00:00 2001 From: joe Date: Mon, 25 Sep 2017 15:36:05 -0600 Subject: [PATCH 18/29] udpated tomcat password --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index be160f005..dc65b9f00 100644 --- a/pom.xml +++ b/pom.xml @@ -147,11 +147,11 @@ 2.2 tomcat-development-server - http://144.38.196.10:8080/manager/text + http://144.38.196.18:8080/manager/text target\spring-petclinic-1.5.1.war /petclinic - foo - dude + admin + cloud@123 From 490661a73bd278bbd5d8e1f1d866939d63890039 Mon Sep 17 00:00:00 2001 From: joe Date: Mon, 25 Sep 2017 16:13:29 -0600 Subject: [PATCH 19/29] update pom --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index dc65b9f00..5165f9361 100644 --- a/pom.xml +++ b/pom.xml @@ -150,8 +150,8 @@ http://144.38.196.18:8080/manager/text target\spring-petclinic-1.5.1.war /petclinic - admin - cloud@123 + joe + 1francom$ From 0a3934037b1d0f0e1b6fd3ea638bd44983083a1a Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 26 Sep 2017 18:45:17 -0600 Subject: [PATCH 20/29] try for modify on tomcat --- pom.xml | 6 ++++++ .../samples/petclinic/PetClinicApplication.java | 15 ++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 5165f9361..b1ba04df9 100644 --- a/pom.xml +++ b/pom.xml @@ -65,6 +65,7 @@ spring-boot-starter-test test + @@ -115,6 +116,11 @@ spring-boot-devtools runtime + + org.springframework.boot + spring-boot-starter-tomcat + provided + diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java index 224c326c7..2ff7b77c4 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java @@ -26,10 +26,23 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * */ @SpringBootApplication -public class PetClinicApplication { +public class PetClinicApplication extends SpringBootServletInitializer { + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(Application.class); + } public static void main(String[] args) throws Exception { SpringApplication.run(PetClinicApplication.class, args); } } +/**@SpringBootApplication +*public class PetClinicApplication { +* +* public static void main(String[] args) throws Exception { +* SpringApplication.run(PetClinicApplication.class, args); +* } +* +*} +*/ From 188c80edddb973e2d8acdbce463b3c6ae3231f19 Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 26 Sep 2017 18:47:03 -0600 Subject: [PATCH 21/29] try for modify on tomcat --- .../springframework/samples/petclinic/PetClinicApplication.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java index 2ff7b77c4..fc403edea 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java @@ -18,6 +18,8 @@ package org.springframework.samples.petclinic; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.context.web.SpringBootServletInitializer; +import org.springframework.boot.builder.SpringApplicationBuilder; /** * PetClinic Spring Boot Application. From 0d3c11cb03b3fec9664f66bff5cc7409cd142fbd Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 26 Sep 2017 18:51:28 -0600 Subject: [PATCH 22/29] another tomcat try --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index b1ba04df9..6427df656 100644 --- a/pom.xml +++ b/pom.xml @@ -34,6 +34,10 @@ + + org.springframework.boot + spring-boot-starter-data-rest + org.springframework.boot spring-boot-starter-actuator From d711ebe53a24d052e2e77d3e9cffd7db2bcead9c Mon Sep 17 00:00:00 2001 From: joe Date: Tue, 26 Sep 2017 18:55:41 -0600 Subject: [PATCH 23/29] Revert to 56e05fced --- pom.xml | 10 ---------- .../samples/petclinic/PetClinicApplication.java | 17 +---------------- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/pom.xml b/pom.xml index 6427df656..5165f9361 100644 --- a/pom.xml +++ b/pom.xml @@ -34,10 +34,6 @@ - - org.springframework.boot - spring-boot-starter-data-rest - org.springframework.boot spring-boot-starter-actuator @@ -69,7 +65,6 @@ spring-boot-starter-test test - @@ -120,11 +115,6 @@ spring-boot-devtools runtime - - org.springframework.boot - spring-boot-starter-tomcat - provided - diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java index fc403edea..224c326c7 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java @@ -18,8 +18,6 @@ package org.springframework.samples.petclinic; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.context.web.SpringBootServletInitializer; -import org.springframework.boot.builder.SpringApplicationBuilder; /** * PetClinic Spring Boot Application. @@ -28,23 +26,10 @@ import org.springframework.boot.builder.SpringApplicationBuilder; * */ @SpringBootApplication -public class PetClinicApplication extends SpringBootServletInitializer { - @Override - protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { - return application.sources(Application.class); - } +public class PetClinicApplication { public static void main(String[] args) throws Exception { SpringApplication.run(PetClinicApplication.class, args); } } -/**@SpringBootApplication -*public class PetClinicApplication { -* -* public static void main(String[] args) throws Exception { -* SpringApplication.run(PetClinicApplication.class, args); -* } -* -*} -*/ From ee371a17537ef7b90b92279754d475d1aed45b97 Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 27 Sep 2017 13:36:54 -0600 Subject: [PATCH 24/29] trial pom tomcat --- pom.xml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pom.xml b/pom.xml index 5165f9361..b224f9b4e 100644 --- a/pom.xml +++ b/pom.xml @@ -49,7 +49,18 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + + + org.apache.tomcat.embed + tomcat-embed-el + provided + org.springframework.boot spring-boot-starter-thymeleaf From 25989ca4ee54dd57ec79ce32ad14edc22fc63cba Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 27 Sep 2017 13:40:31 -0600 Subject: [PATCH 25/29] update again for tomcat --- pom.xml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pom.xml b/pom.xml index b224f9b4e..c1afc9346 100644 --- a/pom.xml +++ b/pom.xml @@ -49,12 +49,6 @@ org.springframework.boot spring-boot-starter-web - - - org.springframework.boot - spring-boot-starter-tomcat - - org.apache.tomcat.embed From 945954cb477aaac2b897b7320093245eae0ae15c Mon Sep 17 00:00:00 2001 From: joe Date: Thu, 28 Sep 2017 12:42:59 -0600 Subject: [PATCH 26/29] test for tomcat --- pom.xml | 5 +++++ .../samples/petclinic/PetClinicApplication.java | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1afc9346..6409f3f28 100644 --- a/pom.xml +++ b/pom.xml @@ -70,6 +70,11 @@ spring-boot-starter-test test + + org.springframework.boot + spring-boot-starter-tomcat + provided + diff --git a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java index 224c326c7..daf77bc28 100644 --- a/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java +++ b/src/main/java/org/springframework/samples/petclinic/PetClinicApplication.java @@ -18,6 +18,8 @@ package org.springframework.samples.petclinic; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.builder.SpringApplicationBuilder; +import org.springframework.boot.web.support.SpringBootServletInitializer; /** * PetClinic Spring Boot Application. @@ -26,7 +28,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * */ @SpringBootApplication -public class PetClinicApplication { +public class PetClinicApplication extends SpringBootServletInitializer { + @Override + protected SpringApplicationBuilder configure(SpringApplicationBuilder application) { + return application.sources(PetClinicApplication.class); + } public static void main(String[] args) throws Exception { SpringApplication.run(PetClinicApplication.class, args); From 9be932d73a0273a95eaa0cf0793913432da99c2a Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 29 Sep 2017 10:19:50 -0600 Subject: [PATCH 27/29] change welcom --- .../samples/petclinic/system/WelcomeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java index b5af0f7d7..43d7d9312 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java @@ -9,6 +9,6 @@ class WelcomeController { @RequestMapping("/") public String welcome() { - return "welcome"; + return "Chickety china the chinese chicken"; } } From ac29c7de599732eb4720b6036ca989fb24333c9a Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 29 Sep 2017 10:26:04 -0600 Subject: [PATCH 28/29] change welcom --- .../samples/petclinic/system/WelcomeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java index 43d7d9312..ebf372828 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java @@ -9,6 +9,6 @@ class WelcomeController { @RequestMapping("/") public String welcome() { - return "Chickety china the chinese chicken"; + return "Chickety china the chinese chicken-foo"; } } From d6aa7788ec514fa49ece716bb1a111274bc58983 Mon Sep 17 00:00:00 2001 From: joe Date: Fri, 29 Sep 2017 10:29:36 -0600 Subject: [PATCH 29/29] fix back to welcom --- .../samples/petclinic/system/WelcomeController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java index ebf372828..b5af0f7d7 100644 --- a/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java +++ b/src/main/java/org/springframework/samples/petclinic/system/WelcomeController.java @@ -9,6 +9,6 @@ class WelcomeController { @RequestMapping("/") public String welcome() { - return "Chickety china the chinese chicken-foo"; + return "welcome"; } }