rik/jlibibuddy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move general server code to base project, adjust loader and tests

Browse Source
This commit is contained in:
Rik Veenboer
2015-06-21 17:38:51 +01:00
parent 50567a9846
commit 62796af99b
4 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/github/boukefalos/ibuddy/Loader.java
View File

@@ -23,7 +23,15 @@ public class Loader extends AbstractLoader<Loader> {
pico.addComponent(Remote.class);
/* Add sender implementation */
addSender(properties);
try {
String protocol = properties.getOrDefault("protocol", "tcp").toString();
String implementation = properties.getOrDefault("tcp.implementation", "socket").toString();
String host = properties.getProperty("remote.host");
int port = Integer.valueOf(properties.getProperty("remote.port"));
addSender(protocol, implementation, host, port);
} catch (NumberFormatException e) {
throw new LoaderException("Failed to parse remote.port");
}
break;
}
@@ -31,8 +39,15 @@ public class Loader extends AbstractLoader<Loader> {
if (properties.getProperty("server") != null) {
pico.addComponent(Server.class);
/* Add server forwarder implementation */
addForwarder(properties);
/* Add server forwarder implementation */
try {
String protocol = properties.getOrDefault("server.protocol", "tcp").toString();
String implementation = properties.getOrDefault("tcp.implementation", "socket").toString();
int port = Integer.valueOf(properties.getProperty("server.port"));
addForwarder(protocol, implementation, port);
} catch (NumberFormatException e) {
throw new LoaderException("Failed to parse server.port");
}
}
}