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

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

15 Oct '10

Author: bpoussin Date: 2010-10-15 16:40:35 +0200 (Fri, 15 Oct 2010) New Revision: 414 Url: http://nuiton.org/repositories/revision/wikitty/414 Log: add section about remote notification Modified: trunk/src/site/rst/Spec.rst Modified: trunk/src/site/rst/Spec.rst =================================================================== --- trunk/src/site/rst/Spec.rst 2010-10-15 12:02:05 UTC (rev 413) +++ trunk/src/site/rst/Spec.rst 2010-10-15 14:40:35 UTC (rev 414) @@ -40,6 +40,74 @@ Un wikitty en base a toujours un identifiant, dès instanciation. +WikittyServiceNotifier +====================== + +Tous les events passant par le WikittyServiceNotifier sont envoyé au +RemoteNotifier s'il est indiqué dans la configuration qu'il faut envoyer les +events (wikitty.service.event.propagateEvent). Il faut alors dans ce cas +définir le transporter à utiliser (wikitty.notifier.transporter.class). + +Le transporter sert à envoyer(serveur) et recevoir(client) les events. Le +même transporter doit être utilisé pour le client et le serveur. + +Il existe aujourd'hui deux types de transporter différent (jgroups, xmpp). +L'implantation jgroups pose quelque soucis (ne fonctionne pas toujours). Il +est donc préférable d'utiliser le transporter xmpp. + +Il est bien sur possible d'empiler deux couche de WikittyServiceNotifier +avec des transporters différents coté serveur pour permettre à différent +type de client de fonctionner en même temps (FIXME poussin 20101115 il n'est +pas actuellement possible de configurer ce fonctionnement) + +Pour utiliser le transporter xmpp il faut que vous ayez un serveur xmpp avec +une room acceptant le login anonyme. Pour cette fonctionnalité, il n'y a pas +besoin que la room soit archivée. + +Synchronisation de serveur +========================== + +On peut avoir besoin d'avoir deux serveurs qui soit synchronisé. +Actuellement il n'existe que du maitre/esclave. + +Pour mettre en place la synchronisation il faut que le serveur maitre +utilise la couche de notification avec le transporter xmpp. Il faut que la +room xmpp soit archivée. + +Pour que la synchornisation fonctionne il faut: +- garantir que tous les events soient bien envoyés +- garantir que tous les events soitent bien reçus + +et ceci même si le serveur xmpp s'arrête ou que le client s'arrête. Si le +serveur s'arrête plus aucun event ne sera produit. Il faut seulement +garantir que lorsqu'un event à été enregistrer sur le serveur il sera bien +envoyé aux clients. + +Lorsque le serveur envoie un event, il lui fixe un numero d'ordre qu'il +stocke et qu'il incrémentera et réutilisera pour l'envoi suivant. + +Lorsque le client réceptionne l'event, il vérifie qu'il n'y a pas de rupture +dans la séquence des numeros d'envois. Si c'est le cas, il doit récupérer +les numeros manquants. (il redemande l'historique des messages pour les N +messages qui lui manque) + + + + + + +Deux types de client: +- volatile: ceux intéressé pour récupérer les events lorsqu'ils sont présent +- persistant: ceux intéressé pour récupérer tous les events même lorsqu'ils sont non dispo (coupure réseau) + +Le client ouvre un socket et le serveur laisse la connexion ouverte pour pouvoir +envoyer régulièrement les infos de notification. +Si un client volatile disparait (impossible de lui envoyer l'info), on +l'enleve de la liste des clients a prevenir +Si un client persistant disparait, on met dans une file toutes les +notifications qu'on a pas pu lui envoyer et on lui renvera tout ce qu'il a +manqué lorsqu'il sera de retour. (utile pour la synchro serveur) + Gestion des droits ==================

1 0

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

15 Oct '10

Author: sletellier Date: 2010-10-15 14:02:05 +0200 (Fri, 15 Oct 2010) New Revision: 413 Url: http://nuiton.org/repositories/revision/wikitty/413 Log: - Fix XMPP implementation - Verify that server don't listen own messages Modified: 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/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-15 10:27:38 UTC (rev 412) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-15 12:02:05 UTC (rev 413) @@ -721,7 +721,7 @@ static public class RemoteNotifier implements WikittyServiceListener { /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(JGroupsNotifierTransporter.class); + static private Log log = LogFactory.getLog(RemoteNotifier.class); /** * Indique si les objects sont propages (true) vers les autres caches ou * simplement supprimes des autres caches (false). Default to {@code false}. @@ -732,6 +732,7 @@ /** Notifier service reference reference. */ protected WikittyServiceNotifier ws; + /** * Indique si les objects sont propages (true) vers les autres caches ou * simplement supprimes des autres caches (false). @@ -750,24 +751,25 @@ props.setProperty(WIKITTY_NOTIFIER_TRANSPORTER_CLASS, JGroupsNotifierTransporter.class.getName()); } ApplicationConfig config = new ApplicationConfig(props); + propagateEvent = config.getOptionAsBoolean(WIKITTY_EVENT_PROPAGATE_OPTION); if (log.isDebugEnabled()) { log.debug("Set propagateEvent option to " + propagateEvent); } - if (propagateEvent) { - try { - Class transporterClass = config.getOptionAsClass( - WIKITTY_NOTIFIER_TRANSPORTER_CLASS); - transporter = (RemoteNotifierTransporter) ConstructorUtils.invokeConstructor(transporterClass, new Object[]{this, props}); - } catch (Exception eee) { - throw new WikittyException("Can't create notifier: " - + config.getOption(WIKITTY_NOTIFIER_TRANSPORTER_CLASS), eee); - } + Class transporterClass = config.getOptionAsClass( + WIKITTY_NOTIFIER_TRANSPORTER_CLASS); + try { + transporter = (RemoteNotifierTransporter) ConstructorUtils.invokeConstructor(transporterClass, + new Object[]{ws, props}, + new Class[]{WikittyServiceNotifier.class, Properties.class}); + } catch (Exception eee) { + throw new WikittyException("Can't create notifier: " + + transporterClass.getName(), eee); + } - // add this as listener when transporter is created without error - ws.addWikittyServiceListener(this, WikittyService.ServiceListenerType.ALL); // weak reference - } + // add this as listener when transporter is created without error + ws.addWikittyServiceListener(this, WikittyService.ServiceListenerType.ALL); // weak reference } if (log.isInfoEnabled()) { if (transporter == null) { @@ -785,14 +787,14 @@ */ protected void sendMessage(WikittyServiceEvent event) { try { - if (log.isInfoEnabled()) { - log.info("Try to send message : " + event); + if (log.isDebugEnabled()) { + log.debug("Try to send message : " + event); } transporter.sendMessage(event); - if (log.isInfoEnabled()) { - log.info("message send" + event); + if (log.isDebugEnabled()) { + log.debug("Message is sent : " + event); } } catch (Exception eee) { if (log.isErrorEnabled()) { 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 10:27:38 UTC (rev 412) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java 2010-10-15 12:02:05 UTC (rev 413) @@ -72,12 +72,17 @@ received event missed after deconnection */ protected boolean persistent = false; + // Keep room addresse and pseudo to verify that messages event are not send by us + protected String room; + protected String pseudo; + protected XMPPConnection connection; protected MultiUserChat muc; /** * * @param ws + * @param props */ public XMPPNotifierTransporter(WikittyServiceNotifier ws, Properties props) { this.ws = ws; @@ -94,9 +99,10 @@ persistent = config.getOptionAsBoolean(WIKITTY_NOTIFICATION_PERSISTENT); String server = config.getOption(WIKITTY_XMPP_SERVER); - String room = config.getOption(WIKITTY_XMPP_ROOM); - - String pseudo = getUniqueLoginName(); + + // Keep them to verify that is not us notifications + room = config.getOption(WIKITTY_XMPP_ROOM); + pseudo = getUniqueLoginName(); try { if (log.isInfoEnabled()) { log.info("Try to connect to xmpp serveur " + server + @@ -141,21 +147,27 @@ */ @Override public void processPacket(Packet packet) { - Object event = packet.getProperty(PROPERTY_EVENT_NAME); - if (log.isInfoEnabled()) { - log.info("Receive message : " + event); - } + // Dont listen own events + String name = room + "/" + pseudo; + if (!name.equals(packet.getFrom())) { - if (event instanceof WikittyServiceEvent) { - processEvent((WikittyServiceEvent)event); + Object event = packet.getProperty(PROPERTY_EVENT_NAME); + + if (log.isDebugEnabled()) { + log.debug("Receive message : " + event); + } + + if (event instanceof WikittyServiceEvent) { + processEvent((WikittyServiceEvent)event); + } } } /** * Process event */ - protected void processEvent(WikittyServiceEvent event) { + protected void processEvent(WikittyServiceEvent event) { //source is transient, add it here : event.setSource(ws); event.setRemote(true); // received event became remote

1 0

r412 - in trunk: . wikitty-api
by tchemit＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: tchemit Date: 2010-10-15 12:27:38 +0200 (Fri, 15 Oct 2010) New Revision: 412 Url: http://nuiton.org/repositories/revision/wikitty/412 Log: use correct groupId for xstream : PLEASE pay attention on warnings in the Maven build, when a Warning occurs it is not for any reason... Modified: trunk/pom.xml trunk/wikitty-api/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-15 08:11:00 UTC (rev 411) +++ trunk/pom.xml 2010-10-15 10:27:38 UTC (rev 412) @@ -180,7 +180,7 @@  <dependency> - <groupId>xstream</groupId> + <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> <version>1.2.2</version> </dependency> @@ -475,8 +475,8 @@ <hbase.version>0.89.0-SNAPSHOT</hbase.version>  - <license.version>2.4</license.version> - <licenseName>lgpl_v3</licenseName> + <license.version>2.4.1-SNAPSHOT</license.version> + <license.licenseName>lgpl_v3</license.licenseName> </properties>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-10-15 08:11:00 UTC (rev 411) +++ trunk/wikitty-api/pom.xml 2010-10-15 10:27:38 UTC (rev 412) @@ -94,7 +94,7 @@  <dependency> - <groupId>xstream</groupId> + <groupId>com.thoughtworks.xstream</groupId> <artifactId>xstream</artifactId> </dependency>

1 0

r411 - in trunk/src/site: . rst
by tchemit＠users.nuiton.org 15 Oct '10

15 Oct '10

Author: tchemit Date: 2010-10-15 10:11:00 +0200 (Fri, 15 Oct 2010) New Revision: 411 Url: http://nuiton.org/repositories/revision/wikitty/411 Log: add headers Modified: trunk/src/site/rst/DevDoc.rst trunk/src/site/rst/Spec.rst trunk/src/site/rst/changes.rst trunk/src/site/rst/hessian.rst trunk/src/site/rst/index.rst trunk/src/site/rst/migration.rst trunk/src/site/rst/todo.rst trunk/src/site/site.xml Modified: trunk/src/site/rst/DevDoc.rst =================================================================== --- trunk/src/site/rst/DevDoc.rst 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/rst/DevDoc.rst 2010-10-15 08:11:00 UTC (rev 411) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - ========================= Documentation développeur ========================= Modified: trunk/src/site/rst/Spec.rst =================================================================== --- trunk/src/site/rst/Spec.rst 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/rst/Spec.rst 2010-10-15 08:11:00 UTC (rev 411) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Ce document est fait pour contenir toutes les normalisations autour de Wikitty Identifiant des wikitties Modified: trunk/src/site/rst/changes.rst =================================================================== --- trunk/src/site/rst/changes.rst 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/rst/changes.rst 2010-10-15 08:11:00 UTC (rev 411) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Changes ======= Modified: trunk/src/site/rst/hessian.rst =================================================================== --- trunk/src/site/rst/hessian.rst 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/rst/hessian.rst 2010-10-15 08:11:00 UTC (rev 411) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Hessian ======= Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/rst/index.rst 2010-10-15 08:11:00 UTC (rev 411) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Wikitty ======= Modified: trunk/src/site/rst/migration.rst =================================================================== --- trunk/src/site/rst/migration.rst 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/rst/migration.rst 2010-10-15 08:11:00 UTC (rev 411) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - Manage data migration using Wikitty ----------------------------------- Modified: trunk/src/site/rst/todo.rst =================================================================== --- trunk/src/site/rst/todo.rst 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/rst/todo.rst 2010-10-15 08:11:00 UTC (rev 411) @@ -1,3 +1,27 @@ +.. - +.. * #%L +.. * Wikitty +.. * +.. * $Id$ +.. * $HeadURL$ +.. * %% +.. * Copyright (C) 2009 - 2010 CodeLutin +.. * %% +.. * This program is free software: you can redistribute it and/or modify +.. * it under the terms of the GNU Lesser General Public License as +.. * published by the Free Software Foundation, either version 3 of the +.. * License, or (at your option) any later version. +.. * +.. * This program is distributed in the hope that it will be useful, +.. * but WITHOUT ANY WARRANTY; without even the implied warranty of +.. * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +.. * GNU General Lesser Public License for more details. +.. * +.. * You should have received a copy of the GNU General Lesser Public +.. * License along with this program. If not, see +.. * <http://www.gnu.org/licenses/lgpl-3.0.html>. +.. * #L% +.. - TODO ==== Modified: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-10-14 16:55:59 UTC (rev 410) +++ trunk/src/site/site.xml 2010-10-15 08:11:00 UTC (rev 411) @@ -1,4 +1,29 @@ <?xml version="1.0" encoding="UTF-8"?> + + <project name="${project.name}"> <publishDate format="dd/MM/yyyy"/>

1 0

r410 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 14 Oct '10

14 Oct '10

Author: bpoussin Date: 2010-10-14 18:55:59 +0200 (Thu, 14 Oct 2010) New Revision: 410 Url: http://nuiton.org/repositories/revision/wikitty/410 Log: change log level to know transporter used Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-14 16:41:46 UTC (rev 409) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceNotifier.java 2010-10-14 16:55:59 UTC (rev 410) @@ -769,8 +769,12 @@ ws.addWikittyServiceListener(this, WikittyService.ServiceListenerType.ALL); // weak reference } } - if (transporter == null && log.isDebugEnabled()) { - log.debug("RemoteNotifier synchronisation not used "); + if (log.isInfoEnabled()) { + if (transporter == null) { + log.info("RemoteNotifier synchronisation not used "); + } else { + log.info("RemoteNotifier transporter: " + transporter.getClass().getName()); + } } }

1 0

r409 - trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification
by bpoussin＠users.nuiton.org 14 Oct '10

14 Oct '10

Author: bpoussin Date: 2010-10-14 18:41:46 +0200 (Thu, 14 Oct 2010) New Revision: 409 Url: http://nuiton.org/repositories/revision/wikitty/409 Log: suppression de l'affichage d'info sur la room (qui fait un NPE incomprehensible) Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 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-14 16:30:15 UTC (rev 408) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-10-14 16:41:46 UTC (rev 409) @@ -1,20 +1,3 @@ -/* *##% - * Copyright (c) 2010 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.notification; @@ -94,9 +77,9 @@ }); // Discover information about the room roomName(a)conference.myserver - RoomInfo info = MultiUserChat.getRoomInfo(connection, room); - System.out.println("Number of occupants:" + info.getOccupantsCount()); - System.out.println("Room Subject:" + info.getSubject()); +// RoomInfo info = MultiUserChat.getRoomInfo(connection, room); +// System.out.println("Number of occupants:" + info.getOccupantsCount()); +// System.out.println("Room Subject:" + info.getSubject()); // Thread t = new Thread(); // t.sleep(1000*60);

1 0

r408 - trunk
by tchemit＠users.nuiton.org 14 Oct '10

14 Oct '10

Author: tchemit Date: 2010-10-14 18:30:15 +0200 (Thu, 14 Oct 2010) New Revision: 408 Url: http://nuiton.org/repositories/revision/wikitty/408 Log: use maven-license-plugin configuration while waiting after next version of mavenpom4redmine Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-14 16:28:44 UTC (rev 407) +++ trunk/pom.xml 2010-10-14 16:30:15 UTC (rev 408) @@ -476,7 +476,7 @@ <hbase.version>0.89.0-SNAPSHOT</hbase.version>  <license.version>2.4</license.version> - <licenseName>lgpl_3</licenseName> + <licenseName>lgpl_v3</licenseName> </properties>

1 0

r407 - trunk
by tchemit＠users.nuiton.org 14 Oct '10

14 Oct '10

Author: tchemit Date: 2010-10-14 18:28:44 +0200 (Thu, 14 Oct 2010) New Revision: 407 Url: http://nuiton.org/repositories/revision/wikitty/407 Log: use maven-license-plugin configuration while waiting after next version of mavenpom4redmine Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-14 15:45:33 UTC (rev 406) +++ trunk/pom.xml 2010-10-14 16:28:44 UTC (rev 407) @@ -474,6 +474,9 @@ <zk.version>5.0.2</zk.version> <hbase.version>0.89.0-SNAPSHOT</hbase.version> +  + <license.version>2.4</license.version> + <licenseName>lgpl_3</licenseName> </properties>

1 0

r406 - in trunk: . wikitty-api
by bpoussin＠users.nuiton.org 14 Oct '10

14 Oct '10

Author: bpoussin Date: 2010-10-14 17:45:33 +0200 (Thu, 14 Oct 2010) New Revision: 406 Url: http://nuiton.org/repositories/revision/wikitty/406 Log: ajout de la dependance xstream pour la serialisation xml des events Modified: trunk/pom.xml trunk/wikitty-api/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-10-14 15:21:42 UTC (rev 405) +++ trunk/pom.xml 2010-10-14 15:45:33 UTC (rev 406) @@ -178,6 +178,13 @@ <scope>compile</scope> </dependency> +  + <dependency> + <groupId>xstream</groupId> + <artifactId>xstream</artifactId> + <version>1.2.2</version> + </dependency> +  <dependency> <groupId>org.jgroups</groupId> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-10-14 15:21:42 UTC (rev 405) +++ trunk/wikitty-api/pom.xml 2010-10-14 15:45:33 UTC (rev 406) @@ -92,6 +92,12 @@ <artifactId>jta</artifactId> </dependency> +  + <dependency> + <groupId>xstream</groupId> + <artifactId>xstream</artifactId> + </dependency> +  <dependency> <groupId>org.jgroups</groupId>

1 0

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

14 Oct '10

Author: bpoussin Date: 2010-10-14 17:21:42 +0200 (Thu, 14 Oct 2010) New Revision: 405 Url: http://nuiton.org/repositories/revision/wikitty/405 Log: Implantation du transporteur sur xmpp devrait fonctionner (a tester sur vradi) Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 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-13 14:39:33 UTC (rev 404) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyServiceEvent.java 2010-10-14 15:21:42 UTC (rev 405) @@ -18,6 +18,8 @@ package org.nuiton.wikitty; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.json.JettisonMappedXmlDriver; import java.util.EventObject; import java.util.Map; import java.util.Set; @@ -101,6 +103,14 @@ this.source = source; } + public WikittyEventType getType() { + return type; + } + + public void setType(WikittyEventType type) { + this.type = type; + } + /** * Is event remote. * @@ -176,8 +186,34 @@ @Override public String toString() { String toString = getClass().getName() + "[source=" + source + + ", type=" + type + ", remote=" + remote + ", ids=" + ids + ", idExtensions=" + idExtensions + ", idVersions=" + idVersions + "]"; return toString; } + + /** + * Permet de serializer en XML l'event. Pourrait etre utilise pour l'envoi + * sur un transporteur qui ne peremt pas la serialisation java + * @return + */ + public String toXML() { + XStream xstream = new XStream(); + xstream.setMode(XStream.NO_REFERENCES); + xstream.alias("event", WikittyServiceEvent.class); + String result = xstream.toXML(this); + return result; + } + + /** + * Inverse de la methode toXML + * @param xml + * @return + */ + static public WikittyServiceEvent fromXML(String xml) { + XStream xstream = new XStream(); + xstream.alias("event", WikittyServiceEvent.class); + WikittyServiceEvent result = (WikittyServiceEvent)xstream.fromXML(xml); + return result; + } } Added: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java (rev 0) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/XMPPNotifierTransporter.java 2010-10-14 15:21:42 UTC (rev 405) @@ -0,0 +1,235 @@ +/* *##% + * Copyright (c) 2010 Code Lutin, Benjamin 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; + + +import java.net.Inet4Address; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.NetworkInterface; +import java.util.Date; +import java.util.Enumeration; +import java.util.Properties; +import java.util.UUID; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jivesoftware.smack.PacketListener; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.packet.Message; +import org.jivesoftware.smack.packet.Packet; +import org.jivesoftware.smackx.muc.DiscussionHistory; +import org.jivesoftware.smackx.muc.MultiUserChat; +import org.nuiton.util.ApplicationConfig; + +/** + * Transporter d'event via xmpp. Pour que ca fonctionne il faut un serveur + * xmpp avec une room + * <p> + * Configuration + * <li>wikitty.xmpp.server = adresse du serveur (ex: im.codelutin.com) + * <li>wikitty.xmpp.room = adresse de la room (ex: wikitty-event(a)im.codelutin.com) + * <li>wikitty.notification.persistent = [true|false] indique si on doit + * recevoir tous les messages sans en loupe un seul. Pour cela il faut que la + * room soit archivee. (FIXME poussin 20101014 pas encore implantee) + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class XMPPNotifierTransporter implements PacketListener, + WikittyServiceNotifier.RemoteNotifierTransporter { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(XMPPNotifierTransporter.class); + + static final public String PROPERTY_EVENT_NAME = "wikitty-event"; + static final public String WIKITTY_XMPP_SERVER = "wikitty.xmpp.server"; + static final public String WIKITTY_XMPP_ROOM = "wikitty.xmpp.room"; + static final public String WIKITTY_NOTIFICATION_PERSISTENT = + "wikitty.notification.persistent"; + + /** Notifier service reference reference. */ + protected WikittyServiceNotifier ws; + + /** if persistent is true use Chat otherwize use MUC. Chat permit to + received event missed after deconnection */ + protected boolean persistent = false; + + protected XMPPConnection connection; + protected MultiUserChat muc; + + /** + * + * @param ws + */ + public XMPPNotifierTransporter(WikittyServiceNotifier ws, Properties props) { + this.ws = ws; + initXMPP(props); + } + + /** + * Si persistent est vrai alors il faut toujours utilise le meme user id + * + * @param props + */ + protected void initXMPP(Properties props) { + ApplicationConfig config = new ApplicationConfig(props); + + persistent = config.getOptionAsBoolean(WIKITTY_NOTIFICATION_PERSISTENT); + String server = config.getOption(WIKITTY_XMPP_SERVER); + String room = config.getOption(WIKITTY_XMPP_ROOM); + + String pseudo = getUniqueLoginName(); + try { + if (log.isInfoEnabled()) { + log.info("Try to connect to xmpp serveur " + server + + " with pseudo " + pseudo + " in room " + room + + " persistent " + persistent); + } + connection = new XMPPConnection(server); + connection.connect(); + connection.loginAnonymously(); + + DiscussionHistory history = new DiscussionHistory(); + if (persistent) { + // FIXME poussin 20101113 compute amount of log history to retrieve + // MUC must be archived + Date date = new Date(); + history.setSince(date); + } else { + history.setMaxChars(0); + } + + // connection to the volatile room + muc = new MultiUserChat(connection, room); + muc.join(pseudo, "", history, 4000); + muc.addMessageListener(this); + } catch (Exception eee) { + throw new WikittyException("Can't connect to xmpp serveur", eee); + } + } + + @Override + public void sendMessage(WikittyServiceEvent event) throws Exception { + Message message = muc.createMessage(); + message.setBody(event.getType().toString()); + message.setProperty(PROPERTY_EVENT_NAME, event); + + muc.sendMessage(message); + } + + /** + * used for MUC message + * @param packet + */ + @Override + public void processPacket(Packet packet) { + Object event = packet.getProperty(PROPERTY_EVENT_NAME); + + if (log.isInfoEnabled()) { + log.info("Receive message : " + event); + } + + if (event instanceof WikittyServiceEvent) { + processEvent((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 + * le pseudo soit bien unique. + * + * Le pseudo, n'est pas seulement un UUID, pour pouvoir facilement faire + * du debug en entrant dans le channel et voir les ip des machiens connectees + * + * @return + */ + static public String getUniqueLoginName() { + String result = UUID.randomUUID().toString(); + try { + String ipv4 = null; + String ipv6 = null; + for (Enumeration<NetworkInterface> e = NetworkInterface.getNetworkInterfaces(); e.hasMoreElements();) { + NetworkInterface netint = e.nextElement(); + + for (Enumeration<InetAddress> a = netint.getInetAddresses(); a.hasMoreElements();) { + InetAddress ip = a.nextElement(); + if (ip instanceof Inet4Address) { + if ((ipv4 == null || "127.0.0.1".equals(ipv4))) { + ipv4 = ip.getHostAddress(); + } + } else if (ip instanceof Inet6Address) { + if (ipv6 == null) { + ipv6 = ip.getHostAddress(); + } + } else { + log.error("Can't get ip from no ipv4 and no ipv6: " + ip); + } + } + } + + if (ipv4 != null) { + result = ipv4 + "=" + result; + } else if (ipv6 != null) { + result = ipv6 + "=" + result; + } + } catch (Exception eee) { + log.error("Can't compute unique name from network interface", eee); + } + return result; + } + +} Added: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java (rev 0) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/notification/XMPPNotificationTest.java 2010-10-14 15:21:42 UTC (rev 405) @@ -0,0 +1,105 @@ +/* *##% + * Copyright (c) 2010 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.notification; + + +import java.util.HashSet; +import java.util.Properties; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jivesoftware.smack.PacketListener; +import org.jivesoftware.smack.XMPPConnection; +import org.jivesoftware.smack.packet.Packet; +import org.jivesoftware.smackx.muc.DiscussionHistory; +import org.jivesoftware.smackx.muc.MultiUserChat; +import org.jivesoftware.smackx.muc.RoomInfo; +import org.junit.Test; +import org.nuiton.wikitty.WikittyServiceEvent; +import org.nuiton.wikitty.XMPPNotifierTransporter; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class XMPPNotificationTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(XMPPNotificationTest.class); + + @Test + public void testXMPP() throws Exception { + String server = "im.codelutin.com"; + String room = "test(a)conference.im.codelutin.com"; + Properties props = new Properties(); + props.setProperty(XMPPNotifierTransporter.WIKITTY_XMPP_SERVER, server); + props.setProperty(XMPPNotifierTransporter.WIKITTY_XMPP_ROOM, room); + + // Envoi d'un message avec le transporter normal + + XMPPNotifierTransporter xmpp = new XMPPNotifierTransporter(null, props); + WikittyServiceEvent event = new WikittyServiceEvent("test", + WikittyServiceEvent.WikittyEventType.PUT_WIKITTY); + Set<String> ids = new HashSet<String>(); + ids.add("id1"); + ids.add("id2"); + ids.add("id3"); + event.setIds(ids); + xmpp.sendMessage(event); + + + // essaie de recuperation du message + + XMPPConnection connection = new XMPPConnection(server); + connection.connect(); + connection.loginAnonymously(); + + MultiUserChat muc = new MultiUserChat(connection, room); + String pseudo = XMPPNotifierTransporter.getUniqueLoginName(); + System.out.println("pseudo: " + pseudo); + + DiscussionHistory history = new DiscussionHistory(); + history.setMaxStanzas(1); + muc.join(pseudo, "", history, 4000); + + muc.addMessageListener(new PacketListener() { + + @Override + public void processPacket(Packet packet) { + System.out.println("ext: " + packet.getExtensions()); + System.out.println("prop: " + packet.getPropertyNames()); + Object event = packet.getProperty(XMPPNotifierTransporter.PROPERTY_EVENT_NAME); + System.out.println("event " + event + " PACKET: " + + " xml: " + packet.toXML()); + } + }); + + // Discover information about the room roomName(a)conference.myserver + RoomInfo info = MultiUserChat.getRoomInfo(connection, room); + System.out.println("Number of occupants:" + info.getOccupantsCount()); + System.out.println("Room Subject:" + info.getSubject()); + +// Thread t = new Thread(); +// t.sleep(1000*60); + } + +}

1 0