From 560244e8e4be39bc1133aed84e4b986476c1cbbb Mon Sep 17 00:00:00 2001 From: Ryan Cicchiello Date: Thu, 12 Apr 2018 20:10:40 -0400 Subject: [PATCH] Wording --- README.md | 2 +- libaris/res/edu/rpi/aris/VERSION | 2 +- server/src/edu/rpi/aris/net/server/DatabaseManager.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 20141ec8..5d722b6f 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ TODO 1. Download and install the server package for your system from the [Releases](https://github.com/cicchr/ARIS-Java/releases) section 2. Obtain signed SSL certificates from a valid certificate authority and save the ca certificate and private key using the x509 encoded pem format -3. Create a configuration file in /etc/aris.d/ (You can add a 2 digit suffix to set the file's priority) and set the ca and key options to the location where the certificate and key are stored +3. Create a configuration file in /etc/aris.d/ (You can add a 2 digit prefix to set the file's priority) and set the ca and key options to the location where the certificate and key are stored ``` # /etc/aris.d/ diff --git a/libaris/res/edu/rpi/aris/VERSION b/libaris/res/edu/rpi/aris/VERSION index 2aa91601..31c01c92 100644 --- a/libaris/res/edu/rpi/aris/VERSION +++ b/libaris/res/edu/rpi/aris/VERSION @@ -1 +1 @@ -0.0.44 +0.0.45 diff --git a/server/src/edu/rpi/aris/net/server/DatabaseManager.java b/server/src/edu/rpi/aris/net/server/DatabaseManager.java index f989bfe4..c657ffdf 100644 --- a/server/src/edu/rpi/aris/net/server/DatabaseManager.java +++ b/server/src/edu/rpi/aris/net/server/DatabaseManager.java @@ -80,7 +80,7 @@ private void verifyDatabase(Connection connection) throws SQLException, IOExcept } } - private void createTables(Connection connection) throws SQLException, IOException { + private void createTables(Connection connection) throws SQLException { logger.warn("Creating non existent tables"); logger.warn("If this is not the first run of the program this may have unexpected results"); boolean autoCommit = connection.getAutoCommit(); @@ -190,7 +190,7 @@ private void updateSchema2(Connection connection) throws SQLException { } } - public Pair createUser(String username, String password, String userType) throws SQLException, IOException { + public Pair createUser(String username, String password, String userType) throws SQLException { if (username == null || username.length() == 0 || userType == null || !(userType.equals(NetUtil.USER_STUDENT) || userType.equals(NetUtil.USER_INSTRUCTOR))) return new ImmutablePair<>(null, NetUtil.INVALID); if (password == null)