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

r155 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: echatellier Date: 2010-06-24 16:13:27 +0200 (Thu, 24 Jun 2010) New Revision: 155 Url: http://nuiton.org/repositories/revision/wikitty/155 Log: Add some debug traces Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-06-24 14:13:02 UTC (rev 154) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-06-24 14:13:27 UTC (rev 155) @@ -22,6 +22,8 @@ import java.util.Map; import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * Cette classe sert a introduire du cache dans wikitty. Elle sert a centraliser @@ -36,6 +38,8 @@ */ public class WikittyCache implements WikittyServiceListener { + static private Log log = LogFactory.getLog(WikittyCache.class); + protected Map<String, Wikitty> wikittyCache; /** @@ -86,7 +90,17 @@ if (old == null || WikittyUtil.versionGreaterThan(e.getVersion(), old.getVersion())) { wikittyCache.put(e.getId(), e); + + if (log.isTraceEnabled()) { + log.trace("Replace cached wikitty : new version " + e.getVersion() + + " > old version " + (old == null ? null : old.getVersion())); + } } + else { + if (log.isTraceEnabled()) { + log.trace("Ignoring putWikittyEvent : new version " + e.getVersion() + " < old version " + old.getVersion()); + } + } } /**

1 0

r154 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: echatellier Date: 2010-06-24 16:13:02 +0200 (Thu, 24 Jun 2010) New Revision: 154 Url: http://nuiton.org/repositories/revision/wikitty/154 Log: Take care of update reponse (on remote use, input wikitty parameters are not propagated) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-24 14:09:22 UTC (rev 153) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-06-24 14:13:02 UTC (rev 154) @@ -200,6 +200,8 @@ @Override public UpdateResponse store(String securityToken, Wikitty wikitty) { UpdateResponse updateResponse = ws.store(securityToken, wikitty); + // update wikitty + updateResponse.update(wikitty); // notify listeners firePutWikitty(wikitty); return updateResponse; @@ -208,6 +210,10 @@ @Override public UpdateResponse store(String securityToken, Collection<Wikitty> wikitties) { UpdateResponse updateResponse = ws.store(securityToken, wikitties); + // update wikitty + for (Wikitty wikitty : wikitties) { + updateResponse.update(wikitty); + } // notify listeners firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()])); return updateResponse; @@ -218,6 +224,10 @@ boolean disableAutoVersionIncrement) { UpdateResponse updateResponse = ws.store( securityToken, wikitties, disableAutoVersionIncrement); + // update wikitty + for (Wikitty wikitty : wikitties) { + updateResponse.update(wikitty); + } // notify listeners firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()])); return updateResponse; @@ -228,6 +238,10 @@ Collection<Wikitty> wikitties, boolean disableAutoVersionIncrement) { UpdateResponse updateResponse = ws.store(securityToken, transaction, wikitties, disableAutoVersionIncrement); + // update wikitty + for (Wikitty wikitty : wikitties) { + updateResponse.update(wikitty); + } // notify listeners firePutWikitty(wikitties.toArray(new Wikitty[wikitties.size()])); return updateResponse;

1 0

r153 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by echatellier＠users.nuiton.org 24 Jun '10

24 Jun '10

Author: echatellier Date: 2010-06-24 16:09:22 +0200 (Thu, 24 Jun 2010) New Revision: 153 Url: http://nuiton.org/repositories/revision/wikitty/153 Log: Restore old field type definition parsing (unique, not null). Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-23 16:17:59 UTC (rev 152) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-06-24 14:09:22 UTC (rev 153) @@ -96,13 +96,15 @@ * <li>group 1: type (string) * <li>group 2: name (string) * <li>group 3: lower bound (number) can be null - * <li>group 4: upper bound (number) can be null, mutualy exclusif with group 5 + * <li>group 4: upper bound (number) can be null, mutually exclusive with group 5 * <li>group 5: upper bound (n or *) can be null - * <li>group 6: all tag/value (toto=titi tutu=tata;lala tata="truc bidulle") + * <li>group 6: unique can be null (legacy configuration, prefer use of {@code unique="true"} + * <li>group 7: not null can be null (legacy configuration, prefer use of {@code notNull="true"} + * <li>group 8: all tag/value (toto=titi tutu=tata;lala tata="truc bidulle") */ static protected Pattern fieldPattern = Pattern .compile( - "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?((?:\\s+" + "\\s*(\\w+)\\s+(\\w+)(?:\\s*\\[(\\d+)-(?:(\\d+)|([\\*n]))\\])?(?:\\s+(unique))?(?:\\s+(not null))?((?:\\s+" + tagValuesPatternString + ")*)", Pattern.DOTALL); /** @@ -133,8 +135,22 @@ fieldType.upperBound = FieldType.NOLIMIT; } - String tagValues = match.group(6); + // parse group 8 before + String tagValues = match.group(8); Map<String, String> tagValuesMap = tagValuesToMap(tagValues); + + // legacy field definition : unique + String uniqueString = match.group(6); + if (uniqueString != null) { + tagValuesMap.put(FieldType.UNIQUE, "true"); + } + + // legacy field definition : not null + String notNullString = match.group(7); + if (notNullString != null) { + tagValuesMap.put(FieldType.NOT_NULL, "true"); + } + fieldType.setTagValues(tagValuesMap); return name;

1 0

r152 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 18:17:59 +0200 (Wed, 23 Jun 2010) New Revision: 152 Url: http://nuiton.org/repositories/revision/wikitty/152 Log: Fix unique contraints collection type used Set/List Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-23 15:55:51 UTC (rev 151) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-06-23 16:17:59 UTC (rev 152) @@ -448,7 +448,8 @@ } /** - * Create Wikitty from h2 tables + * Create Wikitty from jdbc tables. + * * @param id the id of the wikitty to restore * @param version the version of the wikitty to restore * @param extensionList the list of the extensions of the wikitty to restore @@ -531,8 +532,17 @@ // add fieldList in wikitty for (String fieldName : listFieldMap.keySet()) { Object[] array = listFieldMap.get(fieldName); - List list = new ArrayList(Arrays.asList(array)); - result.setFqField(fieldName, list ); + FieldType type = result.getFieldType(fieldName); + + // EC20100623 check this Set/List depending on unique constraints + if (type.isUnique()) { + Set set = new HashSet(Arrays.asList(array)); + result.setFqField(fieldName, set); + } + else { + List list = new ArrayList(Arrays.asList(array)); + result.setFqField(fieldName, list); + } } return result;

1 0

r151 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/conform
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 17:55:51 +0200 (Wed, 23 Jun 2010) New Revision: 151 Url: http://nuiton.org/repositories/revision/wikitty/151 Log: Fix notNull check and tests Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-23 14:59:56 UTC (rev 150) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-06-23 15:55:51 UTC (rev 151) @@ -136,7 +136,7 @@ for (String fieldName : ext.getFieldNames()) { FieldType type = ext.getFieldType(fieldName); if (type.isNotNull()) { - if (null == w.getFqField(fieldName)) { + if (null == w.getFieldAsObject(ext.getName(), fieldName)) { throw new WikittyException(String.format( "Field %s must not be null", fieldName)); } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-23 14:59:56 UTC (rev 150) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-06-23 15:55:51 UTC (rev 151) @@ -158,9 +158,9 @@ public void testFieldConstraint() throws Exception { WikittyExtension ext = new WikittyExtension("TestConstraint", "1", null, WikittyUtil.buildFieldMapExtension( - "String id not null", - "String ext[0-n] unique", - "String other[0-n] unique not null" + "String id notNull=true", + "String ext[0-n] unique=true", + "String other[0-n] unique=true notNull=true" )); ws.storeExtension(null, Arrays.asList(ext));

1 0

r150 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: bpoussin Date: 2010-06-23 16:59:56 +0200 (Wed, 23 Jun 2010) New Revision: 150 Url: http://nuiton.org/repositories/revision/wikitty/150 Log: ajout de la methode notNull pour ajouter la contrainte Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-06-23 08:19:43 UTC (rev 149) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-06-23 14:59:56 UTC (rev 150) @@ -55,6 +55,11 @@ return this; } + public FieldFactory notNull() { + addTagValue(FieldType.NOT_NULL, "true"); + return this; + } + public FieldFactory addTagValue(String tag, String value) { tagValues.put(tag, value); return this;

1 0

r149 - trunk/wikitty-hessian-client
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 10:19:43 +0200 (Wed, 23 Jun 2010) New Revision: 149 Url: http://nuiton.org/repositories/revision/wikitty/149 Log: Set svn:ignore Modified: trunk/wikitty-hessian-client/ Property changes on: trunk/wikitty-hessian-client ___________________________________________________________________ Added: svn:ignore + .settings target .classpath .project

1 0

r148 - in trunk: . wikitty-hessian-client wikitty-hessian-client/src wikitty-hessian-client/src/main wikitty-hessian-client/src/main/java wikitty-hessian-client/src/main/java/org wikitty-hessian-client/src/main/java/org/wikitty wikitty-hessian-client/src/main/java/org/wikitty/hessian wikitty-hessian-client/src/test
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 10:13:18 +0200 (Wed, 23 Jun 2010) New Revision: 148 Url: http://nuiton.org/repositories/revision/wikitty/148 Log: Link wikitty-ui-zk to build. Add wikitty-hessian-client module and hessian dependency Added: trunk/wikitty-hessian-client/ trunk/wikitty-hessian-client/LICENSE.txt trunk/wikitty-hessian-client/README.txt trunk/wikitty-hessian-client/changelog.txt trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-client/src/ trunk/wikitty-hessian-client/src/main/ trunk/wikitty-hessian-client/src/main/java/ trunk/wikitty-hessian-client/src/main/java/org/ trunk/wikitty-hessian-client/src/main/java/org/wikitty/ trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/ trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java trunk/wikitty-hessian-client/src/test/ trunk/wikitty-hessian-client/src/test/java/ Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-23 08:11:37 UTC (rev 147) +++ trunk/pom.xml 2010-06-23 08:13:18 UTC (rev 148) @@ -26,7 +26,9 @@ <module>wikitty-jdbc-impl</module> <module>wikitty-multistorage-impl</module> <module>wikitty-jms-impl</module> -  + <module>wikitty-ui-zk</module> + <module>wikitty-hessian-client</module> +  </modules> <dependencyManagement> @@ -93,6 +95,13 @@ <version>1.6.0</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>3.1.5</version> + <scope>compile</scope> + </dependency>  +  +  + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-hessian-client</artifactId> + + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>com.caucho</groupId> + <artifactId>hessian</artifactId> + <version>3.1.5</version> + <scope>compile</scope> + </dependency> + </dependencies> + +  +  +  + + <name>Wikitty :: hessian client</name> + + <description>Wikitty hessian client</description> + <inceptionYear>2010</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> + + </properties> + + <build> + + </build> + +  +  +  + +</project> Added: trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java =================================================================== --- trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java (rev 0) +++ trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java 2010-06-23 08:13:18 UTC (rev 148) @@ -0,0 +1,65 @@ +/* *##% + * Copyright (C) 2010 Code Lutin, Chatellier Eric + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * 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 Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + *##%*/ + +package org.wikitty.hessian; + +import java.net.MalformedURLException; + +import org.nuiton.wikitty.WikittyException; + +import com.caucho.hessian.client.HessianProxyFactory; + +/** + * Wikitty hessian client factory. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class WikittyHessianFactory { + + /** + * Get hessian service proxy on remove endpoint. + * + * @param <S> service type + * @param serviceInterface service interface + * @param serviceEndpoint service endpoint (full url) + * @return hessian proxy implementing {@code S} + * @throws WikittyException if hessian proxy can't be created + */ + public <S> S getService(Class<S> serviceInterface, String serviceEndpoint) throws WikittyException { + + HessianProxyFactory factory = new HessianProxyFactory(); + // Fix : com.caucho.hessian.io.HessianProtocolException: '��' is an unknown code + factory.setHessian2Request(true); + // pour que les méthodes aux noms dupliquées fonctionnent (arguments different) + factory.setOverloadEnabled(true); + + // service proxy + S hessianProxy; + try { + hessianProxy = (S)factory.create(serviceInterface, serviceEndpoint); + } catch (MalformedURLException eee) { + throw new WikittyException("Can't create hessian proxy", eee); + } + + return hessianProxy; + } +} Property changes on: trunk/wikitty-hessian-client/src/main/java/org/wikitty/hessian/WikittyHessianFactory.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r147 - trunk/wikitty-ui-zk
by echatellier＠users.nuiton.org 23 Jun '10

23 Jun '10

Author: echatellier Date: 2010-06-23 10:11:37 +0200 (Wed, 23 Jun 2010) New Revision: 147 Url: http://nuiton.org/repositories/revision/wikitty/147 Log: Set svn:ignore Modified: trunk/wikitty-ui-zk/ Property changes on: trunk/wikitty-ui-zk ___________________________________________________________________ Modified: svn:ignore - target + target .settings .classpath .project

1 0

r146 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory
by bpoussin＠users.nuiton.org 22 Jun '10

22 Jun '10

Author: bpoussin Date: 2010-06-22 19:13:36 +0200 (Tue, 22 Jun 2010) New Revision: 146 Url: http://nuiton.org/repositories/revision/wikitty/146 Log: suppression d'import non utilise Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-22 17:12:42 UTC (rev 145) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-06-22 17:13:36 UTC (rev 146) @@ -9,21 +9,16 @@ import java.util.Arrays; import java.util.Collection; import java.util.Date; -import java.util.LinkedList; -import java.util.List; import org.junit.Before; import org.junit.Test; -import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.ExtensionFactory; -import org.nuiton.wikitty.PagedResult; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyServiceInMemory; import org.nuiton.wikitty.WikittyUtil; import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.api.AbstractTestApi; -import org.nuiton.wikitty.search.Search; public class InMemoryStorageTest extends AbstractTestApi {

1 0