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

r843 - trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org 27 Apr '11

27 Apr '11

Author: bpoussin Date: 2011-04-27 19:46:44 +0200 (Wed, 27 Apr 2011) New Revision: 843 Url: http://nuiton.org/repositories/revision/wikitty/843 Log: Anomalie #1484: bad getConnection method used in wikitty-jdbc (before correction work with h2 and fail with pg) Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2011-04-27 15:51:40 UTC (rev 842) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2011-04-27 17:46:44 UTC (rev 843) @@ -96,7 +96,7 @@ public WikittyExtensionStorageJDBC(ApplicationConfig config) { this.config = config; jdbcQuery = WikittyJDBCUtil.loadQuery(config); - Connection connectionTest = WikittyJDBCUtil.getJDBCConnection(config); + Connection connectionTest = WikittyJDBCUtil.getConnection(config); try { // If test of existance work, no exception and do nothing // if exception try to create databse Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-04-27 15:51:40 UTC (rev 842) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyJDBCUtil.java 2011-04-27 17:46:44 UTC (rev 843) @@ -48,6 +48,7 @@ import org.apache.commons.dbcp.managed.BasicManagedDataSource; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; @@ -228,11 +229,14 @@ /** * Get a new connection instance (i.e. it opens a new transaction) plug on * JTA. - * + * + * This connection is not configured, returned connection is just create connection + * Don't use this method, use getConnection that change auto commit to false + * * @param conf configuration * @return a new Connection (db transaction) */ - public static synchronized Connection getConnection(ApplicationConfig conf) { + public static synchronized Connection getConnectionUnconfigured(ApplicationConfig conf) { String driver = conf.getOption( WikittyConfigOption.WIKITTY_STORAGE_JDBC_DRIVER.getKey()); String host = conf.getOption( @@ -257,21 +261,22 @@ BasicManagedDataSource dataSource = new BasicManagedDataSource(); // if xadatasource - if(xaDataSourceClassName != null) { - XADataSource xaDataSource = (XADataSource) Class.forName(xaDataSourceClassName).newInstance(); + if(StringUtils.isNotEmpty(xaDataSourceClassName)) { + XADataSource xaDataSource = (XADataSource) + Class.forName(xaDataSourceClassName).newInstance(); BeanMap beanMap = new BeanMap(xaDataSource); Set<String> fields = beanMap.keySet(); + String keyStart = + WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() + + "." + xaDataSourceClassName + "."; + // Inject properties in xadatasource for(Entry<Object, Object> properties : conf.getFlatOptions().entrySet()) { String propertyName = (String) properties.getKey(); - if (propertyName.startsWith( - WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() - + "." + xaDataSourceClassName + ".")) { - propertyName = propertyName.replaceFirst( - WikittyConfigOption.WIKITTY_STORAGE_JDBC_XADATASOURCE.getKey() - + "." + xaDataSourceClassName + ".", ""); + if (propertyName.startsWith(keyStart)) { + propertyName = propertyName.replaceFirst(keyStart, ""); if(fields.contains(propertyName)) { String propertyValue = (String) properties.getValue(); BeanUtils.setProperty(xaDataSource, propertyName, propertyValue); @@ -333,10 +338,12 @@ * @return a new Connection (db transaction) * @throws SQLException if the connection fails */ - public static synchronized Connection getJDBCConnection(ApplicationConfig config) { + public static synchronized Connection getConnection(ApplicationConfig config) { try { - Connection connection = getConnection(config); - connection.setAutoCommit(false); + Connection connection = getConnectionUnconfigured(config); + if (connection.getAutoCommit()) { + connection.setAutoCommit(false); + } return connection; } catch(SQLException eee) { throw new WikittyException( Modified: trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2011-04-27 15:51:40 UTC (rev 842) +++ trunk/wikitty-jdbc/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2011-04-27 17:46:44 UTC (rev 843) @@ -129,7 +129,7 @@ * test table existance or create them if necessary */ protected void checkTableOrCreation() { - Connection connectionTest = WikittyJDBCUtil.getJDBCConnection(config); + Connection connectionTest = WikittyJDBCUtil.getConnection(config); try { // If test of existance work, no exception and do nothing // if exception try to create databse @@ -162,7 +162,7 @@ * If add can be done, wikitty work for all, except binary type */ protected void checkColumnBinaryOrAlter() { - Connection connectionTest = WikittyJDBCUtil.getJDBCConnection(config); + Connection connectionTest = WikittyJDBCUtil.getConnection(config); try { // If test of existance work, no exception and do nothing // if exception try to create databse

1 0

r842 - in trunk/wikitty-publication/src: main/java/org/nuiton/wikitty/publication/synchro site/rst
by mfortun＠users.nuiton.org 27 Apr '11

27 Apr '11

Author: mfortun Date: 2011-04-27 17:51:40 +0200 (Wed, 27 Apr 2011) New Revision: 842 Url: http://nuiton.org/repositories/revision/wikitty/842 Log: * add the rst that containt spec about wikitty publication sync * make change in wikitty publication file system to supprot commit/update function * basically implements commit as an operation for wikitty publication Added: trunk/wikitty-publication/src/site/rst/sync.rst Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-27 07:59:44 UTC (rev 841) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublication.java 2011-04-27 15:51:40 UTC (rev 842) @@ -24,6 +24,7 @@ */ package org.nuiton.wikitty.publication.synchro; +import java.io.File; import java.net.URI; import java.net.URISyntaxException; import java.util.ArrayList; @@ -35,6 +36,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; +import org.nuiton.util.FileUtil; import org.nuiton.wikitty.WikittyProxy; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.WikittyUtil; @@ -68,6 +70,12 @@ */ static public String WIKITTY_OPTION_COMPONENT = "wikitty.WikittyService.components"; + /** + * Key for the other uri, usefull in the case of commit/update with a file + * system wikitty service. + */ + static public String WIKITTY_SERVICE_INTERLOCUTEUR = "wikitty.service.interlocuteur"; + static protected ApplicationConfig applicationConfig; /** @@ -83,6 +91,9 @@ */ static public String IS_EXISTING_OPTION = "existing"; + /** + * Use to save the label by the wikitty publication file system + */ static public String LABEL_KEY = "working.label"; /** @@ -115,10 +126,21 @@ // allias for all the action applicationConfig.addAlias("wp sync", "--option", "sync"); + applicationConfig.addAlias("wp commit", "--option", "commit"); + + applicationConfig.addAlias("wp update", "--option", "update"); + applicationConfig .addActionAlias("sync", "org.nuiton.wikitty.publication.synchro.WikittyPublication#synchronisation"); + applicationConfig + .addActionAlias("commit", + "org.nuiton.wikitty.publication.synchro.WikittyPublication#commit"); + + applicationConfig + .addActionAlias("update", + "org.nuiton.wikitty.publication.synchro.WikittyPublication#update"); // parsing applicationConfig.parse(args); @@ -127,12 +149,11 @@ } - static public void synchronisation(String origin, String target) throws URISyntaxException - { + static public void synchronisation(String origin, String target) + throws URISyntaxException { boolean isRecur = applicationConfig .getOptionAsBoolean(IS_RECURSION_OPTION); - URI uriOrigin = new URI(origin); URI uriTarget = new URI(target); @@ -145,15 +166,22 @@ boolean isUpdate = !isDelete && !isExisting; /* - * necessary to have property correctly initialize in order to obtaint + * necessary to have property correctly initialize in order to obtain * the correct implementation of the wikitty service */ + // once on the service origin + applicationConfig.setOption(WIKITTY_SERVICE_INTERLOCUTEUR, target); + ApplicationConfig temp1 = setUpApplicationConfigServerConnector(uriOrigin); WikittyProxy proxyOrigin = new WikittyProxy( WikittyServiceFactory.buildWikittyService(temp1)); + // store the other uri in the application, if the service is a + // wikittypublication file system + // it can need it to store wikittyservice property + applicationConfig.setOption(WIKITTY_SERVICE_INTERLOCUTEUR, origin); // once on the service target ApplicationConfig temp2 = setUpApplicationConfigServerConnector(uriTarget); @@ -187,6 +215,11 @@ existOnlyOnTarget.removeAll(listOrigin); /* + * FIXME mfortun-2011-04-27 remove all that stuff for the safety of the + * version when a solution rise for the wikitty version + */ + + /* * if option is update send wikitty that are not in the target. */ if (isUpdate) { @@ -398,6 +431,98 @@ } + static public void update(String... uriFileSystem) throws Exception { + + /* + * Alors c'est facile si on a un élément dans le param c'est que on + * spécifie l'endroit du FS à updater/commit, ce qui veut dire que on + * doit aller chercher ensuite dans le dossier donné l'adresse du + * wikitty service. Notons que si il y a un élément ça doit forcément + * être une uri avec le protocole file. après on appelle simplement la + * méthode synchro avec l'ordre correct entre uritarget et uri origin. + * + * dans le cas ou ya pas d'argument ça veut dire que on doit + * commit/update le dossier courant donc aller chercher dans + * l'arborescence l'adresse du wikitty service. + * + * et pareil on va construire les adresses pour faire une synchro + */ + + } + + static public void commit(String... uriFileSystem) throws Exception { + + String target = ""; + String origin = ""; + + File currentDir = new File(FileUtil.getCurrentDirectory() + .getAbsolutePath()); + + PropertiesExtended homePorperty = null; + switch (uriFileSystem.length) { + case 0: + + homePorperty = WikittyPublicationFileSystem + .searchWikittyPublicationHomePropertie(currentDir); + + target = (String) homePorperty.get(WIKITTY_SERVICE_INTERLOCUTEUR); + + // construct the current uri for origin + // search the current label + PropertiesExtended metaPropertiesExtended = WikittyPublicationFileSystem + .getWikittyPublicationProperties( + currentDir, + WikittyPublicationFileSystem.WIKITTY_FILE_META_PROPERTIES_FILE); + String labelCurrent = metaPropertiesExtended + .getProperty(WikittyPublicationFileSystem.META_CURRENT_LABEL); + + origin = "file:///" + currentDir.getAbsolutePath() + "#" + + labelCurrent; + + synchronisation(origin, target); + break; + + case 1: + + origin = uriFileSystem[0]; + URI originUri = new URI(origin); + if (!originUri.getScheme().equals("file")) { + // Exception + } + File workingDir = new File(originUri.getPath()); + homePorperty = WikittyPublicationFileSystem + .searchWikittyPublicationHomePropertie(workingDir); + + target = (String) homePorperty.get(WIKITTY_SERVICE_INTERLOCUTEUR); + + // TODO mfortun 2011-04-27 do something on labels ? + + synchronisation(origin, target); + break; + + default: + + // exception + break; + } + + /* + * Alors c'est facile si on a un élément dans le param c'est que on + * spécifie l'endroit du FS à updater/commit, ce qui veut dire que on + * doit aller chercher ensuite dans le dossier donné l'adresse du + * wikitty service. Notons que si il y a un élément ça doit forcément + * être une uri avec le protocole file. après on appelle simplement la + * méthode synchro avec l'ordre correct entre uritarget et uri origin. + * + * dans le cas ou ya pas d'argument ça veut dire que on doit + * commit/update le dossier courant donc aller chercher dans + * l'arborescence l'adresse du wikitty service. + * + * et pareil on va construire les adresses pour faire une synchro + */ + + } + /* * TODO mfortun-2011-04-18 plus tard il faudra rajouter un fonctionnement * commit update à la commande sync, en se servant de l'adresse du wikitty Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-27 07:59:44 UTC (rev 841) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-27 15:51:40 UTC (rev 842) @@ -187,9 +187,12 @@ * recursion, @see WikittyPublication for constant * @throws URISyntaxException * if serveur url is not in the proper format (URI format) + * @throws IOException + * if error while creating/reading the wikitty service + * properties */ public WikittyPublicationFileSystem(ApplicationConfig app) - throws URISyntaxException { + throws URISyntaxException, IOException { this.mimeHelper = new MimeTypePubHelper(); @@ -209,6 +212,28 @@ label = homeFile.getName(); } + File homeProperty = new File(homeFile.getAbsolutePath() + + File.separator + PROPERTY_DIRECTORY); + + if (!homeProperty.exists()) { + homeProperty.createNewFile(); + } + + // write/update the "home property file" + PropertiesExtended propertyWikittyService = getWikittyPublicationProperties( + homeFile, WIKITTY_FILE_SERVICE); + + // the original label use to create + propertyWikittyService.setProperty(WikittyPublication.LABEL_KEY, + this.label); + // the service use to update or commit + propertyWikittyService + .setProperty( + WikittyPublication.WIKITTY_SERVICE_INTERLOCUTEUR, + app.getOption(WikittyPublication.WIKITTY_SERVICE_INTERLOCUTEUR)); + + propertyWikittyService.store(); + this.recursion = app .getOptionAsBoolean(WikittyPublication.IS_RECURSION_OPTION); @@ -1427,7 +1452,8 @@ * since the last check. If so, it increment the minor version of the * wikitty and store the new checksum and version * - * @param child the file need to check if modified + * @param child + * the file need to check if modified * @throws IOException */ protected void checkModifications(File child) throws IOException { @@ -1566,4 +1592,45 @@ return result; } + /** + * Use to search and return the home property that containt informations + * about wikitty service use to synchronise a wikitty publication file + * system + * + * @param start + * the directory where starts the search + * @return PropertiesExtended the home property + * @throws IOException + * if error while reading property file + */ + static public PropertiesExtended searchWikittyPublicationHomePropertie( + File start) throws IOException { + + if (start != null && start.exists() && start.isDirectory()) { + + // recursion, we search in the parents for the home property file + // those which containt the wikitty service property withe the + // adress of the interlocuteur + + File propertyDirectory = new File(start.getCanonicalPath() + + File.separator + PROPERTY_DIRECTORY); + + if (propertyDirectory.exists()) { + File propertie = new File(propertyDirectory.getCanonicalPath() + + File.separator + WIKITTY_FILE_SERVICE); + if (propertie.exists()) { + return new PropertiesExtended(propertie); + } + } + + return searchWikittyPublicationHomePropertie(start.getParentFile()); + } else { + // Exception + /* + * TODO mfortun-2011-04-27 write/set the appropriate exception here + */ + return null; + } + } + } Added: trunk/wikitty-publication/src/site/rst/sync.rst =================================================================== --- trunk/wikitty-publication/src/site/rst/sync.rst (rev 0) +++ trunk/wikitty-publication/src/site/rst/sync.rst 2011-04-27 15:51:40 UTC (rev 842) @@ -0,0 +1,220 @@ + + + +Spécification Wikitty publication module de synchronisation +=========================================================== +:Authors: Manoël Fortun + + +Nouvelle approche sur le modèle Rsync +------------------------------------- + +Cette nouvelle approche du module wikitty publication, basé sur Rsync, et plus +un "simple" système de commit/update/import/delete/relocate comme svn, est motivé +par l'aspect plus généraliste que celà apporte. + +Cette approche permet de syncrhoniser le contenu de n'importe quel wikitty service +avec un autre, et donc de redéployer simplement tout les wikittys que l'on souhaite +d'un wikitty service à un autre. + +La nature du wikitty service cible importe pas, on peut synchroniser un wikitty service +sur un file system avec un wikitty service sur un serveur cajo, ou deux wikitty service +sur des serveurs cajo, cette approche se veut plus universelle. Et pourra être testé justement +entre deux wikitty service sur serveur. + + +Définitions +----------- + +Fichier -> Objets wikitty ++++++++++++++++++++++++++ + +Un fichier est défini par un nom, une extention, un contenu et un chemin. +dans wikitty publication les fichiers sont convertis en fonction de leurs type +en objet wikitty. les fichiers sources sont convertit en WikittyPubText et les +fichiers binaires(eg image, etc) en WikittyPubData. + +Les deux types d'objet ont les mêmes attribut: + + - Name: correspondant au nom du fichier + - MimeType: crrespondant au type, qui donnera l'extension + - Content: le contenu binaire pour pour les PubData et textuel pour les PubText + + + +Le mimetype donne l'extention par exemple pour un PubData si on a en mimetype "image/png" + alors l'extension du fichier associé sera ".png". Dans le cas d'un PubText +le mimetype donnera l'extension et le langage de la source par exemple si on a +en mimetype "application/javascript" le langage est javascript et l'extension +sera donc ".js". + +A ces objets wikitty on associe un wikittyLabel, c'est un objet qui peut +contenir un ensemble de label différent, un label par exemple +"src.org.chorem.entities" sert ici pour contenir le chemin menant au fichier +sur le file system. Un wikitty peut avoir un certain nombre de label, pour les +wikittyPub celà indiquera qu'ils appartiennent à plusieurs arborescences. + + +Objets wikitty -> Fichier ++++++++++++++++++++++++++ + +Lorsque l'on va enregistrer des wikitties en fichier en utilisant un +wikitty service file system, on devra restaurer les fichiers en se servant +des labels pour localiser sa place dans l'arborescence, du mimetype pour +les extensions, etc. + +Dans ce cas le repo local des wikitty devra contenir toutes les informations +du wikitty si l'on veux le renvoyer vers un autre wikitty service en se servant +de l'application wikitty publication sync. + +Propriétés pour l'inversabilité fichier/wikitty ++++++++++++++++++++++++++++++++++++++++++++++++ + +Tout objet wikitty dispose d'une version qui est modifiée par le wikitty service +à chaque modification de l'objet wikitty, les wikittypub donc aussi. Cette +information de la version sera stockée dans un fichier de propriété dans un +dossier caché ".wp/" afin que l'on garde trâce des versions des objets que +l'on aura transformé en fichier, celà pour une synchronisation ultérieure avec un +autre wikitty service. + +On conservera trace ausi dans ce même fichier de propriété du label courant, permettant +de ne pas faire d'opération "complexes" et pénible sur les noms de fichier afin de retrouver +le label de travail. Conserver trace du label actuel à l'avantage de n'avoir pas +besoin de rechercher dans l'arborescence la première occurence du fichier de propriété +pour pouvoir reconstituer le label complet. + +On distinguera deux fichiers de propriétés pour les informations un qui conservera +les id des wikitty lié à leur nom de fichier. Et un autre fichiers de propriété +qui conservera un checksum, la version et les id aussi. + +On conserve les id dans un premier fichier puisque celà permet simplement de récupérer +l'ensemble des id et leurs noms de fichier lié sans avoir besoin de faire le tri +parmis toutes les propriétés enregistrées. On converse l'id aussi dans un autre fichier de +propriété, à défaut d'avoir un system de type bidimap pour les proriétés, celà permet +de récupérer l'id d'un wikitty à partir de son nom de fichier, et inversement du nom de fichier +à l'id. + +La propriété checksum sera utilisée pour enregistrer la somme de controle de +l'objet lors de son enregistrement, pour plus tard, savoir si celui ci à été +modifié depuis lors. + +Exemple pour un contenu de file system: + + +racine + |script.js + |scripttut.js + |image.png + |+.wp + ||id.properties + ||meta.properties + |+directory2 + ||script3.js + ||+.wp + |||meta.properties + |||id.properties + ||+directory3 + |||truc.js + |||+.wp + ||||meta.properties + ||||id.properties + |+directory22 + ||machin.png + ||+.wp + |||versions.properties + |||id.properties + +Exemples de fichiers de propriétés: + +meta.properties: + +script.js.version=numéroVersion7 +scripttut.js.version=numéroVersion +image.png.version=numéroVersion +current.label=racine +script.js.checksum= checksum +scripttut.js.checksum= checksum +image.png.checksum= checksum +id.image.png=uubdazudba +id.scripttut.js=11daz5facz +id.script.js=jbdub1dza8 + +id.properties: + +uubdazudba=image.png +11daz5facz=scripttut.js +jbdub1dza8=script.js + +Fonctionnalités +--------------- + +Sync +++++ + +Définitions +*********** +La fonctionnalité CP permet de transférer l'ensemble des wikittys ciblés par l'uri, +d'un service wikitty à un autre. Son fonctionnement doit être similaire à la commande +linux "rsync". + +On reprendra donc quelques options comme: + + - Recursion pour savoir si l'on s'occupe des sous labels du label ciblé. + - Update, qui permettra de mettre à jour ce qui est présent et antérieur + sur la cible et d'y envoyer les nouveaux wikitty. Par défaut cette option + sera active, et sera desactivée lorsque les autres option (delete ou existing) + seront choisis. + - Existing qui est un update mais sans l'envois des nouveaux fichiers, on + envois juste ce qui à été mis à jour et qui existe sur le wikitty service cible. + - Delete pour supprimer dans le wikitty cible, ce qui n'existe plus dans le + wikitty origine. + +La suppression n'est pas une vraie suppression elle se contente de supprimer le label +ciblé du wikitty. + +En fonction des uris des wikitty services ciblé par la fonction, une implémentation +différente de service wikitty sera instancié, en fonction des protocoles (file, hessian +ou cajo). + + +Prototype commande +****************** + + +''wp sync [--norecursion] [--delete|--existing] [URI orgirine] [URI cible]'' + +Avec URI sous forme: + - file:///truc/machin/#label + - hessian://www.adresse.com:8827/etc/etc#label + - cajo://www.adresse.com:8827/etc/etc#label + +Evidement le path pour le protocole File indiquant le répertoire où aller +chercher/mettre les wikitties. + +Les labels de l'uri cible et local peuvent être différent, et pendant ils seront +conservé, c'est à dire que des wikitties de la cible si ils ont besoin de se +mettre à jour, leurs labels seront conservés. +Dans le cas de wikitty qui n'existe pas dans la cible, on remplacera le label +origine qui à permis de trouver ces wikitties et le remplacer par le label cible, +les autres labels du wikitty seront transmit. + + +Wikitty Service File System +--------------------------- + +Un tel service devra fournir les méthodes suivantes les méthodes de sauvegarde +des wikitty, de restauration, ainsi qu'un certain nombre de fonctionnalités concernant +les recherches de wikitty. + +Le wikitty service sur file system prendra en charge les recherches sur critéria +de façon compléte. A chaque recherche sur le wikitty service file system, il faudra +indexer les nouveaux wikitty, enlever les property des fichiers/wikitty supprimé, +incrémenter la version mineur si il y a eut des modifications depuis la dernière +indexation. + + + +Commit/update +------------- + + +

1 0

r841 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 09:59:44 +0200 (Wed, 27 Apr 2011) New Revision: 841 Url: http://nuiton.org/repositories/revision/wikitty/841 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> <modules> @@ -371,10 +371,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1 + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-api/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-dto/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-generators/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-hessian-client/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-hessian-server/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-jdbc/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-perf-test/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-04-27 07:59:42 UTC (rev 840) +++ trunk/wikitty-solr/pom.xml 2011-04-27 07:59:44 UTC (rev 841) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1</version> + <version>3.1.1-SNAPSHOT</version> </parent>

1 0

r840 - in tags: . wikitty-3.1
by sletellier＠users.nuiton.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 09:59:42 +0200 (Wed, 27 Apr 2011) New Revision: 840 Url: http://nuiton.org/repositories/revision/wikitty/840 Log: [maven-release-plugin] copy for tag wikitty-3.1 Added: tags/wikitty-3.1/ Property changes on: tags/wikitty-3.1 ___________________________________________________________________ Added: svn:ignore + .settings .project target *.iml *.ipr *.iws Added: svn:mergeinfo + /branches/2.0-eugene2:164-179

1 0

r839 - in trunk: . wikitty-api wikitty-dto wikitty-generators wikitty-hessian-client wikitty-hessian-server wikitty-jdbc wikitty-perf-test wikitty-solr
by sletellier＠users.nuiton.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 09:59:40 +0200 (Wed, 27 Apr 2011) New Revision: 839 Url: http://nuiton.org/repositories/revision/wikitty/839 Log: [maven-release-plugin] prepare release wikitty-3.1 Modified: trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-dto/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-hessian-client/pom.xml trunk/wikitty-hessian-server/pom.xml trunk/wikitty-jdbc/pom.xml trunk/wikitty-perf-test/pom.xml trunk/wikitty-solr/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> <modules> @@ -371,10 +371,10 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/trunk + <connection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/wikitty/tags/wikitty-3.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/wikitty/trunk</url> + <url>http://www.nuiton.org/repositories/browse/wikitty/tags/wikitty-3.1</url> </scm>  Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-api/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent>  Modified: trunk/wikitty-dto/pom.xml =================================================================== --- trunk/wikitty-dto/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-dto/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent>  Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-generators/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent>  Modified: trunk/wikitty-hessian-client/pom.xml =================================================================== --- trunk/wikitty-hessian-client/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-hessian-client/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent>  Modified: trunk/wikitty-hessian-server/pom.xml =================================================================== --- trunk/wikitty-hessian-server/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-hessian-server/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent>  Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-jdbc/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-perf-test/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: trunk/wikitty-solr/pom.xml =================================================================== --- trunk/wikitty-solr/pom.xml 2011-04-27 07:56:28 UTC (rev 838) +++ trunk/wikitty-solr/pom.xml 2011-04-27 07:59:40 UTC (rev 839) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.1-SNAPSHOT</version> + <version>3.1</version> </parent>

1 0

r838 - trunk
by sletellier＠users.nuiton.org 27 Apr '11

27 Apr '11

Author: sletellier Date: 2011-04-27 09:56:28 +0200 (Wed, 27 Apr 2011) New Revision: 838 Url: http://nuiton.org/repositories/revision/wikitty/838 Log: - Up to nuiton-utils 2.1.2 - #1478 Move wikitty-publication to extra-modules Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 14:54:03 UTC (rev 837) +++ trunk/pom.xml 2011-04-27 07:56:28 UTC (rev 838) @@ -29,8 +29,6 @@ <module>wikitty-hessian-server</module> <module>wikitty-perf-test</module> - <module>wikitty-publication</module> - </modules> <dependencyManagement> @@ -537,7 +535,7 @@  <eugeneVersion>2.3.1</eugeneVersion> - <nuitonUtilsVersion>2.2-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.1.2</nuitonUtilsVersion> <nuitonI18nVersion>2.2</nuitonI18nVersion> <processPluginVersion>1.1</processPluginVersion> @@ -607,6 +605,7 @@ <module>wikitty-jms-impl</module> <module>wikitty-multistorage-impl</module> <module>wikitty-ui-zk</module> + <module>wikitty-publication</module> </modules> </profile> </profiles>

1 0

r837 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/search wikitty-api/src/test/java/org/nuiton/wikitty/search wikitty-hessian-server/src/license wikitty-jdbc wikitty-jdbc/src/license wikitty-perf-test wikitty-publication wikitty-publication/src/license wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro wikitty-solr/src/license wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr
by sletellier＠users.nuiton.org 26 Apr '11

26 Apr '11

Author: sletellier Date: 2011-04-26 16:54:03 +0200 (Tue, 26 Apr 2011) New Revision: 837 Url: http://nuiton.org/repositories/revision/wikitty/837 Log: - Update headers - Fix undeclared dependencies - Update third-pary Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicCountComparator.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicNameComparator.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties trunk/wikitty-jdbc/pom.xml trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties trunk/wikitty-perf-test/pom.xml trunk/wikitty-publication/pom.xml trunk/wikitty-publication/src/license/THIRD-PARTY.properties trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java trunk/wikitty-solr/src/license/THIRD-PARTY.properties trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,23 +1,23 @@ /* * #%L * Wikitty :: api - * + * * * $Id$ * $HeadURL$ * %% * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin * %% * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the * License, or (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public + * + * You should have received a copy of the GNU General Lesser Public * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigAction.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,4 +1,28 @@ /* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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% + */ +/* * Copyright (c) 2011 poussin. All rights reserved. * * This program is free software: you can redistribute it and/or modify Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfigOption.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,4 +1,28 @@ /* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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% + */ +/* * Copyright (c) 2011 poussin. All rights reserved. * * This program is free software: you can redistribute it and/or modify Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicCountComparator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicCountComparator.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicCountComparator.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.search; import java.util.Comparator; Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicNameComparator.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicNameComparator.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopicNameComparator.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.search; import java.util.Comparator; Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/search/FacetTopicTest.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,4 +1,28 @@ /* + * #%L + * Wikitty :: api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 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% + */ +/* * Copyright (c) 2011 poussin. All rights reserved. * * This program is free software: you can redistribute it and/or modify Modified: trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-hessian-server/src/license/THIRD-PARTY.properties 2011-04-26 14:54:03 UTC (rev 837) @@ -1,8 +1,7 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 -# - Apache License # - Apache Software License - Version 2.0 # - Apache Software License, version 1.1 # - BSD License @@ -12,9 +11,7 @@ # - Eclipse Public License - Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 -# - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 -# - MIT License # - Public Domain # - Public domain # - TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. @@ -25,10 +22,9 @@ # Please fill the missing licenses for dependencies : # # -#Thu Dec 23 12:32:55 CET 2010 +#Tue Apr 26 16:43:05 CEST 2011 commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-jdbc/pom.xml =================================================================== --- trunk/wikitty-jdbc/pom.xml 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-jdbc/pom.xml 2011-04-26 14:54:03 UTC (rev 837) @@ -34,6 +34,17 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.apache.solr</groupId> + <artifactId>solr-core</artifactId> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jdk14</artifactId> + </exclusion> + </exclusions> + </dependency> +  <dependency> Modified: trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-jdbc/src/license/THIRD-PARTY.properties 2011-04-26 14:54:03 UTC (rev 837) @@ -1,16 +1,14 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 # - Apache License # - Apache Software License, version 1.1 # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 -# - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -22,10 +20,14 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jan 27 11:01:33 CET 2011 +#Tue Apr 26 16:34:59 CEST 2011 +antlr--antlr--2.7.2--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +dom4j--dom4j--1.1--jar=BSD License +jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 +org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-perf-test/pom.xml =================================================================== --- trunk/wikitty-perf-test/pom.xml 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-perf-test/pom.xml 2011-04-26 14:54:03 UTC (rev 837) @@ -49,6 +49,11 @@ <groupId>com.h2database</groupId> <artifactId>h2</artifactId> </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> </dependencies>  Modified: trunk/wikitty-publication/pom.xml =================================================================== --- trunk/wikitty-publication/pom.xml 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-publication/pom.xml 2011-04-26 14:54:03 UTC (rev 837) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.nuiton</groupId> @@ -9,100 +9,105 @@ <version>3.1-SNAPSHOT</version> </parent> -  -  -  +  +  +  - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-publication</artifactId> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-publication</artifactId> - <dependencies> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-jdbc</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.nuiton.wikitty</groupId> - <artifactId>wikitty-solr</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> + <dependencies> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-jdbc</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.nuiton.wikitty</groupId> + <artifactId>wikitty-solr</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> - <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> - </dependency> - </dependencies> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> -  -  -  + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + </dependencies> - <name>Wikitty :: publication</name> +  +  +  - <description>Web publication for Wikitty</description> - <inceptionYear>2010</inceptionYear> + <name>Wikitty :: publication</name> -  -  -  + <description>Web publication for Wikitty</description> + <inceptionYear>2010</inceptionYear> - <packaging>war</packaging> +  +  +  - <build> + <packaging>war</packaging> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-sources/models</directory> - <includes> - <include>*.objectmodel</include> - <include>*.properties</include> - </includes> - </resource> - </resources> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-sources/models</directory> + <includes> + <include>*.objectmodel</include> + <include>*.properties</include> + </includes> + </resource> + </resources> + <plugins> <plugin> <groupId>org.nuiton.eugene</groupId> @@ -128,7 +133,7 @@ </plugin> </plugins> - - </build> + </build> + </project> Modified: trunk/wikitty-publication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-publication/src/license/THIRD-PARTY.properties 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-publication/src/license/THIRD-PARTY.properties 2011-04-26 14:54:03 UTC (rev 837) @@ -1,16 +1,14 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 # - Apache License # - Apache Software License, version 1.1 # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 -# - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -22,10 +20,14 @@ # Please fill the missing licenses for dependencies : # # -#Thu Dec 23 12:41:54 CET 2010 +#Tue Apr 26 16:46:25 CEST 2011 +antlr--antlr--2.7.2--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +dom4j--dom4j--1.1--jar=BSD License +jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 +org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/FileSystemWIkittyId.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.synchro; /** Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/MimeTypePubHelper.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.synchro; import java.util.ArrayList; Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/PropertiesExtended.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: publication + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.publication.synchro; import java.io.File; Modified: trunk/wikitty-solr/src/license/THIRD-PARTY.properties =================================================================== --- trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-solr/src/license/THIRD-PARTY.properties 2011-04-26 14:54:03 UTC (rev 837) @@ -1,17 +1,15 @@ -# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2 # - Apache License # - Apache Software License, version 1.1 # - BSD License -# - BSD style # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Development and Distribution License (CDDL) v1.0 # - Common Public License Version 1.0 # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - LGPL 2.1 -# - LGPL 2.1 / The Apache Software License - Version 2.0 # - Lesser General Public License (LGPL) v 3.0 # - MIT License # - Public Domain @@ -22,10 +20,14 @@ # Please fill the missing licenses for dependencies : # # -#Thu Jan 27 11:01:33 CET 2011 +#Tue Apr 26 16:24:04 CEST 2011 +antlr--antlr--2.7.2--jar=BSD License commons-primitives--commons-primitives--1.0--jar=The Apache Software License, Version 2.0 concurrent--concurrent--1.0--jar=TECHNOLOGY LICENSE FROM SUN MICROSYSTEMS, INC. +dom4j--dom4j--1.1--jar=BSD License +jakarta-regexp--jakarta-regexp--1.4--jar=The Apache Software License, Version 2.0 javax.servlet--servlet-api--2.5--jar=Common Development and Distribution License (CDDL) v1.0 javax.transaction--jta--1.1--jar=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -woodstox--wstx-asl--3.2.7--jar=LGPL 2.1 / The Apache Software License - Version 2.0 +org.apache.zookeeper--zookeeper--3.3.1--jar=The Apache Software License, Version 2.0 +oro--oro--2.0.8--jar=The Apache Software License, Version 2.0 xpp3--xpp3_min--1.1.3.4.O--jar=Indiana University Extreme\! Lab Software License, vesion 1.1.1 Modified: trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java =================================================================== --- trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-26 13:54:32 UTC (rev 836) +++ trunk/wikitty-solr/src/test/java/org/nuiton/wikitty/storage/solr/SolrTestHelper.java 2011-04-26 14:54:03 UTC (rev 837) @@ -1,3 +1,27 @@ +/* + * #%L + * Wikitty :: wikitty-solr + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.wikitty.storage.solr; import java.io.File;

1 0

r836 - trunk
by sletellier＠users.nuiton.org 26 Apr '11

26 Apr '11

Author: sletellier Date: 2011-04-26 15:54:32 +0200 (Tue, 26 Apr 2011) New Revision: 836 Url: http://nuiton.org/repositories/revision/wikitty/836 Log: Add myself on developer Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 13:40:52 UTC (rev 835) +++ trunk/pom.xml 2011-04-26 13:54:32 UTC (rev 836) @@ -491,8 +491,7 @@ </roles> </developer> - - <developer> + <developer> <name>Manoel Fortun</name> <id>mfortun</id> <email>mfortun(a)codelutin.com</email> @@ -513,6 +512,17 @@ </roles> </developer> + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> + </developers>

1 0

r835 - trunk
by mfortun＠users.nuiton.org 26 Apr '11

26 Apr '11

Author: mfortun Date: 2011-04-26 15:40:52 +0200 (Tue, 26 Apr 2011) New Revision: 835 Url: http://nuiton.org/repositories/revision/wikitty/835 Log: * add myself as a developer in wikitty project Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-04-26 12:34:23 UTC (rev 834) +++ trunk/pom.xml 2011-04-26 13:40:52 UTC (rev 835) @@ -490,6 +490,18 @@ <role>Developer</role> </roles> </developer> + + + <developer> + <name>Manoel Fortun</name> + <id>mfortun</id> + <email>mfortun(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Developer</role> + </roles> + </developer> <developer> <name>Benoit Brossaud</name>

1 0

r834 - trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro
by mfortun＠users.nuiton.org 26 Apr '11

26 Apr '11

Author: mfortun Date: 2011-04-26 14:34:23 +0200 (Tue, 26 Apr 2011) New Revision: 834 Url: http://nuiton.org/repositories/revision/wikitty/834 Log: * add documentation Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java Modified: trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java =================================================================== --- trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-26 10:25:41 UTC (rev 833) +++ trunk/wikitty-publication/src/main/java/org/nuiton/wikitty/publication/synchro/WikittyPublicationFileSystem.java 2011-04-26 12:34:23 UTC (rev 834) @@ -27,7 +27,6 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.net.URI; @@ -1331,14 +1330,21 @@ } /** + * Check on local file if there new file that have to be converted into + * wikitty, check wikitty if they have been modified, and check if some + * wikitty were deleted and update property * * @param starts + * the starting directory * @param label - * @throws Exception + * the current label, normaly equals to the starting directory + * @throws IOException + * if error while read file, read property */ protected void harvestNewCheckModificationsAndDeleted(File starts, - String label) throws Exception { + String label) throws IOException { + // write property directory if not exist File propertyFile = new File(starts + File.separator + PROPERTY_DIRECTORY); @@ -1347,14 +1353,17 @@ } + // create/load property file PropertiesExtended ids = getWikittyPublicationProperties(starts, WIKITTY_ID_PROPERTIES_FILE); PropertiesExtended meta = getWikittyPublicationProperties(starts, WIKITTY_FILE_META_PROPERTIES_FILE); + // set label meta.put(META_CURRENT_LABEL, label); meta.store(); + // for the child directory check on them List<String> listChildFileNonDir = new ArrayList<String>(); for (File child : starts.listFiles()) { @@ -1363,7 +1372,7 @@ harvestNewCheckModificationsAndDeleted(child, label + WIKITTYLABEL_SEPARATOR + child.getName()); } else if (!child.isDirectory()) { - + // list all of the file non dir listChildFileNonDir.add(child.getName()); // check if file is a wikitty by check if they is a id/file name // in the correct properties file @@ -1374,11 +1383,12 @@ if (!filesWikitty.contains(child.getName())) { writeWikittyFileProperties(child, null, null); } else { + // if the file is a wikitty check if there was modification checkModifications(child); } } } - // after the add of new file check for delete file + // after adding all new file, check for deleted wikitty ids = getWikittyPublicationProperties(starts, WIKITTY_ID_PROPERTIES_FILE); @@ -1386,7 +1396,8 @@ filesWikitty.addAll(CollectionUtil.toGenericCollection(ids.values(), String.class)); - // remove property of deleted wikitties + // if number of wikitty registered != number of current file (not dir) + // check for the deleted if (filesWikitty.size() != listChildFileNonDir.size()) { meta = getWikittyPublicationProperties(starts, @@ -1395,6 +1406,8 @@ filesWikitty.removeAll(listChildFileNonDir); for (String fileRemoved : filesWikitty) { + + // remove properties ids.remove(meta.get(META_PREFIX_KEY_ID + fileRemoved)); meta.remove(META_PREFIX_KEY_CHECKSUM + fileRemoved); @@ -1409,7 +1422,15 @@ } - protected void checkModifications(File child) throws IOException { + /** + * Check with the corresponding checksum if the file have been modified + * since the last check. If so, it increment the minor version of the + * wikitty and store the new checksum and version + * + * @param child the file need to check if modified + * @throws IOException + */ + protected void checkModifications(File child) throws IOException { // will check if there was modification with checksum BufferedInputStream input = new BufferedInputStream( @@ -1448,10 +1469,10 @@ * wiitty id, null if wikitty does not exist yet * @param wikittyVersion * wikitty version, null if wikitty not exist yet - * @throws Exception + * @throws IOException */ protected void writeWikittyFileProperties(File towrite, String wikittyID, - String wikittyVersion) throws Exception { + String wikittyVersion) throws IOException { if (towrite.exists() && !towrite.isDirectory()) { Wikitty wikitty = new WikittyImpl(wikittyID); @@ -1488,8 +1509,8 @@ id.store(); meta.store(); } else { - // TODO mfortun-2011-04-19 set proper type of exception - throw new Exception(); + throw new IOException(towrite.toString() + + " not exist or isn't a directory"); } } @@ -1506,7 +1527,7 @@ protected boolean createFilesFromLabelPath(String label) throws Exception { label = labelToPath(label); - + String[] pathElements = StringUtil.split(label, File.separator); boolean result = false; @@ -1528,7 +1549,9 @@ /** * Construct correctly the path from a label - * @param label the label + * + * @param label + * the label * @return the correct path */ public String labelToPath(String label) {

1 0