June 2010 - Jrst-commits - mailman.cloud.codelutin.com

r480 - trunk/jrst/src/test/resources/bugs
by sletellier＠users.nuiton.org June 30, 2010

June 30, 2010

Author: sletellier Date: 2010-06-30 16:41:40 +0200 (Wed, 30 Jun 2010) New Revision: 480 Url: http://nuiton.org/repositories/revision/jrst/480 Log: Fix invalid rst and keep infinte loop to future test Modified: trunk/jrst/src/test/resources/bugs/infiniteLoop.rst Modified: trunk/jrst/src/test/resources/bugs/infiniteLoop.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/infiniteLoop.rst 2010-06-28 07:36:35 UTC (rev 479) +++ trunk/jrst/src/test/resources/bugs/infiniteLoop.rst 2010-06-30 14:41:40 UTC (rev 480) @@ -1,32 +1,32 @@ Developer guide for working with Mifos internationalization, specifically as relates to making translation files work with the online translation tool. Goals -==== +===== * strictly limit the proliferation of resource bundles to ensure manageability * support an extensible translatable string dictionary format to make life easy for translators Overall i18n Architecture -==== +========================= Following `the Cheetah i18n architecture guide <CheetahInternationalization>`_, "master" keys and translatable strings are in Java ``.properties`` format resource bundles. These ``.properties`` files will not contain underscores in their filenames. These files will be stored in source code version control. Language-specific translations will also be stored in source code version control, but only in ``.po`` (portable object) format, like ``LOCALE/bundlename_LOCALE.po``. Language-specific Java ``.properties`` format resource bundles needed by Mifos to display the application in a language other than the default will be generated during the build. Notes -==== +===== Things are still in development right now - we would like everything to run automatically from the maven build, but there are various shell scripts in the process right now. We're working to make this process smoother! Required Software -==== +================= * `Translate Toolkit <http://translate.sourceforge.net/wiki/toolkit>`_ - `TT install page <http://translate.sourceforge.net/wiki/toolkit/installation>`_ (required on all platforms. On Windows we suggest using the .exe installer) * `Cygwin <http://www.cygwin.org/cygwin/>`_ (required on Windows, to run the shell script) * On Mac OS, required python module lxml may not be installed by default. See installation instructions `here <http://codespeak.net/lxml/installation.html>`_. General Guidelines -==== +================== * Before working with translation files, perform an update to pull the latest changes in source control into your working copy. * Use detailed log messages when committing. Mention *why* you made the change, refer to related issues, and link to related mailing list threads. @@ -34,26 +34,25 @@ * When operating directly on .po or .properties files (not via the online translation tool) watch for conflicts on the online translation tool server's working copy. Converting legacy bundles -==== +========================= Create the directory to store .po files (for example, "fr") in mifos/src/org/mifos/config/localizedResources. Use ``capture_initial_locales.sh`` to convert legacy Java .properties-based resource bundles to .po format. Follow with ``locale_sync.sh`` to clean up duplicate msgctxt strings and add fuzzy translations. Adding new keys -==== +=============== * add key and default translation to appropriate ``.properties`` file -* run ``locale_sync.sh`` +* run ``locale_sync.sh`` * On Windows, running from the Cygwin command, if you get errors like ``./locale_sync.sh: line 3: $'\r': command not found`` then run ``dos2unix local_sync.sh`` and try rerunning it. * Also note before running ./locale_sync.sh in Cygwin you need to get to the windows directory your localized resource files are in. An example of doing this on C drive is: cd /cygwin/c/mifosinstallation/mifos-gazelle/application/src/main/resources/org/mifos/config/localizedResources * Note that currently this will update all ``.po`` files, even if no changes have been made to the corresponding ``.properties`` file. In the future this could be improved so that only the ``.po`` files affected by the new key were updated. - * commit default ``.properties`` and ``LOCALE/*.po`` files -New ``.properties`` files will also be picked up by ``locale_sync.sh``, but in general new keys should be added to existing ``.properties`` files. +New ``.properties`` files will also be picked up by ``locale_sync.sh``, but in general new keys should be added to existing ``.properties`` files. Care should be taken to only add new default/master translations and translation files when absolutely necessary (see `Goals`_). If you need some text, first check and see if it is already in a ``.properties`` file. @@ -63,35 +62,37 @@ * Running local_sync.sh requires the external software mentioned above. In the future, we plan to move the work performed by this script into the maven build in order to eliminate this step and its tool requirements. Adding new languages -==== +==================== * Locales are either made up of a single language code (for instance, ``en``, for English language), or a combination of of a language code and a country code (``en_US``, for United States English). (Here is the `Sun Java Locale page <http://java.sun.com/developer/technicalArticles/J2SE/locale/>`_ which has more info.) - * Find the two-letter language code using the `ISO 639-2 language code list <http://www.loc.gov/standards/iso639-2/php/code_list.php>`_. + * Find the two-letter language code using the `ISO 639-2 language code list <http://www.loc.gov/standards/iso639-2/php/code_list.php>`_. * If the locale has a country code, find the two-letter country code in the `ISO 3166 country code list <http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_na…>`_ * create directory using the code for locale. * run ``locale_sync.sh`` * commit ``LOCALE/*.po`` files * a Pootle administrator also needs to add new translation files for this language to the Pootle server via the Pootle admin UI; make a request on the `mifos-developer mailing list </developers/listserv#developer-listserv>`_ for this. - * If you are the Pootle administrator, on the server that Pootle runs on, do this: - * cd to ``/var/lib/pootle/gazelle`` - * ``sudo sudo -u pootle svn co https://mifos.svn.sourceforge.net/svnroot/mifos/trunk/application/src/main/… km --username mifospootle`` (replacing km with the locale name you have added) (You will need the mifospootle password; ask one of the developers if you don't have this.) - * restart the Pootle server: ``sudo /etc/init.d/pootle restart`` + + * If you are the Pootle administrator, on the server that Pootle runs on, do this: + + * cd to ``/var/lib/pootle/gazelle`` + * ``sudo sudo -u pootle svn co https://mifos.svn.sourceforge.net/svnroot/mifos/trunk/application/src/main/… km --username mifospootle`` (replacing km with the locale name you have added) (You will need the mifospootle password; ask one of the developers if you don't have this.) + * restart the Pootle server: ``sudo /etc/init.d/pootle restart`` * Enable the locale in the Mifos software by following AddingANewLocale Making a build with language bundles -==== +==================================== -Property file bundles for non-English languages are generated by the ``create_props.sh`` script. +Property file bundles for non-English languages are generated by the ``create_props.sh`` script. * To generate a build with all language bundles, cd to the ``/mifos/src/main/resources/org/mifos/config/localizedResources`` directory, and run the ``create_props.sh`` script. This will generate all the locale-specific property files from the .po files. * The Hudson job for gazelle trunk runs this script automatically. * We would like to eliminate the shell scripts. One option is the `Maven 2.x Gettext Plugin <http://xnap-commons.sourceforge.net/m2/maven-gettext-plugin/index.html>`_. Bulk Updates -==== +============ On neem:

1 0

r479 - in trunk: doxia-module-jrst/src doxia-module-jrst/src/license jrst/src jrst/src/license
by tchemit＠users.nuiton.org June 28, 2010

June 28, 2010

Author: tchemit Date: 2010-06-28 09:36:35 +0200 (Mon, 28 Jun 2010) New Revision: 479 Url: http://nuiton.org/repositories/revision/jrst/479 Log: consolidate THIRD-PARTY Added: trunk/doxia-module-jrst/src/license/ trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties trunk/jrst/src/license/ trunk/jrst/src/license/THIRD-PARTY.properties Added: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties 2010-06-28 07:36:35 UTC (rev 479) @@ -0,0 +1,24 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License +# - Apache License 2.0 +# - Common Public License Version 1.0 +# - LGPL +# - Lesser General Public License (LGPL) v 3.0 +# - MIT-like License +# - The Apache Software License, Version 2.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 09:30:13 CEST 2010 +com.ibm.icu--icu4j--2.6.1=X License (http://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.h…) +commons-codec--commons-codec--1.2=The Apache Software License, Version 2.0 +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +org.codehaus.plexus--plexus-classworlds--1.2-alpha-9=http\://classworlds.codehaus.org/license.html +xerces--xmlParserAPIs--2.6.2=The Apache Software License, Version 2.0 +xml-apis--xml-apis--1.3.02=The Apache Software License, Version 2.0 Property changes on: trunk/doxia-module-jrst/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/license/THIRD-PARTY.properties =================================================================== --- trunk/jrst/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/jrst/src/license/THIRD-PARTY.properties 2010-06-28 07:36:35 UTC (rev 479) @@ -0,0 +1,25 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache License 2.0 +# - BSD +# - BSD License +# - Common Public License Version 1.0 +# - LGPL +# - Lesser General Public License (LGPL) v 3.0 +# - MIT-like License +# - The Apache Software License, Version 2.0 +# - http://jaxen.codehaus.org/license.html +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 09:27:16 CEST 2010 +com.ibm.icu--icu4j--2.6.1=X License (http://icu-project.org/repos/icu/icu4j/trunk/main/shared/licenses/license.h…) +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +org.nuiton.thirdparty--sdoc--0.5.0-beta-patchcl=Lesser General Public License (LGPL) v 3.0 +xerces--xercesImpl--2.6.2=The Apache Software License, Version 2.0 +xerces--xmlParserAPIs--2.6.2=The Apache Software License, Version 2.0 Property changes on: trunk/jrst/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r478 - trunk
by tchemit＠users.nuiton.org June 27, 2010

June 27, 2010

Author: tchemit Date: 2010-06-27 08:35:36 +0200 (Sun, 27 Jun 2010) New Revision: 478 Url: http://nuiton.org/repositories/revision/jrst/478 Log: Utilisation de mavenpom4redmine 2.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-21 09:53:15 UTC (rev 477) +++ trunk/pom.xml 2010-06-27 06:35:36 UTC (rev 478) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2</version> + <version>2.2.1</version> </parent> <artifactId>jrst</artifactId>

1 0

r477 - trunk/jrst/src/test/java/org/nuiton/jrst/bugs
by echatellier＠users.nuiton.org June 21, 2010

June 21, 2010

Author: echatellier Date: 2010-06-21 11:53:15 +0200 (Mon, 21 Jun 2010) New Revision: 477 Url: http://nuiton.org/repositories/revision/jrst/477 Log: Fix compilation failure Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java Modified: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2010-06-21 08:58:47 UTC (rev 476) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2010-06-21 09:53:15 UTC (rev 477) @@ -59,7 +59,7 @@ Reader in = new InputStreamReader(url.openStream()); JRSTReader jrst = new JRSTReader(); - Document doc = jrst.read(in, new File(url.getFile())); + Document doc = jrst.read(in); Assert.assertNotNull(doc); }

1 0

r476 - in trunk/jrst/src/test: java/org/nuiton/jrst java/org/nuiton/jrst/bugs resources resources/bugs
by echatellier＠users.nuiton.org June 21, 2010

June 21, 2010

Author: echatellier Date: 2010-06-21 10:58:47 +0200 (Mon, 21 Jun 2010) New Revision: 476 Url: http://nuiton.org/repositories/revision/jrst/476 Log: Add test case for infinite loop bug (#697). Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java trunk/jrst/src/test/resources/bugs/ trunk/jrst/src/test/resources/bugs/infiniteLoop.rst Added: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java =================================================================== --- trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java (rev 0) +++ trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java 2010-06-21 08:58:47 UTC (rev 476) @@ -0,0 +1,66 @@ +/* + * #%L + * JRst :: Api + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin, Chatellier Eric + * %% + * 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.jrst.bugs; + +import java.io.File; +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.URL; + +import org.dom4j.Document; +import org.junit.Assert; +import org.junit.Test; +import org.nuiton.jrst.JRSTReader; +import org.nuiton.jrst.JRSTReaderTest; + +/** + * Test for infinite loop bug. + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class InfiniteLoopTest { + + /** + * Test de parser un fichier et déclare le test en echec si il dure + * plus de 5s. (bug #697). + * + * @throws Exception + */ + @Test(timeout=5000) + public void testInfiniteLoop() throws Exception { + URL url = JRSTReaderTest.class.getResource("/bugs/infiniteLoop.rst"); + Reader in = new InputStreamReader(url.openStream()); + + JRSTReader jrst = new JRSTReader(); + Document doc = jrst.read(in, new File(url.getFile())); + + Assert.assertNotNull(doc); + } +} Property changes on: trunk/jrst/src/test/java/org/nuiton/jrst/bugs/InfiniteLoopTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/jrst/src/test/resources/bugs/infiniteLoop.rst =================================================================== --- trunk/jrst/src/test/resources/bugs/infiniteLoop.rst (rev 0) +++ trunk/jrst/src/test/resources/bugs/infiniteLoop.rst 2010-06-21 08:58:47 UTC (rev 476) @@ -0,0 +1,103 @@ +Developer guide for working with Mifos internationalization, specifically as relates to making translation files work with the online translation tool. + +Goals +==== + +* strictly limit the proliferation of resource bundles to ensure manageability +* support an extensible translatable string dictionary format to make life easy for translators + +Overall i18n Architecture +==== + +Following `the Cheetah i18n architecture guide <CheetahInternationalization>`_, "master" keys and translatable strings are in Java ``.properties`` format resource bundles. These ``.properties`` files will not contain underscores in their filenames. These files will be stored in source code version control. + +Language-specific translations will also be stored in source code version control, but only in ``.po`` (portable object) format, like ``LOCALE/bundlename_LOCALE.po``. Language-specific Java ``.properties`` format resource bundles needed by Mifos to display the application in a language other than the default will be generated during the build. + +Notes +==== + +Things are still in development right now - we would like everything to run automatically from the maven build, but there are various shell scripts in the process right now. We're working to make this process smoother! + +Required Software +==== + +* `Translate Toolkit <http://translate.sourceforge.net/wiki/toolkit>`_ - `TT install page <http://translate.sourceforge.net/wiki/toolkit/installation>`_ (required on all platforms. On Windows we suggest using the .exe installer) +* `Cygwin <http://www.cygwin.org/cygwin/>`_ (required on Windows, to run the shell script) +* On Mac OS, required python module lxml may not be installed by default. See installation instructions `here <http://codespeak.net/lxml/installation.html>`_. + +General Guidelines +==== + +* Before working with translation files, perform an update to pull the latest changes in source control into your working copy. +* Use detailed log messages when committing. Mention *why* you made the change, refer to related issues, and link to related mailing list threads. +* If you are doing anything directly on the .properties files, please notify the PM managing Online Translations as this might affect any existing translation work being done. +* When operating directly on .po or .properties files (not via the online translation tool) watch for conflicts on the online translation tool server's working copy. + +Converting legacy bundles +==== + +Create the directory to store .po files (for example, "fr") in mifos/src/org/mifos/config/localizedResources. Use ``capture_initial_locales.sh`` to convert legacy Java .properties-based resource bundles to .po format. + +Follow with ``locale_sync.sh`` to clean up duplicate msgctxt strings and add fuzzy translations. + +Adding new keys +==== + +* add key and default translation to appropriate ``.properties`` file +* run ``locale_sync.sh`` + + * On Windows, running from the Cygwin command, if you get errors like ``./locale_sync.sh: line 3: $'\r': command not found`` then run ``dos2unix local_sync.sh`` and try rerunning it. + * Also note before running ./locale_sync.sh in Cygwin you need to get to the windows directory your localized resource files are in. An example of doing this on C drive is: + cd /cygwin/c/mifosinstallation/mifos-gazelle/application/src/main/resources/org/mifos/config/localizedResources + * Note that currently this will update all ``.po`` files, even if no changes have been made to the corresponding ``.properties`` file. In the future this could be improved so that only the ``.po`` files affected by the new key were updated. + +* commit default ``.properties`` and ``LOCALE/*.po`` files + +New ``.properties`` files will also be picked up by ``locale_sync.sh``, but in general new keys should be added to existing ``.properties`` files. + +Care should be taken to only add new default/master translations and translation files when absolutely necessary (see `Goals`_). If you need some text, first check and see if it is already in a ``.properties`` file. + +Some things to note: + +* Only the English (default) version of the .properties file should be translated. (As of this writing, non-English .properties files are still in version control, but they will be eliminated since they are generated from .PO files) +* Running local_sync.sh requires the external software mentioned above. In the future, we plan to move the work performed by this script into the maven build in order to eliminate this step and its tool requirements. + +Adding new languages +==== + +* Locales are either made up of a single language code (for instance, ``en``, for English language), or a combination of of a language code and a country code (``en_US``, for United States English). (Here is the `Sun Java Locale page <http://java.sun.com/developer/technicalArticles/J2SE/locale/>`_ which has more info.) + + * Find the two-letter language code using the `ISO 639-2 language code list <http://www.loc.gov/standards/iso639-2/php/code_list.php>`_. + * If the locale has a country code, find the two-letter country code in the `ISO 3166 country code list <http://www.iso.org/iso/country_codes/iso_3166_code_lists/english_country_na…>`_ + +* create directory using the code for locale. +* run ``locale_sync.sh`` +* commit ``LOCALE/*.po`` files +* a Pootle administrator also needs to add new translation files for this language to the Pootle server via the Pootle admin UI; make a request on the `mifos-developer mailing list </developers/listserv#developer-listserv>`_ for this. + * If you are the Pootle administrator, on the server that Pootle runs on, do this: + * cd to ``/var/lib/pootle/gazelle`` + * ``sudo sudo -u pootle svn co https://mifos.svn.sourceforge.net/svnroot/mifos/trunk/application/src/main/… km --username mifospootle`` (replacing km with the locale name you have added) (You will need the mifospootle password; ask one of the developers if you don't have this.) + * restart the Pootle server: ``sudo /etc/init.d/pootle restart`` +* Enable the locale in the Mifos software by following AddingANewLocale + + +Making a build with language bundles +==== + +Property file bundles for non-English languages are generated by the ``create_props.sh`` script. + +* To generate a build with all language bundles, cd to the ``/mifos/src/main/resources/org/mifos/config/localizedResources`` directory, and run the ``create_props.sh`` script. This will generate all the locale-specific property files from the .po files. +* The Hudson job for gazelle trunk runs this script automatically. +* We would like to eliminate the shell scripts. One option is the `Maven 2.x Gettext Plugin <http://xnap-commons.sourceforge.net/m2/maven-gettext-plugin/index.html>`_. + +Bulk Updates +==== + +On neem: + +:: + + sudo su - pootle + svn update /var/lib/pootle/gazelle/* + +Other operations can be performed as the pootle user, such as manually editing .po files and resolving conflicts. \ No newline at end of file

1 0

r475 - trunk
by tchemit＠users.nuiton.org June 19, 2010

June 19, 2010

Author: tchemit Date: 2010-06-19 20:55:48 +0200 (Sat, 19 Jun 2010) New Revision: 475 Url: http://nuiton.org/repositories/revision/jrst/475 Log: Utilisation de mavenpom4redmine 2.2 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 14:23:54 UTC (rev 474) +++ trunk/pom.xml 2010-06-19 18:55:48 UTC (rev 475) @@ -25,342 +25,392 @@ --> <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> +  +  +  + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.2</version> + </parent> + + <artifactId>jrst</artifactId> + <version>1.2-SNAPSHOT</version> + + <modules> + <module>jrst</module> +  +  + <module>doxia-module-jrst</module> + <module>jrst-doc</module> + </modules> + + <dependencyManagement> + <dependencies> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + <scope>compile</scope> + </dependency> + + <dependency> <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.5</version> - </parent> + <artifactId>nuiton-utils</artifactId> + <version>${nuiton-utils.version}</version> + <scope>compile</scope> + </dependency> - <artifactId>jrst</artifactId> - <version>1.2-SNAPSHOT</version> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> + <exclusions> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + </exclusion> - <modules> - <module>jrst</module> -  -  - <module>doxia-module-jrst</module> - <module>jrst-doc</module> - </modules> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</artifactId> + </exclusion> - <dependencyManagement> - <dependencies> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - <scope>compile</scope> - </dependency> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${nuiton-utils.version}</version> - <scope>compile</scope> - </dependency> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-settings</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - <exclusions> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-settings</artifactId> - </exclusion> - <exclusion> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-cipher</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> + <exclusion> + <groupId>org.sonatype.plexus</groupId> + <artifactId>plexus-sec-dispatcher</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> - <exclusion> - <groupId>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> + </exclusions> + </dependency> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> + <dependency> + <groupId>xmlunit</groupId> + <artifactId>xmlunit</artifactId> + <version>1.2</version> + <scope>test</scope> + </dependency> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - </exclusion> + <dependency> + <groupId>org.apache.xmlgraphics</groupId> + <artifactId>fop</artifactId> + <version>0.95</version> + <scope>compile</scope> + </dependency> - <exclusion> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</artifactId> - </exclusion> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + <scope>runtime</scope> + </dependency> - <exclusion> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - </exclusion> + <dependency> + <groupId>xalan</groupId> + <artifactId>serializer</artifactId> + <version>2.7.1</version> + <scope>runtime</scope> + </dependency> - </exclusions> - </dependency> +  - <dependency> - <groupId>xmlunit</groupId> - <artifactId>xmlunit</artifactId> - <version>1.2</version> - <scope>test</scope> - </dependency> +  - <dependency> - <groupId>org.apache.xmlgraphics</groupId> - <artifactId>fop</artifactId> - <version>0.95</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>sdoc</artifactId> + <version>0.5.0-beta-patchcl</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <scope>compile</scope> + </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>serializer</artifactId> - <version>2.7.1</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>uk.co.flamingpenguin.jewelcli</groupId> + <artifactId>jewelcli</artifactId> + <version>0.57</version> + <scope>compile</scope> + </dependency> -  + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> -  + <dependency> + <groupId>org.docbook</groupId> + <artifactId>docbook-xsl</artifactId> + <version>1.72.0</version> + </dependency> - <dependency> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>sdoc</artifactId> - <version>0.5.0-beta-patchcl</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>uk.co.flamingpenguin.jewelcli</groupId> - <artifactId>jewelcli</artifactId> - <version>0.57</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-module-xdoc</artifactId> + <version>${doxia.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <version>${doxia.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.docbook</groupId> - <artifactId>docbook-xsl</artifactId> - <version>1.72.0</version> - </dependency> + <dependency> + <groupId>org.apache.maven.doxia</groupId> + <artifactId>doxia-core</artifactId> + <type>test-jar</type> + <version>${doxia.version}</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.8.1</version> + <scope>test</scope> + </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> + </dependencies> + </dependencyManagement> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-module-xdoc</artifactId> - <version>${doxia.version}</version> - <scope>provided</scope> - </dependency> +  +  +  + <name>JRst</name> + <description>JRst</description> + <inceptionYear>2004</inceptionYear> + <url>http://maven-site.nuiton.org/jrst</url> - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <version>${doxia.version}</version> - <scope>provided</scope> - </dependency> + <developers> + <developer> + <name>Benjamin Poussin</name> + <id>bpoussin</id> + <email>poussin(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + <role>Debian packager</role> + </roles> + </developer> + <developer> + <name>Eric Chatellier</name> + <id>echatellier</id> + <email>chatellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Sylvain Letellier</name> + <id>sletellier</id> + <email>letellier(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + <developer> + <name>Tony Chemit</name> + <id>tchemit</id> + <email>chemit(a)codelutin.com</email> + <organization>CodeLutin</organization> + <timezone>+2</timezone> + <roles> + <role>Développeur</role> + </roles> + </developer> + </developers> +  +  +  - <dependency> - <groupId>org.apache.maven.doxia</groupId> - <artifactId>doxia-core</artifactId> - <type>test-jar</type> - <version>${doxia.version}</version> - <scope>test</scope> - </dependency> + <packaging>pom</packaging> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> + <properties> - </dependencies> - </dependencyManagement> +  + <projectId>jrst</projectId> -  -  -  - <name>JRst</name> - <description>JRst</description> - <inceptionYear>2004</inceptionYear> - <url>http://maven-site.nuiton.org/jrst</url> +  + <locales>fr,en</locales> - <developers> - <developer> - <name>Benjamin Poussin</name> - <id>bpoussin</id> - <email>poussin(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - <role>Debian packager</role> - </roles> - </developer> - <developer> - <name>Eric Chatellier</name> - <id>echatellier</id> - <email>chatellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Sylvain Letellier</name> - <id>sletellier</id> - <email>letellier(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - <developer> - <name>Tony Chemit</name> - <id>tchemit</id> - <email>chemit(a)codelutin.com</email> - <organization>CodeLutin</organization> - <timezone>+2</timezone> - <roles> - <role>Développeur</role> - </roles> - </developer> - </developers> -  -  -  + <siteSourcesType>apt</siteSourcesType> - <packaging>pom</packaging> + <doxia.version>1.1.3</doxia.version> + <nuiton-utils.version>1.3.1</nuiton-utils.version> + <i18n.version>1.2.2</i18n.version> + </properties> - <properties> + <build> -  - <projectId>jrst</projectId> + <pluginManagement> + <plugins> -  - <locales>fr,en</locales> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${i18n.version}</version> + </plugin> - <siteSourcesType>apt</siteSourcesType> + </plugins> + </pluginManagement> - <doxia.version>1.1.3</doxia.version> - <nuiton-utils.version>1.2</nuiton-utils.version> - <i18n.version>1.2.2</i18n.version> - </properties> + </build> - <build> +  +  +  - <pluginManagement> - <plugins> +  + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> + </scm> - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${i18n.version}</version> - </plugin> + <profiles> - </plugins> - </pluginManagement> + <profile> + <id>central-safe</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - </build> + <properties> -  -  -  +  + <release.repository>${nuiton.central.release.repository}</release.repository> -  - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jrst/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jrst/trunk</url> - </scm> + </properties> + <build> + <defaultGoal>validate</defaultGoal> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>check-central-safe</id> + <inherited>true</inherited> + <goals> + <goal>check-auto-container</goal> + </goals> + <configuration> + <addMavenCentral>true</addMavenCentral> + <failIfNotSafe>true</failIfNotSafe> + <repositories> + <nuiton-central-releases> + http://nexus.nuiton.org/nexus/content/repositories/nuiton-central-releases + </nuiton-central-releases> + </repositories> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + + </profiles> + </project>

1 0

r474 - trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst
by tchemit＠users.nuiton.org June 2, 2010

June 2, 2010

Author: tchemit Date: 2010-06-02 16:23:54 +0200 (Wed, 02 Jun 2010) New Revision: 474 Url: http://nuiton.org/repositories/revision/jrst/474 Log: Eric is not a maven member :) Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java =================================================================== --- trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-06-02 14:21:34 UTC (rev 473) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-06-02 14:23:54 UTC (rev 474) @@ -39,7 +39,7 @@ * Parse an RST model, transform it into xdoc model and emit events into the * specified doxia Sink. * - * @author <a href="mailto:chatellier@maven.org">Eric Chatellier</a> + * @author <a href="mailto:chatellier@codelutin.com">Eric Chatellier</a> * @version $Id$ * @since 0.9.0 * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="jrst" Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java =================================================================== --- trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java 2010-06-02 14:21:34 UTC (rev 473) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java 2010-06-02 14:23:54 UTC (rev 474) @@ -30,7 +30,7 @@ /** * JrstSiteModule. * - * @author <a href="mailto:chatellier@maven.org">Eric Chatellier</a> + * @author <a href="mailto:chatellier@codelutin.com">Eric Chatellier</a> * @version $Id$ * @since 0.9.0 * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="jrst"

1 0

r473 - in trunk: . doxia-module-jrst/src/main/java/org/nuiton/jrst
by tchemit＠users.nuiton.org June 2, 2010

June 2, 2010

Author: tchemit Date: 2010-06-02 16:21:34 +0200 (Wed, 02 Jun 2010) New Revision: 473 Url: http://nuiton.org/repositories/revision/jrst/473 Log: Evolution #658: Use doxia 1.1.3 Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java trunk/pom.xml Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java =================================================================== --- trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-06-02 10:28:08 UTC (rev 472) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstParser.java 2010-06-02 14:21:34 UTC (rev 473) @@ -39,11 +39,10 @@ * Parse an RST model, transform it into xdoc model and emit events into the * specified doxia Sink. * - * @author <a href="mailto:jason@maven.org">Jason van Zyl</a> + * @author <a href="mailto:chatellier@maven.org">Eric Chatellier</a> * @version $Id$ * @since 0.9.0 - * @plexus.component role="org.apache.maven.doxia.parser.Parser" - * role-hint="jrst" + * @plexus.component role="org.apache.maven.doxia.parser.Parser" role-hint="jrst" */ public class JrstParser extends XdocParser { Modified: trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java =================================================================== --- trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java 2010-06-02 10:28:08 UTC (rev 472) +++ trunk/doxia-module-jrst/src/main/java/org/nuiton/jrst/JrstSiteModule.java 2010-06-02 14:21:34 UTC (rev 473) @@ -30,8 +30,8 @@ /** * JrstSiteModule. * - * @author chatellier - * @version $Revision : 1 $ + * @author <a href="mailto:chatellier@maven.org">Eric Chatellier</a> + * @version $Id$ * @since 0.9.0 * @plexus.component role="org.apache.maven.doxia.module.site.SiteModule" role-hint="jrst" */ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-02 10:28:08 UTC (rev 472) +++ trunk/pom.xml 2010-06-02 14:21:34 UTC (rev 473) @@ -327,11 +327,11 @@ <projectId>jrst</projectId>  - <siteLocales>fr,en</siteLocales> + <locales>fr,en</locales> <siteSourcesType>apt</siteSourcesType> - <doxia.version>1.1.2</doxia.version> + <doxia.version>1.1.3</doxia.version> <nuiton-utils.version>1.2</nuiton-utils.version> <i18n.version>1.2.2</i18n.version> </properties>

1 0

r472 - trunk
by tchemit＠users.nuiton.org June 2, 2010

June 2, 2010

Author: tchemit Date: 2010-06-02 12:28:08 +0200 (Wed, 02 Jun 2010) New Revision: 472 Url: http://nuiton.org/repositories/revision/jrst/472 Log: Utilisation de mavenpom4redmine 2.1.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-05-09 12:34:10 UTC (rev 471) +++ trunk/pom.xml 2010-06-02 10:28:08 UTC (rev 472) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.1.4</version> + <version>2.1.5</version> </parent> <artifactId>jrst</artifactId>

1 0