Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Develop #16

Open
wants to merge 94 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
15764bc
modify text
DzmitryKarpovich Jul 10, 2020
29862ea
added some!
DzmitryKarpovich Jul 10, 2020
92eb8f6
aaa
DzmitryKarpovich Jul 10, 2020
3b2d20a
name like email
DzmitryKarpovich Jul 10, 2020
f0566b6
change smile
DzmitryKarpovich Jul 10, 2020
7d84c02
increase font
DzmitryKarpovich Jul 10, 2020
8bbee1e
Create tomcat-users.xml
DzmitryKarpovich Jul 10, 2020
0b29073
Update tomcat-users.xml
DzmitryKarpovich Jul 10, 2020
72b6d53
Create context.xml
DzmitryKarpovich Jul 10, 2020
d1b26f9
Update README.md
DzmitryKarpovich Jul 10, 2020
3f303c5
Update index.jsp
DzmitryKarpovich Sep 29, 2020
8c9087a
Update index.jsp
DzmitryKarpovich Sep 29, 2020
d68ef46
update text Hello world
DzmitryKarpovich Sep 29, 2020
1307794
new
DzmitryKarpovich Sep 29, 2020
1d80a11
edit text with more expression
DzmitryKarpovich Sep 29, 2020
4ee9120
5415
DzmitryKarpovich Sep 29, 2020
c7c1776
888
DzmitryKarpovich Oct 21, 2020
ffc8552
git
DzmitryKarpovich Oct 21, 2020
47ba5b4
555
DzmitryKarpovich Oct 21, 2020
ccd2a5e
123
DzmitryKarpovich Oct 21, 2020
f924240
9595
DzmitryKarpovich Oct 21, 2020
5e2732e
8484
DzmitryKarpovich Oct 21, 2020
aa2f8b7
readme update
DzmitryKarpovich Oct 21, 2020
a689f70
erg
DzmitryKarpovich Oct 22, 2020
258f533
6262
DzmitryKarpovich Oct 22, 2020
dfafb18
555
DzmitryKarpovich Oct 22, 2020
932885d
qaz
DzmitryKarpovich Oct 22, 2020
df9084f
initial for txt file
Oct 23, 2020
a59959b
commit from VSCode
Oct 23, 2020
dd3b842
remove the from first text line
Oct 23, 2020
001c1b7
backround color
Oct 24, 2020
7a6e5c0
colour changed to more not deep
Oct 24, 2020
8266228
uncomment picture
Oct 24, 2020
1eb43cc
update main page text
Oct 24, 2020
acec88e
comment changes
Oct 24, 2020
0cf2a93
comment changes
Oct 25, 2020
3e32773
Merge branch 'master' of https://github.com/DzmitryKarpovich/webapp i…
Oct 25, 2020
d5c219e
Merge branch 'master' of https://github.com/DzmitryKarpovich/webapp i…
Oct 25, 2020
bb8573c
Merge branch 'master' of https://github.com/DzmitryKarpovich/webapp i…
Oct 25, 2020
7c6420d
Merge branch 'master' of https://github.com/DzmitryKarpovich/webapp i…
Oct 25, 2020
ade1175
rfg
Oct 25, 2020
7783f15
add appritiation text
Oct 25, 2020
738bd52
new color licenced
Oct 25, 2020
bcd2a44
epmhdc-5369 first working commit
Oct 25, 2020
49308d4
remove apritiation text part
Oct 25, 2020
e230c99
change color from green to blue
Oct 25, 2020
d9e6038
move hello text below
Oct 25, 2020
96c1a7f
add blank line
Oct 25, 2020
467254e
add second balank line
Oct 25, 2020
d19ef0b
fix bug with empty lines
Oct 25, 2020
6210b45
subbug fix
Oct 25, 2020
d8a914c
qqq
Oct 25, 2020
169bb04
! add
Oct 25, 2020
4865378
qwer
Oct 27, 2020
57be48b
esp text
Oct 27, 2020
2668fb1
gdbngfn
Oct 27, 2020
c438080
qaz
Oct 27, 2020
5383127
wcqwcqwcc
Oct 27, 2020
f12532b
66
Oct 27, 2020
0280250
new
Oct 27, 2020
93236b1
qqq
Oct 27, 2020
21ff525
Merge branch 'master' of https://github.com/DzmitryKarpovich/webapp i…
Oct 27, 2020
8685857
add esp team text
Oct 27, 2020
a03d66b
page text rebuild
Oct 27, 2020
77bcc66
make text bigger
Oct 27, 2020
ef7ff66
reconfigure text
Oct 27, 2020
aa548ea
edit hello line
Oct 27, 2020
1f0be98
less expression to the hello
Oct 27, 2020
34bc3b4
add text first touch
Oct 28, 2020
bfe7788
less expression to the hello
Oct 28, 2020
2571acd
Merge branch 'master' of https://github.com/DzmitryKarpovich/webapp i…
Oct 28, 2020
3ba0f7c
add thanks text
Oct 28, 2020
bae16cd
hide thanks
Oct 28, 2020
593de19
add !
Oct 28, 2020
9f24aaf
Merge branch 'master' of https://github.com/DzmitryKarpovich/webapp i…
Oct 28, 2020
55a65a5
add thx
Oct 28, 2020
346e760
H1 to H2
Nov 5, 2020
33eb174
update .gitignore
Nov 6, 2020
eb9e5b2
Update test
Jan 13, 2021
0c91e13
green
Jan 13, 2021
c234d0d
Revert "green"
Jan 13, 2021
1579813
Revert "Revert "green""
Jan 13, 2021
6bf733d
add 101 %%
Jan 15, 2021
96de35e
update text and color
Jan 15, 2021
1f31259
Revert "update text and color"
Jan 15, 2021
ff5e865
Revert "Revert "update text and color""
Jan 15, 2021
2a3e712
add test txt file
Jan 15, 2021
6103b46
delete team name
Dec 6, 2021
7eb984a
update gteetings
Dec 13, 2021
b5f9da6
fix greetings
Dec 13, 2021
3680c38
add expression
Dec 15, 2021
90f9539
do very-very relevant
Dec 15, 2021
3c8e336
less expression
Dec 23, 2021
3954928
more expression
Dec 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .factorypath
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<factorypath>
<factorypathentry kind="VARJAR" id="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-api/2.5/log4j-api-2.5.jar" enabled="true" runInBatchMode="false"/>
<factorypathentry kind="VARJAR" id="M2_REPO/org/apache/logging/log4j/log4j-core/2.5/log4j-core-2.5.jar" enabled="true" runInBatchMode="false"/>
</factorypath>
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
*.class

*.999
# Mobile Tools for Java (J2ME)
.mtj.tmp/

Expand Down
54 changes: 33 additions & 21 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,33 @@
[![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 <TOMCAT>/webapps/manager/META-INF/
copy configs/tomcat-users.xml to <TOMCAT>/conf/

## hints to start for DK
cd /usr/local/apache-tomcat-9.0.37/bin/
./startup.sh

Example http://ec2-18-218-1-221.us-east-2.compute.amazonaws.com:8080/mvn-hello-world/

Ask about feedback
24 changes: 24 additions & 0 deletions configs/context.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<Context antiResourceLocking="false" privileged="true" >
<!--
<Valve className="org.apache.catalina.valves.RemoteAddrValve"
allow="127\.\d+\.\d+\.\d+|::1|0:0:0:0:0:0:0:1|172.31.16.230|18.190.25.4" />
-->
<Manager sessionAttributeValueClassNameFilter="java\.lang\.(?:Boolean|Integer|Long|Number|String)|org\.apache\.catalina\.filters\.CsrfPreventionFilter\$LruCache(?:\$1)?|java\.util\.(?:Linked)?HashMap"/>
</Context>
49 changes: 49 additions & 0 deletions configs/tomcat-users.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<tomcat-users xmlns="http://tomcat.apache.org/xml"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://tomcat.apache.org/xml tomcat-users.xsd"
version="1.0">
<!--
NOTE: By default, no user is included in the "manager-gui" role required
to operate the "/manager/html" web application. If you wish to use this app,
you must define such a user - the username and password are arbitrary. It is
strongly recommended that you do NOT use one of the users in the commented out
section below since they are intended for use with the examples web
application.
-->
<!--
NOTE: The sample user and role entries below are intended for use with the
examples web application. They are wrapped in a comment and thus are ignored
when reading this file. If you wish to configure these users for use with the
examples web application, do not forget to remove the <!.. ..> that surrounds
them. You will also need to set the passwords to something appropriate.
-->
<!--
<role rolename="tomcat"/>
<role rolename="role1"/>
<user username="tomcat" password="<must-be-changed>" roles="tomcat"/>
<user username="both" password="<must-be-changed>" roles="tomcat,role1"/>
<user username="role1" password="<must-be-changed>" roles="role1"/>
-->
<role rolename="manager-gui"/>
<role rolename="manager-script"/>
<user username="tomcat" password="tomcat" roles="manager-script"/>
<user username="deployer" password="deployer" roles="manager-gui"/>

</tomcat-users>
118 changes: 59 additions & 59 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,59 +1,59 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.dev3l.hello_world</groupId>
<artifactId>mvn-hello-world</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<name>mvn-hello-world Maven Webapp</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
<!-- junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<!-- log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.5</version>
</dependency>
</dependencies>
<build>
<finalName>mvn-hello-world</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.dev3l.hello_world</groupId>
<artifactId>mvn-hello-world</artifactId>
<packaging>war</packaging>
<version>1.0-SNAPSHOT</version>
<name>mvn-hello-world Maven Webapp</name>
<url>http://maven.apache.org</url>
<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
<!-- junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.12</version>
<scope>test</scope>
</dependency>
<!-- log4j -->
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>2.5</version>
</dependency>
</dependencies>
<build>
<finalName>mvn-hello-world</finalName>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
<plugin>
<!-- Java EE 6 doesn't require web.xml, Maven needs to catch up! -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.4</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins>
</build>
</project>
Empty file added src/main/test_file.txt
Empty file.
39 changes: 22 additions & 17 deletions src/main/webapp/index.jsp
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Welcome to Jenkins </title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
</head>
<body>
<div class="jumbotron" style="background-color:white">
<h1 class="text-center">Welcome to</h1>
<img src="http://www.learntek.org/wp-content/uploads/2017/08/jenkins_image.png" alt="Spidertocat"
class="img-responsive center-block" style="width:250px"/>
<h1 class="text-center">My job is done with jenkins</h1>
<h2 class="text-center">Now you are with Narendra</h2>
</div>
</body>
</html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>Welcome to Learning GIT!!!</title>
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/css/bootstrap.min.css">
</head>
<body>
<div class="jumbotron" style="background-color:rgb(25, 211, 65)">
<h1 class="text-center">Hello Team!!!</h1>
<h1 class="text-center">Welcome to the Training</h1>
</div>
<div>
<img src="https://cdn.freebiesupply.com/logos/large/2x/git-logo-svg-vector.svg" alt="Spidertocat"
class="img-responsive center-block" style="width:250px">
</div>
<div>
<h2 class="text-center">First Touch</h2>
<h1 class="text-center">THANK YOU!!!</h1>
</div>
</body>
</html>