Release version 3.0.1

Fixes #20: Replace Log4j with Log4j2 - Update Maven dependencies - Migrate log4j.properties to log4j2.xml Fixes #21: Correct default configuration file processing - Use qualified 'file:' URL for finding resource Additional updates: - Reorder config schema elements - v4 before v6 - Add Logging section to user guide - Update release notes
jagornet · Sep 29, 2020 · 844b2a3 · 844b2a3
1 parent 8f60332
commit 844b2a3
Show file tree

Hide file tree

Showing 30 changed files with 751 additions and 752 deletions.
diff --git a/Jagornet-DHCP/dhcp-client/pom.xml b/Jagornet-DHCP/dhcp-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.jagornet</groupId>
     <artifactId>jagornet-dhcp-all</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
   </parent>
 
   <artifactId>jagornet-dhcp-client</artifactId>
@@ -13,12 +13,12 @@
   	<dependency>
   		<groupId>com.jagornet</groupId>
   		<artifactId>jagornet-dhcp-core</artifactId>
-  		<version>3.0.0</version>
+  		<version>3.0.1</version>
   	</dependency>
   	<dependency>
   		<groupId>com.jagornet</groupId>
   		<artifactId>jagornet-dhcp-server</artifactId>
-  		<version>3.0.0</version>
+  		<version>3.0.1</version>
   	</dependency>
 	<dependency>
 	    <groupId>commons-cli</groupId>

diff --git a/Jagornet-DHCP/dhcp-client/src/main/resources/log4j2-testclient.xml b/Jagornet-DHCP/dhcp-client/src/main/resources/log4j2-testclient.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Configuration status is for Log4j2 internal status logging -->
+<Configuration status="WARN">
+  <Appenders>
+    <Console name="Console" target="SYSTEM_OUT">
+      <PatternLayout pattern="%d{ABSOLUTE} (%x)[%t] %-5p %c{1} - %m%n"/>
+    </Console>
+    <RollingFile name="Logfile" 
+    			 fileName="log/testclient.log"
+    			 filePattern="log/testclient-%i.log">
+      <PatternLayout>
+        <Pattern>%d [%t] %-5p %c{2} - %m%n</Pattern>
+      </PatternLayout>
+      <DefaultRolloverStrategy max="10"/>
+      <Policies>
+      	<SizeBasedTriggeringPolicy size="10 MB"/>
+      </Policies>
+    </RollingFile>
+  </Appenders>
+  <Loggers>
+    <Root level="INFO">
+      <AppenderRef ref="Console" level="INFO"/>
+      <AppenderRef ref="Logfile" level="DEBUG"/>
+    </Root>
+    <Logger name="com.jagornet" level="DEBUG">
+      <!-- Inherit appenders from root logger -->
+    </Logger>
+  </Loggers>
+</Configuration>
diff --git a/Jagornet-DHCP/dhcp-client/src/main/resources/testclient_log4j.properties b/Jagornet-DHCP/dhcp-client/src/main/resources/testclient_log4j.properties
diff --git a/Jagornet-DHCP/dhcp-core/pom.xml b/Jagornet-DHCP/dhcp-core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.jagornet</groupId>
     <artifactId>jagornet-dhcp-all</artifactId>
-    <version>3.0.0</version>
+    <version>3.0.1</version>
   </parent>
 
   <artifactId>jagornet-dhcp-core</artifactId>

diff --git a/Jagornet-DHCP/dhcp-server/.gitignore b/Jagornet-DHCP/dhcp-server/.gitignore
@@ -1,3 +1,4 @@
 /target/
 /dist/
 /log/
+/db/
diff --git a/Jagornet-DHCP/dhcp-server/.settings/org.eclipse.core.resources.prefs b/Jagornet-DHCP/dhcp-server/.settings/org.eclipse.core.resources.prefs
@@ -3,5 +3,4 @@ encoding//src/main/java=UTF-8
 encoding//src/main/resources=UTF-8
 encoding//src/test/java=UTF-8
 encoding//src/test/resources=UTF-8
-encoding//target/generated-sources/jaxb=UTF-8
 encoding/<project>=UTF-8
diff --git a/Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.xml b/Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.xml
@@ -3,18 +3,18 @@
 <dhc:dhcpServerConfig xmlns:dhc="http://jagornet.com/dhcp/xml"
 					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					xsi:schemaLocation="http://jagornet.com/dhcpserver.xsd">
+
+	<v4ServerIdOption>
+		<!--  DHCPv4 ServerID must be a local IP address -->
+		<ipAddress>10.0.0.2</ipAddress>
+	</v4ServerIdOption>
 
 	<v6ServerIdOption>
 		<!-- DHCPv6 ServerID should be auto-generated hex data -->
 		<opaqueData>
 			<asciiValue>Jagornet</asciiValue>
 		</opaqueData>
 	</v6ServerIdOption>
-
-	<v4ServerIdOption>
-		<!--  DHCPv4 ServerID must be a local IP address -->
-		<ipAddress>10.0.0.2</ipAddress>
-	</v4ServerIdOption>
 
 	<links>
 		<!-- Must define at least one link for client requests -->

diff --git a/Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.xml b/Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.xml
@@ -3,6 +3,11 @@
 <dhc:dhcpServerConfig xmlns:dhc="http://jagornet.com/dhcp/xml"
 					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 					xsi:schemaLocation="http://jagornet.com/dhcpserver.xsd">
+
+	<v4ServerIdOption>
+		<!--  DHCPv4 ServerID must be a local IP address -->
+		<ipAddress>10.0.0.2</ipAddress>
+	</v4ServerIdOption>
 
 	<v6ServerIdOption>
 		<!-- DHCPv6 ServerID should be auto-generated hex data -->
@@ -11,11 +16,6 @@
 		</opaqueData>
 	</v6ServerIdOption>
 
-	<v4ServerIdOption>
-		<!--  DHCPv4 ServerID must be a local IP address -->
-		<ipAddress>10.0.0.2</ipAddress>
-	</v4ServerIdOption>
-
 	<policies>
 		<!-- Global server level policies -->
 		<policy>

diff --git a/Jagornet-DHCP/dhcp-server/config/dhcpserver.xml b/Jagornet-DHCP/dhcp-server/config/dhcpserver.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <ns2:dhcpServerConfig xmlns:ns2="http://jagornet.com/dhcp/xml">
-    <v6ServerIdOption>
-        <opaqueData>
-            <hexValue>000100015F4BB4E2CA268E9E606F</hexValue>
-        </opaqueData>
-    </v6ServerIdOption>
-    <v4ServerIdOption>
-        <ipAddress>127.0.0.1</ipAddress>
-    </v4ServerIdOption>
+    <v4ServerIdOption/>
+    <v6ServerIdOption/>
 </ns2:dhcpServerConfig>