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

r436 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty test/java/org/nuiton/wikitty/notification
by bpoussin＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: bpoussin Date: 2010-10-20 16:16:17 +0200 (Wed, 20 Oct 2010) New Revision: 436 Url: http://nuiton.org/repositories/revision/wikitty/436 Log: modification pour que le test fonctionne "toujours". Il y a un petit probleme de synchro de thread mais le probleme ne peut apparaitre que dans les tests (fonctionnalite de synchro non utilise dans un vrai developpement). Donc pour l'instant un petit sleep suffira :) Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.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-10-20 14:14:33 UTC (rev 435) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-20 14:16:17 UTC (rev 436) @@ -638,16 +638,21 @@ /** * thread that want wait for particulare event to be processed, can be - * call this method with event time in argument. + * call this method with event time in argument. Used only in unit test + * but this is necessary for test. */ public void waitFor(long eventTime) throws InterruptedException { - if (eventTime <= lastEventTime) { - // le thread demande a attendre un event deja passe - // on le met donc pas en attente - return; - } Object mutex = null; + sleep(1); // sleep 1 millis to prevent problem with 2 events in same millis synchronized (waiter) { + if (eventTime <= lastEventTime) { + // le thread demande a attendre un event deja passe + // on le met donc pas en attente + if (log.isDebugEnabled()) { + log.debug("event deja passe " + eventTime + " <= " + lastEventTime); + } + return; + } mutex = waiter.get(eventTime); if (mutex == null) { mutex = new Object(); @@ -700,6 +705,9 @@ log.error("Can't notify listener", eee); } synchronized (waiter) { + // on met a jour l'heure du dernier event envoye + lastEventTime = event.getTime(); + // on previent les threads en attente si besoin // dans un premier temps on ne recupere que ceux @@ -734,7 +742,6 @@ } } } - lastEventTime = event.getTime(); } } catch (InterruptedException eee) { log.error("Notification thread error", eee); Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java 2010-10-20 14:14:33 UTC (rev 435) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java 2010-10-20 14:16:17 UTC (rev 436) @@ -103,8 +103,8 @@ wsn.processRemoteEvent(event); wsn.getEventThread().waitFor(event.getTime()); if (hasListener) { - Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION, - lastEvent); + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION, + lastEvent); } else { Assert.assertEquals(null, lastEvent); }

1 0

r435 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty main/xmi test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: bpoussin Date: 2010-10-20 16:14:33 +0200 (Wed, 20 Oct 2010) New Revision: 435 Url: http://nuiton.org/repositories/revision/wikitty/435 Log: Ajout du support i18n pour les extensions, et d'un debut de test unitaire http://www.nuiton.org/issues/show/756 Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nImpl.java 2010-10-20 14:14:33 UTC (rev 435) @@ -0,0 +1,217 @@ +package org.nuiton.wikitty; + +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.HashMap; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.util.StringUtil; + +/** + * WikittyI18n permet de gerer les traductions des champs des extensions. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyI18nImpl extends WikittyI18nAbstract + implements PropertyChangeListener { + + private static final long serialVersionUID = 3824481585361443459L; + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyI18nImpl.class); + + /** contient les translations sous une forme plus simple a utiliser */ + transient protected Map<String, Map<String, String>> translationsCache = null; + + /** + * WikittyI18nImpl : + */ + public WikittyI18nImpl() { + super(); + } + + /** + * WikittyI18nImpl : + * @param wikitty + */ + public WikittyI18nImpl(Wikitty wikitty) { + super(wikitty); + } + + /** + * WikittyI18nImpl : + * @param businessEntityWikitty + */ + public WikittyI18nImpl(BusinessEntityWikitty businessEntityWikitty) { + super(businessEntityWikitty.getWikitty()); + } + + /** + * WikittyAuthorisationImpl : + * @param extension + * @param wikitty + */ + + public WikittyI18nImpl(WikittyExtension extension, Wikitty wikitty) { + this(wikitty); + setExtensionForMetaExtension(extension); + } + + /** + * On surcharge la methode pour se mettre listener des modifications de + * translation pour pouvoir vider le cache de translation + * @param wikitty + */ + @Override + public void setWikitty(Wikitty wikitty) { + if (this.wikitty != null) { + this.wikitty.removePropertyChangeListener( + FQ_FIELD_WIKITTYI18N_TRANSLATIONS, this); + } + super.setWikitty(wikitty); + if (this.wikitty != null) { + this.wikitty.addPropertyChangeListener( + FQ_FIELD_WIKITTYI18N_TRANSLATIONS, this); + } + } + + /** + * Retourne la translation pour un champs donne pour une lang donnee + * @param lang la langue souhaitee (ex: fr) + * @param field le champs souhaite (ex: name) + * @return la traduction + */ + public String getTranslation(String lang, String field) { + parseAndCacheTranslations(); + + String result = null; + Map<String, String> l = translationsCache.get(lang); + if (l != null) { + result = l.get(field); + } + + if (result == null) { + // no translation for this field, default return field in parameter + result = field; + } + return result; + } + + /** + * Modifie la traduction d'un champs + * @param lang + * @param field + * @param trad + */ + public void setTranslation(String lang, String field, String trad) { + parseAndCacheTranslations(); + putInTranslationCache(lang, field, trad); + // on sauve temporairement le cache, car il va etre supprime + // suite au setTranslations, vu qu'il est a jour se serait dommage de + // devoir le reconstruire + Map<String, Map<String, String>> tmp = translationsCache; + String trans = convertToString(tmp); + setTranslations(trans); + // remet le cache sauvegarde en place + translationsCache = tmp; + + // on indique que la lang a des traductions si besoin + if (getLang() == null || !getLang().contains(lang)) { + addLang(lang); + } + } + + /** + * Parse les traductions et le met en cache + * + * Translations est de la forme: + * [fr:"name"="nom","firstname"="prenom"],[en:"name="name","firstname"="firstname"] + */ + protected void parseAndCacheTranslations() { + if (translationsCache == null) { + String trans = getTranslations(); + String[] langsFields = StringUtil.split(trans, ","); + for (String langFields : langsFields) { + // suppression des [ ] + langFields = langFields.substring(1, langFields.length() - 1); + int colonPos = langFields.indexOf(":"); + // recuperation de la langue + String lang = langFields.substring(0, colonPos); + langFields = langFields.substring(colonPos + 1); + String[] fields = StringUtil.split(langFields, ","); + for (String field : fields) { + String[] fieldNameAndTrad = StringUtil.split(field, "="); + String fieldName = fieldNameAndTrad[0]; + String fieldTrad = fieldNameAndTrad[1]; + + // suppression des " + fieldName = fieldName.substring(1, fieldName.length() - 1); + fieldTrad = fieldTrad.substring(1, fieldTrad.length() - 1); + putInTranslationCache(lang, fieldName, fieldTrad); + } + } + } + } + + /** + * met un traduction en plus dans le cache + * @param lang + * @param field + * @param trans + */ + protected void putInTranslationCache(String lang, String field, String trans) { + if (translationsCache == null) { + translationsCache = new HashMap<String, Map<String, String>>(); + } + Map<String, String> l = translationsCache.get(lang); + if (l == null) { + l = new HashMap<String, String>(); + translationsCache.put(lang, l); + } + l.put(field, trans); + } + + /** + * converti le cache dans une representation string + * @param trans + * @return + */ + protected String convertToString(Map<String, Map<String, String>> trans) { + StringBuilder result = new StringBuilder(); + for (Map.Entry<String, Map<String, String>> l : trans.entrySet()) { + String lang = l.getKey(); + result.append("[" + lang + ":"); + for(Map.Entry<String, String> t : l.getValue().entrySet()) { + result.append("\"" + t.getKey() + "\"=\"" + t.getValue() + "\","); + } + // suppression de la derniere , + if (result.charAt(result.length() - 1) == ',') { + result.deleteCharAt(result.length() - 1); + } + result.append("],"); + } + if (result.charAt(result.length() - 1) == ',') { + result.deleteCharAt(result.length() - 1); + } + return result.toString(); + } + + /** + * Ecoute les events pour devalider le cache + * @param evt + */ + @Override + public void propertyChange(PropertyChangeEvent evt) { + String propName = evt.getPropertyName(); + if (FQ_FIELD_WIKITTYI18N_TRANSLATIONS.equals(propName)) { + // la valeur a change on vide le cache + translationsCache = null; + } + } + +} //WikittyI18nImpl Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyI18nUtil.java 2010-10-20 14:14:33 UTC (rev 435) @@ -0,0 +1,44 @@ +package org.nuiton.wikitty; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * + * Cette classe sert a aider a la gestion multi-langue des extensions + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyI18nUtil { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyI18nUtil.class); + + /** + * Create or load WikittyExtensionTranslation for given extension. + * If created you must call store if you want keep it in storage + * @param proxy + * @param extension + * @return + */ + static public WikittyI18n getI18n(WikittyProxy proxy, WikittyExtension extension) { + String id = WikittyMetaExtensionUtil.generateId( + WikittyI18n.EXT_WIKITTYI18N, + extension.getName()); + + WikittyI18n result; + Wikitty w = proxy.restore(id); + if (w == null) { + w = new WikittyImpl(id); + } + result = new WikittyI18nImpl(w); + + return result; + } + +} Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo =================================================================== (Binary files differ) Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/WikittyI18nTest.java 2010-10-20 14:14:33 UTC (rev 435) @@ -0,0 +1,52 @@ +package org.nuiton.wikitty; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyI18nTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyI18nTest.class); + + @Test + public void testI18n() throws Exception { + // creation d'un proxy sur un ws in memory + WikittyService ws = new WikittyServiceInMemory(); + WikittyProxy proxy = new WikittyProxy(ws); + + // creation d'un label pour l'utiliser pour l'i18n + WikittyLabel label = new WikittyLabelImpl(); + WikittyExtension ext = + label.getWikitty().getExtension(WikittyLabel.EXT_WIKITTYLABEL); + + WikittyI18n i18n = WikittyI18nUtil.getI18n(proxy, ext); + i18n.setTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS, "étiquette"); + proxy.store(i18n); + + // ajout d'une traduction pour le francais + String trad = i18n.getTranslation("fr", WikittyLabel.FIELD_WIKITTYLABEL_LABELS); + Assert.assertEquals("étiquette", trad); + Assert.assertEquals(1, i18n.getLang().size()); + Assert.assertEquals("fr", i18n.getLang().iterator().next()); + Assert.assertEquals("[fr:\"labels\"=\"étiquette\"]", i18n.getTranslations()); + + // ajout d'une traduction pour l'espagnole + i18n.setTranslation("es", WikittyLabel.FIELD_WIKITTYLABEL_LABELS, "etiqueta"); + + Assert.assertEquals(2, i18n.getLang().size()); + + System.out.println(i18n.getTranslations()); + } + +}

1 0

r434 - trunk/src/site/rst
by bpoussin＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: bpoussin Date: 2010-10-20 16:07:29 +0200 (Wed, 20 Oct 2010) New Revision: 434 Url: http://nuiton.org/repositories/revision/wikitty/434 Log: ajout d'un debut de fichier expliquant comment faire les choses avec wikitty (il aurait pu s'appeler tutorial ou faq) Added: trunk/src/site/rst/HowTo.rst Added: trunk/src/site/rst/HowTo.rst =================================================================== --- trunk/src/site/rst/HowTo.rst (rev 0) +++ trunk/src/site/rst/HowTo.rst 2010-10-20 14:07:29 UTC (rev 434) @@ -0,0 +1,20 @@ +How to work Translation +====================== + +Add extension field translation +------------------------------- + +WikittyI18n w = WikittyI18nUtil.getI18n(proxy, extension); +w.setTranslation("fr", "myField", "MonChampsTraduit"); +proxy.store(w); + +Get extension field translation +------------------------------- + +WikittyI18n w = WikittyI18nUtil.getI18n(proxy, extension); +String trad = w.getTranslation("fr", "myField"); + +If there is no translation for this field, default value is returned + +How to add security +===================

1 0

r433 - trunk/src/site/rst
by bpoussin＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: bpoussin Date: 2010-10-20 16:06:11 +0200 (Wed, 20 Oct 2010) New Revision: 433 Url: http://nuiton.org/repositories/revision/wikitty/433 Log: ajout d'info pour la synchro de deux serveurs Modified: trunk/src/site/rst/Spec.rst Modified: trunk/src/site/rst/Spec.rst =================================================================== --- trunk/src/site/rst/Spec.rst 2010-10-20 14:04:52 UTC (rev 432) +++ trunk/src/site/rst/Spec.rst 2010-10-20 14:06:11 UTC (rev 433) @@ -22,6 +22,7 @@ .. * <http://www.gnu.org/licenses/lgpl-3.0.html>. .. * #L% .. - + Ce document est fait pour contenir toutes les normalisations autour de Wikitty Identifiant des wikitties @@ -91,9 +92,20 @@ les numeros manquants. (il redemande l'historique des messages pour les N messages qui lui manque) +A intervale régulier il enregistre un fichier de synchro contenant, la date du serveur +(il lui demande via le protocole xmpp) et le numero (+id?) du dernier event +reçu. Ce fichier n'est enregistré que si on est bien à jour dans les données +reçu (pas de rupture détectée dans la sequence des events). +Lorsque le client démarera pour la 1ère fois, il faut que la base de données +ait été remplie manuellement, son indexe recréer, et le fichier de synchro +créé convenablement. +Lorsque le client redémarre après un arrêt, il redemande l'historique depuis +la date du fichier de synchro. +Le numéro unique d'event est généré par la couche de persistance et stocké +sur le serveur en même temps que les données. Deux types de client:

1 0

r432 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: bpoussin Date: 2010-10-20 16:04:52 +0200 (Wed, 20 Oct 2010) New Revision: 432 Url: http://nuiton.org/repositories/revision/wikitty/432 Log: Add model method generation in contract. this follow issue http://www.nuiton.org/issues/show/961 Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-10-20 10:45:04 UTC (rev 431) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-10-20 14:04:52 UTC (rev 432) @@ -24,11 +24,9 @@ */ package org.nuiton.wikitty.generator; -import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; @@ -167,6 +165,12 @@ String extensionVariableName = WikittyTransformerUtil.classToExtensionVariableName(businessEntity, false); + // add all method describe in model in contract interfaces + // this method must be writed by developer in Impl + for (ObjectModelOperation operation : businessEntity.getOperations()) { + addOperation(contract, operation); + } + for(ObjectModelAttribute attribute : businessEntity.getAttributes()) { if (attribute.isNavigable()) { // two variables needed below @@ -234,6 +238,7 @@ setDocumentation(getter, attribute.getDocumentation()); } + } // now, add to this contract all operation due to inheritence from

1 0

r431 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by bpoussin＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: bpoussin Date: 2010-10-20 12:45:04 +0200 (Wed, 20 Oct 2010) New Revision: 431 Url: http://nuiton.org/repositories/revision/wikitty/431 Log: Don't generate Impl if there are some method in model http://www.nuiton.org/issues/show/961 Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-20 09:46:30 UTC (rev 430) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-20 10:45:04 UTC (rev 431) @@ -47,15 +47,17 @@ @Override public void transformFromClass(ObjectModelClass clazz) { + if (clazz.getOperations().isEmpty()) { - if ( WikittyTransformerUtil.isBusinessEntity(clazz) ) { - ObjectModelClass implementation = prepareImplementation(clazz); - processBusinessEntity(clazz, implementation); - } + if (WikittyTransformerUtil.isBusinessEntity(clazz)) { + ObjectModelClass implementation = prepareImplementation(clazz); + processBusinessEntity(clazz, implementation); + } - if ( WikittyTransformerUtil.isMetaExtension(clazz) ) { - ObjectModelClass implementation = prepareImplementation(clazz); - processMetaExtension(clazz, implementation); + if (WikittyTransformerUtil.isMetaExtension(clazz)) { + ObjectModelClass implementation = prepareImplementation(clazz); + processMetaExtension(clazz, implementation); + } } }

1 0

r430 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by sletellier＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: sletellier Date: 2010-10-20 11:46:30 +0200 (Wed, 20 Oct 2010) New Revision: 430 Url: http://nuiton.org/repositories/revision/wikitty/430 Log: Upate headers Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Package.html trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Package.html =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Package.html 2010-10-20 09:46:15 UTC (rev 429) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Package.html 2010-10-20 09:46:30 UTC (rev 430) @@ -1,3 +1,27 @@ + <h1>Wikitty API documentation</h1> <h2>Extensions version management</h2> Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java 2010-10-20 09:46:15 UTC (rev 429) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java 2010-10-20 09:46:30 UTC (rev 430) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * 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; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java 2010-10-20 09:46:15 UTC (rev 429) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java 2010-10-20 09:46:30 UTC (rev 430) @@ -1,23 +1,23 @@ /* * #%L * Wikitty :: api - * + * * * $Id$ * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin * %% * 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 + * 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 + * + * 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%

1 0

r429 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by sletellier＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: sletellier Date: 2010-10-20 11:46:15 +0200 (Wed, 20 Oct 2010) New Revision: 429 Url: http://nuiton.org/repositories/revision/wikitty/429 Log: Overide toString method Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Criteria.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Criteria.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Criteria.java 2010-10-20 09:45:52 UTC (rev 428) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Criteria.java 2010-10-20 09:46:15 UTC (rev 429) @@ -239,4 +239,8 @@ return this; } + @Override + public String toString() { + return toXML(this); + } }

1 0

r428 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by sletellier＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: sletellier Date: 2010-10-20 11:45:52 +0200 (Wed, 20 Oct 2010) New Revision: 428 Url: http://nuiton.org/repositories/revision/wikitty/428 Log: Add log level test Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.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-10-20 09:44:25 UTC (rev 427) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-20 09:45:52 UTC (rev 428) @@ -480,7 +480,10 @@ Collection<WikittyExtension> extensions = wikitty.getExtensions(); for (WikittyExtension extension : extensions) { String extensionName = extension.getName(); - log.debug("extensionName=" + extensionName); + + if (log.isDebugEnabled()) { + log.debug("extensionName=" + extensionName); + } WikittyExtension currentExtension = extension; String currentExtensionVersion = currentExtension.getVersion(); @@ -488,8 +491,11 @@ WikittyExtension lastExtension = restoreExtensionLastVersion( securityToken, transaction, extensionName); String lastExtensionVersion = lastExtension.getVersion(); - log.debug("lastExtensionVersion=" + lastExtensionVersion); + if (log.isDebugEnabled()) { + log.debug("lastExtensionVersion=" + lastExtensionVersion); + } + WikittyExtensionMigration migration = WikittyExtensionMigration.migrationRegistry.get(extensionName); if (migration == null) { migration = defaultExtensionMigration; @@ -504,8 +510,10 @@ WikittyExtension nextExtension = restoreExtension( securityToken, transaction, nextExtensionId); - log.debug("currentExtensionVersion=" + currentExtensionVersion); - log.debug("nextExtensionVersion=" + nextExtensionVersion); + if (log.isDebugEnabled()) { + log.debug("currentExtensionVersion=" + currentExtensionVersion); + log.debug("nextExtensionVersion=" + nextExtensionVersion); + } // Test if extension is never use in this version if(nextExtension != null) {

1 0

r427 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by sletellier＠users.nuiton.org 20 Oct '10

20 Oct '10

Author: sletellier Date: 2010-10-20 11:44:25 +0200 (Wed, 20 Oct 2010) New Revision: 427 Url: http://nuiton.org/repositories/revision/wikitty/427 Log: Change level log Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-19 14:51:48 UTC (rev 426) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-10-20 09:44:25 UTC (rev 427) @@ -158,8 +158,8 @@ ext.getId(), fieldName, type.toDefinition(fieldName)); } } else { - if (log.isInfoEnabled()) { - log.info("The extension is found " + id); + if (log.isDebugEnabled()) { + log.debug("The extension is found " + id); } } }

1 0