eaw/dPWR
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Updates

Browse Source
This commit is contained in:
Philip Smart
2019-11-20 17:56:57 +00:00
parent bd54324232
commit dcb2f9c194
11 changed files with 9216 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1062
jDPWR/jDPWR.cfg.docker Normal file
View File

File diff suppressed because it is too large Load Diff

18
jDPWR/src/main/java/org/eclipse/jetty/dpwr/jDPWR.java
View File

@@ -86,8 +86,8 @@ public class jDPWR
//
// Constants.
//
private static final String CONFIG_FILE = "../jDPWR.cfg";
private static final String DEFAULT_CONFIG_FILE = "../jDPWR.cfg.default";
private static final String CONFIG_FILE = "jDPWR.cfg";
private static final String DEFAULT_CONFIG_FILE = "jDPWR.cfg.default";
// Maxims.
//
@@ -110,7 +110,12 @@ public class jDPWR
ObjectMapper mapper = new ObjectMapper();
Boolean readDefault = false;
try {
dpwr = mapper.readValue(new File(CONFIG_FILE), DPWRServlet.class);
try {
dpwr = mapper.readValue(new File(CONFIG_FILE), DPWRServlet.class);
}
catch (IOException e) {
dpwr = mapper.readValue(new File("../" + CONFIG_FILE), DPWRServlet.class);
}
LOG.info("Loaded configuration: " + CONFIG_FILE);
}
catch (JsonGenerationException e) {
@@ -135,7 +140,12 @@ public class jDPWR
{
System.out.println("Reading default configuration: " + DEFAULT_CONFIG_FILE);
try {
dpwr = mapper.readValue(new File(DEFAULT_CONFIG_FILE), DPWRServlet.class);
try {
dpwr = mapper.readValue(new File(DEFAULT_CONFIG_FILE), DPWRServlet.class);
}
catch (IOException e) {
dpwr = mapper.readValue(new File("../" + DEFAULT_CONFIG_FILE), DPWRServlet.class);
}
LOG.info("Loaded default configuration: " + DEFAULT_CONFIG_FILE);
}
catch (Exception e) {