Skip to content

Commit 844b2a3

Browse files
author
agrabil
committed
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
1 parent 8f60332 commit 844b2a3

30 files changed

+751
-752
lines changed

‎Jagornet-DHCP/dhcp-client/pom.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.jagornet</groupId>
66
<artifactId>jagornet-dhcp-all</artifactId>
7-
<version>3.0.0</version>
7+
<version>3.0.1</version>
88
</parent>
99

1010
<artifactId>jagornet-dhcp-client</artifactId>
@@ -13,12 +13,12 @@
1313
<dependency>
1414
<groupId>com.jagornet</groupId>
1515
<artifactId>jagornet-dhcp-core</artifactId>
16-
<version>3.0.0</version>
16+
<version>3.0.1</version>
1717
</dependency>
1818
<dependency>
1919
<groupId>com.jagornet</groupId>
2020
<artifactId>jagornet-dhcp-server</artifactId>
21-
<version>3.0.0</version>
21+
<version>3.0.1</version>
2222
</dependency>
2323
<dependency>
2424
<groupId>commons-cli</groupId>

‎Jagornet-DHCP/dhcp-client/src/main/resources/log4j2-testclient.xml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!-- Configuration status is for Log4j2 internal status logging -->
3+
<Configuration status="WARN">
4+
<Appenders>
5+
<Console name="Console" target="SYSTEM_OUT">
6+
<PatternLayout pattern="%d{ABSOLUTE} (%x)[%t] %-5p %c{1} - %m%n"/>
7+
</Console>
8+
<RollingFile name="Logfile"
9+
fileName="log/testclient.log"
10+
filePattern="log/testclient-%i.log">
11+
<PatternLayout>
12+
<Pattern>%d [%t] %-5p %c{2} - %m%n</Pattern>
13+
</PatternLayout>
14+
<DefaultRolloverStrategy max="10"/>
15+
<Policies>
16+
<SizeBasedTriggeringPolicy size="10 MB"/>
17+
</Policies>
18+
</RollingFile>
19+
</Appenders>
20+
<Loggers>
21+
<Root level="INFO">
22+
<AppenderRef ref="Console" level="INFO"/>
23+
<AppenderRef ref="Logfile" level="DEBUG"/>
24+
</Root>
25+
<Logger name="com.jagornet" level="DEBUG">
26+
<!-- Inherit appenders from root logger -->
27+
</Logger>
28+
</Loggers>
29+
</Configuration>

‎Jagornet-DHCP/dhcp-client/src/main/resources/testclient_log4j.properties‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Jagornet-DHCP/dhcp-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.jagornet</groupId>
66
<artifactId>jagornet-dhcp-all</artifactId>
7-
<version>3.0.0</version>
7+
<version>3.0.1</version>
88
</parent>
99

1010
<artifactId>jagornet-dhcp-core</artifactId>

‎Jagornet-DHCP/dhcp-server/.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
/target/
22
/dist/
33
/log/
4+
/db/

‎Jagornet-DHCP/dhcp-server/.settings/org.eclipse.core.resources.prefs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ encoding//src/main/java=UTF-8
33
encoding//src/main/resources=UTF-8
44
encoding//src/test/java=UTF-8
55
encoding//src/test/resources=UTF-8
6-
encoding//target/generated-sources/jaxb=UTF-8
76
encoding/<project>=UTF-8

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
<dhc:dhcpServerConfig xmlns:dhc="http://jagornet.com/dhcp/xml"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://jagornet.com/dhcpserver.xsd">
6+
7+
<v4ServerIdOption>
8+
<!-- DHCPv4 ServerID must be a local IP address -->
9+
<ipAddress>10.0.0.2</ipAddress>
10+
</v4ServerIdOption>
611

712
<v6ServerIdOption>
813
<!-- DHCPv6 ServerID should be auto-generated hex data -->
914
<opaqueData>
1015
<asciiValue>Jagornet</asciiValue>
1116
</opaqueData>
1217
</v6ServerIdOption>
13-
14-
<v4ServerIdOption>
15-
<!-- DHCPv4 ServerID must be a local IP address -->
16-
<ipAddress>10.0.0.2</ipAddress>
17-
</v4ServerIdOption>
1818

1919
<links>
2020
<!-- Must define at least one link for client requests -->

‎Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
<dhc:dhcpServerConfig xmlns:dhc="http://jagornet.com/dhcp/xml"
44
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
55
xsi:schemaLocation="http://jagornet.com/dhcpserver.xsd">
6+
7+
<v4ServerIdOption>
8+
<!-- DHCPv4 ServerID must be a local IP address -->
9+
<ipAddress>10.0.0.2</ipAddress>
10+
</v4ServerIdOption>
611

712
<v6ServerIdOption>
813
<!-- DHCPv6 ServerID should be auto-generated hex data -->
@@ -11,11 +16,6 @@
1116
</opaqueData>
1217
</v6ServerIdOption>
1318

14-
<v4ServerIdOption>
15-
<!-- DHCPv4 ServerID must be a local IP address -->
16-
<ipAddress>10.0.0.2</ipAddress>
17-
</v4ServerIdOption>
18-
1919
<policies>
2020
<!-- Global server level policies -->
2121
<policy>

‎Jagornet-DHCP/dhcp-server/config/dhcpserver.xml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
22
<ns2:dhcpServerConfig xmlns:ns2="http://jagornet.com/dhcp/xml">
3-
<v6ServerIdOption>
4-
<opaqueData>
5-
<hexValue>000100015F4BB4E2CA268E9E606F</hexValue>
6-
</opaqueData>
7-
</v6ServerIdOption>
8-
<v4ServerIdOption>
9-
<ipAddress>127.0.0.1</ipAddress>
10-
</v4ServerIdOption>
3+
<v4ServerIdOption/>
4+
<v6ServerIdOption/>
115
</ns2:dhcpServerConfig>

0 commit comments

Comments
 (0)