Author: bpoussin Date: 2013-02-24 01:07:23 +0100 (Sun, 24 Feb 2013) New Revision: 1543 Url: http://nuiton.org/projects/wikitty/repository/revisions/1543 Log: rename conf to config Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2013-02-23 14:20:54 UTC (rev 1542) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2013-02-24 00:07:23 UTC (rev 1543) @@ -34,9 +34,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Types; -import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -239,25 +237,25 @@ * * This connection must be close be the asker after used * - * @param conf configuration + * @param config configuration * @return a new Connection (db transaction) */ public static synchronized Connection getConnectionUnconfigured( - WikittyTransaction tx, ApplicationConfig conf) { + WikittyTransaction tx, ApplicationConfig config) { if (tx == null) { throw new IllegalArgumentException("WikittyTransaction must not be null"); } - String driver = conf.getOption( + String driver = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); - String host = conf.getOption( + String host = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_URL.getKey()); - String username = conf.getOption( + String username = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_LOGIN.getKey()); - String password = conf.getOption( + String password = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_PASSWORD.getKey()); - String xaDataSourceClassName = conf.getOption( + String xaDataSourceClassName = config.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey()); try { String jdbcUrl = String.format("%s:%s@%s", username, password, host); @@ -284,7 +282,7 @@ + "." + xaDataSourceClassName + "."; // Inject properties in xadatasource - for(Entry<Object, Object> properties : conf.getFlatOptions().entrySet()) { + for(Entry<Object, Object> properties : config.getFlatOptions().entrySet()) { String propertyName = (String) properties.getKey(); if (propertyName.startsWith(keyStart)) { propertyName = propertyName.replaceFirst(keyStart, "");