diff --git a/dependency-reduced-pom.xml b/dependency-reduced-pom.xml index 667d911..076f00d 100644 --- a/dependency-reduced-pom.xml +++ b/dependency-reduced-pom.xml @@ -96,6 +96,18 @@ + + maven-compiler-plugin + 3.13.0 + + + --add-exports + java.base/sun.security.x509=ALL-UNNAMED + --add-exports + java.base/sun.security.util=ALL-UNNAMED + + + maven-javadoc-plugin 3.6.3 diff --git a/pom.xml b/pom.xml index ede7e0e..15e3fd2 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.openautonomousconnection INSServer - 1.0.0-BETA.1.2 + 1.0.0-BETA.1.3 Open Autonomous Connection https://open-autonomous-connection.org/ @@ -104,7 +104,7 @@ org.openautonomousconnection Protocol - 1.0.0-BETA.6.1 + 1.0.0-BETA.7.2 org.projectlombok @@ -136,6 +136,19 @@ + + org.apache.maven.plugins + maven-compiler-plugin + 3.13.0 + + + --add-exports + java.base/sun.security.x509=ALL-UNNAMED + --add-exports + java.base/sun.security.util=ALL-UNNAMED + + + org.apache.maven.plugins maven-javadoc-plugin diff --git a/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java b/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java index d2e1733..4eb9182 100644 --- a/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java +++ b/src/main/java/org/openautonomousconnection/insserver/DatabaseINSServer.java @@ -29,8 +29,8 @@ public final class DatabaseINSServer extends ProtocolINSServer { * @throws IOException If the base server initialization fails. * @throws CertificateException If required certificate files are missing or invalid. */ - public DatabaseINSServer(String insInfoSite, String insFrontendSite, int tcpPort, int udpPort, String jdbcUrl, String jdbcUser, String jdbcPassword) throws Exception { - super(insInfoSite, insFrontendSite, tcpPort, udpPort); + public DatabaseINSServer(String insInfoSite, String insFrontendSite, String jdbcUrl, String jdbcUser, String jdbcPassword) throws Exception { + super(insInfoSite, insFrontendSite); this.jdbcUrl = jdbcUrl; this.jdbcUser = jdbcUser; diff --git a/src/main/java/org/openautonomousconnection/insserver/Main.java b/src/main/java/org/openautonomousconnection/insserver/Main.java index 1642fd0..76d9aee 100644 --- a/src/main/java/org/openautonomousconnection/insserver/Main.java +++ b/src/main/java/org/openautonomousconnection/insserver/Main.java @@ -31,7 +31,11 @@ public class Main { values = new ProtocolValues(); values.packetHandler = new PacketHandler(); values.eventManager = new EventManager(); - values.eventManager.registerListener(Listener.class); + values.eventManager.registerListener(new Listener()); + + if (!new File("config.properties").exists()) { + new File("config.properties").createNewFile(); + } ConfigurationManager config = new ConfigurationManager(new File("config.properties")); config.loadProperties(); @@ -84,9 +88,9 @@ public class Main { String info = config.getString("ins.info"); String frontend = config.getString("ins.frontend"); - DatabaseINSServer server = new DatabaseINSServer(info, frontend, tcpPort, udpPort, url, user, password); + DatabaseINSServer server = new DatabaseINSServer(info, frontend, url, user, password); protocolBridge = new ProtocolBridge(server, values, ProtocolVersion.PV_1_0_0_BETA, new File("logs")); - server.getNetwork().start(); + server.start(tcpPort); commandManager = new CommandManager(values.eventManager); commandManager.registerCommand(StopCommand.class);