diff --git a/.factorypath b/.factorypath new file mode 100644 index 00000000..25c8a9b0 --- /dev/null +++ b/.factorypath @@ -0,0 +1,5 @@ + + + + + diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..2b4f8cd9 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "automatic" +} \ No newline at end of file diff --git a/README.md b/README.md index cc359504..61cf4eec 100644 --- a/README.md +++ b/README.md @@ -1,21 +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 +[![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 new file mode 100644 index 00000000..0c09e70b --- /dev/null +++ b/configs/context.xml @@ -0,0 +1,24 @@ + + + + + + diff --git a/configs/tomcat-users.xml b/configs/tomcat-users.xml new file mode 100644 index 00000000..cefa51d1 --- /dev/null +++ b/configs/tomcat-users.xml @@ -0,0 +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 + + + + + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 378e41af..220dfc6d 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -1,17 +1,16 @@ - - - - - Welcome to Jenkins - - - -
-

Welcome to

- Spidertocat -

My job is done with jenkins

-

Now you are with Narendra

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

Welcome to

+ Spidertocat +

Hello, World!!

+
+ +