Author: schorlet Date: 2010-02-04 12:09:30 +0100 (Thu, 04 Feb 2010) New Revision: 376 Modified: wikengo_core-wikitty/changelog.txt wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml Log: change dynamicField named "*_s" from type "text_fr" to type "string" add new class constructor: WikittyExtensionStorageJDBC(Properties properties) WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) in order to pass custom jdbc connection properties Modified: wikengo_core-wikitty/changelog.txt =================================================================== --- wikengo_core-wikitty/changelog.txt 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/changelog.txt 2010-02-04 11:09:30 UTC (rev 376) @@ -1,3 +1,12 @@ +1.0.0-alpha-6 +============= + +change dynamicField named "*_s" from type "text_fr" to type "string" +add new class constructor: + WikittyExtensionStorageJDBC(Properties properties) + WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) + in order to pass custom jdbc connection properties + 1.0.0-alpha-5 ============= Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-02-04 11:09:30 UTC (rev 376) @@ -17,17 +17,39 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. *##%*/ -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.*; -import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.*; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDRANK; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDTYPE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_ID; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_NAME; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_REQUIRES; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_TAG_VALUES; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.closeConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.getConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.loadProperties; import java.sql.Connection; import java.sql.ResultSet; import java.sql.SQLException; import java.sql.Statement; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.sharengo.wikitty.FieldType; +import org.sharengo.wikitty.UpdateResponse; +import org.sharengo.wikitty.WikittyException; +import org.sharengo.wikitty.WikittyExtension; +import org.sharengo.wikitty.WikittyExtensionStorage; +import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.WikittyUtil; + /** * @author morin * @version $Revision$ @@ -86,7 +108,7 @@ /** * Properties file */ - protected Properties conf = loadProperties(); + protected Properties conf; class CommandJDBC implements Command { protected String queries; @@ -108,7 +130,12 @@ protected Map<String, String> lastVersion = null; public WikittyExtensionStorageJDBC() { + this(loadProperties()); + } + + public WikittyExtensionStorageJDBC(Properties properties) { //check if driver ca be loaded + conf = properties; try { Class.forName(conf.getProperty(driver)); } catch (ClassNotFoundException eee) { @@ -122,7 +149,7 @@ Connection con = null; //connect try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); try { statement.execute(conf.getProperty(extAdminCreationQ)); @@ -148,7 +175,7 @@ throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<Command> result = new ArrayList<Command>(extensions.size()); for (WikittyExtension ext : extensions) { @@ -194,7 +221,7 @@ List<Command> extensionStorageCommandList) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); for (Command command : extensionStorageCommandList) { CommandJDBC commandJDBC = (CommandJDBC) command; @@ -218,7 +245,7 @@ public boolean exists(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with teh id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -238,7 +265,7 @@ public List<String> getAllExtensionIds() { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<String> result = new ArrayList<String>(); Statement statement = con.createStatement(); //get all extensions names and versions @@ -263,7 +290,7 @@ public List<WikittyExtension> getAllExtensions(boolean lastVersion) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<WikittyExtension> result = new ArrayList<WikittyExtension>(); Statement statement = con.createStatement(); @@ -312,7 +339,7 @@ lastVersion = new HashMap<String, String>(); Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //get all extensions names and versions ResultSet resultSet = statement.executeQuery( @@ -346,7 +373,7 @@ if (result == null) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //get the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyJDBCUtil.java 2010-02-04 11:09:30 UTC (rev 376) @@ -18,16 +18,15 @@ package org.sharengo.wikitty.jdbc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.io.IOException; import java.net.URL; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + /** * @author morin * @version $Revision$ @@ -113,10 +112,6 @@ static protected String password = "jdbc.con.password"; /** - * Properties file - */ - protected static Properties conf = loadProperties(); - /** * location of default config (in class-path) */ public static final String CONFIG_FILE = "jdbc.properties"; @@ -147,7 +142,7 @@ * @return a new Connection (db transaction) * @throws SQLException if the connection fails */ - public static Connection getConnection() throws SQLException { + public static Connection getConnection(Properties conf) throws SQLException { Connection con = DriverManager.getConnection(conf.getProperty(host), conf.getProperty(userName), conf.getProperty(password)); con.setAutoCommit(false); Modified: wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-jdbc-impl/src/main/java/org/sharengo/wikitty/jdbc/WikittyStorageJDBC.java 2010-02-04 11:09:30 UTC (rev 376) @@ -16,18 +16,50 @@ *##%*/ package org.sharengo.wikitty.jdbc; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.sharengo.wikitty.*; -import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.*; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_BOOLEAN_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_DATE_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_DELETION_DATE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_EXTENSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_FIELDNAME; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_ID; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_NUMBER_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_TEXT_VALUE; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.COL_VERSION; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.closeConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.getConnection; +import static org.sharengo.wikitty.jdbc.WikittyJDBCUtil.loadProperties; import java.math.BigDecimal; -import java.sql.*; -import java.util.*; +import java.sql.Connection; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.sharengo.wikitty.FieldType; +import org.sharengo.wikitty.UpdateResponse; +import org.sharengo.wikitty.Wikitty; +import org.sharengo.wikitty.WikittyException; +import org.sharengo.wikitty.WikittyExtension; +import org.sharengo.wikitty.WikittyExtensionStorage; +import org.sharengo.wikitty.WikittyStorage; +import org.sharengo.wikitty.WikittyTransaction; +import org.sharengo.wikitty.WikittyUtil; + /** * @author morin * @version $Revision$ @@ -99,7 +131,7 @@ /** * Properties file */ - protected Properties conf = loadProperties(); + protected Properties conf; /** * used to parse list field from hbase data. ex: extension.fieldname[11/15] @@ -134,6 +166,11 @@ protected WikittyExtensionStorage extensionStorage; public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage) { + this(extensionStorage, loadProperties()); + } + + public WikittyStorageJDBC(WikittyExtensionStorage extensionStorage, Properties properties) { + this.conf = properties; this.extensionStorage = extensionStorage; //check if driver ca be loaded try { @@ -149,7 +186,7 @@ Connection con = null; //connect try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); try { statement.execute(conf.getProperty(wikittyAdminCreationQ)); @@ -175,7 +212,7 @@ boolean disableAutoVersionIncrement) throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); List<Command> result = new ArrayList<Command>(wikitties.size()); for (Wikitty wikitty : wikitties) { Statement statement = con.createStatement(); @@ -428,7 +465,7 @@ List<Command> wikittyStorageCommandList) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); UpdateResponse result = new UpdateResponse(); for (Command command : wikittyStorageCommandList) { @@ -462,7 +499,7 @@ public boolean exists(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -482,7 +519,7 @@ public boolean isDeleted(String id) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet resultSet = statement.executeQuery( @@ -510,7 +547,7 @@ String id, String... fqFieldName) throws WikittyException { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( @@ -686,10 +723,10 @@ } @Override - public void scanWikitties(Scanner scanner) { + public void scanWikitties(Scanner scanner) { Connection con = null; try { - con = getConnection(); + con = getConnection(conf); Statement statement = con.createStatement(); //select the data with the id "id" in the admin table ResultSet adminResultSet = statement.executeQuery( Modified: wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml =================================================================== --- wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2010-02-03 16:57:15 UTC (rev 375) +++ wikengo_core-wikitty/wikengo_core-wikitty-solr-impl/src/main/resources/schema.xml 2010-02-04 11:09:30 UTC (rev 376) @@ -295,7 +295,7 @@ <copyField source="*_dt" dest="text"/> <dynamicField name="*_i" type="sint" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_s" type="text_fr" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_l" type="slong" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_t" type="text_fr" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_b" type="boolean" indexed="true" stored="true" multiValued="true"/>