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

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

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

19 Oct '10

Author: bpoussin Date: 2010-10-19 16:51:48 +0200 (Tue, 19 Oct 2010) New Revision: 426 Url: http://nuiton.org/repositories/revision/wikitty/426 Log: refactoring de la notification (event) - utilisation d'un seul thread - ajout de tests unitaires - suppression de 6 methodes redondantes - correction bug http://www.nuiton.org/issues/show/906 Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifierTransporter.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceListener.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifierTransporter.java 2010-10-18 08:10:24 UTC (rev 425) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifierTransporter.java 2010-10-19 14:51:48 UTC (rev 426) @@ -138,29 +138,7 @@ if (message instanceof WikittyServiceEvent) { WikittyServiceEvent event = (WikittyServiceEvent)message; - - //source is transient, add it here : - event.setSource(ws); - event.setRemote(true); // received event became remote - - switch(event.type) { - case PUT_WIKITTY: - ws.firePutWikitty(event); break; - case REMOVE_WIKITTY: - ws.fireRemoveWikitty(event); break; - case CLEAR_WIKITTY: - ws.fireClearWikitty(event); break; - case PUT_EXTENSION: - ws.firePutExtension(event); break; - case REMOVE_EXTENSION: - ws.fireRemoveExtension(event); break; - case CLEAR_EXTENSION: - ws.fireClearExtension(event); break; - default: - if (log.isDebugEnabled()) { - log.debug("Not managed jgroup message " + event.type); - } - } + ws.processRemoteEvent(event); } } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-18 08:10:24 UTC (rev 425) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-19 14:51:48 UTC (rev 426) @@ -54,12 +54,18 @@ /** Message type (put, remove, clear...). */ static public enum WikittyEventType { - PUT_WIKITTY, - REMOVE_WIKITTY, - CLEAR_WIKITTY, - PUT_EXTENSION, - REMOVE_EXTENSION, - CLEAR_EXTENSION + PUT_WIKITTY(WikittyServiceListener.PUT_WIKITTY_METHOD), + REMOVE_WIKITTY(WikittyServiceListener.REMOVE_WIKITTY_METHOD), + CLEAR_WIKITTY(WikittyServiceListener.CLEAR_WIKITTY_METHOD), + PUT_EXTENSION(WikittyServiceListener.PUT_EXTENSION_METHOD), + REMOVE_EXTENSION(WikittyServiceListener.REMOVE_EXTENSION_METHOD), + CLEAR_EXTENSION(WikittyServiceListener.CLEAR_EXTENSION_METHOD); + + /** le nom de la methode du listener a appeler pour ce type d'event */ + public String listenerMethodName; + WikittyEventType(String listenerMethodName) { + this.listenerMethodName = listenerMethodName; + } } @@ -69,6 +75,9 @@ /** event type */ protected WikittyEventType type; + /** heure de creation de l'event */ + protected long time; + /** * Id managed by event. * @@ -97,10 +106,19 @@ */ public WikittyServiceEvent(Object source, WikittyEventType type) { super(source); + this.time = System.currentTimeMillis(); this.type = type; } /** + * Return time of event creation + * @return + */ + public long getTime() { + return time; + } + + /** * To allow set transient source after deserialisation. * * @param source source Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceListener.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceListener.java 2010-10-18 08:10:24 UTC (rev 425) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceListener.java 2010-10-19 14:51:48 UTC (rev 426) @@ -26,7 +26,8 @@ package org.nuiton.wikitty; /** - * TODO add comment here. + * Permet d'ajouter des listeners sur les methodes de modification de + * WikittyService. * * @author chatellier * @version $Revision$ @@ -36,6 +37,15 @@ */ public interface WikittyServiceListener { + // this constant must be up to date with real method name + // this is used during fire event + final static public String PUT_WIKITTY_METHOD = "putWikitty"; + final static public String REMOVE_WIKITTY_METHOD = "removeWikitty"; + final static public String CLEAR_WIKITTY_METHOD = "clearWikitty"; + final static public String PUT_EXTENSION_METHOD = "putExtension"; + final static public String REMOVE_EXTENSION_METHOD = "removeExtension"; + final static public String CLEAR_EXTENSION_METHOD = "clearExtension"; + public void putWikitty(WikittyServiceEvent event); public void removeWikitty(WikittyServiceEvent event); public void clearWikitty(WikittyServiceEvent event); @@ -44,4 +54,5 @@ public void putExtension(WikittyServiceEvent event); public void removeExtension(WikittyServiceEvent event); public void clearExtension(WikittyServiceEvent event); + } 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-18 08:10:24 UTC (rev 425) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-19 14:51:48 UTC (rev 426) @@ -28,11 +28,16 @@ import java.util.Collection; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Properties; import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.TimeUnit; import org.apache.commons.beanutils.ConstructorUtils; import org.apache.commons.logging.Log; @@ -68,10 +73,18 @@ /** Wikitty service listener (only for remote event). */ protected ListenerSet<WikittyServiceListener> remoteWikittyServiceListeners; - /** JGroup notifier. */ + /** notifier */ protected WikittyServiceListener notifier; /** + * Tous les events en attentent d'etre envoyer aux listeners + */ + protected LinkedBlockingQueue<WikittyServiceEvent> eventToSend; + + /** thread utilise pour evoyer les events */ + protected EventThread eventThread; + + /** * Default constructor. * * @param ws delegate service @@ -95,6 +108,12 @@ localWikittyServiceListeners = new ListenerSet<WikittyServiceListener>(); remoteWikittyServiceListeners = new ListenerSet<WikittyServiceListener>(); + eventToSend = new LinkedBlockingQueue<WikittyServiceEvent>(); + + eventThread = new EventThread(eventToSend, + allWikittyServiceListeners, localWikittyServiceListeners, + remoteWikittyServiceListeners); + // can be null according to default constructor if (props != null) { notifier = new RemoteNotifier(this, props); @@ -105,9 +124,21 @@ public void addWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { // not delegated switch (type) { - case ALL : allWikittyServiceListeners.add(listener); break; - case LOCAL : localWikittyServiceListeners.add(listener); break; - case REMOTE : remoteWikittyServiceListeners.add(listener); break; + case ALL : + synchronized(allWikittyServiceListeners) { + allWikittyServiceListeners.add(listener); + } + break; + case LOCAL : + synchronized(localWikittyServiceListeners) { + localWikittyServiceListeners.add(listener); + } + break; + case REMOTE : + synchronized(remoteWikittyServiceListeners) { + remoteWikittyServiceListeners.add(listener); + } + break; } } @@ -115,9 +146,21 @@ public void removeWikittyServiceListener(WikittyServiceListener listener, ServiceListenerType type) { // not delegated switch (type) { - case ALL : allWikittyServiceListeners.remove(listener); break; - case LOCAL : localWikittyServiceListeners.remove(listener); break; - case REMOTE : remoteWikittyServiceListeners.remove(listener); break; + case ALL : + synchronized(allWikittyServiceListeners) { + allWikittyServiceListeners.remove(listener); + } + break; + case LOCAL : + synchronized (localWikittyServiceListeners) { + localWikittyServiceListeners.remove(listener); + } + break; + case REMOTE : + synchronized(remoteWikittyServiceListeners) { + remoteWikittyServiceListeners.remove(listener); + } + break; } } @@ -393,7 +436,7 @@ event.setIds(ids); event.setIdExtensions(idsExtension); event.setIdVersions(idsVersion); - firePutWikitty(event); + fireEvent(event); } /** @@ -412,7 +455,7 @@ } event.setIds(ids); - fireRemoveWikitty(event); + fireEvent(event); } /** @@ -421,7 +464,7 @@ protected void fireClearWikitty() { WikittyServiceEvent event = new WikittyServiceEvent(ws, WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY); - fireClearWikitty(event); + fireEvent(event); } /** @@ -450,7 +493,7 @@ event.setIds(ids); event.setIdExtensions(idsExtension); - firePutExtension(event); + fireEvent(event); } /** @@ -469,7 +512,7 @@ } event.setIds(ids); - fireRemoveExtension(event); + fireEvent(event); } /** @@ -480,206 +523,224 @@ protected void fireClearExtension() { WikittyServiceEvent event = new WikittyServiceEvent(ws, WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION); - fireClearExtension(event); + fireEvent(event); } /** * Fire event to all registred listener. - * + * * Take care about {@link WikittyServiceEvent#isRemote()} for fire. * * @param event event to fire */ - protected void firePutWikitty(final WikittyServiceEvent event) { + protected void fireEvent(final WikittyServiceEvent event) { // ajout d'un thread, car si les listener doit // ouvrir une transaction WikittyTransaction // alors que celui qui lance l'event en a une ouverte // cela cause une exception JTA - Thread eventThread = new Thread("wikitty-event-thread") { - @Override - public void run() { - for (WikittyServiceListener l : allWikittyServiceListeners) { - l.putWikitty(event); - } - if (event.isRemote()) { - for (WikittyServiceListener l : remoteWikittyServiceListeners) { - l.putWikitty(event); - } - } - else { - for (WikittyServiceListener l : localWikittyServiceListeners) { - l.putWikitty(event); - } - } + EventThread thread = getEventThread(); + + // si le thread de notification est en cours d'arret on leve une exception + if (thread.stopAsked()) { + throw new WikittyException( + "Event thread dispatcher is stopped, no more event can be send"); + } else { + eventToSend.offer(event); + + if (!thread.isAlive()) { + // on demarre le thread que lorsqu'il y a le premier event d'arrive + thread.start(); } - }; - eventThread.start(); + } } /** - * Fire event to all registred listener. - * - * Take care about {@link WikittyServiceEvent#isRemote()} for fire. - * - * @param event event to fire + * fire event passed in argument. Before fire, change source to current + * WikittyServiceNotifier and set remote event to true. */ - protected void fireRemoveWikitty(final WikittyServiceEvent event) { - // ajout d'un thread, car si les listener doit - // ouvrir une transaction WikittyTransaction - // alors que celui qui lance l'event en a une ouverte - // cela cause une exception JTA - Thread eventThread = new Thread("wikitty-event-thread") { - @Override - public void run() { - for (WikittyServiceListener l : allWikittyServiceListeners) { - l.removeWikitty(event); - } - if (event.isRemote()) { - for (WikittyServiceListener l : remoteWikittyServiceListeners) { - l.removeWikitty(event); - } - } - else { - for (WikittyServiceListener l : localWikittyServiceListeners) { - l.removeWikitty(event); - } - } - } - }; - eventThread.start(); + public void processRemoteEvent(WikittyServiceEvent event) { + //source is transient, add it here : + event.setSource(this); + event.setRemote(true); // received event became remote + fireEvent(event); } /** - * Fire event to all registred listener. - * - * Take care about {@link WikittyServiceEvent#isRemote()} for fire. + * Retourne le dernier thread utiliser pour envoyer les events. * - * @param event event to fire + * @return */ - protected void fireClearWikitty(final WikittyServiceEvent event) { - // ajout d'un thread, car si les listener doit - // ouvrir une transaction WikittyTransaction - // alors que celui qui lance l'event en a une ouverte - // cela cause une exception JTA - Thread eventThread = new Thread("wikitty-event-thread") { - @Override - public void run() { - for (WikittyServiceListener l : allWikittyServiceListeners) { - l.clearWikitty(event); - } - if (event.isRemote()) { - for (WikittyServiceListener l : remoteWikittyServiceListeners) { - l.clearWikitty(event); - } - } - else { - for (WikittyServiceListener l : localWikittyServiceListeners) { - l.clearWikitty(event); - } - } - } - }; - eventThread.start(); + public EventThread getEventThread() { + return eventThread; } + @Override + protected void finalize() throws Throwable { + getEventThread().askStop(); + super.finalize(); + } + /** - * Fire event to all registred listener. - * - * Take care about {@link WikittyServiceEvent#isRemote()} for fire. - * - * @param event event to fire + * Thread utilise pour envoyer les events. On rend accessible ce thread + * pour pouvoir y acceder depuis l'exterieur (pour l'instant pour les tests + * mais peut-etre plus tard du monitoring). Il permet a un thread d'attendre + * qu'un evenement leve a une certaine heure est bien ete dispatchee grace a + * la methode waitfor */ - protected void firePutExtension(final WikittyServiceEvent event) { - // ajout d'un thread, car si les listener doit - // ouvrir une transaction WikittyTransaction - // alors que celui qui lance l'event en a une ouverte - // cela cause une exception JTA - Thread eventThread = new Thread("wikitty-event-thread") { - @Override - public void run() { - for (WikittyServiceListener l : allWikittyServiceListeners) { - l.putExtension(event); + static public class EventThread extends Thread { + + protected boolean mustBeRunning = true; + + protected SortedMap<Long, Object> waiter = new TreeMap<Long, Object>(); + /** + * reference vers la collection qui contient les events a envoyer + */ + protected LinkedBlockingQueue<WikittyServiceEvent> eventToSend; + + /** Wikitty service listener (all event). */ + protected ListenerSet<WikittyServiceListener> allWikittyServiceListeners; + + /** Wikitty service listener (only for local event). */ + protected ListenerSet<WikittyServiceListener> localWikittyServiceListeners; + + /** Wikitty service listener (only for remote event). */ + protected ListenerSet<WikittyServiceListener> remoteWikittyServiceListeners; + + /** heure du dernier event envoye */ + protected long lastEventTime = 0; + + public EventThread(LinkedBlockingQueue<WikittyServiceEvent> eventToSend, + ListenerSet<WikittyServiceListener> allWikittyServiceListeners, + ListenerSet<WikittyServiceListener> localWikittyServiceListeners, + ListenerSet<WikittyServiceListener> remoteWikittyServiceListeners) { + super("wikitty-event-thread"); + this.eventToSend = eventToSend; + this.allWikittyServiceListeners = allWikittyServiceListeners; + this.localWikittyServiceListeners = localWikittyServiceListeners; + this.remoteWikittyServiceListeners = remoteWikittyServiceListeners; + } + + /** + * demande l'arret du thread, ne doit être appeler que par le finalize + * du WikittyServiceNotifier + */ + protected void askStop() { + this.mustBeRunning = false; + } + + /** + * retourne vrai si on a demande l'arret du thread + * @return + */ + public boolean stopAsked() { + return !mustBeRunning; + } + + /** + * thread that want wait for particulare event to be processed, can be + * call this method with event time in argument. + */ + 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; + synchronized (waiter) { + mutex = waiter.get(eventTime); + if (mutex == null) { + mutex = new Object(); + waiter.put(eventTime, mutex); } - if (event.isRemote()) { - for (WikittyServiceListener l : remoteWikittyServiceListeners) { - l.putExtension(event); - } - } - else { - for (WikittyServiceListener l : localWikittyServiceListeners) { - l.putExtension(event); - } - } } - }; - eventThread.start(); - } + synchronized(mutex) { + mutex.wait(); + } + } - /** - * Fire event to all registred listener. - * - * Take care about {@link WikittyServiceEvent#isRemote()} for fire. - * - * @param event event to fire - */ - protected void fireRemoveExtension(final WikittyServiceEvent event) { - // ajout d'un thread, car si les listener doit - // ouvrir une transaction WikittyTransaction - // alors que celui qui lance l'event en a une ouverte - // cela cause une exception JTA - Thread eventThread = new Thread("wikitty-event-thread") { - @Override - public void run() { - for (WikittyServiceListener l : allWikittyServiceListeners) { - l.removeExtension(event); - } - if (event.isRemote()) { - for (WikittyServiceListener l : remoteWikittyServiceListeners) { - l.removeExtension(event); + @Override + public void run() { + while(mustBeRunning) { + processEventQueue(); + } + // le thread est arrete, force l'envoi de tous les events pour + // liberer correctement tous les threads en attente + // plus aucun event ne doit etre accepte dans la queue (voir method fireEvent) + processEventQueue(); + } + + protected void processEventQueue() { + try { + WikittyServiceEvent event; + // on attend pas indefiniment un event, car il faut verifier + // aussi que personne n'a arrete le thread + while (null != (event = eventToSend.poll(5, TimeUnit.SECONDS))) { + try { + synchronized (allWikittyServiceListeners) { + allWikittyServiceListeners.fire( + event.getType().listenerMethodName, event); + } + } catch (Exception eee) { + log.error("Can't notify listener", eee); } - } - else { - for (WikittyServiceListener l : localWikittyServiceListeners) { - l.removeExtension(event); + try { + if (event.isRemote()) { + synchronized (remoteWikittyServiceListeners) { + remoteWikittyServiceListeners.fire( + event.getType().listenerMethodName, event); + } + } else { + synchronized (localWikittyServiceListeners) { + localWikittyServiceListeners.fire( + event.getType().listenerMethodName, event); + } + } + } catch (Exception eee) { + log.error("Can't notify listener", eee); } - } - } - }; - eventThread.start(); - } + synchronized (waiter) { + // on previent les threads en attente si besoin - /** - * Fire event to all registred listener. - * - * Take care about {@link WikittyServiceEvent#isRemote()} for fire. - * - * @param event event to fire - */ - protected void fireClearExtension(final WikittyServiceEvent event) { - // ajout d'un thread, car si les listener doit - // ouvrir une transaction WikittyTransaction - // alors que celui qui lance l'event en a une ouverte - // cela cause une exception JTA - Thread eventThread = new Thread("wikitty-event-thread") { - @Override - public void run() { - for (WikittyServiceListener l : allWikittyServiceListeners) { - l.clearExtension(event); - } - if (event.isRemote()) { - for (WikittyServiceListener l : remoteWikittyServiceListeners) { - l.clearExtension(event); + // dans un premier temps on ne recupere que ceux + // inferieur a event.getTime() + SortedMap<Long, Object> subwaiter = + waiter.headMap(event.getTime()); + for (Iterator<Map.Entry<Long, Object>> i = subwaiter.entrySet().iterator(); i.hasNext();) { + Object mutex = i.next().getValue(); + i.remove(); + synchronized (mutex) { + mutex.notifyAll(); + } + } + // dans un second temps on verifie si le suivant ne + // serait pas egal a event.getTime() + if (!waiter.isEmpty()) { + Long time = waiter.firstKey(); + // il pourrait y avoir plusieurs event avec la meme heure + // il faut bien tous les liberer + while (time.equals(event.getTime())) { + // il est bien egal on l'enleve aussi + Object mutex = waiter.remove(time); + synchronized (mutex) { + mutex.notifyAll(); + } + + if (!waiter.isEmpty()) { + time = waiter.firstKey(); + } else { + break; + } + } + } } + lastEventTime = event.getTime(); } - else { - for (WikittyServiceListener l : localWikittyServiceListeners) { - l.clearExtension(event); - } - } + } catch (InterruptedException eee) { + log.error("Notification thread error", eee); } - }; - eventThread.start(); - } + } + }; /** * This interface must be implemented to send and received remote message. Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java 2010-10-18 08:10:24 UTC (rev 425) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java 2010-10-19 14:51:48 UTC (rev 426) @@ -167,46 +167,12 @@ } if (event instanceof WikittyServiceEvent) { - processEvent((WikittyServiceEvent)event); + ws.processRemoteEvent((WikittyServiceEvent)event); } } } /** - * Process event - */ - protected void processEvent(WikittyServiceEvent event) { - //source is transient, add it here : - event.setSource(ws); - event.setRemote(true); // received event became remote - - switch (event.getType()) { - case PUT_WIKITTY: - ws.firePutWikitty(event); - break; - case REMOVE_WIKITTY: - ws.fireRemoveWikitty(event); - break; - case CLEAR_WIKITTY: - ws.fireClearWikitty(event); - break; - case PUT_EXTENSION: - ws.firePutExtension(event); - break; - case REMOVE_EXTENSION: - ws.fireRemoveExtension(event); - break; - case CLEAR_EXTENSION: - ws.fireClearExtension(event); - break; - default: - if (log.isDebugEnabled()) { - log.debug("Not managed xmpp message " + event.type); - } - } - } - - /** * Recherche le meilleur nom a utiliser comme pseudo pour cette machine. * Un UUID est toujours ajouter en debut, pour potentiellement lancer * plusieurs application en meme temps sur la meme machine et etre sur que Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/WikittyServiceNotificationTest.java 2010-10-19 14:51:48 UTC (rev 426) @@ -0,0 +1,195 @@ +package org.nuiton.wikitty.notification; + + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.wikitty.WikittyService.ServiceListenerType; +import org.nuiton.wikitty.WikittyServiceEvent; +import org.nuiton.wikitty.WikittyServiceListener; +import org.nuiton.wikitty.WikittyServiceNotifier; + +/** + * Test si la notification par event fonctionne bien (les bons types d'event + * sont envoyer et recu + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceNotificationTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyServiceNotificationTest.class); + + protected WikittyServiceEvent.WikittyEventType lastEvent = null; + protected int nbEvent = 0; + + /** + * Test si les events sont bien lever et bien recu + * @throws Exception + */ + @Test + public void testEvent() throws Exception { + WikittyServiceNotifier wsn = new WikittyServiceNotifier(null); + Listener l = new Listener(); + + // test d'envoi et de bonne reception + wsn.addWikittyServiceListener(l, ServiceListenerType.ALL); + sendEvent(wsn, true); + + // si on enleve le listener, plus aucun event ne doit arriver + wsn.removeWikittyServiceListener(l, ServiceListenerType.ALL); + sendEvent(wsn, false); + + // donc au total seulement 6 events on du etre envoye + Assert.assertEquals(6, nbEvent); + + } + + /** + * Envoi tous les events possible. Permet de tester la methode process et + * la method fireEvent de WikittyServiceNotifier vu que la premiere + * appelle la deuxieme + * + * @param wsn + */ + protected void sendEvent(WikittyServiceNotifier wsn, boolean hasListener) throws Exception { + { + WikittyServiceEvent event = new WikittyServiceEvent("test", + WikittyServiceEvent.WikittyEventType.PUT_WIKITTY); + wsn.processRemoteEvent(event); + wsn.getEventThread().waitFor(event.getTime()); + if (hasListener) { + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_WIKITTY, + lastEvent); + } else { + Assert.assertEquals(null, lastEvent); + } + lastEvent = null; + } + { + WikittyServiceEvent event = new WikittyServiceEvent("test", + WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY); + wsn.processRemoteEvent(event); + wsn.getEventThread().waitFor(event.getTime()); + if (hasListener) { + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY, + lastEvent); + } else { + Assert.assertEquals(null, lastEvent); + } + lastEvent = null; + } + { + WikittyServiceEvent event = new WikittyServiceEvent("test", + WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY); + wsn.processRemoteEvent(event); + wsn.getEventThread().waitFor(event.getTime()); + if (hasListener) { + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY, + lastEvent); + } else { + Assert.assertEquals(null, lastEvent); + } + lastEvent = null; + } + { + WikittyServiceEvent event = new WikittyServiceEvent("test", + WikittyServiceEvent.WikittyEventType.PUT_EXTENSION); + wsn.processRemoteEvent(event); + wsn.getEventThread().waitFor(event.getTime()); + if (hasListener) { + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION, + lastEvent); + } else { + Assert.assertEquals(null, lastEvent); + } + lastEvent = null; + } + { + WikittyServiceEvent event = new WikittyServiceEvent("test", + WikittyServiceEvent.WikittyEventType.REMOVE_EXTENSION); + wsn.processRemoteEvent(event); + wsn.getEventThread().waitFor(event.getTime()); + if (hasListener) { + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.REMOVE_EXTENSION, + lastEvent); + } else { + Assert.assertEquals(null, lastEvent); + } + lastEvent = null; + } + { + WikittyServiceEvent event = new WikittyServiceEvent("test", + WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION); + wsn.processRemoteEvent(event); + wsn.getEventThread().waitFor(event.getTime()); + if (hasListener) { + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION, + lastEvent); + } else { + Assert.assertEquals(null, lastEvent); + } + lastEvent = null; + } + } + + /** + * Class listener des events, check la bonne reception + */ + class Listener implements WikittyServiceListener { + + @Override + public void putWikitty(WikittyServiceEvent event) { + nbEvent++; + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_WIKITTY, + event.getType()); + lastEvent = event.getType(); + } + + @Override + public void removeWikitty(WikittyServiceEvent event) { + nbEvent++; + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.REMOVE_WIKITTY, + event.getType()); + lastEvent = event.getType(); + } + + @Override + public void clearWikitty(WikittyServiceEvent event) { + nbEvent++; + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.CLEAR_WIKITTY, + event.getType()); + lastEvent = event.getType(); + } + + @Override + public void putExtension(WikittyServiceEvent event) { + nbEvent++; + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.PUT_EXTENSION, + event.getType()); + lastEvent = event.getType(); + } + + @Override + public void removeExtension(WikittyServiceEvent event) { + nbEvent++; + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.REMOVE_EXTENSION, + event.getType()); + lastEvent = event.getType(); + } + + @Override + public void clearExtension(WikittyServiceEvent event) { + nbEvent++; + Assert.assertEquals(WikittyServiceEvent.WikittyEventType.CLEAR_EXTENSION, + event.getType()); + lastEvent = event.getType(); + } + + } +}

1 0

r425 - trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator
by sletellier＠users.nuiton.org 18 Oct '10

18 Oct '10

Author: sletellier Date: 2010-10-18 10:10:24 +0200 (Mon, 18 Oct 2010) New Revision: 425 Url: http://nuiton.org/repositories/revision/wikitty/425 Log: Import wikittyTreeNode / impl and abrstart Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-17 01:40:34 UTC (rev 424) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-18 08:10:24 UTC (rev 425) @@ -138,9 +138,9 @@ addImport(clazz, "org.nuiton.wikitty.WikittyUser"); addImport(clazz, "org.nuiton.wikitty.WikittyUserAbstract"); addImport(clazz, "org.nuiton.wikitty.WikittyUserImpl"); - addImport(clazz, "org.nuiton.wikitty.TreeNode"); - addImport(clazz, "org.nuiton.wikitty.TreeNodeAbstract"); - addImport(clazz, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(clazz, "org.nuiton.wikitty.WikittyTreeNode"); + addImport(clazz, "org.nuiton.wikitty.WikittyTreeNodeAbstract"); + addImport(clazz, "org.nuiton.wikitty.WikittyTreeNodeImpl"); addImport(clazz, java.util.List.class); addImport(clazz, java.util.ArrayList.class); addImport(clazz, java.util.Collection.class); 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-17 01:40:34 UTC (rev 424) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-10-18 08:10:24 UTC (rev 425) @@ -114,9 +114,9 @@ addImport(contract, "org.nuiton.wikitty.WikittyUser"); addImport(contract, "org.nuiton.wikitty.WikittyUserAbstract"); addImport(contract, "org.nuiton.wikitty.WikittyUserImpl"); - addImport(contract, "org.nuiton.wikitty.TreeNode"); - addImport(contract, "org.nuiton.wikitty.TreeNodeAbstract"); - addImport(contract, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(contract, "org.nuiton.wikitty.WikittyTreeNode"); + addImport(contract, "org.nuiton.wikitty.WikittyTreeNodeAbstract"); + addImport(contract, "org.nuiton.wikitty.WikittyTreeNodeImpl"); addImport(contract, java.util.List.class); addImport(contract, java.util.ArrayList.class); addImport(contract, java.util.Collection.class); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-10-17 01:40:34 UTC (rev 424) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-10-18 08:10:24 UTC (rev 425) @@ -57,9 +57,9 @@ addImport(helper, "org.nuiton.wikitty.WikittyUser"); addImport(helper, "org.nuiton.wikitty.WikittyUserAbstract"); addImport(helper, "org.nuiton.wikitty.WikittyUserImpl"); - addImport(helper, "org.nuiton.wikitty.TreeNode"); - addImport(helper, "org.nuiton.wikitty.TreeNodeAbstract"); - addImport(helper, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(helper, "org.nuiton.wikitty.WikittyTreeNode"); + addImport(helper, "org.nuiton.wikitty.WikittyTreeNodeAbstract"); + addImport(helper, "org.nuiton.wikitty.WikittyTreeNodeImpl"); addImport(helper, java.util.List.class); addImport(helper, java.util.ArrayList.class); addImport(helper, java.util.Collection.class); 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-17 01:40:34 UTC (rev 424) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-18 08:10:24 UTC (rev 425) @@ -77,9 +77,9 @@ addImport(implementation, "org.nuiton.wikitty.WikittyUser"); addImport(implementation, "org.nuiton.wikitty.WikittyUserAbstract"); addImport(implementation, "org.nuiton.wikitty.WikittyUserImpl"); - addImport(implementation, "org.nuiton.wikitty.TreeNode"); - addImport(implementation, "org.nuiton.wikitty.TreeNodeAbstract"); - addImport(implementation, "org.nuiton.wikitty.TreeNodeImpl"); + addImport(implementation, "org.nuiton.wikitty.WikittyTreeNode"); + addImport(implementation, "org.nuiton.wikitty.WikittyTreeNodeAbstract"); + addImport(implementation, "org.nuiton.wikitty.WikittyTreeNodeImpl"); addImport(implementation, java.util.List.class); addImport(implementation, java.util.ArrayList.class); addImport(implementation, java.util.Collection.class);

1 0