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

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

r424 - trunk
by tchemit＠users.nuiton.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:40:34 +0200 (Sun, 17 Oct 2010) New Revision: 424 Url: http://nuiton.org/repositories/revision/wikitty/424 Log: remove unecessary license plugin Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-17 01:39:30 UTC (rev 423) +++ trunk/pom.xml 2010-10-17 01:40:34 UTC (rev 424) @@ -474,9 +474,6 @@ <zk.version>5.0.2</zk.version> <hbase.version>0.89.0-SNAPSHOT</hbase.version> -  - <license.version>2.4.1-SNAPSHOT</license.version> - <license.licenseName>lgpl_v3</license.licenseName> </properties>

1 0

r423 - trunk
by tchemit＠users.nuiton.org 17 Oct '10

17 Oct '10

Author: tchemit Date: 2010-10-17 03:39:30 +0200 (Sun, 17 Oct 2010) New Revision: 423 Url: http://nuiton.org/repositories/revision/wikitty/423 Log: Update mavenpom4redmine to 2.3.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-15 18:19:28 UTC (rev 422) +++ trunk/pom.xml 2010-10-17 01:39:30 UTC (rev 423) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </parent>

1 0

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

15 Oct '10

Author: bpoussin Date: 2010-10-15 20:19:28 +0200 (Fri, 15 Oct 2010) New Revision: 422 Url: http://nuiton.org/repositories/revision/wikitty/422 Log: escape String documentation to prevent any problem Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.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-15 18:08:39 UTC (rev 421) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-15 18:19:28 UTC (rev 422) @@ -31,6 +31,7 @@ import java.util.Random; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; @@ -227,7 +228,10 @@ // generate a string line like " deprecated=true" or "" String deprecated = attribute.hasTagValue("deprecated") ? " deprecated=" + attribute.getTagValue("deprecated") : ""; // generate a string line like ' documentation="my documentation"' or "" - String attributeDocumentation = attribute.hasTagValue("documentation") ? " documentation=\\\"" + attribute.getTagValue("documentation") + "\\\"": ""; + String attributeDocumentation = + attribute.hasTagValue("documentation") ? " documentation=\\\"" + + StringEscapeUtils.escapeJava(attribute.getTagValue("documentation")) + + "\\\"": ""; // generate a string like " notNull=true" or "" String notNull = attribute.hasTagValue("notNull") ? " notNull=" + attribute.getTagValue("notNull") : ""; buildFieldMapExtensionParameters.add("" // generate a line like '"Wikitty attributName[0-*] unique=true deprecated=true documentation=\"my documentation\""'

1 0

r421 - trunk/wikitty-api/src/main/xmi
by bpoussin＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: bpoussin Date: 2010-10-15 20:08:39 +0200 (Fri, 15 Oct 2010) New Revision: 421 Url: http://nuiton.org/repositories/revision/wikitty/421 Log: put WikittyExtensionTranslation in right package Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo =================================================================== (Binary files differ)

1 0

r420 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr
by bpoussin＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: bpoussin Date: 2010-10-15 19:55:20 +0200 (Fri, 15 Oct 2010) New Revision: 420 Url: http://nuiton.org/repositories/revision/wikitty/420 Log: force solr data directory creation Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-15 17:46:03 UTC (rev 419) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-15 17:55:20 UTC (rev 420) @@ -70,6 +70,7 @@ import com.arjuna.ats.arjuna.state.InputObjectState; import com.arjuna.ats.arjuna.state.OutputObjectState; import com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord; +import java.io.File; /** * @@ -497,7 +498,10 @@ // init system env solr.data.dir if (properties != null) { String solrDataDir = properties.getProperty(SOLR_DATA_DIR_CONFIG); + // make sure that dir exists if (solrDataDir != null) { + File file = new File(solrDataDir); + file.mkdirs(); System.setProperty(SOLR_DATA_DIR_CONFIG, solrDataDir); } }

1 0

r419 - in trunk/wikitty-solr-impl/src: main/java/org/nuiton/wikitty/solr test/java/org/nuiton/wikitty/solr/test
by bpoussin＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: bpoussin Date: 2010-10-15 19:46:03 +0200 (Fri, 15 Oct 2010) New Revision: 419 Url: http://nuiton.org/repositories/revision/wikitty/419 Log: to prevent conflict rename Tree to WikittyTreeNode rename TreeNode to WikittyTreeNode rename SecurityToken to WikittyToken rename Label to WikittyLabel rename WikittyLabelHelper to WikittyLabelUtil http://www.nuiton.org/issues/show/953 Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java Modified: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-15 17:38:43 UTC (rev 418) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEnginSolr.java 2010-10-15 17:46:03 UTC (rev 419) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin + * 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 @@ -22,22 +22,6 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ -/* *##% - * Copyright (c) 2009 poussin. All rights reserved. - * - * 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 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 Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - *##%*/ package org.nuiton.wikitty.solr; @@ -69,7 +53,7 @@ import org.nuiton.wikitty.FieldType; import org.nuiton.wikitty.FieldType.TYPE; import org.nuiton.wikitty.PagedResult; -import org.nuiton.wikitty.TreeNode; +import org.nuiton.wikitty.WikittyTreeNode; import org.nuiton.wikitty.UpdateResponse; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; @@ -119,7 +103,7 @@ static final public String SOLR_QUERY_PARSER = "{!wikitty}"; // Use for indexation tree node - static final public String TREENODE_PREFIX = TreeNode.EXT_TREENODE + "."; + static final public String TREENODE_PREFIX = WikittyTreeNode.EXT_WIKITTYTREENODE + "."; static final public String TREENODE_EMPTY = TREENODE_PREFIX + "empty"; static final public String TREENODE_ROOT = TREENODE_PREFIX + "root"; static final public String TREENODE_PATH = TREENODE_PREFIX + "path"; @@ -272,7 +256,7 @@ // is root return null; } - parentId = (String) doc.getFieldValue(TreeNode.FQ_FIELD_TREENODE_PARENT); + parentId = (String) doc.getFieldValue(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); parents.put(nodeId, parentId); } @@ -338,7 +322,7 @@ Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); // Find all node contain child - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TreeNode.FQ_FIELD_TREENODE_ATTACHMENT + ":" + id); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT + ":" + id); QueryResponse response = solrServer.query(query); SolrDocumentList updateDocs = response.getResults(); @@ -551,15 +535,15 @@ for (Wikitty w : wikitties) { String id = w.getId(); - if (w.hasExtension(TreeNode.EXT_TREENODE)) { + if (w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { - Set<String> attachments = w.getFieldAsSet(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + Set<String> attachments = w.getFieldAsSet(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); reindexChildTreeNode.putIncludedAttachments(id, attachments); // Search deleted children SolrDocument treeNodeDoc = findById(solrServer, id); if (treeNodeDoc != null) { - Collection oldAttachments = treeNodeDoc.getFieldValues(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT); + Collection oldAttachments = treeNodeDoc.getFieldValues(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT); if (oldAttachments != null) { // if no more children, remove all old children if(attachments == null) { @@ -576,7 +560,7 @@ } // Get new parent id (may be the same old parent) - String parentId = w.getFieldAsString(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); + String parentId = w.getFieldAsString(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); reindexChildTreeNode.putParent(id, parentId); } @@ -771,7 +755,7 @@ public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); + String parent = w.getFieldAsWikitty(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -792,7 +776,7 @@ public Map<String, Integer> findAllChildrenCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { String wikittyId = w.getId(); - String parent = w.getFieldAsWikitty(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT); + String parent = w.getFieldAsWikitty(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT); if(parent == null) { parent = TREENODE_ROOT; } else { @@ -819,7 +803,7 @@ log.debug("Facet result " + counts); // Find all children, add the other node not found with facet - criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, wikittyId).criteria() + criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, wikittyId).criteria() .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); search = findAllByCriteria(transaction, criteria); Modified: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-10-15 17:38:43 UTC (rev 418) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-10-15 17:46:03 UTC (rev 419) @@ -41,9 +41,9 @@ import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.ExtensionFactory; import org.nuiton.wikitty.FieldType.TYPE; -import org.nuiton.wikitty.Tree; -import org.nuiton.wikitty.TreeNode; -import org.nuiton.wikitty.TreeNodeImpl; +import org.nuiton.wikitty.WikittyTree; +import org.nuiton.wikitty.WikittyTreeNode; +import org.nuiton.wikitty.WikittyTreeNodeImpl; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyImpl; @@ -142,7 +142,7 @@ Wikitty node = findNode(nodeName); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); + node.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); } @@ -150,7 +150,7 @@ * Find node by name */ protected Wikitty findNode(String nodeName) { - Criteria criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_NAME, nodeName).criteria(); + Criteria criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, nodeName).criteria(); Wikitty wikitty = ws.findByCriteria(null, criteria); return wikitty; } @@ -171,15 +171,15 @@ int sum = 0; // Sum value in node - Set<String> values = node.getFieldAsSet(TreeNode.EXT_TREENODE, - TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + Set<String> values = node.getFieldAsSet(WikittyTreeNode.EXT_WIKITTYTREENODE, + WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); if(values != null) { sum = values.size(); } // Sum children node in node String nodeId = node.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); /* for (Integer count : children.values()) { @@ -187,12 +187,12 @@ } */ - for (Map.Entry<TreeNode, Integer> e : children.entrySet()) { + for (Map.Entry<WikittyTreeNode, Integer> e : children.entrySet()) { log.debug("*treeNode = " + e.getKey().getName() + " " + e.getValue() + " -> " + e.getKey().getAttachment()); } - for (TreeNode treeNode : children.keySet()) { + for (WikittyTreeNode treeNode : children.keySet()) { Set<String> treeNodeChildren = treeNode.getAttachment(); log.debug("+treeNode = " + treeNode.getName() + " " + (treeNodeChildren==null?0:treeNodeChildren.size()) + " -> " + treeNodeChildren); @@ -201,24 +201,24 @@ // } else { // sum += treeNodeChildren.size(); // } - sum += sum(((TreeNodeImpl)treeNode).getWikitty()); + sum += sum(((WikittyTreeNodeImpl)treeNode).getWikitty()); } return sum; } /** - * Create a Wikitty TreeNode + * Create a Wikitty WikittyTreeNode * * @param name * name of the node * @param parentId * id of the parent * @return - * the wikitty object corresponding to the TreeNode + * the wikitty object corresponding to the WikittyTreeNode */ protected Wikitty createNode(String name, String parentId) { - TreeNodeImpl node = new TreeNodeImpl(); + WikittyTreeNodeImpl node = new WikittyTreeNodeImpl(); node.setName(name); node.setParent(parentId); Wikitty nodeWikitty = node.getWikitty(); @@ -230,7 +230,7 @@ Wikitty root = findNode("root"); String rootId = root.getId(); - Tree tree = ws.restoreTree(null, rootId); + WikittyTree tree = ws.restoreTree(null, rootId); assertNotNull(tree); } @@ -254,7 +254,7 @@ Wikitty node1 = findNode("node1"); String node1Id = node1.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); assertEquals(3, children.size()); } @@ -264,7 +264,7 @@ String node1Id = node1.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); assertEquals(3, children.size()); } @@ -273,7 +273,7 @@ Wikitty node11 = findNode("node11"); String node11Id = node11.getId(); - Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, null); + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, null); assertEquals(3, count.getValue().intValue()); } @@ -283,7 +283,7 @@ String node11Id = node11.getId(); Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Entry<TreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); assertEquals(1, count.getValue().intValue()); } @@ -292,7 +292,7 @@ // Check that node 2 it has any child Wikitty node2 = findNode("node2"); String node2Id = node2.getId(); - Map<TreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); assertEquals(0, children.size()); // Create a new node, child of node 2 @@ -321,7 +321,7 @@ // Add it in the node2 (now: two values in it) Wikitty node = findNode("node2"); assertNotNull(node); - node.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leaf.getId()); + node.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leaf.getId()); ws.store(null, node); // now, there is one more value for the root node @@ -373,16 +373,16 @@ // Remove a value on node11 Wikitty node = findNode("node11"); - List<String> leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); - node.removeFromField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, leafs.get(0)); + List<String> leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); + node.removeFromField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leafs.get(0)); - leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); log.info("leafs after remove = " + leafs); ws.store(null, node); node = ws.restore(null, node.getId()); - leafs = node.getFieldAsList(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, String.class); + leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); log.info("leafs after restore = " + leafs); // now, there is one more value for the root node @@ -394,14 +394,14 @@ @Test public void testSimpleDeleteChild() throws Exception { - TreeNodeImpl parent = new TreeNodeImpl(); + WikittyTreeNodeImpl parent = new WikittyTreeNodeImpl(); ws.store(null, parent.getWikitty()); - TreeNodeImpl child = new TreeNodeImpl(); + WikittyTreeNodeImpl child = new WikittyTreeNodeImpl(); child.setParent(parent.getWikittyId()); ws.store(null, child.getWikitty()); - Map<TreeNode, Integer> children = ws.restoreChildren(null, parent.getWikittyId(), null); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, parent.getWikittyId(), null); assertEquals(1, children.size()); assertEquals(0, children.get(child).intValue()); @@ -446,7 +446,7 @@ int childSum2 = sum(node2); // Move node 1 in mode 2 - node121.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_PARENT, node2); + node121.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT, node2); ws.store(null, node121); // now, there is less value node 121 for the node 1 @@ -468,18 +468,18 @@ String valueId = value.getId(); Wikitty node31 = findNode("node31"); - node31.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); + node31.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, valueId); ws.store(null, node31); Wikitty node32 = findNode("node32"); - node32.addToField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_ATTACHMENT, valueId); + node32.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, valueId); ws.store(null, node32); Wikitty node3 = findNode("node3"); int sum = sum(node3); assertEquals(2, sum); - Entry<TreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); assertEquals(1, count.getValue().intValue()); sum = sum(node31);

1 0

r418 - in trunk/wikitty-api/src: main/java/org/nuiton/wikitty main/xmi test/java/org/nuiton/wikitty/api test/java/org/nuiton/wikitty/conform test/java/org/nuiton/wikitty/importexport test/resources/csv
by bpoussin＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: bpoussin Date: 2010-10-15 19:38:43 +0200 (Fri, 15 Oct 2010) New Revision: 418 Url: http://nuiton.org/repositories/revision/wikitty/418 Log: to prevent conflict rename Tree to WikittyTreeNode rename TreeNode to WikittyTreeNode rename SecurityToken to WikittyToken rename Label to WikittyLabel rename WikittyLabelHelper to WikittyLabelUtil http://www.nuiton.org/issues/show/953 Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java Removed: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java trunk/wikitty-api/src/main/xmi/wikitty.zargo trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java trunk/wikitty-api/src/test/resources/csv/importtree.csv trunk/wikitty-api/src/test/resources/csv/importtree2.csv Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java 2010-10-15 17:38:43 UTC (rev 418) @@ -1,59 +0,0 @@ -/* - * #%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 - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.wikitty; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.nuiton.wikitty.TreeNode; - -public class Tree implements Serializable { - - /** serialVersionUID. */ - private static final long serialVersionUID = 5785244346524975096L; - - protected TreeNode node; - protected List<Tree> children; - - public void setNode(TreeNode node) { - this.node = node; - } - - public void addChild(Tree tree) { - getChildren().add( tree ); - } - - public List<Tree> getChildren() { - if ( children == null ) { - children = new ArrayList<Tree>(); - } - return children; - } - - public String getName() { - return node.getName(); - } -} Deleted: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java 2010-10-15 17:38:43 UTC (rev 418) @@ -1,87 +0,0 @@ -package org.nuiton.wikitty; - - -import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.wikitty.search.Search; - -/** - * Helper to manage Label (add and find) - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class WikittyLabelHelper { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittyLabelHelper.class); - - /** - * Add new lable to the wikitty object. - * - * @param proxy - * @param wikittyId object'id - * @param label label to add - */ - static public void addLabel(WikittyProxy proxy, String wikittyId, String label) { - Wikitty w = proxy.restore(wikittyId); - LabelImpl l = new LabelImpl(w); - l.addLabels(label); - proxy.store(l); - } - - /** - * Recherche tous les objets qui ont ce label - * - * @param proxy - * @param label - * @param firstIndex - * @param endIndex - * @return - */ - static public PagedResult<Wikitty> findAllByLabel(WikittyProxy proxy, - String label, int firstIndex, int endIndex) { - LabelImpl l = new LabelImpl(); - l.addLabels(label); - - Criteria criteria = Search.query(l.getWikitty()).criteria() - .setFirstIndex(firstIndex).setEndIndex(endIndex); - PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); - - return result; - } - - /** - * Recherche le premier objet qui a ce label - * @param proxy - * @param label - * @return - */ - static public Wikitty findByLabel(WikittyProxy proxy, String label) { - LabelImpl l = new LabelImpl(); - l.addLabels(label); - Criteria criteria = Search.query(l.getWikitty()).criteria(); - Wikitty result = proxy.findByCriteria(criteria); - - return result; - } - - /** - * Retrieve all labels applied on a wikitty object. - * - * @param proxy - * @param wikittyId - * @return set of label - */ - static public Set<String> findAllAppliedLabels(WikittyProxy proxy, String wikittyId) { - Wikitty w = proxy.restore(wikittyId); - Set<String> result = LabelHelper.getLabels(w); - - return result; - } - -} Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java (from rev 415, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelHelper.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyLabelUtil.java 2010-10-15 17:38:43 UTC (rev 418) @@ -0,0 +1,87 @@ +package org.nuiton.wikitty; + + +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.search.Search; + +/** + * Util method to manage Label (add and find) + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyLabelUtil { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittyLabelUtil.class); + + /** + * Add new lable to the wikitty object. + * + * @param proxy + * @param wikittyId object'id + * @param label label to add + */ + static public void addLabel(WikittyProxy proxy, String wikittyId, String label) { + Wikitty w = proxy.restore(wikittyId); + WikittyLabelImpl l = new WikittyLabelImpl(w); + l.addLabels(label); + proxy.store(l); + } + + /** + * Recherche tous les objets qui ont ce label + * + * @param proxy + * @param label + * @param firstIndex + * @param endIndex + * @return + */ + static public PagedResult<Wikitty> findAllByLabel(WikittyProxy proxy, + String label, int firstIndex, int endIndex) { + WikittyLabelImpl l = new WikittyLabelImpl(); + l.addLabels(label); + + Criteria criteria = Search.query(l.getWikitty()).criteria() + .setFirstIndex(firstIndex).setEndIndex(endIndex); + PagedResult<Wikitty> result = proxy.findAllByCriteria(criteria); + + return result; + } + + /** + * Recherche le premier objet qui a ce label + * @param proxy + * @param label + * @return + */ + static public Wikitty findByLabel(WikittyProxy proxy, String label) { + WikittyLabelImpl l = new WikittyLabelImpl(); + l.addLabels(label); + Criteria criteria = Search.query(l.getWikitty()).criteria(); + Wikitty result = proxy.findByCriteria(criteria); + + return result; + } + + /** + * Retrieve all labels applied on a wikitty object. + * + * @param proxy + * @param wikittyId + * @return set of label + */ + static public Set<String> findAllAppliedLabels(WikittyProxy proxy, String wikittyId) { + Wikitty w = proxy.restore(wikittyId); + Set<String> result = WikittyLabelHelper.getLabels(w); + + return result; + } + +} Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-15 17:38:43 UTC (rev 418) @@ -397,8 +397,8 @@ return wikitty; } - public Tree restoreTree(String wikittyId) { - Tree result = wikittyService.restoreTree(securityToken, wikittyId); + public WikittyTree restoreTree(String wikittyId) { + WikittyTree result = wikittyService.restoreTree(securityToken, wikittyId); return result; } @@ -421,7 +421,7 @@ public <E extends BusinessEntity> Map.Entry<E, Integer> restoreNode( Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) { - Map.Entry<TreeNode, Integer> node = wikittyService.restoreNode( + Map.Entry<WikittyTreeNode, Integer> node = wikittyService.restoreNode( securityToken, wikittyId, filter); if(node == null) { return null; @@ -446,17 +446,17 @@ public <E extends BusinessEntity> Map<E, Integer> restoreChildren( Class<E> clazz, String wikittyId, Criteria filter, boolean checkExtension) { - Map<TreeNode, Integer> result = wikittyService.restoreChildren( + Map<WikittyTreeNode, Integer> result = wikittyService.restoreChildren( securityToken, wikittyId, filter); if(result == null) { return null; } Map<E, Integer> convertedResult = new LinkedHashMap<E, Integer>(); - Set<Entry<TreeNode, Integer>> entries = result.entrySet(); - for (Entry<TreeNode, Integer> entry : entries) { + Set<Entry<WikittyTreeNode, Integer>> entries = result.entrySet(); + for (Entry<WikittyTreeNode, Integer> entry : entries) { - TreeNode node = entry.getKey(); + WikittyTreeNode node = entry.getKey(); //TODO EC-20100420 was : String nodeId = node.getId(); String nodeId = node.getWikittyId(); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-15 17:38:43 UTC (rev 418) @@ -401,7 +401,7 @@ * @param wikittyId * @return */ - public Tree restoreTree(String securityToken, String wikittyId); + public WikittyTree restoreTree(String securityToken, String wikittyId); /** * Delete specified tree node and all sub nodes. @@ -420,7 +420,7 @@ * @param wikittyId * @return */ - public Map.Entry<TreeNode, Integer> restoreNode(String securityToken, + public Map.Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter); /** @@ -431,7 +431,7 @@ * @param wikittyId * @return */ - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-10-15 17:38:43 UTC (rev 418) @@ -411,7 +411,7 @@ * @return */ @Override - public Map<TreeNode, Integer> restoreChildren( + public Map<WikittyTreeNode, Integer> restoreChildren( String securityToken, String wikittyId, Criteria filter) { // FIXME lookup in cache, and put in cache return ws.restoreChildren(securityToken, wikittyId, filter); @@ -464,7 +464,7 @@ * @return */ @Override - public Entry<TreeNode, Integer> restoreNode( + public Entry<WikittyTreeNode, Integer> restoreNode( String securityToken, String wikittyId, Criteria filter) { // FIXME lookup in cache, and put in cache return ws.restoreNode(securityToken, wikittyId, filter); @@ -477,7 +477,7 @@ * @return */ @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { // FIXME lookup in cache, and put in cache return ws.restoreTree(securityToken, wikittyId); } Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-10-15 17:38:43 UTC (rev 418) @@ -214,7 +214,7 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { return delegate.restoreTree(securityToken, wikittyId); } @@ -224,13 +224,13 @@ } @Override - public Entry<TreeNode, Integer> restoreNode(String securityToken, + public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { return delegate.restoreNode(securityToken, wikittyId, filter); } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { return delegate.restoreChildren(securityToken, wikittyId, filter); } 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-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-15 17:38:43 UTC (rev 418) @@ -541,27 +541,27 @@ // Store node with have deleted node as parent Criteria criteria = - Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, id).criteria(); + Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, id).criteria(); List<String> wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { if(!ids.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); - TreeNodeHelper.setParent(treeNode, null); + WikittyTreeNodeHelper.setParent(treeNode, null); storedWikitties.add(treeNode); } } // Store node with have deleted child - criteria = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_ATTACHMENT, id).criteria(); + criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT, id).criteria(); wikittyNodesId = findAllByCriteria( securityToken, transaction, criteria).getAll(); for (String wikittyNodeId : wikittyNodesId) { if(!ids.contains(wikittyNodeId)) { Wikitty treeNode = restore( securityToken, transaction, wikittyNodeId); - TreeNodeHelper.removeAttachment(treeNode, id); + WikittyTreeNodeHelper.removeAttachment(treeNode, id); storedWikitties.add(treeNode); } } @@ -687,23 +687,23 @@ } } - protected Tree restoreTree(String securityToken, + protected WikittyTree restoreTree(String securityToken, WikittyTransaction transaction, String wikittyId) { Wikitty w = restore(securityToken, transaction, wikittyId); if(w == null) { return null; } - if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { throw new WikittyException(String.format( "Wikitty '%s' do not handle extension %s", - wikittyId, TreeNode.EXT_TREENODE )); + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); } - Tree tree = new Tree(); - TreeNode node = new TreeNodeImpl(w); + WikittyTree tree = new WikittyTree(); + WikittyTreeNode node = new WikittyTreeNodeImpl(w); tree.setNode(node); - TreeNodeImpl exempleNode = new TreeNodeImpl(); + WikittyTreeNodeImpl exempleNode = new WikittyTreeNodeImpl(); exempleNode.setParent(wikittyId); Criteria criteria = Search.query(exempleNode.getWikitty()).criteria() @@ -718,12 +718,12 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { WikittyTransaction transaction = new WikittyTransaction(); try { transaction.begin(); - Tree tree = restoreTree(securityToken, transaction, wikittyId); + WikittyTree tree = restoreTree(securityToken, transaction, wikittyId); transaction.commit(); return tree; @@ -776,7 +776,7 @@ protected List<String> getRecursiveTreeNodeId(String securityToken, WikittyTransaction transaction, String treeNodeId) { Search search = Search.query(); - search = search.eq(TreeNode.FQ_FIELD_TREENODE_PARENT, treeNodeId); + search = search.eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, treeNodeId); Criteria criteria = search.criteria(); PagedResult<String> childTreeNodeIds = findAllByCriteria(securityToken, transaction, criteria); @@ -790,7 +790,7 @@ } @Override - public Map.Entry<TreeNode, Integer> restoreNode(String securityToken, + public Map.Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { WikittyTransaction transaction = new WikittyTransaction(); try { @@ -802,17 +802,17 @@ return null; } - if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { throw new WikittyException(String.format( "Wikitty '%s' do not handle extension %s", - wikittyId, TreeNode.EXT_TREENODE )); + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); } - TreeNode node = new TreeNodeImpl(w); + WikittyTreeNode node = new WikittyTreeNodeImpl(w); Integer count = getSearchEngin().findNodeCount(transaction, w, filter); - HashMap.SimpleEntry<TreeNode, Integer> result = - new SimpleEntry<TreeNode, Integer>(node, count); + HashMap.SimpleEntry<WikittyTreeNode, Integer> result = + new SimpleEntry<WikittyTreeNode, Integer>(node, count); transaction.commit(); return result; @@ -823,7 +823,7 @@ } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { WikittyTransaction transaction = new WikittyTransaction(); try { @@ -835,13 +835,13 @@ return null; } - if ( !w.hasExtension(TreeNode.EXT_TREENODE) ) { + if ( !w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE) ) { throw new WikittyException(String.format( "Wikitty '%s' do not handle extension %s", - wikittyId, TreeNode.EXT_TREENODE )); + wikittyId, WikittyTreeNode.EXT_WIKITTYTREENODE )); } - Map<TreeNode, Integer> result = new LinkedHashMap<TreeNode, Integer>(); + Map<WikittyTreeNode, Integer> result = new LinkedHashMap<WikittyTreeNode, Integer>(); Map<String, Integer> search = getSearchEngin().findAllChildrenCount( transaction, w, filter); @@ -851,7 +851,7 @@ String id = child.getKey(); Wikitty wikitty = restore(securityToken, transaction, id); - TreeNode node = new TreeNodeImpl(wikitty); + WikittyTreeNode node = new WikittyTreeNodeImpl(wikitty); result.put(node, count); } 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-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-15 17:38:43 UTC (rev 418) @@ -327,7 +327,7 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { // no notification return ws.restoreTree(securityToken, wikittyId); } @@ -341,14 +341,14 @@ } @Override - public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, + public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { // no notification return ws.restoreNode(securityToken, wikittyId, filter); } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { // no notification return ws.restoreChildren(securityToken, wikittyId, filter); Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceSecurity.java 2010-10-15 17:38:43 UTC (rev 418) @@ -84,8 +84,8 @@ String tokenId = WikittyUtil.genSecurityTokenId(); Wikitty wikittyToken = new WikittyImpl(tokenId); // force add extension to wikitty - SecurityTokenHelper.addExtension(wikittyToken); - SecurityTokenHelper.setUser(wikittyToken, user.getId()); + WikittyTokenHelper.addExtension(wikittyToken); + WikittyTokenHelper.setUser(wikittyToken, user.getId()); ws.store(null, wikittyToken); log.debug(String.format("token '%s' is for login '%s'", tokenId, login)); @@ -504,40 +504,40 @@ } @Override - public Tree restoreTree(String securityToken, String wikittyId) { + public WikittyTree restoreTree(String securityToken, String wikittyId) { String userId = getUserId(securityToken); - Tree restoredTree = ws.restoreTree(securityToken, wikittyId); + WikittyTree restoredTree = ws.restoreTree(securityToken, wikittyId); checkRestoreTree(securityToken, userId, restoredTree); return restoredTree; } - protected void checkRestoreTree(String securityToken, String userId, Tree tree) { + protected void checkRestoreTree(String securityToken, String userId, WikittyTree tree) { checkRestoreTreeNode(securityToken, userId, tree.node); - for (Tree subTree : tree.getChildren()) { + for (WikittyTree subTree : tree.getChildren()) { checkRestoreTree(securityToken, userId, subTree); } } - protected void checkRestoreTreeNode(String securityToken, String userId, TreeNode treeNode) { + protected void checkRestoreTreeNode(String securityToken, String userId, WikittyTreeNode treeNode) { refuseUnauthorizedRead(securityToken, userId, treeNode.getWikitty()); } @Override - public Entry<TreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { + public Entry<WikittyTreeNode, Integer> restoreNode(String securityToken, String wikittyId, Criteria filter) { String userId = getUserId(securityToken); - Entry<TreeNode, Integer> entry = ws.restoreNode(securityToken, wikittyId, filter); + Entry<WikittyTreeNode, Integer> entry = ws.restoreNode(securityToken, wikittyId, filter); checkRestoreTreeNode(securityToken, userId, entry.getKey()); return entry; } @Override - public Map<TreeNode, Integer> restoreChildren(String securityToken, + public Map<WikittyTreeNode, Integer> restoreChildren(String securityToken, String wikittyId, Criteria filter) { String userId = getUserId(securityToken); - Map<TreeNode, Integer> children = ws.restoreChildren(securityToken, wikittyId, filter); - for (Map.Entry<TreeNode, Integer> child : children.entrySet()) { + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(securityToken, wikittyId, filter); + for (Map.Entry<WikittyTreeNode, Integer> child : children.entrySet()) { checkRestoreTreeNode(securityToken, userId, child.getKey()); } return children; @@ -545,7 +545,7 @@ @Override public List<String> deleteTree(String securityToken, String treeNodeId) { - TreeNode treeNode = ws.restoreNode(securityToken, treeNodeId, null).getKey(); + WikittyTreeNode treeNode = ws.restoreNode(securityToken, treeNodeId, null).getKey(); Collection<Wikitty> wikitties = Arrays.asList(treeNode.getWikitty()); checkStore(securityToken, wikitties); return ws.deleteTree(securityToken, treeNodeId); @@ -597,7 +597,7 @@ if (securityTokenWikitty == null) { throw new SecurityException("bad (obsolete ?) token"); } else { - result = SecurityTokenHelper.getUser(securityTokenWikitty); + result = WikittyTokenHelper.getUser(securityTokenWikitty); } } return result; Copied: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java (from rev 415, trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java) =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTree.java 2010-10-15 17:38:43 UTC (rev 418) @@ -0,0 +1,57 @@ +/* + * #%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 + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.wikitty; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +public class WikittyTree implements Serializable { + + /** serialVersionUID. */ + private static final long serialVersionUID = 5785244346524975096L; + + protected WikittyTreeNode node; + protected List<WikittyTree> children; + + public void setNode(WikittyTreeNode node) { + this.node = node; + } + + public void addChild(WikittyTree tree) { + getChildren().add( tree ); + } + + public List<WikittyTree> getChildren() { + if ( children == null ) { + children = new ArrayList<WikittyTree>(); + } + return children; + } + + public String getName() { + return node.getName(); + } +} Modified: trunk/wikitty-api/src/main/xmi/wikitty.zargo =================================================================== (Binary files differ) Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -40,8 +40,8 @@ import org.nuiton.wikitty.ExtensionFactory; import org.nuiton.wikitty.FieldType; import org.nuiton.wikitty.FieldType.TYPE; -import org.nuiton.wikitty.TreeNode; -import org.nuiton.wikitty.TreeNodeAbstract; +import org.nuiton.wikitty.WikittyTreeNode; +import org.nuiton.wikitty.WikittyTreeNodeAbstract; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; @@ -446,9 +446,9 @@ @Test public void testGeneratedExtensionType() { - WikittyExtension wikittyExtension = TreeNodeAbstract.extensionTreeNode; - Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_PARENT).getType()); - Assert.assertEquals(TYPE.STRING, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_NAME).getType()); - Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(TreeNode.FIELD_TREENODE_ATTACHMENT).getType()); + WikittyExtension wikittyExtension = WikittyTreeNodeAbstract.extensionWikittyTreeNode; + Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT).getType()); + Assert.assertEquals(TYPE.STRING, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME).getType()); + Assert.assertEquals(TYPE.WIKITTY, wikittyExtension.getFieldType(WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT).getType()); } } Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -36,7 +36,7 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.FieldType; -import org.nuiton.wikitty.LabelImpl; +import org.nuiton.wikitty.WikittyLabelImpl; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyUtil; @@ -465,7 +465,7 @@ } // use in testNewInstance - static class MonLabel extends LabelImpl { + static class MonLabel extends WikittyLabelImpl { } /** check that a date is the same after parse and format */ 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-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -46,17 +46,17 @@ import org.junit.Assert; import org.junit.Test; import org.nuiton.wikitty.Criteria; -import org.nuiton.wikitty.Label; +import org.nuiton.wikitty.WikittyLabel; import org.nuiton.wikitty.PagedResult; -import org.nuiton.wikitty.Tree; -import org.nuiton.wikitty.TreeNode; -import org.nuiton.wikitty.TreeNodeImpl; +import org.nuiton.wikitty.WikittyTree; +import org.nuiton.wikitty.WikittyTreeNode; +import org.nuiton.wikitty.WikittyTreeNodeImpl; import org.nuiton.wikitty.UpdateResponse; import org.nuiton.wikitty.Wikitty; import org.nuiton.wikitty.WikittyException; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyImpl; -import org.nuiton.wikitty.WikittyLabelHelper; +import org.nuiton.wikitty.WikittyLabelUtil; import org.nuiton.wikitty.WikittyObsoleteException; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyUtil; @@ -418,22 +418,22 @@ // labelisation test Wikitty w1 = wikitties.get(0); - WikittyLabelHelper.addLabel(proxy, w1.getId(), "titi"+ts); - WikittyLabelHelper.addLabel(proxy, w1.getId(), "toto"+ts); + WikittyLabelUtil.addLabel(proxy, w1.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(proxy, w1.getId(), "toto"+ts); Wikitty w2 = wikitties.get(1); - WikittyLabelHelper.addLabel(proxy, w2.getId(), "tata"+ts); - WikittyLabelHelper.addLabel(proxy, w2.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(proxy, w2.getId(), "tata"+ts); + WikittyLabelUtil.addLabel(proxy, w2.getId(), "titi"+ts); Wikitty w3 = wikitties.get(2); - WikittyLabelHelper.addLabel(proxy, w3.getId(), "tutu"+ts); - WikittyLabelHelper.addLabel(proxy, w3.getId(), "titi"+ts); + WikittyLabelUtil.addLabel(proxy, w3.getId(), "tutu"+ts); + WikittyLabelUtil.addLabel(proxy, w3.getId(), "titi"+ts); - Wikitty wt = WikittyLabelHelper.findByLabel(proxy, "toto"+ts ); + Wikitty wt = WikittyLabelUtil.findByLabel(proxy, "toto"+ts ); assertEquals(w1, wt); - Set<String> labels = WikittyLabelHelper.findAllAppliedLabels(proxy, w2.getId()); + Set<String> labels = WikittyLabelUtil.findAllAppliedLabels(proxy, w2.getId()); assertEquals(new HashSet(Arrays.asList("tata"+ts, "titi"+ts)), labels); } @@ -444,18 +444,18 @@ List<Wikitty> wikitties = createSampleWikitty(ws); List<Wikitty> wikittyNodes = new ArrayList<Wikitty>(); - TreeNodeImpl root = new TreeNodeImpl(); + WikittyTreeNodeImpl root = new WikittyTreeNodeImpl(); wikittyNodes.add(root.getWikitty()); root.setName("MyCategoryRoot"); for ( int i = 0; i < 3; i++ ) { - TreeNodeImpl leaf = new TreeNodeImpl(); + WikittyTreeNodeImpl leaf = new WikittyTreeNodeImpl(); wikittyNodes.add( leaf.getWikitty() ); leaf.setName( "cat-"+i ); leaf.setParent( root.getWikittyId() ); // root.addChild( leaf.getWikittyId() ); for ( int j = 0; j < 5; j++ ) { - TreeNodeImpl subLeaf = new TreeNodeImpl(); + WikittyTreeNodeImpl subLeaf = new WikittyTreeNodeImpl(); subLeaf.setName( "subcat-"+i+"-"+j ); subLeaf.setParent( leaf.getWikittyId() ); wikittyNodes.add( subLeaf.getWikitty() ); @@ -472,17 +472,17 @@ assign( table, root, "cat-1" ); assign( bureau, root, "cat-2/subcat-2-4" ); - Tree t = ws.restoreTree(null, root.getWikitty().getId() ); + WikittyTree t = ws.restoreTree(null, root.getWikitty().getId() ); t.getName().equals("MyCategoryRoot"); } - protected void assign(Wikitty wikitty, TreeNodeImpl root, String path) { + protected void assign(Wikitty wikitty, WikittyTreeNodeImpl root, String path) { String[] nodeNames = path.split("/"); - TreeNodeImpl currentNode = root; + WikittyTreeNodeImpl currentNode = root; outerloop : for( String nodeName : nodeNames ) { - TreeNodeImpl node = new TreeNodeImpl(); + WikittyTreeNodeImpl node = new WikittyTreeNodeImpl(); node.setName(nodeName); Criteria criteria = Search.query(node.getWikitty()).criteria() @@ -490,10 +490,10 @@ List<String> wikittiesId = ws.findAllByCriteria(null, criteria).getAll(); List<Wikitty> wikitties = ws.restore(null, wikittiesId); for ( Wikitty child : wikitties ) { - if (!child.hasExtension(TreeNode.EXT_TREENODE)) { + if (!child.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { continue; } - node = new TreeNodeImpl(child); + node = new WikittyTreeNodeImpl(child); if ( node.getName().equals(nodeName) ) { currentNode = node; continue outerloop; @@ -512,9 +512,9 @@ public void testWikittyUtilNewInstanceWithWikitty() { Wikitty w = new WikittyImpl(); - w.addExtension(TreeNodeImpl.extensions); + w.addExtension(WikittyTreeNodeImpl.extensions); - TreeNode treeNode = WikittyUtil.newInstance(null, ws, TreeNode.class, w); + WikittyTreeNode treeNode = WikittyUtil.newInstance(null, ws, WikittyTreeNode.class, w); Assert.assertNotNull(treeNode); } @@ -526,20 +526,20 @@ WikittyProxy wikittyProxy = new WikittyProxy(); wikittyProxy.setWikittyService(ws); - TreeNode node = new TreeNodeImpl(); + WikittyTreeNode node = new WikittyTreeNodeImpl(); node.setName("nodeName"); // cast, different business object, same wikitty - Label label = wikittyProxy.cast(node, Label.class); + WikittyLabel label = wikittyProxy.cast(node, WikittyLabel.class); label.addLabels("toto"); label = wikittyProxy.store(label); String wikittyId = label.getWikittyId(); - TreeNode node2 = wikittyProxy.restore(TreeNode.class, wikittyId); + WikittyTreeNode node2 = wikittyProxy.restore(WikittyTreeNode.class, wikittyId); Assert.assertEquals("nodeName", node2.getName()); - Label label2 = wikittyProxy.cast(node, Label.class); + WikittyLabel label2 = wikittyProxy.cast(node, WikittyLabel.class); List<String> labels = new ArrayList<String>(label2.getLabels()); Assert.assertFalse(labels.isEmpty()); Assert.assertEquals("toto", labels.get(0)); @@ -553,8 +553,8 @@ // store 1 Wikitty myWikitty = new WikittyImpl(); - myWikitty.addExtension(TreeNodeImpl.extensions); - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "name"); + myWikitty.addExtension(WikittyTreeNodeImpl.extensions); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "name"); ws.store(null, myWikitty); Assert.assertEquals("1.0", myWikitty.getVersion()); @@ -563,13 +563,13 @@ Assert.assertEquals("1.0", myWikitty.getVersion()); // store 3 : modification - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "new name"); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "new name"); ws.store(null, myWikitty); Assert.assertEquals("2.0", myWikitty.getVersion()); // store 4 : new wikitty with same wikitty id (obsolete) Wikitty myNewWikitty = new WikittyImpl(myWikitty.getId()); - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "new wikitty"); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "new wikitty"); try { ws.store(null, myNewWikitty); Assert.fail("Test must throw WikittyObsoleteException"); @@ -598,8 +598,8 @@ // store 1 Wikitty myWikitty = new WikittyImpl(); - myWikitty.addExtension(TreeNodeImpl.extensions); - myWikitty.setField(TreeNode.EXT_TREENODE, TreeNode.FIELD_TREENODE_NAME, "name"); + myWikitty.addExtension(WikittyTreeNodeImpl.extensions); + myWikitty.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_NAME, "name"); ws.store(null, myWikitty); // delete Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-10-15 17:38:43 UTC (rev 418) @@ -35,8 +35,8 @@ import org.nuiton.util.StringUtil; import org.nuiton.wikitty.Criteria; import org.nuiton.wikitty.PagedResult; -import org.nuiton.wikitty.TreeNode; -import org.nuiton.wikitty.TreeNodeImpl; +import org.nuiton.wikitty.WikittyTreeNode; +import org.nuiton.wikitty.WikittyTreeNodeImpl; import org.nuiton.wikitty.WikittyExtension; import org.nuiton.wikitty.WikittyImportExportService; import org.nuiton.wikitty.WikittyProxy; @@ -163,7 +163,7 @@ // store required import extension WikittyProxy proxy = new WikittyProxy(ws); proxy.storeExtension(extensionClient); - proxy.storeExtension(TreeNodeImpl.extensionTreeNode); + proxy.storeExtension(WikittyTreeNodeImpl.extensionWikittyTreeNode); proxy.storeExtension(extensionTag); // declare import service @@ -185,17 +185,17 @@ Assert.assertEquals(1, pagedResult2.getNumFound()); // test non existant wikitty tree node childreen deletion - Criteria criteria3 = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_NAME, "MyTreeNode").criteria(); - PagedResult<TreeNode> pagedResult3 = proxy.findAllByCriteria(TreeNode.class, criteria3); + Criteria criteria3 = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, "MyTreeNode").criteria(); + PagedResult<WikittyTreeNode> pagedResult3 = proxy.findAllByCriteria(WikittyTreeNode.class, criteria3); Assert.assertEquals(1, pagedResult3.getNumFound()); - TreeNode myTreeNode = pagedResult3.getFirst(); + WikittyTreeNode myTreeNode = pagedResult3.getFirst(); Assert.assertEquals(1, myTreeNode.getAttachment().size()); // test des requetes imbriquées - Criteria criteria4 = Search.query().eq(TreeNode.FQ_FIELD_TREENODE_PARENT, myTreeNode.getWikittyId()).criteria(); - PagedResult<TreeNode> pagedResult4 = proxy.findAllByCriteria(TreeNode.class, criteria4); + Criteria criteria4 = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, myTreeNode.getWikittyId()).criteria(); + PagedResult<WikittyTreeNode> pagedResult4 = proxy.findAllByCriteria(WikittyTreeNode.class, criteria4); Assert.assertEquals(1, pagedResult4.getNumFound()); - TreeNode mySubNode = pagedResult4.getFirst(); + WikittyTreeNode mySubNode = pagedResult4.getFirst(); Assert.assertEquals("MySubNode", mySubNode.getName()); } } Modified: trunk/wikitty-api/src/test/resources/csv/importtree.csv =================================================================== --- trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/resources/csv/importtree.csv 2010-10-15 17:38:43 UTC (rev 418) @@ -1,3 +1,3 @@ -"Wikitty.Id","Wikitty.Ext","TreeNode.name","TreeNode.parent","TreeNode.attachment" +"Wikitty.Id","Wikitty.Ext","WikittyTreeNode.name","WikittyTreeNode.parent","WikittyTreeNode.attachment" "4f6fc798-41f8-48d7-9398-119ef6ab02b6",,"MyRootNode",, "1142aa4c-af5a-4264-9918-9f72d9ef9d59","Tag","MyTreeNode","4f6fc798-41f8-48d7-9398-119ef6ab02b6","(fbcc8aed-7f67-4e3c-a9aa-221373765f8d),(677ee1e7-239f-416c-a353-6e56bc0451e2)" Modified: trunk/wikitty-api/src/test/resources/csv/importtree2.csv =================================================================== --- trunk/wikitty-api/src/test/resources/csv/importtree2.csv 2010-10-15 15:24:44 UTC (rev 417) +++ trunk/wikitty-api/src/test/resources/csv/importtree2.csv 2010-10-15 17:38:43 UTC (rev 418) @@ -1,2 +1,2 @@ -"TreeNode.name","TreeNode.parent" -"MySubNode","TreeNode.name=MyTreeNode" +"WikittyTreeNode.name","WikittyTreeNode.parent" +"MySubNode","WikittyTreeNode.name=MyTreeNode"

1 0

r417 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/importexport wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/main/resources/org/nuiton wikitty-api/src/test/java/org/nuiton/wikitty/api wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-api/src/test/java/org/nuiton/wikitty/importexport wikitty-api/src/test/java/org/nuiton/wikitty/layers wikitty-api/src/test/java/org/nuiton/wikitty/memory wikitty-api/src/
by sletellier＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: sletellier Date: 2010-10-15 17:24:44 +0200 (Fri, 15 Oct 2010) New Revision: 417 Url: http://nuiton.org/repositories/revision/wikitty/417 Log: Oups Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Criteria.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ExtensionFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FacetTopic.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifierTransporter.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyMetaExtensionUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObsoleteException.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySearchEngin.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySecurityHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.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/WikittyStorage.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/JobState.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/AssociatedRestriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Like.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Unlike.java trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java trunk/wikitty-api/src/test/resources/META-INF/spring/wikitty-test.xml trunk/wikitty-api/src/test/resources/log4j.properties 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 trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntity.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/BusinessEntityWikitty.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Criteria.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ExtensionFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ExtensionFactory.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/ExtensionFactory.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FacetTopic.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FacetTopic.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FacetTopic.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldFactory.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/FieldType.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/JGroupsNotifierTransporter.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/PagedResult.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Tree.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/UpdateResponse.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/Wikitty.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCache.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyCopyOnWrite.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyException.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtension.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigration.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionMigrationRename.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionStorage.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyExtensionStorage.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImpl.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyImportExportService.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyMetaExtensionUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyMetaExtensionUtil.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyMetaExtensionUtil.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObsoleteException.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObsoleteException.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyObsoleteException.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyProxy.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySearchEngin.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySearchEngin.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySearchEngin.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySecurityHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySecurityHelper.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittySecurityHelper.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyService.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceCached.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceDelegator.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceImpl.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceInMemory.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceListener.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyStorage.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyTransaction.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyUtil.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ExportTask.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportCSV.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportMethod.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportExportXML.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/ImportTask.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/JobState.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/JobState.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/JobState.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/importexport/WikittyBatchUpdate.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/And.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/AssociatedRestriction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/AssociatedRestriction.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/AssociatedRestriction.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Between.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/BinaryOperator.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Contains.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Element.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/EndsWith.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Equals.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Greater.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/GreaterOrEqual.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/In.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Keyword.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Less.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/LessOrEqual.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Like.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Like.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Like.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Not.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/NotEquals.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Null.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Or.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Restriction.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionHelper.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/RestrictionName.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Search.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SearchOperand.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/StartsWith.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/SubSearch.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Unlike.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Unlike.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/Unlike.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml =================================================================== --- trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/main/resources/org/nuiton/WikittyAPI.gwt.xml 2010-10-15 15:24:44 UTC (rev 417) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/AbstractTestApi.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/CommonTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/ExtensionFactoryTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/SearchCriteriaTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/api/WikittyUtilTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/AbstractTestConformance.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/ImportExportTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/PerformanceBenchMark.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/SearchTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/importexport/ImportExportCSVTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/AbstractWikittyServiceTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceCachedTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/layers/WikittyServiceSecurityTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/memory/InMemoryStorageTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-api/src/test/resources/META-INF/spring/wikitty-test.xml =================================================================== --- trunk/wikitty-api/src/test/resources/META-INF/spring/wikitty-test.xml 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/resources/META-INF/spring/wikitty-test.xml 2010-10-15 15:24:44 UTC (rev 417) @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + 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 Modified: trunk/wikitty-api/src/test/resources/log4j.properties =================================================================== --- trunk/wikitty-api/src/test/resources/log4j.properties 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-api/src/test/resources/log4j.properties 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ # $Id$ # $HeadURL$ # %% -# Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin +# 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyContractGenerator.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyHelperGenerator.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 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-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaTransformer.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyPurifierTransformer.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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 Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-10-15 15:05:57 UTC (rev 416) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyTransformerUtil.java 2010-10-15 15:24:44 UTC (rev 417) @@ -5,7 +5,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2010 CodeLutin, Beanjamin Poussin + * 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

1 0