From 15764bc1c3e36f180963048bdd10524739b66a64 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Fri, 10 Jul 2020 04:36:23 +0200 Subject: [PATCH 01/18] modify text --- src/main/webapp/index.jsp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 378e41af..2da71331 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -11,7 +11,8 @@ Spidertocat

My job is done with jenkins

-

Now you are with Narendra

+

Now you are with Dzmitry Karpovich

+

Hello, World

From 29862eaab414d1b5038127763e624ffcceab72e3 Mon Sep 17 00:00:00 2001 From: Dzmitry Karpovich Date: Fri, 10 Jul 2020 03:04:48 +0000 Subject: [PATCH 02/18] added some! --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 2da71331..9e0d117f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -12,7 +12,7 @@ class="img-responsive center-block" style="width:250px"/>

My job is done with jenkins

Now you are with Dzmitry Karpovich

-

Hello, World

+

Hello, World!

From 92eb8f6de84a1d97b3e415b90a20a117347cb6a7 Mon Sep 17 00:00:00 2001 From: Dzmitry Karpovich Date: Fri, 10 Jul 2020 03:39:36 +0000 Subject: [PATCH 03/18] aaa --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 9e0d117f..07c3bf2d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -10,7 +10,7 @@

Welcome to

Spidertocat -

My job is done with jenkins

+

My job is done with Jenkins :)

Now you are with Dzmitry Karpovich

Hello, World!

From 3b2d20a02773bb565f26c822aa10cff3249bea9d Mon Sep 17 00:00:00 2001 From: Dzmitry Karpovich Date: Fri, 10 Jul 2020 12:16:36 +0000 Subject: [PATCH 04/18] name like email --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 07c3bf2d..b26364c3 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -11,7 +11,7 @@ Spidertocat

My job is done with Jenkins :)

-

Now you are with Dzmitry Karpovich

+

Now you are with Dzmitry_Karpovich@epam.com

Hello, World!

From f0566b6939a3baa407d4fa453ced5da7216060c7 Mon Sep 17 00:00:00 2001 From: Dzmitry Karpovich Date: Fri, 10 Jul 2020 13:52:52 +0000 Subject: [PATCH 05/18] change smile --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index b26364c3..f1fe704d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -10,7 +10,7 @@

Welcome to

Spidertocat -

My job is done with Jenkins :)

+

My job is done with Jenkins ;)

Now you are with Dzmitry_Karpovich@epam.com

Hello, World!

From 7d84c02ffd2bc87aadda7421e42db6e73ab65bbe Mon Sep 17 00:00:00 2001 From: Dzmitry Karpovich Date: Fri, 10 Jul 2020 17:05:53 +0000 Subject: [PATCH 06/18] increase font --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index f1fe704d..0087b00f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -12,7 +12,7 @@ class="img-responsive center-block" style="width:250px"/>

My job is done with Jenkins ;)

Now you are with Dzmitry_Karpovich@epam.com

-

Hello, World!

+

Hello, World!

From 8bbee1ea5681a3c4cbd18285357b902408c015ab Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Fri, 10 Jul 2020 21:24:25 +0200 Subject: [PATCH 07/18] Create tomcat-users.xml --- configs/tomcat-users.xml | 1 + 1 file changed, 1 insertion(+) create mode 100644 configs/tomcat-users.xml diff --git a/configs/tomcat-users.xml b/configs/tomcat-users.xml new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/configs/tomcat-users.xml @@ -0,0 +1 @@ + From 0b29073bb00b1849fc6932888c0125fc9ba48f09 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Fri, 10 Jul 2020 21:30:11 +0200 Subject: [PATCH 08/18] Update tomcat-users.xml --- configs/tomcat-users.xml | 48 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/configs/tomcat-users.xml b/configs/tomcat-users.xml index 8b137891..6cfb321c 100644 --- a/configs/tomcat-users.xml +++ b/configs/tomcat-users.xml @@ -1 +1,49 @@ + + + + + + + + + + + + From 72b6d53a7da146046a6e333e90368b750dd6e61d Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Fri, 10 Jul 2020 21:32:36 +0200 Subject: [PATCH 09/18] Create context.xml --- configs/context.xml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 configs/context.xml diff --git a/configs/context.xml b/configs/context.xml new file mode 100644 index 00000000..b890bd40 --- /dev/null +++ b/configs/context.xml @@ -0,0 +1,24 @@ + + + + + + From d1b26f90dc09755c1f767a6eaea775b0c7192195 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Fri, 10 Jul 2020 21:36:31 +0200 Subject: [PATCH 10/18] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index cc359504..27725868 100644 --- a/README.md +++ b/README.md @@ -19,3 +19,7 @@ https://softwaredev3loper.wordpress.com/2016/02/17/from-zero-to-continuous-deliv * Import 'mvn-hello-world-web-app' as existing project into Eclipse * Use maven to run integration tests and install * mvn clean install + +## bug fixing +copy configs/context.xml to /webapps/manager/META-INF/ +copy configs/tomcat-users.xml to /conf/ From 3f303c51d344f0266272b29a22f951421cd28981 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Tue, 29 Sep 2020 20:59:48 +0200 Subject: [PATCH 11/18] Update index.jsp --- src/main/webapp/index.jsp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 0087b00f..c526456f 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -13,6 +13,8 @@

My job is done with Jenkins ;)

Now you are with Dzmitry_Karpovich@epam.com

Hello, World!

+

Hello, ESP TEAM!!!!

+ From 8c9087a92f76b47c346433ccb4aba3ba2c03e479 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Tue, 29 Sep 2020 23:48:32 +0200 Subject: [PATCH 12/18] Update index.jsp qqq --- src/main/webapp/index.jsp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index c526456f..eb692122 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -12,9 +12,7 @@ class="img-responsive center-block" style="width:250px"/>

My job is done with Jenkins ;)

Now you are with Dzmitry_Karpovich@epam.com

-

Hello, World!

-

Hello, ESP TEAM!!!!

- +

Hello, World!

From d68ef4635089cc72ccf59eae38040f5c41836a30 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Tue, 29 Sep 2020 23:54:57 +0200 Subject: [PATCH 13/18] update text Hello world --- src/main/webapp/index.jsp | 34 ++++++++++++++++------------------ 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index eb692122..69020757 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,18 +1,16 @@ - - - - - Welcome to Jenkins - - - -
-

Welcome to

- Spidertocat -

My job is done with Jenkins ;)

-

Now you are with Dzmitry_Karpovich@epam.com

-

Hello, World!

-
- - + + + + + Welcome to Jenkins + + + +
+

Welcome to

+ Spidertocat +

Hello, World!

+
+ + From 130779444632a8121c2df75699fcb7f540582f49 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:12:53 +0200 Subject: [PATCH 14/18] new --- .factorypath | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .factorypath diff --git a/.factorypath b/.factorypath new file mode 100644 index 00000000..21496fef --- /dev/null +++ b/.factorypath @@ -0,0 +1,5 @@ + + + + + From 1d80a118dd9513ce8eafe7a5d795672417843fb4 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:17:18 +0200 Subject: [PATCH 15/18] edit text with more expression --- src/main/webapp/index.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 69020757..353d08e0 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -10,7 +10,7 @@

Welcome to

Spidertocat -

Hello, World!

+

Hello, World!!!

From 3a15ee5e6967174f8ec474098a899ee3c040f040 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:39:19 +0200 Subject: [PATCH 16/18] dvdv --- .factorypath | 10 ++-- README.md | 50 ++++++++--------- configs/context.xml | 48 ++++++++-------- configs/tomcat-users.xml | 98 ++++++++++++++++---------------- pom.xml | 118 +++++++++++++++++++-------------------- 5 files changed, 162 insertions(+), 162 deletions(-) diff --git a/.factorypath b/.factorypath index 21496fef..25c8a9b0 100644 --- a/.factorypath +++ b/.factorypath @@ -1,5 +1,5 @@ - - - - - + + + + + diff --git a/README.md b/README.md index 27725868..61cf4eec 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,25 @@ -[![Build Status](https://travis-ci.org/DEV3L/mvn-hello-world-web-app.png)](https://travis-ci.org/DEV3L/mvn-hello-world-web-app) - -# mvn-hello-world-web-app -Java Hello World web application created using maven-archetype-webapp - -## Blog Post Reference -https://softwaredev3loper.wordpress.com/2016/02/17/from-zero-to-continuous-delivery/ - -## Dependancies -* git -* maven -* tomcat - -## Eclipse Project setup -* Use git clone to pull project into workspace directory - * git clone https://github.com/DEV3L/mvn-hello-world-web-app.git -* Use maven to resolve Eclipse dependencies - * mvn eclipse:eclipse -* Import 'mvn-hello-world-web-app' as existing project into Eclipse -* Use maven to run integration tests and install - * mvn clean install - -## bug fixing -copy configs/context.xml to /webapps/manager/META-INF/ -copy configs/tomcat-users.xml to /conf/ +[![Build Status](https://travis-ci.org/DEV3L/mvn-hello-world-web-app.png)](https://travis-ci.org/DEV3L/mvn-hello-world-web-app) + +# mvn-hello-world-web-app +Java Hello World web application created using maven-archetype-webapp + +## Blog Post Reference +https://softwaredev3loper.wordpress.com/2016/02/17/from-zero-to-continuous-delivery/ + +## Dependancies +* git +* maven +* tomcat + +## Eclipse Project setup +* Use git clone to pull project into workspace directory + * git clone https://github.com/DEV3L/mvn-hello-world-web-app.git +* Use maven to resolve Eclipse dependencies + * mvn eclipse:eclipse +* Import 'mvn-hello-world-web-app' as existing project into Eclipse +* Use maven to run integration tests and install + * mvn clean install + +## bug fixing +copy configs/context.xml to /webapps/manager/META-INF/ +copy configs/tomcat-users.xml to /conf/ diff --git a/configs/context.xml b/configs/context.xml index b890bd40..0c09e70b 100644 --- a/configs/context.xml +++ b/configs/context.xml @@ -1,24 +1,24 @@ - - - - - - + + + + + + diff --git a/configs/tomcat-users.xml b/configs/tomcat-users.xml index 6cfb321c..cefa51d1 100644 --- a/configs/tomcat-users.xml +++ b/configs/tomcat-users.xml @@ -1,49 +1,49 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 4a3dbbdf..6b14cd40 100644 --- a/pom.xml +++ b/pom.xml @@ -1,59 +1,59 @@ - - - 4.0.0 - com.dev3l.hello_world - mvn-hello-world - war - 1.0-SNAPSHOT - mvn-hello-world Maven Webapp - http://maven.apache.org - - - javax.servlet - servlet-api - 2.5 - - - - junit - junit - 4.12 - test - - - - org.apache.logging.log4j - log4j-api - 2.5 - - - org.apache.logging.log4j - log4j-core - 2.5 - - - - mvn-hello-world - - - org.apache.maven.plugins - maven-compiler-plugin - 3.1 - - 1.8 - 1.8 - - - - - org.apache.maven.plugins - maven-war-plugin - 2.4 - - false - - - - - + + + 4.0.0 + com.dev3l.hello_world + mvn-hello-world + war + 1.0-SNAPSHOT + mvn-hello-world Maven Webapp + http://maven.apache.org + + + javax.servlet + servlet-api + 2.5 + + + + junit + junit + 4.12 + test + + + + org.apache.logging.log4j + log4j-api + 2.5 + + + org.apache.logging.log4j + log4j-core + 2.5 + + + + mvn-hello-world + + + org.apache.maven.plugins + maven-compiler-plugin + 3.1 + + 1.8 + 1.8 + + + + + org.apache.maven.plugins + maven-war-plugin + 2.4 + + false + + + + + From f3158936bc4e3c3d43aed0c71bf508c273f05be2 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:41:22 +0200 Subject: [PATCH 17/18] 555 --- .vscode/settings.json | 3 +++ src/main/webapp/index.jsp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..0d739125 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 353d08e0..220dfc6d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -10,7 +10,7 @@

Welcome to

Spidertocat -

Hello, World!!!

+

Hello, World!!

From 6d6cd9c4002f948eb984c6e702d9c81e18be0775 Mon Sep 17 00:00:00 2001 From: DzmitryKarpovich <63013639+DzmitryKarpovich@users.noreply.github.com> Date: Wed, 30 Sep 2020 00:42:31 +0200 Subject: [PATCH 18/18] 62 --- .vscode/settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 0d739125..2b4f8cd9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,3 +1,3 @@ { - "java.configuration.updateBuildConfiguration": "interactive" + "java.configuration.updateBuildConfiguration": "automatic" } \ No newline at end of file