From 9e889896d6901224427526fc1e1645f858cb0a0f Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Jun 2020 14:06:59 +0000 Subject: [PATCH 1/4] updated index.jsp --- pom.xml | 232 ++---------------- .../target/classes/com/example/Greeter.class | Bin 0 -> 551 bytes server/target/maven-archiver/pom.properties | 5 + server/target/server.jar | Bin 0 -> 2341 bytes .../TEST-com.example.TestGreeter.xml | 66 +++++ .../com.example.TestGreeter.txt | 4 + .../com/example/TestGreeter.class | Bin 0 -> 1435 bytes webapp/src/main/webapp/index.jsp | 23 +- webapp/target/maven-archiver/pom.properties | 5 + webapp/target/webapp.war | Bin 0 -> 2528 bytes webapp/target/webapp/WEB-INF/web.xml | 17 ++ webapp/target/webapp/index.jsp | 3 + 12 files changed, 141 insertions(+), 214 deletions(-) create mode 100644 server/target/classes/com/example/Greeter.class create mode 100644 server/target/maven-archiver/pom.properties create mode 100644 server/target/server.jar create mode 100644 server/target/surefire-reports/TEST-com.example.TestGreeter.xml create mode 100644 server/target/surefire-reports/com.example.TestGreeter.txt create mode 100644 server/target/test-classes/com/example/TestGreeter.class create mode 100644 webapp/target/maven-archiver/pom.properties create mode 100644 webapp/target/webapp.war create mode 100644 webapp/target/webapp/WEB-INF/web.xml create mode 100644 webapp/target/webapp/index.jsp diff --git a/pom.xml b/pom.xml index eccd206883..67f7697b3e 100644 --- a/pom.xml +++ b/pom.xml @@ -1,220 +1,30 @@ - + + 4.0.0 - com.example.maven-project - maven-project - pom - 1.0-SNAPSHOT - Maven Project - Sample Maven project with a working, deployable site. + com.valaxy.webapp + webapp-project + 2.0 + war + + webapp-project Maven Webapp + http://www.example.com - utf-8 - utf-8 + UTF-8 + 1.7 + 1.7 - - server - webapp - - - - - site-server - Test Project Site - file:///tmp/maven-project-site - - - - - - - maven-compiler-plugin - - 1.6 - 1.6 - - - - - maven-release-plugin - - true - - - - - maven-site-plugin - - - - maven-checkstyle-plugin - - - - maven-jxr-plugin - - - - maven-javadoc-plugin - - - - maven-pmd-plugin - - - - maven-surefire-report-plugin - - - - org.codehaus.mojo - findbugs-maven-plugin - - - - org.codehaus.mojo - taglist-maven-plugin - - - - - - - - - - maven-checkstyle-plugin - 2.8 - - - - maven-compiler-plugin - 2.3.2 - - - - maven-javadoc-plugin - 2.8 - - - - maven-jxr-plugin - 2.3 - - - - maven-pmd-plugin - 2.6 - - - - maven-project-info-reports-plugin - 2.4 - - - - maven-release-plugin - 2.2.1 - - - - maven-resources-plugin - 2.5 - - - - maven-site-plugin - 3.0 - - - - maven-surefire-report-plugin - 2.11 - - - - maven-surefire-plugin - 2.11 - - - - org.codehaus.mojo - findbugs-maven-plugin - 2.3.3 - - - - org.codehaus.mojo - taglist-maven-plugin - 2.4 - - - - org.mortbay.jetty - jetty-maven-plugin - 8.0.0.M1 - - - - - - - - - javax.servlet - servlet-api - 2.5 - - - - javax.servlet.jsp - jsp-api - 2.2 - - - - junit - junit-dep - 4.10 - test - - - - org.hamcrest - hamcrest-core - 1.2.1 - test - - - - org.hamcrest - hamcrest-library - 1.2.1 - test - - - - org.mockito - mockito-core - 1.8.5 - test - - - - - - scm:git:git@github.com:jleetutorial/maven-project.git - scm:git:git@github.com:jleetutorial/maven-project.git - HEAD - http://github.com/jleetutorial/maven-project - - - - 3.0.3 - - + + + junit + junit + 4.11 + test + + diff --git a/server/target/classes/com/example/Greeter.class b/server/target/classes/com/example/Greeter.class new file mode 100644 index 0000000000000000000000000000000000000000..9a417731406e7f9657abbb931cd0b2fb840dec91 GIT binary patch literal 551 zcmZutO-sW-5PjREO^vaiwtgP$L1|SC=t(Lb6x2h|L!}^|wsBiilB}eu__Oq+2>Jv3 zQQ~Y;P-*utA8+2gnc1)J_fG)(ST~`en#ZDnnu$7=3@kI`j=a!|j~TRPtIMFD$~(bO zbi7bpj)R_vu6fTVq~b`I`&}M+DxZLQeD94IYK|)dTRidL!58*SaKR zFv#X9J0Q=e=6j7o&LpkABegO9Nc8~x7 literal 0 HcmV?d00001 diff --git a/server/target/maven-archiver/pom.properties b/server/target/maven-archiver/pom.properties new file mode 100644 index 0000000000..1dfec24028 --- /dev/null +++ b/server/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jun 03 12:59:00 UTC 2020 +version=1.0-SNAPSHOT +groupId=com.example.maven-project +artifactId=server diff --git a/server/target/server.jar b/server/target/server.jar new file mode 100644 index 0000000000000000000000000000000000000000..c4268ddef679ec7dfd843350c5e1fd94dd691472 GIT binary patch literal 2341 zcmWIWW@h1H0D;8x!vSChl;8x?zOEsTx}JV+`TRsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5Dco`RamCV&zE7JApvp1069VF}>6nsFbkG1ope@b1_|aXzcJ{{@;2 zCpAt;Oq%{Nr|hXk(b0{|_pH5=9xbT*BvIgD$d7$@qGF{@B~RINJ^#C~Aep&aY}$r1 z0jFPlzuw-dn)}?%jd8i)HzT(lMgOc)d|TCuwp5fZI}kEoguCSS(lZ**&E_4PH|cq1 zms)B9n^oFMwl$oc0^LT+TV`;{2(8+2^wpGqY;S{ZzuD(d|0nE}y1jO%SMnjB(2!6k z%ghCnKCF&ML?wE9M4;smOVC}jEMfq8&$t8G-2_tNi6?`d6(PRHVc1$;`sKXz~tgYvbPu*Jhe_8QfeQ z_WS+iP>wRUl})-?Okzj4ItzJY@5Edz4w{%XYvSg;)7ih|ZCBo%&-s1ps&g;iul{Ky zrlqm;8{?J(nTC@4A}l^@TAMR9nf#JnHTk-LWdK9OPS2HX z{ds!&k~mWjF66VROzt(7u8u5D6ggvg7yo7+puE|Pq_q4)BQM@)yhgq?D~2)dtrp>gr%vgY?mZw@W)p0fPYM(>Xd zy;peSn_qXer%%7KV1oYdLtkDjGOc>J&zDVXGN_XAK2*Fdb& zLEiII{j?>=XZAN!|0UY|vHdPI48*ZAnJ<>3)=a-JjF!_&jF<5W<0m+|M%IlNzaN}B)5 zFgMx$ao%yM`;#}fO>oZS&&6MZw1tYfi-NuuIkvqN6M34xRBd{Js@T+&WvXh^8AL^w zi!t&(WC9kgj7%cTxN8WY$ACb9;jJTxMyfAh+OXFcAjKfCq){D6!nGmQAIKJCE7if; z!4@9{G9hI=%uej3JVM8Fs18J#57UXg)Q9K + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/target/surefire-reports/com.example.TestGreeter.txt b/server/target/surefire-reports/com.example.TestGreeter.txt new file mode 100644 index 0000000000..a2d5543719 --- /dev/null +++ b/server/target/surefire-reports/com.example.TestGreeter.txt @@ -0,0 +1,4 @@ +------------------------------------------------------------------------------- +Test set: com.example.TestGreeter +------------------------------------------------------------------------------- +Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.089 sec diff --git a/server/target/test-classes/com/example/TestGreeter.class b/server/target/test-classes/com/example/TestGreeter.class new file mode 100644 index 0000000000000000000000000000000000000000..9286ecec906ed5de8172f306638f2ee65aff7ff1 GIT binary patch literal 1435 zcmZ{kX;afs6o%j1Es(~t35be7MeL$Pai_RI6|7UOBNfLl&Rp6{8zu{rh4F7WqtMYA ze}F&A@gxl-4E0Oyl6#)_Jtybp&)=WF0j!`VBZs_%>oO9^590zBhj7DREXlZuf{Y?c zGRn9m<2IIMsJJ8JE>excK!e*GPw=6>yU%7Fh3w5i%U17+qX{P2rV@MW? zI}E9+)fNmRb+<#JcEOo}JA-BI^FGNNvXJ%Mg|sINaxlT-CYRQMX;24iRNEhW3ro*8F*JK%;>7U7I_ElD93-Zi!9J z&wMnN(6TR~U<~6769WpWU<9KK=}(rew-r3VLkW)*JjN3Vs|qSulkil*Gd!2@LcuyV zBvci=#48D#3byc?VLHx@X_J#E!N%^sXt|^mB*U;&s7Eiu?2G5ODEp|?26tOsVLR%Z zk5u`$;ff*GvP_q2rqkyzlm^0mP?sAmo64$&(SF4vfpy0bHkp)pFllxL0k{43uM`J6rZzu=tx_vTbxrtpg@|X4oD}XqL@dyy&(Y6-(WR%} zqFIXO)PVGypp{A^qcL4N2Kz>n1TNAu6KrNNNpq!t08^Nz6~iS8P6WZLNCxke(k~=F zA0zn#sfgkKXFyU}Iv;VAkTVmiTn?C5PMHmg^5Z7P)AiDKq{>IglzWhR7>dw25(a^i zfti^AKh+Nl@kz?{DrU*viO{t`Xzo<#ODL3&2_0d$2bm=Op@(b_$^hM2(w(Eq&c}4~ Or@C_kb>~SvfrWooY)@hU literal 0 HcmV?d00001 diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index c833a72aec..f646b00ac9 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,3 +1,20 @@ -

Hello, Welcome to Simple DevOps Project !!

-

Deploying on a kubernetes using ansible for Valaxy Technologies

-

Glad to see you here

+<%@ include file="index.jsp" %> +
+ +

Login Form

+<% +String profile_msg=(String)request.getAttribute("profile_msg"); +if(profile_msg!=null){ +out.print(profile_msg); +} +String login_msg=(String)request.getAttribute("login_msg"); +if(login_msg!=null){ +out.print(login_msg); +} + %> +
+
+Email:

+Password:

+" +
diff --git a/webapp/target/maven-archiver/pom.properties b/webapp/target/maven-archiver/pom.properties new file mode 100644 index 0000000000..10920a5acf --- /dev/null +++ b/webapp/target/maven-archiver/pom.properties @@ -0,0 +1,5 @@ +#Generated by Maven +#Wed Jun 03 12:59:11 UTC 2020 +version=1.0-SNAPSHOT +groupId=com.example.maven-project +artifactId=webapp diff --git a/webapp/target/webapp.war b/webapp/target/webapp.war new file mode 100644 index 0000000000000000000000000000000000000000..11b03737fd2793fa7315ec7ac4dfb28feab58683 GIT binary patch literal 2528 zcmWIWW@h1H0D<)M!vSChl;8x?zOEsTx}JV+`TRsgZ*3~+9=KSU$gDb`lo)+nNojal9t?R_W{$xqm6fx}s zDiu5Dco`RamCV&zE7JApvp1069VF}>6nsFbkG1op|4+2fIw5wJ&aq3Er^)WRyscz= z+bi!v_(xpUdB<9NwJPnz=*2uy-<>!=fLX)KsK5>`SV>zxm(1 znct3FR*C%BKmBfYprdl;+KZmCIt6Qt=d7|0_AuXCX>7Oe|1B;b)0wMTM-MvIqBz(HB!GV3w`=nL3*{q^X@7R z5icdK`=-q|Pybtx{<-7x{X^3C*VUiDIdsLKGw6S|p0n6R zb6AvcFo1%uqvN(ND6uRCVo71LIPkMrGq=dzPrB+!sCTE&R^yO#ZRnYpkMgYcoYd_pa(ons>TT z&G0qL@gr0JGr}B-nE^oY49@_$iDjvI@I-;BSQArma(=E}YDHphK~Ab3Si5dPQGQlx zatR(|3`j8snD`P43gD(eg1YC+bh(|tlv>Kdz+g^>X$3%615@D~fFV_RPrlo1o(~oS-G52i!@!n$F!Ta4Cg2hN!E)gM3iN=vUQ?`2Sz{wf|FzCXCd<=#CzQGeE#xjUcDj6eEn*^yVm zQm>DHHfX#Uskg#JBBYPqtjyqSWWC1DjI1WxE4!S8maBJ5$f|B+?3sLCVUE8}N%&Na z+{@RbgP!beFTZ{F_woLozMCryBPz|K?lf5!Ij#66b1%y+y_Iox-<_Lt79F{-S9XY)xE$3pz+9TwYGd`6}GWhbm zn?-!RSl`56w&nKSVHqK+T8bC@UIf20@|EuNyWr%nGi%$Sr`T)$zF_8jBU;)p_B*Kilo&x#|2m~13I)Z3; zrbTGOUT=XEgTRtTbs!1XhE$6oOu(!)Ky?cQfGj==WFl%BgmXdlB}^TN2GunX0Mhju z$b{)a)I2cVkQ|L(_rUZoX_N%!bC_;uO@weT_L3K&IRaRf!OLNUHq4?8R1QLb0K@

+ + Webapp + + diff --git a/webapp/target/webapp/index.jsp b/webapp/target/webapp/index.jsp new file mode 100644 index 0000000000..c833a72aec --- /dev/null +++ b/webapp/target/webapp/index.jsp @@ -0,0 +1,3 @@ +

Hello, Welcome to Simple DevOps Project !!

+

Deploying on a kubernetes using ansible for Valaxy Technologies

+

Glad to see you here

From 1c0311e87155ea32a0cb58018d979c6fb1e13467 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Jun 2020 14:13:44 +0000 Subject: [PATCH 2/4] updated pom.xml --- pom.xml | 227 ++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 205 insertions(+), 22 deletions(-) diff --git a/pom.xml b/pom.xml index 67f7697b3e..711eabec9d 100644 --- a/pom.xml +++ b/pom.xml @@ -1,30 +1,213 @@ - - - 4.0.0 + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - com.valaxy.webapp - webapp-project - 2.0 - war + 4.0.0 - webapp-project Maven Webapp - - http://www.example.com + in.valaxy + maven-project + pom + 1.0-SNAPSHOT + Maven Project + Sample Maven project with a working, deployable site. + http://www.valaxy.in - UTF-8 - 1.7 - 1.7 + utf-8 + utf-8 - - - junit - junit - 4.11 - test - - + + server + webapp + + + + + site-server + Test Project Site + file:///tmp/maven-project-site + + + + + + + maven-compiler-plugin + + 1.6 + 1.6 + + + + + maven-release-plugin + + true + + + + + maven-site-plugin + + + + maven-checkstyle-plugin + + + + maven-jxr-plugin + + + + maven-javadoc-plugin + + + + maven-pmd-plugin + + + + maven-surefire-report-plugin + + + + org.codehaus.mojo + findbugs-maven-plugin + + + + org.codehaus.mojo + taglist-maven-plugin + + + + + + + + + + maven-checkstyle-plugin + 2.8 + + + + maven-compiler-plugin + 2.3.2 + + + + maven-javadoc-plugin + 2.8 + + + + maven-jxr-plugin + 2.3 + + + + maven-pmd-plugin + 2.6 + + + + maven-project-info-reports-plugin + 2.4 + + + + maven-release-plugin + 2.2.1 + + + + maven-resources-plugin + 2.5 + + + + maven-site-plugin + 3.0 + + + + maven-surefire-report-plugin + 2.11 + + + + maven-surefire-plugin + 2.11 + + + + org.codehaus.mojo + findbugs-maven-plugin + 2.3.3 + + + + org.codehaus.mojo + taglist-maven-plugin + 2.4 + + + + org.mortbay.jetty + jetty-maven-plugin + 8.0.0.M1 + + + + + + + + + javax.servlet + servlet-api + 2.5 + + + + javax.servlet.jsp + jsp-api + 2.2 + + + + junit + junit-dep + 4.10 + test + + + + org.hamcrest + hamcrest-core + 1.2.1 + test + + + + org.hamcrest + hamcrest-library + 1.2.1 + test + + + + org.mockito + mockito-core + 1.8.5 + test + + + + + + 3.0.3 + + From 4126f93b903f582017e6326f7386c16f9d2d3f38 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 3 Jun 2020 14:19:40 +0000 Subject: [PATCH 3/4] updated index.jsp --- webapp/src/main/webapp/index.jsp | 43 +++++++++++++++++--------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/webapp/src/main/webapp/index.jsp b/webapp/src/main/webapp/index.jsp index f646b00ac9..cbf21859f9 100644 --- a/webapp/src/main/webapp/index.jsp +++ b/webapp/src/main/webapp/index.jsp @@ -1,20 +1,23 @@ -<%@ include file="index.jsp" %> -
- -

Login Form

-<% -String profile_msg=(String)request.getAttribute("profile_msg"); -if(profile_msg!=null){ -out.print(profile_msg); -} -String login_msg=(String)request.getAttribute("login_msg"); -if(login_msg!=null){ -out.print(login_msg); -} - %> -
-
-Email:

-Password:

-" -
+
+
+ Avatar +
+ +
+ + + + + + + + +
+ +
+ + Forgot password? +
+
From 34711a935d5f255fe94bb1ac188ec9defdd6c9a7 Mon Sep 17 00:00:00 2001 From: lakshmi bhavani <47098074+lakshmiKrishnaa@users.noreply.github.com> Date: Thu, 17 Feb 2022 11:46:27 +0800 Subject: [PATCH 4/4] Delete Dockerfile --- Dockerfile | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index e0bc2f55fb..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,7 +0,0 @@ -# Pull base image -From tomcat:8-jre8 - -# Maintainer -MAINTAINER "valaxytech@gmail.com" -COPY ./webapp.war /usr/local/tomcat/webapps -RUN cp -R /usr/local/tomcat/webapps.dist/* /usr/local/tomcat/webapps