February 2012 - Wikitty-commits - mailman.cloud.codelutin.com

r1434 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage
by bpoussin＠users.nuiton.org 25 Feb '12

25 Feb '12

Author: bpoussin Date: 2012-02-25 16:31:44 +0100 (Sat, 25 Feb 2012) New Revision: 1434 Url: http://nuiton.org/repositories/revision/wikitty/1434 Log: remove unused import Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java 2012-02-20 16:50:14 UTC (rev 1433) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineHelper.java 2012-02-25 15:31:44 UTC (rev 1434) @@ -25,11 +25,9 @@ package org.nuiton.wikitty.storage; import java.math.BigDecimal; -import java.math.MathContext; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.swing.text.html.parser.DTDConstants; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.wikitty.WikittyException; @@ -41,7 +39,6 @@ import org.nuiton.wikitty.query.WikittyQueryMaker; import org.nuiton.wikitty.query.WikittyQueryResult; import org.nuiton.wikitty.query.conditions.Condition; -import org.nuiton.wikitty.entities.Element; import org.nuiton.wikitty.query.conditions.Select; import org.nuiton.wikitty.services.WikittyTransaction;

1 0

r1433 - trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 17:50:14 +0100 (Mon, 20 Feb 2012) New Revision: 1433 Url: http://nuiton.org/repositories/revision/wikitty/1433 Log: #1959 : JdbcSQLException during sync engin Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-02-20 16:31:06 UTC (rev 1432) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2012-02-20 16:50:14 UTC (rev 1433) @@ -622,26 +622,33 @@ @Override public DataStatistic getDataStatistic(WikittyTransaction tx) { - DataStatistic result; + DataStatistic result = null; Connection connection = WikittyJDBCUtil.getConnection(tx, config); try { Statement statement = connection.createStatement(); ResultSet resultSet = statement.executeQuery( jdbcQuery.getProperty(QUERY_COUNT_ACTIVE_WIKITTY)); - long activeWikitties = resultSet.getLong(1); + if (resultSet.next()) { + long activeWikitties = resultSet.getLong(1); - resultSet = statement.executeQuery( - jdbcQuery.getProperty(QUERY_COUNT_DELETED_WIKITTY)); - long deletedWikitties = resultSet.getLong(1); - - result = new DataStatistic(activeWikitties, deletedWikitties); + resultSet = statement.executeQuery( + jdbcQuery.getProperty(QUERY_COUNT_DELETED_WIKITTY)); + if (resultSet.next()) { + long deletedWikitties = resultSet.getLong(1); + + result = new DataStatistic(activeWikitties, deletedWikitties); + } + } } catch (SQLException eee) { - result = new DataStatistic(); log.warn("Can't retrieve statisticn data", eee); } finally { WikittyJDBCUtil.closeQuietly(connection); } + + if (result == null) { + result = new DataStatistic(); + } return result; }

1 0

r1432 - trunk/wikitty-jdbc/src/main/resources
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 17:31:06 +0100 (Mon, 20 Feb 2012) New Revision: 1432 Url: http://nuiton.org/repositories/revision/wikitty/1432 Log: #1910 : Update to h2 1.3.164 Modified: trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties Modified: trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties 2012-02-20 16:24:32 UTC (rev 1431) +++ trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties 2012-02-20 16:31:06 UTC (rev 1432) @@ -42,7 +42,7 @@ #table extension_data creation query jdbc.queries.creation.extension.data=CREATE TABLE extension_data (\ id varchar(255) NOT NULL,\ -fieldName text NOT NULL,\ +fieldName varchar(255) NOT NULL,\ fieldType text NOT NULL,\ PRIMARY KEY (id,fieldName),\ FOREIGN KEY (id) REFERENCES extension_admin (id)); @@ -59,7 +59,7 @@ # all time use alter after creation for binaryValue column because this datatype is not portable jdbc.queries.creation.wikitty.data=CREATE TABLE wikitty_data (\ id varchar(64) NOT NULL,\ -fieldName text NOT NULL,\ +fieldName varchar(255) NOT NULL,\ numberValue numeric,\ dateValue timestamp,\ textValue text,\

1 0

r1431 - trunk/wikitty-jdbc/src/main/resources
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 17:24:32 +0100 (Mon, 20 Feb 2012) New Revision: 1431 Url: http://nuiton.org/repositories/revision/wikitty/1431 Log: #1910 : Update to h2 1.3.164 Modified: trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties Modified: trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties 2012-02-20 16:24:21 UTC (rev 1430) +++ trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties 2012-02-20 16:24:32 UTC (rev 1431) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2010 - 2011 CodeLutin, Benjamin Poussin, Chatellier Eric +# Copyright (C) 2010 - 2012 CodeLutin, Benjamin Poussin, Chatellier Eric # %% # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Lesser General Public License as

1 0

r1430 - trunk/wikitty-jdbc/src/main/resources
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 17:24:21 +0100 (Mon, 20 Feb 2012) New Revision: 1430 Url: http://nuiton.org/repositories/revision/wikitty/1430 Log: #1910 : Update to h2 1.3.164 Modified: trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties Modified: trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties =================================================================== --- trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties 2012-02-20 16:12:52 UTC (rev 1429) +++ trunk/wikitty-jdbc/src/main/resources/wikitty-jdbc-query.properties 2012-02-20 16:24:21 UTC (rev 1430) @@ -32,7 +32,7 @@ #table extension_admin creation query jdbc.queries.creation.extension.admin=CREATE TABLE extension_admin (\ -id text NOT NULL,\ +id varchar(255) NOT NULL,\ name text NOT NULL,\ version varchar(8) NOT NULL,\ requires text,\ @@ -41,14 +41,14 @@ #table extension_data creation query jdbc.queries.creation.extension.data=CREATE TABLE extension_data (\ -id text NOT NULL,\ +id varchar(255) NOT NULL,\ fieldName text NOT NULL,\ fieldType text NOT NULL,\ PRIMARY KEY (id,fieldName),\ FOREIGN KEY (id) REFERENCES extension_admin (id)); #table wikitty_admin creation query -jdbc.queries.creation.wikitty.admin=CREATE TABLE wikitty_admin (\ +jdbc.queries.creation.wikitty.admin=CREATE TABLE wikitty_admin (\ id varchar(64) NOT NULL,\ version varchar(8) NOT NULL,\ extension_list text NOT NULL,\

1 0

r1429 - trunk
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 17:12:52 +0100 (Mon, 20 Feb 2012) New Revision: 1429 Url: http://nuiton.org/repositories/revision/wikitty/1429 Log: Move mfortun to contributors Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 16:09:19 UTC (rev 1428) +++ trunk/pom.xml 2012-02-20 16:12:52 UTC (rev 1429) @@ -922,17 +922,6 @@ </developer> <developer> - <name>Manoel Fortun</name> - <id>mfortun</id> - <email>mfortun(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Developer</role> - </roles> - </developer> - - <developer> <name>Sylvain Letellier</name> <id>sletellier</id> <email>letellier(a)codelutin.com</email> @@ -954,6 +943,16 @@ <role>Developer</role> </roles> </contributor> + + <contributor> + <name>Manoel Fortun</name> + <email>mfortun(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </contributor> </contributors>

1 0

r1428 - in trunk: . wikitty-api wikitty-hessian-client
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 17:09:19 +0100 (Mon, 20 Feb 2012) New Revision: 1428 Url: http://nuiton.org/repositories/revision/wikitty/1428 Log: #1982: Update to jbossjta 4.16.0.Final #1983 : Update to smackx 3.2.1 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-hessian-client/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 13:53:24 UTC (rev 1427) +++ trunk/pom.xml 2012-02-20 16:09:19 UTC (rev 1428) @@ -293,7 +293,7 @@ <dependency> <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> - <version>4.16.0.Final</version> + <version>4.16.2.Final</version> <scope>compile</scope> <exclusions> <exclusion> @@ -405,16 +405,16 @@  <dependency> - <groupId>jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smack</artifactId> - <version>3.1.0</version> + <version>3.2.1</version> <scope>compile</scope> </dependency> <dependency> - <groupId>jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smackx</artifactId> - <version>3.1.0</version> + <version>3.2.1</version> <scope>compile</scope> </dependency> @@ -1016,4 +1016,11 @@ </modules> </profile> </profiles> + + <repositories> + <repository> + <id>wikitty-repo</id> + <url>http://nexus.nuiton.org/nexus/content/groups/wikitty/</url> + </repository> + </repositories> </project> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2012-02-20 13:53:24 UTC (rev 1427) +++ trunk/wikitty-api/pom.xml 2012-02-20 16:09:19 UTC (rev 1428) @@ -128,12 +128,12 @@  <dependency> - <groupId>jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smack</artifactId> </dependency> <dependency> - <groupId>jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smackx</artifactId> </dependency> Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2012-02-20 13:53:24 UTC (rev 1427) +++ trunk/wikitty-hessian-client/pom.xml 2012-02-20 16:09:19 UTC (rev 1428) @@ -40,12 +40,12 @@ </dependency> <dependency> - <groupId>jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smack</artifactId> </dependency> <dependency> - <groupId>jivesoftware</groupId> + <groupId>org.igniterealtime.smack</groupId> <artifactId>smackx</artifactId> </dependency>

1 0

r1427 - trunk
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 14:53:24 +0100 (Mon, 20 Feb 2012) New Revision: 1427 Url: http://nuiton.org/repositories/revision/wikitty/1427 Log: #1982 : Update to jbossjta 4.16.0.Final Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 13:51:28 UTC (rev 1426) +++ trunk/pom.xml 2012-02-20 13:53:24 UTC (rev 1427) @@ -293,7 +293,7 @@ <dependency> <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> - <version>4.15.1.Final</version> + <version>4.16.0.Final</version> <scope>compile</scope> <exclusions> <exclusion>

1 0

r1426 - trunk
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 14:51:28 +0100 (Mon, 20 Feb 2012) New Revision: 1426 Url: http://nuiton.org/repositories/revision/wikitty/1426 Log: #1981 : Update to slf4j 1.6.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 13:50:40 UTC (rev 1425) +++ trunk/pom.xml 2012-02-20 13:51:28 UTC (rev 1426) @@ -184,14 +184,14 @@ <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-api</artifactId> - <version>1.6.1</version> + <version>1.6.4</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> - <version>1.6.1</version> + <version>1.6.4</version> <scope>test</scope> </dependency>

1 0

r1425 - trunk
by echatellier＠users.nuiton.org 20 Feb '12

20 Feb '12

Author: echatellier Date: 2012-02-20 14:50:40 +0100 (Mon, 20 Feb 2012) New Revision: 1425 Url: http://nuiton.org/repositories/revision/wikitty/1425 Log: #1980 : Update to postgresql 9.1-901-1.jdbc4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-20 13:49:35 UTC (rev 1424) +++ trunk/pom.xml 2012-02-20 13:50:40 UTC (rev 1425) @@ -177,7 +177,7 @@ <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.4-702.jdbc4</version> + <version>9.1-901-1.jdbc4</version> <scope>test</scope> </dependency>

1 0