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

r1026 - in trunk: . wikitty-api wikitty-lucene wikitty-solr
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 13:31:50 +0200 (Fri, 01 Jul 2011) New Revision: 1026 Url: http://nuiton.org/repositories/revision/wikitty/1026 Log: Update libs (jbosstja...) Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-lucene/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -58,7 +58,7 @@ <dependency> <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> - <version>1.2.1</version> + <version>1.2.2</version> </dependency>  @@ -93,7 +93,7 @@ <dependency> <groupId>commons-pool</groupId> <artifactId>commons-pool</artifactId> - <version>1.5.4</version> + <version>1.5.6</version> </dependency> <dependency> @@ -105,14 +105,14 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.3.156</version> + <version>1.3.157</version> <scope>test</scope> </dependency> <dependency> <groupId>postgresql</groupId> <artifactId>postgresql</artifactId> - <version>8.4-701.jdbc4</version> + <version>8.4-702.jdbc4</version> <scope>test</scope> </dependency> @@ -133,7 +133,7 @@ <dependency> <groupId>com.caucho</groupId> <artifactId>hessian</artifactId> - <version>4.0.6</version> + <version>4.0.7</version> <scope>compile</scope> </dependency> @@ -201,10 +201,16 @@  <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> - <version>4.9.0.GA</version> + <version>4.15.1.Final</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/wikitty-api/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -79,7 +79,7 @@  <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency> <dependency> Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/wikitty-lucene/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -33,7 +33,7 @@ </dependency> <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) +++ trunk/wikitty-solr/pom.xml 2011-07-01 11:31:50 UTC (rev 1026) @@ -33,7 +33,7 @@ </dependency> <dependency> - <groupId>jboss.jbossts</groupId> + <groupId>org.jboss.jbossts</groupId> <artifactId>jbossjta</artifactId> </dependency>

1 0

r1025 - trunk/wikitty-struts
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 12:09:38 +0200 (Fri, 01 Jul 2011) New Revision: 1025 Url: http://nuiton.org/repositories/revision/wikitty/1025 Log: Fix compilation issue Modified: trunk/wikitty-struts/pom.xml Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2011-07-01 10:00:46 UTC (rev 1024) +++ trunk/wikitty-struts/pom.xml 2011-07-01 10:09:38 UTC (rev 1025) @@ -25,12 +25,18 @@ </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <scope>provided</scope> </dependency> <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> </dependency>

1 0

r1024 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 12:00:46 +0200 (Fri, 01 Jul 2011) New Revision: 1024 Url: http://nuiton.org/repositories/revision/wikitty/1024 Log: Update struts 2 jquery plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:59:10 UTC (rev 1023) +++ trunk/pom.xml 2011-07-01 10:00:46 UTC (rev 1024) @@ -450,7 +450,7 @@ <nuitonI18nVersion>2.4</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> <jettyVersion>7.4.2.v20110526</jettyVersion> - <struts2jqueryVersion>3.0.2</struts2jqueryVersion> + <struts2jqueryVersion>3.1.0</struts2jqueryVersion> <struts2Version>2.2.3</struts2Version> <javassistVersion>3.8.0.GA</javassistVersion> <jspapiversion>2.1</jspapiversion>

1 0

r1023 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 11:59:10 +0200 (Fri, 01 Jul 2011) New Revision: 1023 Url: http://nuiton.org/repositories/revision/wikitty/1023 Log: Move bbrossaud to contributors Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:57:31 UTC (rev 1022) +++ trunk/pom.xml 2011-07-01 09:59:10 UTC (rev 1023) @@ -411,8 +411,9 @@ </developer> <developer> - <name>Benoit Brossaud</name> - <id>bbrossaud</id> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> @@ -420,19 +421,19 @@ </roles> </developer> - <developer> - <name>Sylvain Letellier</name> - <id>sletellier</id> - <email>letellier(a)codelutin.com</email> + </developers> + + <contributors> + <contributor> + <name>Benoit Brossaud</name> <organization>CodeLutin</organization> <timezone>+2</timezone> <roles> <role>Developer</role> </roles> - </developer> + </contributor> + </contributors> - </developers> -

1 0

r1022 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 11:57:31 +0200 (Fri, 01 Jul 2011) New Revision: 1022 Url: http://nuiton.org/repositories/revision/wikitty/1022 Log: Update libs, remove unused. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:06:55 UTC (rev 1021) +++ trunk/pom.xml 2011-07-01 09:57:31 UTC (rev 1022) @@ -265,12 +265,12 @@ <dependency> <groupId>org.apache.struts.xwork</groupId> <artifactId>xwork-core</artifactId> - <version>${strutsxworksVersion}</version> + <version>${struts2Version}</version> </dependency> <dependency> - <groupId>javax.servlet</groupId> + <groupId>javax.servlet.jsp</groupId> <artifactId>jsp-api</artifactId> <version>${jspapiversion}</version> </dependency> @@ -444,29 +444,19 @@ <projectId>wikitty</projectId>  - <eugeneVersion>2.3.1</eugeneVersion> - <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> - <nuitonI18nVersion>2.2</nuitonI18nVersion> + <eugeneVersion>2.3.5</eugeneVersion> + <nuitonUtilsVersion>2.2</nuitonUtilsVersion> + <nuitonI18nVersion>2.4</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> - - <springVersion>3.0.1.RELEASE</springVersion> - <jettyMorbayVersion>6.1.22</jettyMorbayVersion> - - <zkVersion>5.0.2</zkVersion> - <jettyVersion>7.2.1.v20101111</jettyVersion> - - <hbaseVersion>0.89.0-SNAPSHOT</hbaseVersion> - -  - <locales>fr,en</locales> - -  + <jettyVersion>7.4.2.v20110526</jettyVersion> <struts2jqueryVersion>3.0.2</struts2jqueryVersion> <struts2Version>2.2.3</struts2Version> <javassistVersion>3.8.0.GA</javassistVersion> - <strutsxworksVersion>2.2.3</strutsxworksVersion> + <jspapiversion>2.1</jspapiversion> - <jspapiversion>2.0</jspapiversion> +  + <locales>fr,en</locales> + </properties>

1 0

r1021 - trunk
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 11:06:55 +0200 (Fri, 01 Jul 2011) New Revision: 1021 Url: http://nuiton.org/repositories/revision/wikitty/1021 Log: Link lucene module to extra modules Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 09:04:51 UTC (rev 1020) +++ trunk/pom.xml 2011-07-01 09:06:55 UTC (rev 1021) @@ -519,6 +519,7 @@ <modules> <module>wikitty-publication</module> <module>wikitty-struts</module> + <module>wikitty-lucene</module> </modules> </profile> </profiles>

1 0

r1020 - trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 11:04:51 +0200 (Fri, 01 Jul 2011) New Revision: 1020 Url: http://nuiton.org/repositories/revision/wikitty/1020 Log: Update to lucene 3.3 Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/FieldModifier.java trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/FieldModifier.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/FieldModifier.java 2011-07-01 08:54:27 UTC (rev 1019) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/FieldModifier.java 2011-07-01 09:04:51 UTC (rev 1020) @@ -25,9 +25,6 @@ package org.nuiton.wikitty.storage.lucene; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.WikittyExtension; import org.nuiton.wikitty.search.operators.Element; import org.nuiton.wikitty.storage.WikittyExtensionStorage; Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java =================================================================== --- trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-07-01 08:54:27 UTC (rev 1019) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2011-07-01 09:04:51 UTC (rev 1020) @@ -133,7 +133,7 @@ protected FieldModifier fieldModifier; /** Lucene version used by wikitty. */ - protected static final Version WIKITTY_LUCENE_VERSION = Version.LUCENE_32; + protected static final Version WIKITTY_LUCENE_VERSION = Version.LUCENE_33; /** * Constructor.

1 0

r1019 - trunk/wikitty-jdbc
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 10:54:27 +0200 (Fri, 01 Jul 2011) New Revision: 1019 Url: http://nuiton.org/repositories/revision/wikitty/1019 Log: Wrong commit Modified: trunk/wikitty-jdbc/pom.xml Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) +++ trunk/wikitty-jdbc/pom.xml 2011-07-01 08:54:27 UTC (rev 1019) @@ -29,12 +29,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>wikitty-lucene</artifactId> - <version>${project.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> <classifier>tests</classifier>

1 0

r1018 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-lucene wikitty-perf-test wikitty-publication wikitty-solr wikitty-struts
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 10:53:49 +0200 (Fri, 01 Jul 2011) New Revision: 1018 Url: http://nuiton.org/repositories/revision/wikitty/1018 Log: Set next version to 3.2 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-lucene/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-solr/pom.xml trunk/wikitty-struts/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> <modules> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-api/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-dto/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-generators/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-hessian-client/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-hessian-server/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-jdbc/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> @@ -29,6 +29,12 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>wikitty-lucene</artifactId> + <version>${project.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>wikitty-api</artifactId> <version>${project.version}</version> <classifier>tests</classifier> Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-lucene/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-perf-test/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-publication/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-solr/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-struts/pom.xml =================================================================== --- trunk/wikitty-struts/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) +++ trunk/wikitty-struts/pom.xml 2011-07-01 08:53:49 UTC (rev 1018) @@ -7,7 +7,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1.3-SNAPSHOT</version> + <version>3.2-SNAPSHOT</version> </parent>

1 0

r1017 - in trunk: . wikitty-solr/src/main/resources
by echatellier＠users.nuiton.org 01 Jul '11

01 Jul '11

Author: echatellier Date: 2011-07-01 10:41:25 +0200 (Fri, 01 Jul 2011) New Revision: 1017 Url: http://nuiton.org/repositories/revision/wikitty/1017 Log: Update to lucene/solr 3.3 Modified: trunk/pom.xml trunk/wikitty-solr/src/main/resources/solrconfig.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-07-01 08:39:51 UTC (rev 1016) +++ trunk/pom.xml 2011-07-01 08:41:25 UTC (rev 1017) @@ -140,25 +140,32 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>3.1.0</version> + <version>3.3.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> - <version>3.1.0</version> + <version>3.3.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.1.0</version> + <version>3.3.0</version> <scope>compile</scope> </dependency> <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-analyzers</artifactId> + <version>3.3.0</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> <version>2.5</version> Modified: trunk/wikitty-solr/src/main/resources/solrconfig.xml =================================================================== --- trunk/wikitty-solr/src/main/resources/solrconfig.xml 2011-07-01 08:39:51 UTC (rev 1016) +++ trunk/wikitty-solr/src/main/resources/solrconfig.xml 2011-07-01 08:41:25 UTC (rev 1017) @@ -26,7 +26,7 @@ <config> - <luceneMatchVersion>LUCENE_31</luceneMatchVersion> + <luceneMatchVersion>LUCENE_33</luceneMatchVersion> <!-- Set this to 'false' if you want solr to continue working after it has encountered an severe configuration error. In a production environment,

1 0