From b5e53f8bcdc02603d6a9898a775ff3a817c57399 Mon Sep 17 00:00:00 2001
From: Ivan Olexyn <ivan@olexyn.com>
Date: Fri, 24 Apr 2020 22:55:15 +0200
Subject: [PATCH] ~ make mirror be built by maven
---
mirror/build.xml | 40 --------
mirror/web.xml | 23 -----
mirror/web/hello.jsp | 23 -----
mirror/web/images/tomcat.gif | Bin 1441 -> 0 bytes
mirror/web/index.html | 25 -----
{mirror => misp-mirror}/README.md | 0
misp-mirror/install-locally.sh | 10 ++
misp-mirror/pom.xml | 90 ++++++++++++++++++
.../java/com/olexyn/misp}/mirror/Mirror.java | 2 +-
misp-mirror/src/main/webapp/WEB-INF/web.xml | 23 +++++
.../src/main/webapp/images/io42630.png | Bin 0 -> 617 bytes
misp-mirror/src/main/webapp/index.jsp | 20 ++++
12 files changed, 144 insertions(+), 112 deletions(-)
delete mode 100644 mirror/build.xml
delete mode 100644 mirror/web.xml
delete mode 100644 mirror/web/hello.jsp
delete mode 100644 mirror/web/images/tomcat.gif
delete mode 100644 mirror/web/index.html
rename {mirror => misp-mirror}/README.md (100%)
create mode 100755 misp-mirror/install-locally.sh
create mode 100644 misp-mirror/pom.xml
rename {mirror/src/com/olexyn => misp-mirror/src/main/java/com/olexyn/misp}/mirror/Mirror.java (98%)
create mode 100644 misp-mirror/src/main/webapp/WEB-INF/web.xml
create mode 100644 misp-mirror/src/main/webapp/images/io42630.png
create mode 100644 misp-mirror/src/main/webapp/index.jsp
diff --git a/mirror/build.xml b/mirror/build.xml
deleted file mode 100644
index 0b59974..0000000
--- a/mirror/build.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" ?>
-<project name="mirror" basedir="." default="war">
-
- <!-- DEFINE SOME VARS -->
- <property name="appname" value="mirror" />
-
-
-
- <path id="compile.classpath">
- <fileset dir="lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- INIT -->
- <target name="init">
- <mkdir dir="build/classes"/>
- </target>
-
- <!-- COMPILE -->
- <target name="compile" depends="init" >
- <javac destdir="build/classes" debug="true" srcdir="src">
- <classpath refid="compile.classpath"/>
- </javac>
- </target>
-
- <!-- WAR -->
- <target name="war" depends="compile">
- <war destfile="${appname}A.war" webxml="web.xml">
- <fileset dir="web"/>
- <lib dir="lib"/>
- <classes dir="build/classes"/>
- </war>
- </target>
-
- <target name="clean">
- <delete dir="build" />
- </target>
-
-</project>
\ No newline at end of file
diff --git a/mirror/web.xml b/mirror/web.xml
deleted file mode 100644
index a4e2df5..0000000
--- a/mirror/web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <display-name>Mirror</display-name>
- <description>
- This is a simple web application with a source code organization
- based on the recommendations of the Application Developer's Guide.
- </description>
-
- <servlet>
- <servlet-name>Mirror</servlet-name>
- <servlet-class>com.olexyn.mirror.Mirror</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Mirror</servlet-name>
- <url-pattern>/core</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/mirror/web/hello.jsp b/mirror/web/hello.jsp
deleted file mode 100644
index 9596088..0000000
--- a/mirror/web/hello.jsp
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-<title>Sample Application JSP Page</title>
-</head>
-<body bgcolor=white>
-
-<table border="0">
-<tr>
-<td align=center>
-<img src="images/tomcat.gif">
-</td>
-<td>
-<h1>Sample Application JSP Page</h1>
-This is the output of a JSP page that is part of the Hello, World
-application.
-</td>
-</tr>
-</table>
-
-<%= new String("Hello!") %>
-
-</body>
-</html>
diff --git a/mirror/web/images/tomcat.gif b/mirror/web/images/tomcat.gif
deleted file mode 100644
index 32f7d809fbf745e814598cae44329394515c4879..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1441
zcmV;S1z!3`Nk%w1VPpVD0J8u9?d|O+B_HU@b7@o+r;}NBZdk3Yt<uuc&a`KXi;ARz
zA5Kd`|J-%bq#OVM0RR90A^8LV00000EC2ui0Av71000F4@X1N5y*OX9j{e|tEJkRa
zsI)ji;-w&vI8FiIxOC8TQ05jxfVTh|O$HXPc6<N|ykVe8#moppp3Mj)t^n2W1d3QK
zx415k0DXz8D*<6iOW<b9fB^b?Q-=%!bSz*gJ9GsMb9R1B04xlOg9!iz2?+%Ynwy&i
z1qlXfJpz(wjX*mAkql;ouCJ~Hk#nY}I6Dig0<BS=1Z+zSzigRVG>NkgMYcdmxvLDB
z3k3wE&<w`1*9-^+1KP<`%sI~6=FoFA*5}uA;^Q~v?B^@b^XM$_p`e8!srTmQfCI=a
zAC&`^JY6y%BM*rXk5sWM5TN1$YXSlwAh-&FK_D{!c)<$h1_OX0>!9rlKuzGPY8;a-
zBi9R*frQ3fG0HGx<2Ev@GR53BXC{m%G)VNLfCm<(3@d!93@{LZo_h$0rKE)ez={AR
zgN!_u;fgt_k*ub?wkzoZv`}`Ys26raPFHm$%%BQT?K!Jd*G5{=2gTkKm85a{lvhHM
zq%hB6VYfiyxgkqU9BLfq5RU<ZBMCk00If<W?+iPTYimd~0b4zJswlg5rW&%PVo7>*
z2xlq)4&Xs{t#U;v$CFDj&NmWlD78X3I~6kLRd#bsr!75?4-CS74p59TK!KLf(JWu{
zs2v*S6ek^IHWKo4`3Crh2n(HYAT;)8-4<Q{3?CgKTowV`hu?w&C^M0I+e{OX8NZoS
zU=Ci<vA}{H;zxsj+p)ySVo_a|8e$j1Af79FbjYBC+q8w7ZC$(-5EDnGs2U9e++{$A
z2*BnJdNW*9Tn*=B<UoZy$#+8nSuCIcehm_V0EZM+)WdParL{r<q)=odG|VAbQDGr~
zhe9a9T#26o#<=<B0CZM44K)E-#8N=A9dn5bDNJVqQY;u#K!;Txx?qs7?SW)>N!?Qv
zNbi9l1PcSqNrRkkR)i&s4h%q4MFf=5oO?=aIRu&^c=rJw0k{aKqKI;+K%I56kbr3(
zT^9|EFF~oypO-Kx)_@a?poNQXGV3h=heLGfTx2gvE6D=$^|mAimqz*Qx6i`q0EiqZ
zX{>b0T!2TWRdNdMyA7Df-B5uH!I}}iQP5DR3&J@iyZ|@QpsyT3VN?@)6_TL?|JvGb
zsR2JbFnZ>Em8}t9itts#&O#Tl#4NP8&A=BMaR>)2aO~^~Du2x3z~t)k)w%Hy0Wb|N
zf17BMQk3jS7A-St-iA4YT*F$sb-+w3wCY?#(cjA3oB($E+yrXkHtlSK1V9}%g5$L?
z4jxm=8#ISec@1urM2z!T!(E(>UmR+KtH75H9xTQonZA6CVvE^3jNEGf8?Dt{4bgYM
zB8}xx0fgr)FOFfvw|E2Nu^`I-E1+OfSsnpQ6FIyCXB@^}X!r0#Q?Ha1Tqt*iKKj-*
zbZu`Hd;Pnc4;4Jdc?Pd1&`RjkM63YE4c>dh0Ym&NF1B{PqBjP@eV!ELIakRle2Onf
z!}iJE#RJVc2-}0!;N}Fr2?j5C`v(gnatq2yDd;Sm3ncK%`!KwXpTQ?+TmTTKffX(5
zeh_;T4ald1=DBZMCtzJt5W<feB!&p+6WW<l(7w4*?gY$(h1hOkK9)qzJYb0+3;IO}
z3pQ>E%0q#&l0rBXp38ywnN(Lc7mOyr?ig~*8{&%esThK=OkAph3=niSAp+oHso<EJ
z;6Weyv4mM{qYav%pt4F%QPGEH2tdmQ;0aA6<p)WKRfoLz#U{+~iq0xS9Ukx%T+xY*
vZ3H6?jpn;otS^t`2;<pMc#}dJ@+J%fBoexiAUo2D28xU%{az7(2mk;(wBv5g
diff --git a/mirror/web/index.html b/mirror/web/index.html
deleted file mode 100644
index d82bd2a..0000000
--- a/mirror/web/index.html
+++ /dev/null
@@ -1,25 +0,0 @@
-<html>
-<head>
-<title>Mirror</title>
-</head>
-<body bgcolor=white>
-
-<table border="0">
-<tr>
-<td>
-<img src="images/tomcat.gif">
-</td>
-<td>
-<h1>Mirror</h1>
-</td>
-</tr>
-</table>
-
-<ul>
-<p>This Servlet currently provides the following features:
-<!--<li>To a <a href="hello.jsp">JSP page</a>.-->
-<li><a href="core">Mirror</a> of all requests.
-</ul>
-
-</body>
-</html>
diff --git a/mirror/README.md b/misp-mirror/README.md
similarity index 100%
rename from mirror/README.md
rename to misp-mirror/README.md
diff --git a/misp-mirror/install-locally.sh b/misp-mirror/install-locally.sh
new file mode 100755
index 0000000..e72296e
--- /dev/null
+++ b/misp-mirror/install-locally.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+version="0.1"
+file="target/misp-mirror-${version}.war"
+groupId="com.olexyn.misp.mirror"
+artifactId="misp-mirror"
+
+
+
+mvn package
+mvn install:install-file -Dfile=${file} -DgroupId=${groupId} -DartifactId=${artifactId} -Dversion=${version} -Dpackaging=war -DgeneratePom=true
diff --git a/misp-mirror/pom.xml b/misp-mirror/pom.xml
new file mode 100644
index 0000000..fcc6d6d
--- /dev/null
+++ b/misp-mirror/pom.xml
@@ -0,0 +1,90 @@
+<?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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>com.olexyn.misp.mirror</groupId>
+ <artifactId>misp-mirror</artifactId>
+ <version>0.1</version>
+ <packaging>war</packaging>
+
+ <name>misp-mirror Maven Webapp</name>
+ <!-- FIXME change it to the project's website -->
+ <url>http://www.example.com</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <maven.compiler.source>1.7</maven.compiler.source>
+ <maven.compiler.target>1.7</maven.compiler.target>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.11</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.olexyn.misp.helper</groupId>
+ <artifactId>misp-helper</artifactId>
+ <version>0.1</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>2.6</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty.orbit</groupId>
+ <artifactId>javax.servlet</artifactId>
+ <version>3.0.0.v201112011016</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.json</groupId>
+ <artifactId>json</artifactId>
+ <version>20190722</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
+ <plugins>
+ <plugin>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>3.1.0</version>
+ </plugin>
+ <!-- see http://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_war_packaging -->
+ <plugin>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>3.0.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.0</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.1</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>3.2.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.5.2</version>
+ </plugin>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>2.8.2</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+</project>
diff --git a/mirror/src/com/olexyn/mirror/Mirror.java b/misp-mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java
similarity index 98%
rename from mirror/src/com/olexyn/mirror/Mirror.java
rename to misp-mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java
index df7fa25..a5ce338 100644
--- a/mirror/src/com/olexyn/mirror/Mirror.java
+++ b/misp-mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java
@@ -1,4 +1,4 @@
-package com.olexyn.mirror;
+package com.olexyn.misp.mirror;
import com.olexyn.misp.helper.Ride;
import com.olexyn.misp.helper.WebPrint;
diff --git a/misp-mirror/src/main/webapp/WEB-INF/web.xml b/misp-mirror/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..7177bd2
--- /dev/null
+++ b/misp-mirror/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,23 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+
+<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <display-name>misp-mirror</display-name>
+
+ <servlet>
+ <servlet-name>misp-mirror</servlet-name>
+ <servlet-class>com.olexyn.misp.mirror.Mirror</servlet-class>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>misp-mirror</servlet-name>
+ <url-pattern>/core</url-pattern>
+ </servlet-mapping>
+
+</web-app>
diff --git a/misp-mirror/src/main/webapp/images/io42630.png b/misp-mirror/src/main/webapp/images/io42630.png
new file mode 100644
index 0000000000000000000000000000000000000000..01d99bf52efa311d32a32001004ab18602c9cd05
GIT binary patch
literal 617
zcmeAS@N?(olHy`uVBq!ia0vp^CqS5k2}mkgS)OEIU^4J@aSW-L^X5t**C7W1R!8@u
z|JwcL0wS|EM17r~$b7ciPC-FO=#Y{kRf+3&`G3gnuKq4;XJ&jcwcFJxLZxNk3D!A>
zlO_s?aV8Q??AUdA_ifq!GiR>f|9AWUzVwYA9NjG&1{2Xx96_y^TMtY%|Nq+_=9;)I
SZ)q`*!{F)a=d#Wzp$PyZXv%5;
literal 0
HcmV?d00001
diff --git a/misp-mirror/src/main/webapp/index.jsp b/misp-mirror/src/main/webapp/index.jsp
new file mode 100644
index 0000000..11324db
--- /dev/null
+++ b/misp-mirror/src/main/webapp/index.jsp
@@ -0,0 +1,20 @@
+<html>
+<head>
+<title>misp-mirror</title>
+</head>
+<body bgcolor=white>
+
+<table border="0">
+<tr>
+<td align=center>
+<img src="images/io42630.png">
+</td>
+</tr>
+<tr>
+<td>
+<h1>misp-mirror</h1>
+</td>
+</tr>
+</table>
+</body>
+</html>