diff --git a/mirror/Dockerfile b/mirror/Dockerfile index 45a358d..d56189a 100644 --- a/mirror/Dockerfile +++ b/mirror/Dockerfile @@ -1,4 +1,4 @@ FROM eclipse-temurin:17-alpine -COPY /target/mirror-0.1.war /usr/local/lib/mirror-0.1.war -EXPOSE 8090 -ENTRYPOINT ["java","-jar","/usr/local/lib/mirror-0.1.war"] +COPY /target/mirror-0.1.jar /usr/local/lib/mirror-0.1.jar +EXPOSE 8080 +ENTRYPOINT ["java","-jar","/usr/local/lib/mirror-0.1.jar"] diff --git a/mirror/build.sh b/mirror/build.sh old mode 100644 new mode 100755 diff --git a/mirror/pom.xml b/mirror/pom.xml index 567add5..0e1faac 100644 --- a/mirror/pom.xml +++ b/mirror/pom.xml @@ -4,12 +4,12 @@ com.olexyn zeeroot - 17.0.1 + spring-boot-jdk17-0.1 com.olexyn.misp mirror 0.1 - war + jar mirror @@ -33,16 +33,28 @@ commons-io commons-io - - org.eclipse.jetty.orbit - javax.servlet - 3.0.0.v201112011016 - compile - org.json json + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-autoconfigure + + + org.springframework.boot + spring-boot-starter-tomcat + provided + + + + org.aspectj + aspectjweaver + diff --git a/mirror/src/main/java/com/olexyn/misp/mirror/App.java b/mirror/src/main/java/com/olexyn/misp/mirror/App.java new file mode 100644 index 0000000..05733fd --- /dev/null +++ b/mirror/src/main/java/com/olexyn/misp/mirror/App.java @@ -0,0 +1,13 @@ +package com.olexyn.misp.mirror; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.EnableAspectJAutoProxy; + +@SpringBootApplication +@EnableAspectJAutoProxy(proxyTargetClass = true) +public class App { + public static void main(String... args) { + SpringApplication.run(App.class, args); + } +} diff --git a/mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java b/mirror/src/main/java/com/olexyn/misp/mirror/web/Mirror.java similarity index 85% rename from mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java rename to mirror/src/main/java/com/olexyn/misp/mirror/web/Mirror.java index db943cd..e9ec4d6 100644 --- a/mirror/src/main/java/com/olexyn/misp/mirror/Mirror.java +++ b/mirror/src/main/java/com/olexyn/misp/mirror/web/Mirror.java @@ -1,9 +1,11 @@ -package com.olexyn.misp.mirror; +package com.olexyn.misp.mirror.web; import com.olexyn.misp.helper.WebPrint; import org.json.JSONObject; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -11,7 +13,8 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -public class Mirror extends HttpServlet { +@RestController +public class Mirror { private final List list = new ArrayList<>(); @@ -32,7 +35,7 @@ public class Mirror extends HttpServlet { } - @Override + @GetMapping("/") public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException { addRequest(request); @@ -53,13 +56,9 @@ public class Mirror extends HttpServlet { } - @Override + @PostMapping("/") public void doPost(HttpServletRequest request, HttpServletResponse response) { addRequest(request); } - - @Override - public void doPut(HttpServletRequest request, HttpServletResponse response) { addRequest(request); } - } diff --git a/mirror/src/main/resources/appication.properties b/mirror/src/main/resources/appication.properties new file mode 100644 index 0000000..e69de29 diff --git a/mirror/src/main/webapp/WEB-INF/web.xml b/mirror/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index eeae59d..0000000 --- a/mirror/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - misp-mirror - - - misp-mirror - com.olexyn.misp.mirror.Mirror - - - - misp-mirror - /mirror - - - diff --git a/mirror/src/main/webapp/images/io42630.png b/mirror/src/main/webapp/images/io42630.png deleted file mode 100644 index 01d99bf..0000000 Binary files a/mirror/src/main/webapp/images/io42630.png and /dev/null differ diff --git a/mirror/src/main/webapp/index.jsp b/mirror/src/main/webapp/index.jsp deleted file mode 100644 index 11324db..0000000 --- a/mirror/src/main/webapp/index.jsp +++ /dev/null @@ -1,20 +0,0 @@ - - -misp-mirror - - - - - - - - - - -
- -
-

misp-mirror

-
- -