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

r1336 - branches
by echatellier＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: echatellier Date: 2012-01-18 12:35:57 +0100 (Wed, 18 Jan 2012) New Revision: 1336 Url: http://nuiton.org/repositories/revision/wikitty/1336 Log: Remove useless branch Removed: branches/wikitty-3.3.x/

1 0

r1335 - in trunk: wikitty-api/src/test/java/org/nuiton/wikitty wikitty-api/src/test/java/org/nuiton/wikitty/test wikitty-api/src/test/xmi wikitty-jdbc/src/test/java/org/nuiton/wikitty wikitty-lucene/src/test/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: echatellier Date: 2012-01-18 11:41:26 +0100 (Wed, 18 Jan 2012) New Revision: 1335 Url: http://nuiton.org/repositories/revision/wikitty/1335 Log: Begin #1006 : new wikitty client tests. Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/WikittyClientJdbcTest.java trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/WikittyClientLuceneTest.java Modified: trunk/wikitty-api/src/test/xmi/multiinheritance.zargo Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java 2012-01-18 10:41:26 UTC (rev 1335) @@ -0,0 +1,145 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty; + +import java.util.ArrayList; +import java.util.List; + +import junit.framework.Assert; + +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryMaker; +import org.nuiton.wikitty.query.WikittyQueryParser; +import org.nuiton.wikitty.services.WikittyServiceInMemory; +import org.nuiton.wikitty.test.Pegasus; +import org.nuiton.wikitty.test.PegasusImpl; + +/** + * Wikitty client test to test for client use. + * + * This test is designed to be overridden and change {@link WikittyClient} + * implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyClientTest { + + protected static ApplicationConfig wikittyConfig; + + protected WikittyClient wikittyClient; + + /** + * Init {@link ApplicationConfig} class. + */ + @BeforeClass + public static void setUpConfig() { + // can't call parse method here + wikittyConfig = new ApplicationConfig( + WikittyConfigOption.class, WikittyConfigAction.class, + null, null); + } + + /** + * Override to method in sub tests to change wikitty client implementation. + * + * @return wikitty client implementation to use in current test case instance + */ + protected WikittyClient getWikittyClient() { + WikittyService wikittyService = new WikittyServiceInMemory(wikittyConfig); + WikittyClient client = new WikittyClient(wikittyConfig, wikittyService); + return client; + } + + /** + * Clear all data and add some test data for all tests. + */ + @Before + public void setUpTestData() { + wikittyClient = getWikittyClient(); + wikittyClient.clear(); + addTestDataInClient(wikittyClient); + } + + /** + * Add some wikitty in client. + * + * @param wikittyClient wikitty client + */ + protected void addTestDataInClient(WikittyClient wikittyClient) { + // some tree nodes + WikittyTreeNode rootNode = new WikittyTreeNodeImpl(); + rootNode.setName("rootnode"); + WikittyTreeNode subNode = new WikittyTreeNodeImpl(); + subNode.setName("subnode"); + + List<WikittyTreeNode> allNodes = new ArrayList<WikittyTreeNode>(); + allNodes.add(rootNode); + allNodes.add(subNode); + wikittyClient.store(allNodes); + + // Pegasus (multiple inheritance) + Pegasus pegasus = new PegasusImpl(); + pegasus.setFly(2); + pegasus.setColor("black"); + pegasus.setColorFromBird("white"); + wikittyClient.store(pegasus); + } + + /** + * Test a query with query maker. + */ + @Test + public void testFindByQueryMaker() { + WikittyQuery query = new WikittyQueryMaker().and() + .eq(Pegasus.ELEMENT_FIELD_HORSE_COLOR, "black") + .eq(Pegasus.ELEMENT_FIELD_BIRD_COLOR, "white") + .end(); + + Pegasus pegasus = wikittyClient.findByQuery(Pegasus.class, query); + Assert.assertEquals("[Pegasus]black/white", pegasus.getReference()); + } + + /** + * Test a query with query parser. + */ + @Test + public void testFindQueryParser() { + WikittyQuery query = WikittyQueryParser.parse( + "Horse.color=black Bird.color=white"); + Pegasus pegasus = wikittyClient.findByQuery(Pegasus.class, query); + Assert.assertEquals(2, pegasus.getFly()); + } +} Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyClientTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java 2012-01-18 10:41:26 UTC (rev 1335) @@ -0,0 +1,61 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.test; + +import org.nuiton.wikitty.entities.BusinessEntityImpl; +import org.nuiton.wikitty.entities.Wikitty; + +/** + * TODO add comment here. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class PegasusImpl extends PegasusAbstract { + + public PegasusImpl() { + super(); + } + + public PegasusImpl(Wikitty wikitty) { + super(wikitty); + } + + public PegasusImpl(BusinessEntityImpl businessEntityImpl) { + super(businessEntityImpl.getWikitty()); + } + + /* + * @see org.nuiton.wikitty.test.Pegasus#getReference() + */ + @Override + public String getReference() { + return "[Pegasus]" + getColor() + "/" + getColorFromBird(); + } +} Property changes on: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/test/PegasusImpl.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/wikitty-api/src/test/xmi/multiinheritance.zargo =================================================================== (Binary files differ) Added: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/WikittyClientJdbcTest.java =================================================================== --- trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/WikittyClientJdbcTest.java (rev 0) +++ trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/WikittyClientJdbcTest.java 2012-01-18 10:41:26 UTC (rev 1335) @@ -0,0 +1,59 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty; + +import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; +import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; +import org.nuiton.wikitty.services.WikittyServiceStorage; +import org.nuiton.wikitty.storage.WikittyExtensionStorage; +import org.nuiton.wikitty.storage.WikittySearchEngine; +import org.nuiton.wikitty.storage.WikittyStorage; +import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; + +/** + * Wikitty client test over JDBC implementation. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyClientJdbcTest extends WikittyClientTest { + + @Override + protected WikittyClient getWikittyClient() { + + WikittyExtensionStorage extStorage = new WikittyExtensionStorageJDBC(wikittyConfig); + WikittyStorage wikittyStorage = new WikittyStorageJDBC(wikittyConfig, extStorage); + WikittySearchEngine searchEngine = new WikittySearchEngineSolr(wikittyConfig, extStorage); + + WikittyServiceStorage wikittyService = new WikittyServiceStorage(wikittyConfig, + extStorage, wikittyStorage, searchEngine); + WikittyClient client = new WikittyClient(wikittyConfig, wikittyService); + return client; + } +} Property changes on: trunk/wikitty-jdbc/src/test/java/org/nuiton/wikitty/WikittyClientJdbcTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/WikittyClientLuceneTest.java =================================================================== --- trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/WikittyClientLuceneTest.java (rev 0) +++ trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/WikittyClientLuceneTest.java 2012-01-18 10:41:26 UTC (rev 1335) @@ -0,0 +1,59 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 Codelutin, 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 + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty; + +import org.nuiton.wikitty.services.WikittyServiceStorage; +import org.nuiton.wikitty.storage.WikittyExtensionStorage; +import org.nuiton.wikitty.storage.WikittyExtensionStorageInMemory; +import org.nuiton.wikitty.storage.WikittySearchEngine; +import org.nuiton.wikitty.storage.WikittyStorage; +import org.nuiton.wikitty.storage.WikittyStorageInMemory; +import org.nuiton.wikitty.storage.lucene.WikittySearchEngineLucene; + +/** + * Test on wikitty client over lucene. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyClientLuceneTest extends WikittyClientTest { + + @Override + protected WikittyClient getWikittyClient() { + + WikittyExtensionStorage extStorage = new WikittyExtensionStorageInMemory(); + WikittyStorage wikittyStorage = new WikittyStorageInMemory(); + WikittySearchEngine searchEngine = new WikittySearchEngineLucene(wikittyConfig, extStorage); + + WikittyServiceStorage wikittyService = new WikittyServiceStorage(wikittyConfig, + extStorage, wikittyStorage, searchEngine); + WikittyClient client = new WikittyClient(wikittyConfig, wikittyService); + return client; + } +} Property changes on: trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/WikittyClientLuceneTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r1334 - in trunk/wikitty-lucene/src: main/java/org/nuiton/wikitty/storage/lucene test/java/org/nuiton/wikitty/storage/lucene
by echatellier＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: echatellier Date: 2012-01-18 11:40:56 +0100 (Wed, 18 Jan 2012) New Revision: 1334 Url: http://nuiton.org/repositories/revision/wikitty/1334 Log: Fix module compilation (but test won't run) Modified: trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittyServiceLucene.java 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 2012-01-18 10:40:18 UTC (rev 1333) +++ trunk/wikitty-lucene/src/main/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLucene.java 2012-01-18 10:40:56 UTC (rev 1334) @@ -80,10 +80,13 @@ import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; import org.nuiton.wikitty.entities.Wikitty; import org.nuiton.wikitty.entities.WikittyTreeNode; import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; +import org.nuiton.wikitty.entities.WikittyTypes; +import org.nuiton.wikitty.query.WikittyQuery; +import org.nuiton.wikitty.query.WikittyQueryResult; +import org.nuiton.wikitty.query.WikittyQueryResultTreeNode; import org.nuiton.wikitty.search.Criteria; import org.nuiton.wikitty.search.FacetTopic; import org.nuiton.wikitty.search.PagedResult; @@ -133,7 +136,7 @@ protected FieldModifier fieldModifier; /** Lucene version used by wikitty. */ - protected static final Version WIKITTY_LUCENE_VERSION = Version.LUCENE_33; + protected static final Version WIKITTY_LUCENE_VERSION = Version.LUCENE_35; /** * Constructor. @@ -651,7 +654,7 @@ * Ajoute un champs dans un document a indexer */ protected void addToIndexDocument(Document doc, - TYPE type, String fqfieldName, String fieldValue, + WikittyTypes type, String fqfieldName, String fieldValue, boolean collection) { if (fqfieldName.startsWith(WIKITTY_LUCENE_PREFIX)) { doc.removeField(fqfieldName); @@ -1005,7 +1008,7 @@ facetValue.close(); } - pagedResult = new PagedResult<String>(firstIndex, pagedResultCount, + pagedResult = new PagedResult<String>(null, firstIndex, pagedResultCount, query.toString(), pagedResultFacets, results); /*// execute search query @@ -1236,4 +1239,24 @@ } return result; } + + /* + * @see org.nuiton.wikitty.storage.WikittySearchEngine#findAllByQuery(org.nuiton.wikitty.services.WikittyTransaction, org.nuiton.wikitty.query.WikittyQuery) + */ + @Override + public WikittyQueryResult<String> findAllByQuery( + WikittyTransaction transaction, WikittyQuery queries) { + return null; + } + + /* + * @see org.nuiton.wikitty.storage.WikittySearchEngine#findAllChildrenCount(org.nuiton.wikitty.services.WikittyTransaction, java.lang.String, int, boolean, org.nuiton.wikitty.query.WikittyQuery) + */ + @Override + public WikittyQueryResultTreeNode<String> findAllChildrenCount( + WikittyTransaction transaction, String wikittyId, int depth, + boolean count, WikittyQuery filter) { + // TODO Auto-generated method stub + return null; + } } Modified: trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java =================================================================== --- trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java 2012-01-18 10:40:18 UTC (rev 1333) +++ trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittySearchEngineLuceneTest.java 2012-01-18 10:40:56 UTC (rev 1334) @@ -131,7 +131,7 @@ } - @Test + /*@Test public void testCountAttachment() throws Exception { List<Wikitty> toStore = new ArrayList<Wikitty>(); @@ -229,7 +229,7 @@ Assert.assertEquals(2, children.getChildCount()); Assert.assertEquals(5, children.getChild(node1.getId()).getAttCount()); Assert.assertEquals(4, children.getChild(node2.getId()).getAttCount()); - } + }*/ /** * Test que lors de la reindexation les noeuds indexés le sont Modified: trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittyServiceLucene.java =================================================================== --- trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittyServiceLucene.java 2012-01-18 10:40:18 UTC (rev 1333) +++ trunk/wikitty-lucene/src/test/java/org/nuiton/wikitty/storage/lucene/WikittyServiceLucene.java 2012-01-18 10:40:56 UTC (rev 1334) @@ -40,7 +40,9 @@ * by : $Author$ */ public class WikittyServiceLucene extends WikittyServiceStorage { + public WikittyServiceLucene(ApplicationConfig config) { + super(config); extensionStorage = new WikittyExtensionStorageInMemory(); wikittyStorage = new WikittyStorageInMemory(); searchEngine = new WikittySearchEngineLucene(config, extensionStorage);

1 0

r1333 - trunk
by echatellier＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: echatellier Date: 2012-01-18 11:40:18 +0100 (Wed, 18 Jan 2012) New Revision: 1333 Url: http://nuiton.org/repositories/revision/wikitty/1333 Log: #1881: Update to solr and lucene 3.5 #1911: Update to nuiton-utils 2.4.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-01-18 10:02:58 UTC (rev 1332) +++ trunk/pom.xml 2012-01-18 10:40:18 UTC (rev 1333) @@ -53,7 +53,7 @@  <eugeneVersion>2.4.2</eugeneVersion> - <nuitonUtilsVersion>2.4.2</nuitonUtilsVersion> + <nuitonUtilsVersion>2.4.4</nuitonUtilsVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> <jettyVersion>7.4.2.v20110526</jettyVersion> @@ -198,28 +198,28 @@ <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-core</artifactId> - <version>3.3.0</version> + <version>3.5.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.solr</groupId> <artifactId>solr-solrj</artifactId> - <version>3.3.0</version> + <version>3.5.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-core</artifactId> - <version>3.3.0</version> + <version>3.5.0</version> <scope>compile</scope> </dependency> <dependency> <groupId>org.apache.lucene</groupId> <artifactId>lucene-analyzers</artifactId> - <version>3.3.0</version> + <version>3.5.0</version> <scope>compile</scope> </dependency>

1 0

r1332 - trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr
by echatellier＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: echatellier Date: 2012-01-18 11:02:58 +0100 (Wed, 18 Jan 2012) New Revision: 1332 Url: http://nuiton.org/repositories/revision/wikitty/1332 Log: Remove wrong import Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java Modified: trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-18 09:57:05 UTC (rev 1331) +++ trunk/wikitty-solr/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2012-01-18 10:02:58 UTC (rev 1332) @@ -35,7 +35,6 @@ import java.util.Map; import java.util.Set; -import com.ctc.wstx.util.StringUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.solr.client.solrj.SolrQuery;

1 0

r1331 - trunk/src/site/rst/user
by echatellier＠users.nuiton.org 18 Jan '12

18 Jan '12

Author: echatellier Date: 2012-01-18 10:57:05 +0100 (Wed, 18 Jan 2012) New Revision: 1331 Url: http://nuiton.org/repositories/revision/wikitty/1331 Log: Fix doc Modified: trunk/src/site/rst/user/query.rst Modified: trunk/src/site/rst/user/query.rst =================================================================== --- trunk/src/site/rst/user/query.rst 2012-01-17 16:13:32 UTC (rev 1330) +++ trunk/src/site/rst/user/query.rst 2012-01-18 09:57:05 UTC (rev 1331) @@ -80,7 +80,7 @@ Vous pouvez aussi utiliser WikittyQueryParser pour faire le même travail, mais il est plus sûr d'utiliser le WikittyQueryMaker tant que vous le pouvez:: - WikittyQueryParser parser = WikittyQueryParser.parse( + WikittyQuery query = WikittyQueryParser.parse( "User.lastname=poussin User.firstname=benjamin"); S'il n'y a pas d'opérateur entre deux contraintes un AND est automatiquement

1 0

r1330 - in trunk: wikitty-lucene wikitty-publication wikitty-publication-ui wp-maven-plugin
by echatellier＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: echatellier Date: 2012-01-17 17:13:32 +0100 (Tue, 17 Jan 2012) New Revision: 1330 Url: http://nuiton.org/repositories/revision/wikitty/1330 Log: Update poms Modified: trunk/wikitty-lucene/pom.xml trunk/wikitty-publication-ui/pom.xml trunk/wikitty-publication/pom.xml trunk/wp-maven-plugin/pom.xml Modified: trunk/wikitty-lucene/pom.xml =================================================================== --- trunk/wikitty-lucene/pom.xml 2012-01-17 16:04:12 UTC (rev 1329) +++ trunk/wikitty-lucene/pom.xml 2012-01-17 16:13:32 UTC (rev 1330) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2012-01-17 16:04:12 UTC (rev 1329) +++ trunk/wikitty-publication/pom.xml 2012-01-17 16:13:32 UTC (rev 1330) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-publication-ui/pom.xml =================================================================== --- trunk/wikitty-publication-ui/pom.xml 2012-01-17 16:04:12 UTC (rev 1329) +++ trunk/wikitty-publication-ui/pom.xml 2012-01-17 16:13:32 UTC (rev 1330) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> </parent>  Modified: trunk/wp-maven-plugin/pom.xml =================================================================== --- trunk/wp-maven-plugin/pom.xml 2012-01-17 16:04:12 UTC (rev 1329) +++ trunk/wp-maven-plugin/pom.xml 2012-01-17 16:13:32 UTC (rev 1330) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1329 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport
by echatellier＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: echatellier Date: 2012-01-17 17:04:12 +0100 (Tue, 17 Jan 2012) New Revision: 1329 Url: http://nuiton.org/repositories/revision/wikitty/1329 Log: Rename facet on extension since renaming in 3.3 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-17 11:09:45 UTC (rev 1328) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/addons/importexport/ImportExportCSV.java 2012-01-17 16:04:12 UTC (rev 1329) @@ -382,7 +382,14 @@ for (Map.Entry<String, List<org.nuiton.wikitty.search.FacetTopic>> e : pagedResult.getFacets().entrySet()) { String facetName = e.getKey(); List<FacetTopic> topics = new ArrayList<FacetTopic>(); - facet.put(facetName, topics); + + // since 3.4, facet extension has changed of name + if (org.nuiton.wikitty.search.operators.Element.ELT_EXTENSION.equals(facetName)) { + facet.put(Element.EXTENSION.getValue(), topics); + } else { + facet.put(facetName, topics); + } + for (org.nuiton.wikitty.search.FacetTopic f : e.getValue()) { topics.add(new FacetTopic(f.getFacetName(), f.getTopicName(), f.getCount())); }

1 0

r1328 - in branches/wikitty-3.3.x: . wikitty-api wikitty-dto wikitty-generators wikitty-generators/src/main/java/org/nuiton/wikitty/generator wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-lucene wikitty-perf-test wikitty-publication wikitty-publication-ui wikitty-solr wikitty-struts wp-maven-plugin
by echatellier＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: echatellier Date: 2012-01-17 12:09:45 +0100 (Tue, 17 Jan 2012) New Revision: 1328 Url: http://nuiton.org/repositories/revision/wikitty/1328 Log: Init branche and readd generation modification Modified: branches/wikitty-3.3.x/pom.xml branches/wikitty-3.3.x/wikitty-api/pom.xml branches/wikitty-3.3.x/wikitty-dto/pom.xml branches/wikitty-3.3.x/wikitty-generators/pom.xml branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml branches/wikitty-3.3.x/wikitty-jdbc/pom.xml branches/wikitty-3.3.x/wikitty-lucene/pom.xml branches/wikitty-3.3.x/wikitty-perf-test/pom.xml branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml branches/wikitty-3.3.x/wikitty-publication/pom.xml branches/wikitty-3.3.x/wikitty-solr/pom.xml branches/wikitty-3.3.x/wikitty-struts/pom.xml branches/wikitty-3.3.x/wp-maven-plugin/pom.xml Modified: branches/wikitty-3.3.x/pom.xml =================================================================== --- branches/wikitty-3.3.x/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> <modules> Modified: branches/wikitty-3.3.x/wikitty-api/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-api/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-api/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-dto/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-dto/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-dto/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-generators/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-17 11:09:45 UTC (rev 1328) @@ -24,17 +24,6 @@ */ package org.nuiton.wikitty.generator; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -import org.nuiton.eugene.models.object.ObjectModel; -import org.nuiton.eugene.models.object.ObjectModelAttribute; -import org.nuiton.eugene.models.object.ObjectModelClass; -import org.nuiton.eugene.models.object.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -46,6 +35,18 @@ import java.util.Random; import java.util.Set; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelAttribute; +import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + /*{generator option: writeString = }*/ /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -131,6 +132,11 @@ addConstructors(abstractClassForThisEntity); addConstants(clazz, abstractClassForThisEntity); addToString(clazz, abstractClassForThisEntity); + + // adding a generated serialVersionUID + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(abstractClassForThisEntity, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); } processedClasses.clear(); @@ -158,17 +164,6 @@ addImport(clazz, LinkedHashSet.class); } - protected void addSerialVersionUID(ObjectModelClass clazz) { - // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(clazz, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); - } - protected void addConstructors(ObjectModelClass clazz) { ObjectModelOperation constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); Modified: branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-17 11:09:45 UTC (rev 1328) @@ -32,11 +32,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelModifier; @@ -137,13 +137,9 @@ setSuperClass(implementation, WikittyTransformerUtil.businessEntityToAbstractName(clazz)); // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(implementation, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(implementation, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); processedClasses.put(clazz, implementation); } Modified: branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-jdbc/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-jdbc/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-jdbc/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: branches/wikitty-3.3.x/wikitty-lucene/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-lucene/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-lucene/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-perf-test/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-perf-test/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-perf-test/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: branches/wikitty-3.3.x/wikitty-publication/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-publication/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-publication/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-solr/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-solr/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-solr/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wikitty-struts/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-struts/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-struts/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent>  Modified: branches/wikitty-3.3.x/wp-maven-plugin/pom.xml =================================================================== --- branches/wikitty-3.3.x/wp-maven-plugin/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wp-maven-plugin/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>

1 0

r1327 - in branches: . wikitty-3.3.x
by echatellier＠users.nuiton.org 17 Jan '12

17 Jan '12

Author: echatellier Date: 2012-01-17 12:05:06 +0100 (Tue, 17 Jan 2012) New Revision: 1327 Url: http://nuiton.org/repositories/revision/wikitty/1327 Log: New 3.3x branch Added: branches/wikitty-3.3.x/ Property changes on: branches/wikitty-3.3.x ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0