GUACAMOLE-76: Clean MySQL and PostgreSQL modules for consistency. Project: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/commit/5794338b Tree: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/tree/5794338b Diff: http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/diff/5794338b
Branch: refs/heads/master Commit: 5794338b8d46ea36fc99716f13bba26944c5934d Parents: 2e3d3c4 Author: Michael Jumper <[email protected]> Authored: Sat Aug 20 12:41:48 2016 -0700 Committer: Michael Jumper <[email protected]> Committed: Sat Aug 20 12:42:03 2016 -0700 ---------------------------------------------------------------------- .../guacamole/auth/mysql/MySQLAuthenticationProviderModule.java | 4 ++-- .../auth/postgresql/PostgreSQLAuthenticationProviderModule.java | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5794338b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java index 16cdd05..35d69aa 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-mysql/src/main/java/org/apache/guacamole/auth/mysql/MySQLAuthenticationProviderModule.java @@ -70,7 +70,7 @@ public class MySQLAuthenticationProviderModule implements Module { myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1"); // Use UTF-8 in database - driverProperties.setProperty("characterEncoding","UTF-8"); + driverProperties.setProperty("characterEncoding", "UTF-8"); // Allow use of multiple statements within a single query driverProperties.setProperty("allowMultiQueries", "true"); @@ -86,7 +86,7 @@ public class MySQLAuthenticationProviderModule implements Module { // Bind MyBatis properties Names.bindProperties(binder, myBatisProperties); - // Bing JDBC driver properties + // Bind JDBC driver properties binder.bind(Properties.class) .annotatedWith(Names.named("JDBC.driverProperties")) .toInstance(driverProperties); http://git-wip-us.apache.org/repos/asf/incubator-guacamole-client/blob/5794338b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java ---------------------------------------------------------------------- diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java index dc8442e..0765a5d 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-postgresql/src/main/java/org/apache/guacamole/auth/postgresql/PostgreSQLAuthenticationProviderModule.java @@ -71,8 +71,7 @@ public class PostgreSQLAuthenticationProviderModule implements Module { myBatisProperties.setProperty("mybatis.pooled.pingQuery", "SELECT 1"); // Use UTF-8 in database - driverProperties.setProperty("characterEncoding","UTF-8"); - + driverProperties.setProperty("characterEncoding", "UTF-8"); } @@ -85,7 +84,7 @@ public class PostgreSQLAuthenticationProviderModule implements Module { // Bind MyBatis properties Names.bindProperties(binder, myBatisProperties); - // Bing JDBC driver properties + // Bind JDBC driver properties binder.bind(Properties.class) .annotatedWith(Names.named("JDBC.driverProperties")) .toInstance(driverProperties);
