From 5dfa2b85bc54bc7d52a8375369f84d3ca751d2a4 Mon Sep 17 00:00:00 2001
From: moparisthebest <admin@moparisthebest.com>
Date: Tue, 12 Mar 2019 22:15:04 -0400
Subject: [PATCH] Re-factor into a multi-module maven project

---
 .gitignore                                    |  6 ++-
 jDnsProxy/pom.xml                             | 45 +++++++++++++++++++
 .../java/com/moparisthebest/dns/DnsProxy.java |  0
 .../java/com/moparisthebest/dns/Util.java     |  0
 .../dns/dto/AbstractBufferWindow.java         |  0
 .../moparisthebest/dns/dto/BufferWindow.java  |  0
 .../java/com/moparisthebest/dns/dto/Name.java |  0
 .../java/com/moparisthebest/dns/dto/Opt.java  |  0
 .../com/moparisthebest/dns/dto/OptData.java   |  0
 .../com/moparisthebest/dns/dto/Packet.java    |  0
 .../com/moparisthebest/dns/dto/Question.java  |  0
 .../dns/dto/ResourceRecord.java               |  0
 .../moparisthebest/dns/listen/Listener.java   |  0
 .../moparisthebest/dns/listen/TcpAsync.java   |  0
 .../moparisthebest/dns/listen/UdpSync.java    |  0
 .../com/moparisthebest/dns/net/BufChan.java   |  0
 .../dns/net/FullBufChanCompletionHandler.java |  0
 .../dns/net/FullReadCompletionHandler.java    |  0
 .../dns/net/FullWriteCompletionHandler.java   |  0
 .../dns/net/FunctionalCompletionHandler.java  |  0
 .../com/moparisthebest/dns/net/ParsedUrl.java |  0
 .../dns/net/UdpRequestResponse.java           |  0
 .../AbstractQueueProcessingResolver.java      |  0
 .../dns/resolve/BaseRequestResponse.java      |  0
 .../dns/resolve/CacheResolver.java            |  0
 .../dns/resolve/HttpResolver.java             |  0
 .../dns/resolve/QueueProcessingResolver.java  |  0
 .../dns/resolve/RequestResponse.java          |  0
 .../moparisthebest/dns/resolve/Resolver.java  |  0
 .../dns/resolve/SocketResolver.java           |  0
 pom.xml                                       | 22 +++------
 31 files changed, 56 insertions(+), 17 deletions(-)
 create mode 100644 jDnsProxy/pom.xml
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/DnsProxy.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/Util.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/AbstractBufferWindow.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/BufferWindow.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/Name.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/Opt.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/OptData.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/Packet.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/Question.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/dto/ResourceRecord.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/listen/Listener.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/listen/TcpAsync.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/listen/UdpSync.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/net/BufChan.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/net/FullBufChanCompletionHandler.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/net/FullReadCompletionHandler.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/net/FullWriteCompletionHandler.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/net/FunctionalCompletionHandler.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/net/ParsedUrl.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/net/UdpRequestResponse.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/AbstractQueueProcessingResolver.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/BaseRequestResponse.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/CacheResolver.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/HttpResolver.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/QueueProcessingResolver.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/RequestResponse.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/Resolver.java (100%)
 rename {src => jDnsProxy/src}/main/java/com/moparisthebest/dns/resolve/SocketResolver.java (100%)

diff --git a/.gitignore b/.gitignore
index 765aad8..1f82548 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,8 @@
 .idea/
 *.iml
 */target/
-target/
+target/
+
+dnscache.map
+jdnsproxy.custom*.properties
+*.diff
diff --git a/jDnsProxy/pom.xml b/jDnsProxy/pom.xml
new file mode 100644
index 0000000..e776915
--- /dev/null
+++ b/jDnsProxy/pom.xml
@@ -0,0 +1,45 @@
+<?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">
+    <parent>
+        <groupId>com.moparisthebest.dns</groupId>
+        <artifactId>jDnsProxy-parent</artifactId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>com.moparisthebest.dns</groupId>
+    <artifactId>jDnsProxy</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>${project.artifactId}</name>
+    <dependencies>
+        <dependency>
+            <groupId>eu.geekplace.javapinning</groupId>
+            <artifactId>java-pinning-java7</artifactId>
+            <version>1.1.0</version>
+        </dependency>
+    </dependencies>
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <artifactId>maven-shade-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <configuration>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <mainClass>com.moparisthebest.dns.DnsProxy</mainClass>
+                                </transformer>
+                            </transformers>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/src/main/java/com/moparisthebest/dns/DnsProxy.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/DnsProxy.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/DnsProxy.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/DnsProxy.java
diff --git a/src/main/java/com/moparisthebest/dns/Util.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/Util.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/Util.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/Util.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/AbstractBufferWindow.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/AbstractBufferWindow.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/AbstractBufferWindow.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/AbstractBufferWindow.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/BufferWindow.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/BufferWindow.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/BufferWindow.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/BufferWindow.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/Name.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Name.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/Name.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Name.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/Opt.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Opt.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/Opt.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Opt.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/OptData.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/OptData.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/OptData.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/OptData.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/Packet.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Packet.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/Packet.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Packet.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/Question.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Question.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/Question.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/Question.java
diff --git a/src/main/java/com/moparisthebest/dns/dto/ResourceRecord.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/dto/ResourceRecord.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/dto/ResourceRecord.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/dto/ResourceRecord.java
diff --git a/src/main/java/com/moparisthebest/dns/listen/Listener.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/listen/Listener.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/listen/Listener.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/listen/Listener.java
diff --git a/src/main/java/com/moparisthebest/dns/listen/TcpAsync.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/listen/TcpAsync.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/listen/TcpAsync.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/listen/TcpAsync.java
diff --git a/src/main/java/com/moparisthebest/dns/listen/UdpSync.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/listen/UdpSync.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/listen/UdpSync.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/listen/UdpSync.java
diff --git a/src/main/java/com/moparisthebest/dns/net/BufChan.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/net/BufChan.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/net/BufChan.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/net/BufChan.java
diff --git a/src/main/java/com/moparisthebest/dns/net/FullBufChanCompletionHandler.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/net/FullBufChanCompletionHandler.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/net/FullBufChanCompletionHandler.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/net/FullBufChanCompletionHandler.java
diff --git a/src/main/java/com/moparisthebest/dns/net/FullReadCompletionHandler.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/net/FullReadCompletionHandler.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/net/FullReadCompletionHandler.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/net/FullReadCompletionHandler.java
diff --git a/src/main/java/com/moparisthebest/dns/net/FullWriteCompletionHandler.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/net/FullWriteCompletionHandler.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/net/FullWriteCompletionHandler.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/net/FullWriteCompletionHandler.java
diff --git a/src/main/java/com/moparisthebest/dns/net/FunctionalCompletionHandler.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/net/FunctionalCompletionHandler.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/net/FunctionalCompletionHandler.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/net/FunctionalCompletionHandler.java
diff --git a/src/main/java/com/moparisthebest/dns/net/ParsedUrl.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/net/ParsedUrl.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/net/ParsedUrl.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/net/ParsedUrl.java
diff --git a/src/main/java/com/moparisthebest/dns/net/UdpRequestResponse.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/net/UdpRequestResponse.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/net/UdpRequestResponse.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/net/UdpRequestResponse.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/AbstractQueueProcessingResolver.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/AbstractQueueProcessingResolver.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/AbstractQueueProcessingResolver.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/AbstractQueueProcessingResolver.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/BaseRequestResponse.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/BaseRequestResponse.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/BaseRequestResponse.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/BaseRequestResponse.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/CacheResolver.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/CacheResolver.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/CacheResolver.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/CacheResolver.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/HttpResolver.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/HttpResolver.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/HttpResolver.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/HttpResolver.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/QueueProcessingResolver.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/QueueProcessingResolver.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/QueueProcessingResolver.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/QueueProcessingResolver.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/RequestResponse.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/RequestResponse.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/RequestResponse.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/RequestResponse.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/Resolver.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/Resolver.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/Resolver.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/Resolver.java
diff --git a/src/main/java/com/moparisthebest/dns/resolve/SocketResolver.java b/jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/SocketResolver.java
similarity index 100%
rename from src/main/java/com/moparisthebest/dns/resolve/SocketResolver.java
rename to jDnsProxy/src/main/java/com/moparisthebest/dns/resolve/SocketResolver.java
diff --git a/pom.xml b/pom.xml
index af86618..eee3c5a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,8 +7,8 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.moparisthebest.dns</groupId>
-    <artifactId>jDnsProxy</artifactId>
-    <packaging>jar</packaging>
+    <artifactId>jDnsProxy-parent</artifactId>
+    <packaging>pom</packaging>
     <version>1.0-SNAPSHOT</version>
     <name>${project.artifactId}</name>
     <description>
@@ -44,13 +44,9 @@
         <pushChanges>false</pushChanges>
         <localCheckout>true</localCheckout>
     </properties>
-    <dependencies>
-        <dependency>
-            <groupId>eu.geekplace.javapinning</groupId>
-            <artifactId>java-pinning-java7</artifactId>
-            <version>1.1.0</version>
-        </dependency>
-    </dependencies>
+    <modules>
+        <module>jDnsProxy</module>
+    </modules>
     <build>
         <finalName>${project.artifactId}</finalName>
         <plugins>
@@ -96,12 +92,6 @@
                                     </excludes>
                                 </filter>
                             </filters>
-                            <transformers>
-                                <transformer
-                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-                                    <mainClass>com.moparisthebest.dns.DnsProxy</mainClass>
-                                </transformer>
-                            </transformers>
                         </configuration>
                     </execution>
                 </executions>
@@ -131,4 +121,4 @@
             </activation>
         </profile>
     </profiles>
-</project>
\ No newline at end of file
+</project>