From 9d4a0b1f516dbe591c1d62c7f404826c72ef7a4c Mon Sep 17 00:00:00 2001
From: kwoyke <krzysztofwoyke@gmail.com>
Date: Tue, 2 Jun 2020 21:15:49 +0200
Subject: [PATCH] BAEL-4100: Move HTTP/2 in Jetty to the new libraries-server-2
 module (#9394)

---
 libraries-server-2/.gitignore                 |   9 ++
 libraries-server-2/README.md                  |   8 ++
 libraries-server-2/pom.xml                    |  77 ++++++++++++++++++
 .../src/main/config/jetty.xml                 |   0
 .../jetty/http2/Http2JettyServlet.java        |   0
 .../src/main/resources/keystore.jks           | Bin
 .../src/main/resources/logback.xml            |  13 +++
 .../src/main/resources/truststore.jks         | Bin
 .../src/main/webapp/WEB-INF/web.xml           |   0
 .../src/main/webapp/http2.html                |   0
 .../images/homepage-latest_articles.jpg       | Bin
 .../images/homepage-rest_with_spring.jpg      | Bin
 .../webapp/images/homepage-weekly_reviews.jpg | Bin
 .../src/main/webapp/index.html                |   0
 libraries-server/README.md                    |   2 +-
 libraries-server/pom.xml                      |  40 ---------
 pom.xml                                       |   2 +
 17 files changed, 110 insertions(+), 41 deletions(-)
 create mode 100644 libraries-server-2/.gitignore
 create mode 100644 libraries-server-2/README.md
 create mode 100644 libraries-server-2/pom.xml
 rename {libraries-server => libraries-server-2}/src/main/config/jetty.xml (100%)
 rename {libraries-server => libraries-server-2}/src/main/java/com/baeldung/jetty/http2/Http2JettyServlet.java (100%)
 rename {libraries-server => libraries-server-2}/src/main/resources/keystore.jks (100%)
 create mode 100644 libraries-server-2/src/main/resources/logback.xml
 rename {libraries-server => libraries-server-2}/src/main/resources/truststore.jks (100%)
 rename {libraries-server => libraries-server-2}/src/main/webapp/WEB-INF/web.xml (100%)
 rename {libraries-server => libraries-server-2}/src/main/webapp/http2.html (100%)
 rename {libraries-server => libraries-server-2}/src/main/webapp/images/homepage-latest_articles.jpg (100%)
 rename {libraries-server => libraries-server-2}/src/main/webapp/images/homepage-rest_with_spring.jpg (100%)
 rename {libraries-server => libraries-server-2}/src/main/webapp/images/homepage-weekly_reviews.jpg (100%)
 rename {libraries-server => libraries-server-2}/src/main/webapp/index.html (100%)

diff --git a/libraries-server-2/.gitignore b/libraries-server-2/.gitignore
new file mode 100644
index 0000000000..e594daf27a
--- /dev/null
+++ b/libraries-server-2/.gitignore
@@ -0,0 +1,9 @@
+*.class
+
+# Folders #
+/gensrc
+/target
+
+# Packaged files #
+*.jar
+/bin/
diff --git a/libraries-server-2/README.md b/libraries-server-2/README.md
new file mode 100644
index 0000000000..38166bcd77
--- /dev/null
+++ b/libraries-server-2/README.md
@@ -0,0 +1,8 @@
+## Server
+
+This module contains articles about server libraries.
+
+### Relevant Articles:
+
+- [HTTP/2 in Jetty](https://www.baeldung.com/jetty-http-2)
+- More articles: [[<-- prev]](../libraries-server)
diff --git a/libraries-server-2/pom.xml b/libraries-server-2/pom.xml
new file mode 100644
index 0000000000..5f500a7ced
--- /dev/null
+++ b/libraries-server-2/pom.xml
@@ -0,0 +1,77 @@
+<?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>
+    <artifactId>libraries-server-2</artifactId>
+    <version>0.0.1-SNAPSHOT</version>
+    <name>libraries-server-2</name>
+    <packaging>war</packaging>
+
+    <parent>
+        <groupId>com.baeldung</groupId>
+        <artifactId>parent-modules</artifactId>
+        <version>1.0.0-SNAPSHOT</version>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-server</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-servlet</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.jetty</groupId>
+            <artifactId>jetty-webapp</artifactId>
+            <version>${jetty.version}</version>
+        </dependency>
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.eclipse.jetty</groupId>
+                <artifactId>jetty-maven-plugin</artifactId>
+                <version>${jetty.version}</version>
+                <configuration>
+                    <stopPort>8888</stopPort>
+                    <stopKey>quit</stopKey>
+                    <jvmArgs>
+                        -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar
+                    </jvmArgs>
+                    <jettyXml>${basedir}/src/main/config/jetty.xml</jettyXml>
+                    <webApp>
+                        <contextPath>/</contextPath>
+                    </webApp>
+                </configuration>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.eclipse.jetty.http2</groupId>
+                        <artifactId>http2-server</artifactId>
+                        <version>${jetty.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-alpn-openjdk8-server</artifactId>
+                        <version>${jetty.version}</version>
+                    </dependency>
+                    <dependency>
+                        <groupId>org.eclipse.jetty</groupId>
+                        <artifactId>jetty-servlets</artifactId>
+                        <version>${jetty.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
+        </plugins>
+    </build>
+
+    <properties>
+        <jetty.version>9.4.27.v20200227</jetty.version>
+        <alpn.version>8.1.11.v20170118</alpn.version>
+    </properties>
+
+</project>
\ No newline at end of file
diff --git a/libraries-server/src/main/config/jetty.xml b/libraries-server-2/src/main/config/jetty.xml
similarity index 100%
rename from libraries-server/src/main/config/jetty.xml
rename to libraries-server-2/src/main/config/jetty.xml
diff --git a/libraries-server/src/main/java/com/baeldung/jetty/http2/Http2JettyServlet.java b/libraries-server-2/src/main/java/com/baeldung/jetty/http2/Http2JettyServlet.java
similarity index 100%
rename from libraries-server/src/main/java/com/baeldung/jetty/http2/Http2JettyServlet.java
rename to libraries-server-2/src/main/java/com/baeldung/jetty/http2/Http2JettyServlet.java
diff --git a/libraries-server/src/main/resources/keystore.jks b/libraries-server-2/src/main/resources/keystore.jks
similarity index 100%
rename from libraries-server/src/main/resources/keystore.jks
rename to libraries-server-2/src/main/resources/keystore.jks
diff --git a/libraries-server-2/src/main/resources/logback.xml b/libraries-server-2/src/main/resources/logback.xml
new file mode 100644
index 0000000000..7d900d8ea8
--- /dev/null
+++ b/libraries-server-2/src/main/resources/logback.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </pattern>
+        </encoder>
+    </appender>
+
+    <root level="INFO">
+        <appender-ref ref="STDOUT" />
+    </root>
+</configuration>
\ No newline at end of file
diff --git a/libraries-server/src/main/resources/truststore.jks b/libraries-server-2/src/main/resources/truststore.jks
similarity index 100%
rename from libraries-server/src/main/resources/truststore.jks
rename to libraries-server-2/src/main/resources/truststore.jks
diff --git a/libraries-server/src/main/webapp/WEB-INF/web.xml b/libraries-server-2/src/main/webapp/WEB-INF/web.xml
similarity index 100%
rename from libraries-server/src/main/webapp/WEB-INF/web.xml
rename to libraries-server-2/src/main/webapp/WEB-INF/web.xml
diff --git a/libraries-server/src/main/webapp/http2.html b/libraries-server-2/src/main/webapp/http2.html
similarity index 100%
rename from libraries-server/src/main/webapp/http2.html
rename to libraries-server-2/src/main/webapp/http2.html
diff --git a/libraries-server/src/main/webapp/images/homepage-latest_articles.jpg b/libraries-server-2/src/main/webapp/images/homepage-latest_articles.jpg
similarity index 100%
rename from libraries-server/src/main/webapp/images/homepage-latest_articles.jpg
rename to libraries-server-2/src/main/webapp/images/homepage-latest_articles.jpg
diff --git a/libraries-server/src/main/webapp/images/homepage-rest_with_spring.jpg b/libraries-server-2/src/main/webapp/images/homepage-rest_with_spring.jpg
similarity index 100%
rename from libraries-server/src/main/webapp/images/homepage-rest_with_spring.jpg
rename to libraries-server-2/src/main/webapp/images/homepage-rest_with_spring.jpg
diff --git a/libraries-server/src/main/webapp/images/homepage-weekly_reviews.jpg b/libraries-server-2/src/main/webapp/images/homepage-weekly_reviews.jpg
similarity index 100%
rename from libraries-server/src/main/webapp/images/homepage-weekly_reviews.jpg
rename to libraries-server-2/src/main/webapp/images/homepage-weekly_reviews.jpg
diff --git a/libraries-server/src/main/webapp/index.html b/libraries-server-2/src/main/webapp/index.html
similarity index 100%
rename from libraries-server/src/main/webapp/index.html
rename to libraries-server-2/src/main/webapp/index.html
diff --git a/libraries-server/README.md b/libraries-server/README.md
index 7e41f33a0c..570806611f 100644
--- a/libraries-server/README.md
+++ b/libraries-server/README.md
@@ -13,4 +13,4 @@ This module contains articles about server libraries.
 - [MQTT Client in Java](https://www.baeldung.com/java-mqtt-client)
 - [Guide to XMPP Smack Client](https://www.baeldung.com/xmpp-smack-chat-client)
 - [A Guide to NanoHTTPD](https://www.baeldung.com/nanohttpd)
-- [HTTP/2 in Jetty](https://www.baeldung.com/jetty-http-2)
+- More articles: [[more -->]](../libraries-server-2)
\ No newline at end of file
diff --git a/libraries-server/pom.xml b/libraries-server/pom.xml
index eb9cb61e56..d9546f1678 100644
--- a/libraries-server/pom.xml
+++ b/libraries-server/pom.xml
@@ -5,7 +5,6 @@
     <artifactId>libraries-server</artifactId>
     <version>0.0.1-SNAPSHOT</version>
     <name>libraries-server</name>
-    <packaging>war</packaging>
 
     <parent>
         <groupId>com.baeldung</groupId>
@@ -107,50 +106,11 @@
 
     </dependencies>
     
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.eclipse.jetty</groupId>
-                <artifactId>jetty-maven-plugin</artifactId>
-                <version>${jetty.version}</version>
-                <configuration>
-                    <stopPort>8888</stopPort>
-                    <stopKey>quit</stopKey>
-                    <jvmArgs>
-                        -Xbootclasspath/p:${settings.localRepository}/org/mortbay/jetty/alpn/alpn-boot/${alpn.version}/alpn-boot-${alpn.version}.jar
-                    </jvmArgs>
-                    <jettyXml>${basedir}/src/main/config/jetty.xml</jettyXml>
-                    <webApp>
-                        <contextPath>/</contextPath>
-                    </webApp>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.eclipse.jetty.http2</groupId>
-                        <artifactId>http2-server</artifactId>
-                        <version>${jetty.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.eclipse.jetty</groupId>
-                        <artifactId>jetty-alpn-openjdk8-server</artifactId>
-                        <version>${jetty.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.eclipse.jetty</groupId>
-                        <artifactId>jetty-servlets</artifactId>
-                        <version>${jetty.version}</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
-        </plugins>
-    </build>
-
     <properties>
         <assertj.version>3.6.2</assertj.version>
         <httpclient.version>4.5.3</httpclient.version>
         <jetty.version>9.4.27.v20200227</jetty.version>
         <netty.version>4.1.20.Final</netty.version>
-        <alpn.version>8.1.11.v20170118</alpn.version>
         <tomcat.version>8.5.24</tomcat.version>
         <smack.version>4.3.1</smack.version>
         <eclipse.paho.client.mqttv3.version>1.2.0</eclipse.paho.client.mqttv3.version>
diff --git a/pom.xml b/pom.xml
index 2efea40c91..f797f1bbce 100644
--- a/pom.xml
+++ b/pom.xml
@@ -513,6 +513,7 @@
                 <module>libraries-rpc</module>
                 <module>libraries-security</module>
                 <module>libraries-server</module>
+                <module>libraries-server-2</module>
                 <module>libraries-testing</module>
                 <module>linkrest</module>
                 <module>logging-modules</module>
@@ -1032,6 +1033,7 @@
                 <module>libraries-primitive</module>
                 <module>libraries-security</module>
                 <module>libraries-server</module>
+                <module>libraries-server-2</module>
                 <module>libraries-testing</module>
                 <module>linkrest</module>
                 <module>logging-modules</module>