[I18n-commits] r1748 - in trunk: . ant-i18n-task ant-i18n-task/src/main/java/org/nuiton/i18n/ant ant-i18n-task/src/site ant-i18n-task/src/site/apt ant-i18n-task/src/site/en ant-i18n-task/src/site/en/apt maven-i18n-plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl maven-i18n-plugin/src/site maven-i18n-plugin/

Author: tchemit Date: 2010-04-15 17:37:16 +0200 (Thu, 15 Apr 2010) New Revision: 1748 Log: - add english documentation structure for modules - update headers (remove redundant svn keywords) Added: trunk/ant-i18n-task/src/site/en/ trunk/ant-i18n-task/src/site/en/apt/ trunk/ant-i18n-task/src/site/en/apt/index.apt trunk/ant-i18n-task/src/site/site_en.xml trunk/maven-i18n-plugin/src/site/en/ trunk/maven-i18n-plugin/src/site/en/apt/ trunk/maven-i18n-plugin/src/site/en/apt/index.apt trunk/maven-i18n-plugin/src/site/en/apt/usages.apt trunk/maven-i18n-plugin/src/site/site_en.xml trunk/nuiton-i18n/src/site/en/ trunk/nuiton-i18n/src/site/en/apt/ trunk/nuiton-i18n/src/site/en/apt/index.apt trunk/nuiton-i18n/src/site/site_en.xml Modified: trunk/ant-i18n-task/pom.xml trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java trunk/ant-i18n-task/src/site/apt/index.apt trunk/ant-i18n-task/src/site/site_fr.xml trunk/maven-i18n-plugin/pom.xml trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/Parser.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserException.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserThread.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java trunk/maven-i18n-plugin/src/site/apt/index.apt trunk/maven-i18n-plugin/src/site/apt/usages.apt trunk/maven-i18n-plugin/src/site/site_fr.xml trunk/nuiton-i18n-editor/pom.xml trunk/nuiton-i18n/pom.xml trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java trunk/nuiton-i18n/src/site/apt/index.apt trunk/nuiton-i18n/src/site/site_fr.xml trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java trunk/pom.xml trunk/src/license/project.xml trunk/src/site/apt/application.apt trunk/src/site/apt/bestPractices.apt trunk/src/site/apt/extendInitializer.apt trunk/src/site/apt/helloWorld.apt trunk/src/site/apt/index.apt trunk/src/site/apt/library.apt trunk/src/site/apt/presentation.apt trunk/src/site/en/apt/application.apt trunk/src/site/en/apt/bestPractices.apt trunk/src/site/en/apt/extendInitializer.apt trunk/src/site/en/apt/helloWorld.apt trunk/src/site/en/apt/index.apt trunk/src/site/en/apt/library.apt trunk/src/site/en/apt/presentation.apt trunk/src/site/site_en.xml trunk/src/site/site_fr.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/ant-i18n-task/pom.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,59 +1,136 @@ <?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"> +<!-- + #%L + I18n :: Ant task - <modelVersion>4.0.0</modelVersion> + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + 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. - <parent> - <groupId>org.nuiton</groupId> - <artifactId>i18n</artifactId> - <version>1.2.2-SNAPSHOT</version> - </parent> + 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% + --> +<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"> - <groupId>org.nuiton.i18n</groupId> - <artifactId>ant-i18n-task</artifactId> + <modelVersion>4.0.0</modelVersion> - <dependencies> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${project.version}</version> - <scope>compile</scope> - </dependency> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> - <dependency> - <groupId>org.nuiton.processor</groupId> - <artifactId>nuiton-processor</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - </dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>ant-i18n-task</artifactId> - <!-- tests dependencies --> + <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>I18n :: Ant task</name> - <inceptionYear>2010</inceptionYear> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + </dependency> - <packaging>jar</packaging> + <!-- tests dependencies --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>I18n :: Ant task</name> + <inceptionYear>2010</inceptionYear> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>jar</packaging> + + <properties> + + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + + </properties> + + + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project> Modified: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java =================================================================== --- trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Ant task * - * $Author$ * $Id$ * $HeadURL$ * %% @@ -46,8 +45,7 @@ * @version $Revision$ * * Last update : $Date$ - * by : $Author$ - */ + * by : */ public class I18nExtractorTask extends MatchingTask { public static final int MSG_VERBOSE = Project.MSG_VERBOSE; Modified: trunk/ant-i18n-task/src/site/apt/index.apt =================================================================== --- trunk/ant-i18n-task/src/site/apt/index.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/ant-i18n-task/src/site/apt/index.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,24 +1,23 @@ ~~~ ~~ #%L ~~ I18n :: Ant task -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% Added: trunk/ant-i18n-task/src/site/en/apt/index.apt =================================================================== --- trunk/ant-i18n-task/src/site/en/apt/index.apt (rev 0) +++ trunk/ant-i18n-task/src/site/en/apt/index.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -0,0 +1,37 @@ +~~~ +~~ #%L +~~ I18n :: Ant task +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2010 CodeLutin +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU Lesser General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ + +---- +Ant-i18n-task +---- +---- +2010-03-09 +---- + + +Présentation + + Le module <ant-i18n-task> permet l'utilisation depuis ant de + l'extracteur de clef i18n. Pour plus de détails sur Nuiton I18nExtractor. Property changes on: trunk/ant-i18n-task/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/ant-i18n-task/src/site/site_en.xml =================================================================== --- trunk/ant-i18n-task/src/site/site_en.xml (rev 0) +++ trunk/ant-i18n-task/src/site/site_en.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -0,0 +1,67 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + I18n :: Ant task + + $Id$ + $HeadURL$ + %% + Copyright (C) 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + <links> + <item name="[fr" href="../index.html"/> + <item name="en]" href="index.html"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <menu name="Project Parent"> + <item name="I18n" href="../en/index.html"/> + </menu> + + <menu name="User"> + <item href="index.html" name="Accueil"/> + </menu> + + <menu name="Downloads"> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/ant-i18n-task/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/ant-i18n-task/src/site/site_fr.xml =================================================================== --- trunk/ant-i18n-task/src/site/site_fr.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/ant-i18n-task/src/site/site_fr.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -3,7 +3,6 @@ #%L I18n :: Ant task - $Author$ $Id$ $HeadURL$ %% @@ -34,7 +33,8 @@ <body> <links> - <item name="Nuiton I18n" href="../nuiton-processor"/> + <item name="[fr" href="index.html"/> + <item name="en]" href="en/index.html"/> </links> <breadcrumbs> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/pom.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,174 +1,229 @@ <?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/maven-v4_0_0.xsd"> +<!-- + #%L + I18n :: Maven Plugin - <modelVersion>4.0.0</modelVersion> + $Id$ + $HeadURL$ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> + 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% + --> +<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/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + </dependency> + + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </dependency> + <!-- tests dependencies --> + + <!--dependency> <groupId>org.nuiton</groupId> - <artifactId>i18n</artifactId> - <version>1.2.2-SNAPSHOT</version> - </parent> + <artifactId>maven-helper-plugin</artifactId> + <classifier>tests</classifier> + </dependency> - <groupId>org.nuiton.i18n</groupId> - <artifactId>maven-i18n-plugin</artifactId> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency--> - <dependencies> + <!-- provided dependencies --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${project.version}</version> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton.processor</groupId> - <artifactId>nuiton-processor</artifactId> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - </dependency> + <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </dependency> + </dependencies> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - </dependency> - <!-- tests dependencies --> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>I18n :: Maven Plugin</name> + <description> + Plugin pour maven 2 de génération des bundles pour + l'internationalisation (i18n) des applications java + basé sur nuiton-i18n-api. + </description> + <inceptionYear>2007</inceptionYear> - <!--dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <classifier>tests</classifier> - </dependency> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency--> + <packaging>maven-plugin</packaging> - <!-- provided dependencies --> + <profiles> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> + <build> - <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - </dependency> + <plugins> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> - </dependencies> + </plugins> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>I18n :: Maven Plugin</name> - <description> - Plugin pour maven 2 de génération des bundles pour - l'internationalisation (i18n) des applications java - basé sur nuiton-i18n-api. - </description> - <inceptionYear>2007</inceptionYear> + </build> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + </profile> - <packaging>maven-plugin</packaging> + <!-- perform only on a release stage when using the maven-release-plugin --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> - <build> + <reporting> <plugins> - <!-- plugin plugin --> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>2.5.1</version> + </plugin> </plugins> + </reporting> - </build> + </profile> - <reporting> + <profile> + <id>run-its</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <defaultGoal>verify</defaultGoal> <plugins> - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - </plugin> + <plugin> + <artifactId>maven-invoker-plugin</artifactId> + <configuration> + <pomIncludes> + <pomInclude>**/pom.xml</pomInclude> + </pomIncludes> + <postBuildHookScript>verify</postBuildHookScript> + <localRepositoryPath>${basedir}/target/local-repo + </localRepositoryPath> + <settingsFile>src/it/settings.xml</settingsFile> + <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> + <!--<debug>true</debug>--> + </configuration> + <executions> + <execution> + <id>integration-test</id> + <goals> + <goal>install</goal> + <goal>run</goal> + </goals> + <phase>integration-test</phase> + </execution> + </executions> + </plugin> </plugins> - </reporting> + </build> + </profile> + </profiles> - <profiles> - <profile> - <id>run-its</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <defaultGoal>verify</defaultGoal> - <plugins> - <plugin> - <artifactId>maven-invoker-plugin</artifactId> - <configuration> - <pomIncludes> - <pomInclude>**/pom.xml</pomInclude> - </pomIncludes> - <postBuildHookScript>verify</postBuildHookScript> - <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> - <settingsFile>src/it/settings.xml</settingsFile> - <cloneProjectsTo>${project.build.directory}/its</cloneProjectsTo> - <!--<debug>true</debug>--> - </configuration> - <executions> - <execution> - <id>integration-test</id> - <goals> - <goal>install</goal> - <goal>run</goal> - </goals> - <phase>integration-test</phase> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - </project> Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/AbstractI18nMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GenerateMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/GetterMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% @@ -41,8 +40,7 @@ * @version $Revision$ * <p/> * Mise a jour: $Date$ - * par : $Author$ - */ + * par : */ public abstract class AbstractI18nBundleMojo extends AbstractI18nMojo { /** Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% @@ -53,8 +52,7 @@ * @version $Revision$ * <p/> * Mise a jour: $Date$ - * par : $Author$ - * @goal collect-i18n-artifacts + * par : * @goal collect-i18n-artifacts * @phase generate-resources * @requiresProject true * @requiresDependencyResolution runtime Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractI18nParserMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/KeysModifier.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/Parser.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/Parser.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/Parser.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserEvent.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserException.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserException.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserException.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserThread.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserThread.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserThread.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaActionConfigMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJavaTabConfigMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserValidationMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlMojo.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Maven Plugin * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/maven-i18n-plugin/src/site/apt/index.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/apt/index.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/site/apt/index.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,24 +1,23 @@ ~~~ ~~ #%L ~~ I18n :: Maven Plugin -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2007 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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/maven-i18n-plugin/src/site/apt/usages.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/apt/usages.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/site/apt/usages.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,24 +1,23 @@ ~~~ ~~ #%L ~~ I18n :: Maven Plugin -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2007 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% Added: trunk/maven-i18n-plugin/src/site/en/apt/index.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/en/apt/index.apt (rev 0) +++ trunk/maven-i18n-plugin/src/site/en/apt/index.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -0,0 +1,67 @@ +~~~ +~~ #%L +~~ I18n :: Maven Plugin +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2007 - 2010 CodeLutin +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU Lesser General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ + +---- +Introduction +---- +---- +2009-08-22 +---- + +Maven I18n Plugin + + The Maven I18n Plugin is used to compute i18n bundles for a given maven module. + +Goals Overview + + The I18n plugin has the following goals: + + * {{{./parserJava-mojo.html} i18n:parserJava}} parse Java sources. + + * {{{./parserValidation-mojo.html} i18n:parserValidation}} parse XWorks validation sources. + + * {{{./parserJavaActionConfig-mojo.html} i18n:parserJavaActionConfig}} parse actions jaxx. + + * {{{./parserJavaTabConfig-mojo.html} i18n:parserJavaTabConfig}} parse tabs jaxx. + + * {{{./get-mojo.html} i18n:get}} assembly getter computed by parser-like goals. + + * {{{./gen-mojo.html} i18n:gen}} generate i18n bundle from getters. + + * {{{./collect-i18n-artifacts-mojo.html} i18n:collect-i18n-artifacts}} collects all i18n resources throught project dependencies and store the location of resources in a file. + + * {{{./bundle-mojo.html} i18n:bundle}} generate unique i18n bundle for final application. + + * {{{./tapestry-bundle-mojo.html} i18n:tapestry-bundle}} generate unique i18n bundle for tapestry application. + + * {{{./help-mojo.html} i18n:help}} display help. + +Usage + + Instructions on how to use the Help Plugin can be found in {{{./usages.html} usages}} page. + +Examples + + <to be done.> Property changes on: trunk/maven-i18n-plugin/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/maven-i18n-plugin/src/site/en/apt/usages.apt =================================================================== --- trunk/maven-i18n-plugin/src/site/en/apt/usages.apt (rev 0) +++ trunk/maven-i18n-plugin/src/site/en/apt/usages.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -0,0 +1,240 @@ +~~~ +~~ #%L +~~ I18n :: Maven Plugin +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2007 - 2010 CodeLutin +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU Lesser General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ + +---- +Usages +---- +---- +2009-08-22 +---- + +How it works + + The i18n plugin works in at least two phases : + + * first, it parses some sources to build for each bundle a called <getter> file + which contains all keys found in sources. + + * in a second time, the <getter> files are merged with the existing translations + files. + + * at last, we can make a optimized bundle which merge the module i18n with all + his dependencies (this is good idea when the module is a final application... + see below section) + +* directory layout + + Here is the directory layout convention used by the plugin + +----------------------------------------------------------------------------- +mymodule/ +|-- src +| `-- main +| `-- resources +| `-- i18n +| |-- mymodule-en_GB.properties +| `-- mymodule-fr_FR.properties +`-- target + |-- classes + | `-- META-INF + | |-- mymodule-en_GB.properties + | |-- mymodule-fr_FR.properties + | `-- mymodule-i18n-definition.properties + `-- generated-sources + `-- i18n + |-- mymodule-en_GB.properties + `-- mymodule-fr_FR.properties + +----------------------------------------------------------------------------- + +* Parse files + + The plugin offers some build-in parsers, each parser has his goal prefix by <parser> : + + * parserJava : parse some java source files to detect <I18n._> and <I18n.n_> invocations in code + + * parserValidation : parse some xWorks validation files + + Each parser goal has some default values, if you respect the plugin conventions, + you should have nothing to configure. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + + will parse all java files in <src/main/java> and will generate the <getter> files + in <target/generated-sources/i18n>. + + Moreover, it is possible to defined more directories to be scanned, like in next + example, where we also scan the <src/main/java2> : + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <entries> + <entry> + <basedir>src/main/java2/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + + The entries can be more complex. + + For example, it is possible to filter via some includes/excludes, or + attach the entry only for a specific parser via the <specificGoal> property. + + When using an entry, the default entry for the parser is not used, but it can + be activated via the <treateDefaultEntry> property. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <configuration> + <treateDefaultEntry>true</treateDefaultEntry> + <entries> + <entry> + <basedir>src/main/java2/</basedir> + <includes> + <include>**/*.guix</include> + </includes> + <specificGoal>parserJaxx</specificGoal> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>parserJaxx</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + + + Consult the javadoc of the <org.nuiton.util.SourceEntry> class in + {{{http://maven-site.nuiton.org/maven-helper-plugin/apidocs/index.html}maven-helper-plugin}} + library. + +* Build bundles + + After the files were parsed, it is time to build the i18n bundles of the module. + + * The default location of those files are in <src/main/resources/i18n>. + + * The default file names of the bundles are <artifactId-bundle.properties> + +** The gen goal + + the <gen> goal rebuild those files, using the getter files previously builded. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>gen</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + +** The bundle goal + + The <bundle> goal build the bundles for a final application which aggregate + all i18n bundles of all dependencies of the module. + + This is a good idea to do it, since the loading of the runtime <i18n> system + is much more faster with only one file to deal with. + + The final bundles builded will be placed directly in <target/classes/META-INF> since + this is an only runtime bundle and it should never to add in module's sources. + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>bundle</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + +* All in one + + +----------------------------------------------------------------------------- +<plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> +</plugin> +----------------------------------------------------------------------------- + +And there is more for you! + + There is some other interesting properties in the plugin, for example it is + possible to translate the new i18n key detected while parsing via a swing ui. + + To see all the features of the plugin, consult the + {{{./plugin-info.html}goals details}} page. Property changes on: trunk/maven-i18n-plugin/src/site/en/apt/usages.apt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/maven-i18n-plugin/src/site/site_en.xml =================================================================== --- trunk/maven-i18n-plugin/src/site/site_en.xml (rev 0) +++ trunk/maven-i18n-plugin/src/site/site_en.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + I18n :: Maven Plugin + + $Id$ + $HeadURL$ + %% + Copyright (C) 2007 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <links> + <item name="[fr" href="../index.html"/> + <item name="en]" href="index.html"/> + </links> + + <menu name="Project Parent"> + <item name="I18n" href="../en/index.html"/> + </menu> + + <menu name="User"> + <item name="Introduction" href="index.html"/> + <item name="Usages" href="usages.html"/> + <item name="Parser Goals" href="plugin-info.html"> + <item name="parserJava" href="parserJava-mojo.html"/> + <item name="parserJaxx" href="parserJaxx-mojo.html"/> + <item name="parserSwixat" href="parserSwixat-mojo.html"/> + <item name="parserJavaActionConfig" + href="parserJavaActionConfig-mojo.html"/> + <item name="parserJavaTabConfig" href="parserJavaTabConfig-mojo.html"/> + <item name="parserValidation" href="parserValidation-mojo.html"/> + <item name="get" href="get-mojo.html"/> + <item name="gen" href="gen-mojo.html"/> + </item> + <item name="Bundle Goals" href="plugin-info.html"> + <item name="collect-i18n-artifacts" + href="collect-i18n-artifacts-mojo.html"/> + <item name="bundle" href="bundle-mojo.html"/> + <item name="tapestry-bundle" href="tapestry-bundle-mojo.html"/> + </item> + <item name="Other Goals" href="plugin-info.html"> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu name="Downloads"> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/maven-i18n-plugin/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/maven-i18n-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-i18n-plugin/src/site/site_fr.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/maven-i18n-plugin/src/site/site_fr.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -3,7 +3,6 @@ #%L I18n :: Maven Plugin - $Author$ $Id$ $HeadURL$ %% @@ -38,6 +37,11 @@ <item name="${project.name}" href="index.html"/> </breadcrumbs> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="en/index.html"/> + </links> + <menu ref="parent"/> <menu name="Utilisateur"> @@ -47,14 +51,16 @@ <item name="parserJava" href="parserJava-mojo.html"/> <item name="parserJaxx" href="parserJaxx-mojo.html"/> <item name="parserSwixat" href="parserSwixat-mojo.html"/> - <item name="parserJavaActionConfig" href="parserJavaActionConfig-mojo.html"/> + <item name="parserJavaActionConfig" + href="parserJavaActionConfig-mojo.html"/> <item name="parserJavaTabConfig" href="parserJavaTabConfig-mojo.html"/> <item name="parserValidation" href="parserValidation-mojo.html"/> <item name="get" href="get-mojo.html"/> <item name="gen" href="gen-mojo.html"/> </item> <item name="Bundle Goals" href="plugin-info.html"> - <item name="collect-i18n-artifacts" href="collect-i18n-artifacts-mojo.html"/> + <item name="collect-i18n-artifacts" + href="collect-i18n-artifacts-mojo.html"/> <item name="bundle" href="bundle-mojo.html"/> <item name="tapestry-bundle" href="tapestry-bundle-mojo.html"/> </item> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/pom.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,114 +1,140 @@ <?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"> +<!-- + #%L + I18n :: Api - <modelVersion>4.0.0</modelVersion> + $Id$ + $HeadURL$ + %% + Copyright (C) 2004 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> + 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. - <parent> - <groupId>org.nuiton</groupId> - <artifactId>i18n</artifactId> - <version>1.2.2-SNAPSHOT</version> - </parent> + 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% + --> +<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"> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n</artifactId> + <modelVersion>4.0.0</modelVersion> - <dependencies> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - </dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> + <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> - </dependencies> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> - <name>I18n :: Api</name> - <description>Api of i18n system</description> - <inceptionYear>2004</inceptionYear> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + </dependencies> - <packaging>jar</packaging> - <properties> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + <name>I18n :: Api</name> + <description>Api of i18n system</description> + <inceptionYear>2004</inceptionYear> - </properties> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + <packaging>jar</packaging> - <!-- launch in a release the assembly automaticly --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-assemblies</id> - <phase>verify</phase> - <goals> - <goal>single</goal> - </goals> - </execution> - </executions> - <configuration> - <attach>false</attach> - <descriptorRefs> - <descriptorRef>deps</descriptorRef> - <descriptorRef>full</descriptorRef> - </descriptorRefs> - </configuration> - </plugin> + <properties> - </plugins> + <!-- extra files to include in release --> + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - </build> - </profile> - </profiles> + </properties> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <!-- launch in a release the assembly automaticly --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>create-assemblies</id> + <phase>verify</phase> + <goals> + <goal>single</goal> + </goals> + </execution> + </executions> + <configuration> + <attach>false</attach> + <descriptorRefs> + <descriptorRef>deps</descriptorRef> + <descriptorRef>full</descriptorRef> + </descriptorRefs> + </configuration> + </plugin> + + </plugins> + + </build> + </profile> + </profiles> + </project> Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/CountryEnum.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nDefaultTooltipFilter.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% @@ -34,8 +33,7 @@ * @version $Revision$ * * Mise a jour: $Date$ - * par : $Author$ - */ + * par : */ package org.nuiton.i18n; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nFilter.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% @@ -34,8 +33,7 @@ * @version $Revision$ * * Mise a jour: $Date$ - * par : $Author$ - */ + * par : */ package org.nuiton.i18n; Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/LanguageEnum.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundle.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleEntry.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleScope.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/util/LocaleConverter.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/site/apt/index.apt =================================================================== (Binary files differ) Added: trunk/nuiton-i18n/src/site/en/apt/index.apt =================================================================== --- trunk/nuiton-i18n/src/site/en/apt/index.apt (rev 0) +++ trunk/nuiton-i18n/src/site/en/apt/index.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -0,0 +1,45 @@ +~~~ +~~ #%L +~~ I18n :: Api +~~ +~~ $Id$ +~~ $HeadURL$ +~~ %% +~~ Copyright (C) 2004 - 2010 CodeLutin +~~ %% +~~ This program is free software: you can redistribute it and/or modify +~~ it under the terms of the GNU Lesser General Public License as +~~ published by the Free Software Foundation, either version 3 of the +~~ License, or (at your option) any later version. +~~ +~~ This program is distributed in the hope that it will be useful, +~~ but WITHOUT ANY WARRANTY; without even the implied warranty of +~~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +~~ GNU General Lesser Public License for more details. +~~ +~~ You should have received a copy of the GNU General Lesser Public +~~ License along with this program. If not, see +~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. +~~ #L% +~~~ + +---- +Nuiton-i18n-api +---- +---- +2009-08-22 +---- + +Présentation + + Librairie permettant de rendre les programmes Java multilangue de façon + simple. Il utilise la même philosophie que gettext. C'est à dire que chaque + chaîne de caractères devant être traduite sont tagge avec I18n._("..."). + + Ensuite il suffit d'extraire ces chaînes pour les mettres dans un fichier de + propriété, et d'indiquer quel fichier de propriéttés charger au démarrage de + l'application selon la langue souhaitée. + + + <Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes + librairies.> Property changes on: trunk/nuiton-i18n/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/nuiton-i18n/src/site/site_en.xml =================================================================== --- trunk/nuiton-i18n/src/site/site_en.xml (rev 0) +++ trunk/nuiton-i18n/src/site/site_en.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + I18n :: Api + + $Id$ + $HeadURL$ + %% + Copyright (C) 2004 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> + + <links> + <item name="[fr" href="../index.html"/> + <item name="en]" href="index.html"/> + </links> + + <menu name="Project Parent"> + <item name="I18n" href="../en/index.html"/> + </menu> + + <menu name="User"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu name="Downloads"> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}.jar" + name="Librairie (jar)"/> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-javadoc.jar" + name="Javadoc (jar)"/> + <item + href="${repository.home.url}/org/nuiton/i18n/${project.artifactId}/${project.version}/${project.build.finalName}-sources.jar" + name="Sources (jar)"/> + </menu> + + <menu ref="reports"/> + + </body> +</project> Property changes on: trunk/nuiton-i18n/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Modified: trunk/nuiton-i18n/src/site/site_fr.xml =================================================================== --- trunk/nuiton-i18n/src/site/site_fr.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/site/site_fr.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -3,7 +3,6 @@ #%L I18n :: Api - $Author$ $Id$ $HeadURL$ %% @@ -38,6 +37,11 @@ <item name="${project.name}" href="index.html"/> </breadcrumbs> + <links> + <item name="[fr" href="index.html"/> + <item name="en]" href="en/index.html"/> + </links> + <menu ref="parent"/> <menu name="Utilisateur"> Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/bundle/I18nBundleScopeTest.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java =================================================================== --- trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n/src/test/java/org/nuiton/util/LocaleConverterTest.java 2010-04-15 15:37:16 UTC (rev 1748) @@ -2,7 +2,6 @@ * #%L * I18n :: Api * - * $Author$ * $Id$ * $HeadURL$ * %% Modified: trunk/nuiton-i18n-editor/pom.xml =================================================================== --- trunk/nuiton-i18n-editor/pom.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/nuiton-i18n-editor/pom.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -3,345 +3,348 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion> + <modelVersion>4.0.0</modelVersion> - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>i18n</artifactId> - <version>1.2-SNAPSHOT</version> - </parent> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>i18n</artifactId> + <version>1.2.2-SNAPSHOT</version> + </parent> - <groupId>org.nuiton.i18n</groupId> - <artifactId>nuiton-i18n-editor</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n-editor</artifactId> - <dependencies> + <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>nuiton-i18n</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - <version>${lutinutil.version}</version> - </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>nuiton-i18n</artifactId> + <version>${project.version}</version> + </dependency> - <!--Jaxx--> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${jaxx.version}</version> - </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + <version>${lutinutil.version}</version> + </dependency> - <dependency> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - <version>${jaxx.version}</version> - </dependency> + <!--Jaxx--> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${jaxx.version}</version> + </dependency> - </dependencies> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${jaxx.version}</version> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> + </dependencies> - <name>Nuiton I18n Editor</name> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> - <description>Editeur de fichier i18n</description> - <inceptionYear>2008</inceptionYear> + <name>Nuiton I18n Editor</name> - <licenses> - <license> - <name>GPL</name> - <url>${maven.license.file}</url> - <distribution>local</distribution> - </license> - </licenses> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - <packaging>jar</packaging> + <description>Editeur de fichier i18n</description> + <inceptionYear>2008</inceptionYear> - <properties> + <licenses> + <license> + <name>GPL</name> + <url>${maven.license.file}</url> + <distribution>local</distribution> + </license> + </licenses> - <!-- main class in jar --> - <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor</maven.jar.main.class> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + <packaging>jar</packaging> - <jaxx.version>2.0</jaxx.version> - <lutinutil.version>1.2</lutinutil.version> - - <!-- default license to use --> - <license.licenseName>gpl_v3</license.licenseName> - - <!-- jnlp --> - <!--keystorepath>${codelutin.keystorepath}</keystorepath> - <keystorealias>CodeLutin</keystorealias> - <keystorepass>codelutin</keystorepass> - <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> - <jnlpCodebase>${project.url}</jnlpCodebase--> - <!-- to test jnlp file locally --> - <!--jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase--> + <properties> - <!-- jaxx --> - <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> - <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> - <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> - </properties> + <!-- main class in jar --> + <maven.jar.main.class>org.nuiton.i18n.editor.I18nEditor + </maven.jar.main.class> - <build> + <jaxx.version>2.0</jaxx.version> + <lutinutil.version>1.2</lutinutil.version> - <resources> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> + <!-- default license to use --> + <license.licenseName>gpl_v3</license.licenseName> + + <!-- jnlp --> + <!--keystorepath>${codelutin.keystorepath}</keystorepath> + <keystorealias>CodeLutin</keystorealias> + <keystorepass>codelutin</keystorepass> + <jnlp.build.directory>${project.build.directory}/jnlp</jnlp.build.directory> + <jnlpCodebase>${project.url}</jnlpCodebase--> + <!-- to test jnlp file locally --> + <!--jnlpCodebase>file://${jnlp.build.directory}</jnlpCodebase--> + + <!-- jaxx --> + <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon> + <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> + <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> + </properties> + + <build> + + <resources> + <resource> + <directory>src/main/filters</directory> + <filtering>true</filtering> + <includes> + <include>nuiton-i18n-editor.properties</include> + </includes> + </resource> + <resource> + <directory>src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> + <!--resource> + <directory>${jaxx.helpTarget}</directory> + <includes> + <include>**/*</include> + </includes> + </resource--> + </resources> + + <plugins> + + <plugin> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <version>${jaxx.version}</version> + <executions> + <execution> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <executions> + <execution> + <id>attach-licenses</id> + <goals> + <goal>update-project-license</goal> + <goal>add-third-party</goal> + </goals> + </execution> + </executions> + </plugin> + + <!-- plugin i18n --> + <plugin> + <groupId>${project.groupId}</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <version>${project.version}</version> + <configuration> + <silent>true</silent> + <entries> + <entry> + <basedir>${maven.gen.dir}/java/</basedir> + </entry> + </entries> + </configuration> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + <goal>bundle</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy-deps</id> + <goals> + <goal>copy-dependencies</goal> + </goals> + <configuration> + <silent>true</silent> + <overWriteReleases>false</overWriteReleases> + <overWriteSnapshots>false</overWriteSnapshots> + <overWriteIfNewer>true</overWriteIfNewer> + <outputDirectory>${project.build.directory}/lib</outputDirectory> + </configuration> + </execution> + </executions> + + </plugin> + + </plugins> + + <pluginManagement> + <plugins> + + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <configuration> + <jnlpExtensions> + <jnlpExtension> + <name>sun</name> + <title>Sun MicroSystems</title> + <vendor>Sun MicroSystems, Inc.</vendor> <includes> - <include>nuiton-i18n-editor.properties</include> + <include>javax.help:javahelp</include> </includes> - </resource> - <resource> - <directory>src/main/resources</directory> + </jnlpExtension> + <jnlpExtension> + <name>jxlayer</name> + <title>Swing labs JXLayer</title> + <vendor>Swing Labs</vendor> <includes> - <include>**/*</include> + <include>org.swinglabs:jxlayer</include> </includes> - </resource> - <!--resource> - <directory>${jaxx.helpTarget}</directory> - <includes> - <include>**/*</include> - </includes> - </resource--> - </resources> + </jnlpExtension> + </jnlpExtensions> + </configuration> + </plugin> - <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> + <copyToMETA_INF>true</copyToMETA_INF> + <generateBundle>true</generateBundle> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - <version>${jaxx.version}</version> - <executions> - <execution> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <manifest> + <addClasspath>true</addClasspath> + <classpathPrefix>./lib/</classpathPrefix> + </manifest> + </archive> + </configuration> + </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <executions> - <execution> - <id>attach-licenses</id> - <goals> - <goal>add-license</goal> - <goal>add-third-party</goal> - </goals> - </execution> - </executions> - </plugin> + <!-- plugin site --> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>2.0.1</version> + <dependencies> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>doxia-module-jrst</artifactId> + <version>${jrst.version}</version> + </dependency> + </dependencies> + </plugin> - <!-- plugin i18n --> - <plugin> - <groupId>${project.groupId}</groupId> - <artifactId>maven-i18n-plugin</artifactId> - <version>${project.version}</version> - <configuration> - <silent>true</silent> - <entries> - <entry> - <basedir>${maven.gen.dir}/java/</basedir> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>bundle</goal> - </goals> - </execution> - </executions> - </plugin> + </plugins> + </pluginManagement> + </build> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-deps</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <configuration> - <silent>true</silent> - <overWriteReleases>false</overWriteReleases> - <overWriteSnapshots>false</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - </configuration> - </execution> - </executions> - - </plugin> - - </plugins> + <reporting> + <plugins> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <version>1.0-alpha-2-cl_20091001</version> + </plugin> + </plugins> + </reporting> - <pluginManagement> - <plugins> + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <configuration> - <jnlpExtensions> - <jnlpExtension> - <name>sun</name> - <title>Sun MicroSystems</title> - <vendor>Sun MicroSystems, Inc.</vendor> - <includes> - <include>javax.help:javahelp</include> - </includes> - </jnlpExtension> - <jnlpExtension> - <name>jxlayer</name> - <title>Swing labs JXLayer </title> - <vendor>Swing Labs</vendor> - <includes> - <include>org.swinglabs:jxlayer</include> - </includes> - </jnlpExtension> - </jnlpExtensions> - </configuration> - </plugin> + <profiles> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> - <configuration> - <copyToMETA_INF>true</copyToMETA_INF> - </configuration> - </plugin> + <!-- key store secrets availables --> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifest> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - </manifest> - </archive> - </configuration> - </plugin> + <!-- make webstart --> + <plugin> + <groupId>org.nuiton.thirdparty</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-inline</goal> + </goals> + </execution> + </executions> + </plugin> - <!-- plugin site --> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <version>2.0.1</version> - <dependencies> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>doxia-module-jrst</artifactId> - <version>${jrst.version}</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - </pluginManagement> - </build> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptors> + <descriptor>src/main/assembly/bin.xml</descriptor> + </descriptors> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>attached</goal> + </goals> + </execution> + </executions> + </plugin> - <reporting> - <plugins> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <version>1.0-alpha-2-cl_20091001</version> - </plugin> </plugins> - </reporting> - - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> - - <profiles> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> + </build> + </profile> + </profiles> - <!-- key store secrets availables --> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <executions> - <execution> - <id>get-keystore</id> - <goals> - <goal>share-server-secret</goal> - </goals> - <phase>package</phase> - <configuration> - <serverId>codelutin-keystore</serverId> - <privateKeyOut>keystorepath</privateKeyOut> - <passwordOut>keystorepass</passwordOut> - <usernameOut>keyalias</usernameOut> - <passphraseOut>keypass</passphraseOut> - </configuration> - </execution> - </executions> - </plugin> - - <!-- make webstart --> - <plugin> - <groupId>org.nuiton.thirdparty</groupId> - <artifactId>webstart-maven-plugin</artifactId> - <executions> - <execution> - <id>generate-jnlp</id> - <phase>package</phase> - <goals> - <goal>jnlp-inline</goal> - </goals> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>attached</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - </profiles> - </project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/pom.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,246 +1,273 @@ <?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"> +<!-- + #%L + I18n - <modelVersion>4.0.0</modelVersion> + $Id$ + $HeadURL$ + %% + Copyright (C) 2008 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - <parent> - <groupId>org.nuiton</groupId> - <artifactId>mavenpom4redmine</artifactId> - <version>2.1.1-SNAPSHOT</version> - </parent> + 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. - <artifactId>i18n</artifactId> - <version>1.2.2-SNAPSHOT</version> + 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% + --> +<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"> - <modules> - <module>nuiton-i18n</module> - <module>maven-i18n-plugin</module> - <module>ant-i18n-task</module> - <!--module>nuiton-i18n-editor</module--> - </modules> + <modelVersion>4.0.0</modelVersion> - <dependencyManagement> - <dependencies> + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + <parent> + <groupId>org.nuiton</groupId> + <artifactId>mavenpom4redmine</artifactId> + <version>2.1.1-SNAPSHOT</version> + </parent> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1.1</version> - </dependency> + <artifactId>i18n</artifactId> + <version>1.2.2-SNAPSHOT</version> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.8.0</version> - </dependency> + <modules> + <module>nuiton-i18n</module> + <module>maven-i18n-plugin</module> + <module>ant-i18n-task</module> + <!--module>nuiton-i18n-editor</module--> + </modules> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - <scope>compile</scope> - </dependency> + <dependencyManagement> + <dependencies> - <dependency> - <groupId>org.nuiton.processor</groupId> - <artifactId>nuiton-processor</artifactId> - <version>${processor.version}</version> - </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + </dependency> - <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> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.8.0</version> + </dependency> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact-manager</artifactId> - </exclusion> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + <scope>compile</scope> + </dependency> - <exclusion> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - </exclusion> + <dependency> + <groupId>org.nuiton.processor</groupId> + <artifactId>nuiton-processor</artifactId> + <version>${processor.version}</version> + </dependency> - <exclusion> - <groupId>org.apache.maven</groupId> - <artifactId>maven-model</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>org.apache.maven</groupId> - <artifactId>maven-profile</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact-manager</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.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-simple</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-model</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-api</artifactId> - </exclusion> + <exclusion> + <groupId>org.apache.maven</groupId> + <artifactId>maven-profile</artifactId> + </exclusion> - <exclusion> - <groupId>plexus</groupId> - <artifactId>plexus-mail-sender-javamail</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>javax.mail</groupId> - <artifactId>mail</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-simple</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-cipher</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-api</artifactId> + </exclusion> - <exclusion> - <groupId>org.sonatype.plexus</groupId> - <artifactId>plexus-sec-dispatcher</artifactId> - </exclusion> + <exclusion> + <groupId>plexus</groupId> + <artifactId>plexus-mail-sender-javamail</artifactId> + </exclusion> - <exclusion> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-container-default</artifactId> - </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> - <exclusion> - <groupId>org.apache.velocity</groupId> - <artifactId>velocity</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>org.apache.maven.shared</groupId> - <artifactId>maven-dependency-tree</artifactId> - <version>1.2</version> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - </dependency> + <exclusion> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-container-default</artifactId> + </exclusion> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.1</version> - </dependency> + <exclusion> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + </exclusion> - <!-- tests dependencies --> + </exclusions> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.7</version> - <scope>test</scope> - </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-dependency-tree</artifactId> + <version>1.2</version> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + </dependency> - <!--dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <version>${helper.version}</version> - <scope>test</scope> - <classifier>tests</classifier> - </dependency--> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.1</version> + </dependency> - <!-- provided dependencies --> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>${maven.version}</version> - <scope>provided</scope> - </dependency> + <!-- tests dependencies --> - <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> - <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <version>1.5.15</version> - <scope>compile</scope> - </dependency> + <!--dependency> + <groupId>org.nuiton</groupId> + <artifactId>maven-helper-plugin</artifactId> + <version>${helper.version}</version> + <scope>test</scope> + <classifier>tests</classifier> + </dependency--> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> + <!-- provided dependencies --> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> - <dependency> - <groupId>org.apache.ant</groupId> - <artifactId>ant</artifactId> - <version>1.7.1</version> - <scope>compile</scope> - </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>${maven.version}</version> + <scope>provided</scope> + </dependency> - </dependencies> - </dependencyManagement> + <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.5.15</version> + <scope>compile</scope> + </dependency> - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - <name>I18n</name> - <description>Nuiton i18n tools</description> - <inceptionYear>2008</inceptionYear> - <url>http://maven-site.nuiton.org/i18n</url> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + </dependency> - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> + <dependency> + <groupId>org.apache.ant</groupId> + <artifactId>ant</artifactId> + <version>1.7.1</version> + <scope>compile</scope> + </dependency> - <packaging>pom</packaging> + </dependencies> + </dependencyManagement> - <properties> - - <!-- pour un muli module on doit fixer le projectId --> - <projectId>i18n</projectId> + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + <name>I18n</name> + <description>Nuiton i18n tools</description> + <inceptionYear>2008</inceptionYear> + <url>http://maven-site.nuiton.org/i18n</url> - <processor.version>1.0.3</processor.version> - <helper.version>1.2.3</helper.version> + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> - <!--Multilanguage maven-site --> - <siteLocales>fr,en</siteLocales> - - </properties> + <packaging>pom</packaging> - <!-- ************************************************************* --> - <!-- *** Build Environment ************************************** --> - <!-- ************************************************************* --> + <properties> - <!-- Source control management. --> - <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> - </scm> + <!-- pour un muli module on doit fixer le projectId --> + <projectId>i18n</projectId> + <processor.version>1.0.3</processor.version> + <helper.version>1.2.3</helper.version> + + <!--Multilanguage maven-site --> + <siteLocales>fr,en</siteLocales> + + </properties> + + <!-- ************************************************************* --> + <!-- *** Build Environment ************************************** --> + <!-- ************************************************************* --> + + <!-- Source control management. --> + <scm> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk + </developerConnection> + <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> + </scm> + </project> Modified: trunk/src/license/project.xml =================================================================== --- trunk/src/license/project.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/license/project.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -3,7 +3,6 @@ #%L I18n - $Author$ $Id$ $HeadURL$ %% Modified: trunk/src/site/apt/application.apt =================================================================== --- trunk/src/site/apt/application.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/apt/application.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Tutoriel d'application utilisant Nuiton I18n et une librairie utilisant Nuiton I18n (utilisation de Maven) Modified: trunk/src/site/apt/bestPractices.apt =================================================================== --- trunk/src/site/apt/bestPractices.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/apt/bestPractices.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Bonnes pratiques Nuiton I18n * Choisissez un pattern et suivez le. Modified: trunk/src/site/apt/extendInitializer.apt =================================================================== --- trunk/src/site/apt/extendInitializer.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/apt/extendInitializer.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Etendre Initializer pour répondre exactement à votre besoin TODO Modified: trunk/src/site/apt/helloWorld.apt =================================================================== --- trunk/src/site/apt/helloWorld.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/apt/helloWorld.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,8 +1,7 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% @@ -23,7 +22,6 @@ ~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. ~~ #L% ~~~ - Nuiton I18n Hello World Ce premier tutorial a pour objectif de vous montrer comment se servir de la Modified: trunk/src/site/apt/index.apt =================================================================== --- trunk/src/site/apt/index.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/apt/index.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,8 +1,7 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% @@ -23,7 +22,6 @@ ~~ <http://www.gnu.org/licenses/lgpl-3.0.html>. ~~ #L% ~~~ - Nuiton I18n Le projet Nuiton I18n fournit des classes Java pour l'internationalisation Modified: trunk/src/site/apt/library.apt =================================================================== --- trunk/src/site/apt/library.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/apt/library.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Tutoriel de librairie utilisant Nuiton I18n (utilisation de Maven) * Pourquoi un tutoriel différent pour une librairie et pour une application Modified: trunk/src/site/apt/presentation.apt =================================================================== --- trunk/src/site/apt/presentation.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/apt/presentation.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Présentation La librairie Nuiton I18n a un fonctionnement relativement simple. Les chaînes Modified: trunk/src/site/en/apt/application.apt =================================================================== --- trunk/src/site/en/apt/application.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/en/apt/application.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Tutorial of an application using Nuiton I18n and a library using Nuiton I18n itself (use Maven) Modified: trunk/src/site/en/apt/bestPractices.apt =================================================================== --- trunk/src/site/en/apt/bestPractices.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/en/apt/bestPractices.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Nuiton I18n Best Practices * Choose a pattern and follow it Modified: trunk/src/site/en/apt/extendInitializer.apt =================================================================== --- trunk/src/site/en/apt/extendInitializer.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/en/apt/extendInitializer.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Extend Initializer to suit exactly your needs TODO Modified: trunk/src/site/en/apt/helloWorld.apt =================================================================== --- trunk/src/site/en/apt/helloWorld.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/en/apt/helloWorld.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Nuiton I18n Hello World This first tutorial is aimed to show you how to use Nuiton I18n library the Modified: trunk/src/site/en/apt/index.apt =================================================================== --- trunk/src/site/en/apt/index.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/en/apt/index.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,30 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - - Nuiton I18n Nuiton I18n project features Java classes for applications Modified: trunk/src/site/en/apt/library.apt =================================================================== --- trunk/src/site/en/apt/library.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/en/apt/library.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Library using Nuiton I18n tutorial (using Maven) * Why a different tutorial for a library and a final application ? Modified: trunk/src/site/en/apt/presentation.apt =================================================================== --- trunk/src/site/en/apt/presentation.apt 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/en/apt/presentation.apt 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,29 +1,27 @@ ~~~ ~~ #%L ~~ I18n -~~ ~~ -~~ $Author$ +~~ ~~ $Id$ ~~ $HeadURL$ ~~ %% ~~ Copyright (C) 2008 - 2010 CodeLutin ~~ %% ~~ This program is free software: you can redistribute it and/or modify -~~ it under the terms of the GNU Lesser General Public License as -~~ published by the Free Software Foundation, either version 3 of the +~~ 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% ~~~ - Presentation The Nuiton I18n library works quite simply. The string to translate are only Modified: trunk/src/site/site_en.xml =================================================================== --- trunk/src/site/site_en.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/site_en.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,45 +1,81 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + I18n + + $Id$ + $HeadURL$ + %% + Copyright (C) 2008 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + </poweredBy> - <body> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - <item name="[fr" href="../index.html" /> - <item name="en]" href="index.html" /> - </links> + <menu name="Language"> + <item name="French" href="../index.html"/> + <item name="English" href="index.html"/> + </menu> - <menu name="User"> - <item name="Home" href="index.html"/> - <item name="Presentation" href="presentation.html"/> - <item name="Best Practices" href="bestPractices.html"/> - </menu> + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + <!--item name="[fr" href="../index.html" /> + <item name="en]" href="index.html" /--> + </links> - <menu name="Tutorials"> - <item name="Hello World" href="helloWorld.html"/> - <item name="Library" href="library.html"/> - <item name="Final application" href="application.html"/> - </menu> + <menu name="User"> + <item name="Home" href="index.html"/> + <item name="Presentation" href="presentation.html"/> + <item name="Best Practices" href="bestPractices.html"/> + </menu> - <menu name="Developer"> - <item name="Extend Initializer" href="extendInitializer.html"/> - </menu> + <menu name="Tutorials"> + <item name="Hello World" href="helloWorld.html"/> + <item name="Library" href="library.html"/> + <item name="Final application" href="application.html"/> + </menu> - <menu ref="modules"/> + <menu name="Developer"> + <item name="Extend Initializer" href="extendInitializer.html"/> + </menu> - <menu ref="reports"/> - </body> + <menu name="Modules"> + <item name="I18n :: Api" href="../nuiton-i18n/en/index.html"/> + <item name="I18n :: Maven Plugin" + href="../maven-i18n-plugin/en/index.html"/> + <item name="I18n :: Ant task" href="../ant-i18n-task/en/index.html"/> + </menu> + + <menu ref="reports"/> + </body> </project> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2010-04-15 12:03:40 UTC (rev 1747) +++ trunk/src/site/site_fr.xml 2010-04-15 15:37:16 UTC (rev 1748) @@ -1,45 +1,76 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + I18n + + $Id$ + $HeadURL$ + %% + Copyright (C) 2008 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + <project name="${project.name}"> - <bannerLeft> - <name>${project.name}</name> - <href>index.html</href> - </bannerLeft> + <bannerLeft> + <name>${project.name}</name> + <href>index.html</href> + </bannerLeft> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - </poweredBy> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" + img="${project.url}/images/logos/maven-feather.png"/> + </poweredBy> - <body> + <body> - <breadcrumbs> - <item name="${project.name}" href="index.html"/> - </breadcrumbs> + <breadcrumbs> + <item name="${project.name}" href="index.html"/> + </breadcrumbs> - <links> - <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/" /> - <item name="[fr" href="index.html" /> - <item name="en]" href="en/index.html" /> - </links> + <links> + <item name="Libre-Entreprise" href="http://www.libre-entreprise.org/"/> + <!--item name="[fr" href="index.html" /> + <item name="en]" href="en/index.html" /--> + </links> - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="Présentation" href="presentation.html"/> - <item name="Best Practices" href="bestPractices.html"/> - </menu> + <menu name="Langue"> + <item name="French" href="index.html"/> + <item name="English" href="./en/index.html"/> + </menu> - <menu name="Tutoriaux"> - <item name="Hello World" href="helloWorld.html"/> - <item name="Librairie" href="library.html"/> - <item name="Application finale" href="application.html"/> - </menu> + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Présentation" href="presentation.html"/> + <item name="Best Practices" href="bestPractices.html"/> + </menu> - <menu name="Développeur"> - <item name="Etendre Initializer" href="extendInitializer.html"/> - </menu> + <menu name="Tutoriaux"> + <item name="Hello World" href="helloWorld.html"/> + <item name="Librairie" href="library.html"/> + <item name="Application finale" href="application.html"/> + </menu> - <menu ref="modules"/> + <menu name="Développeur"> + <item name="Etendre Initializer" href="extendInitializer.html"/> + </menu> - <menu ref="reports"/> - </body> + <menu ref="modules"/> + + <menu ref="reports"/> + </body> </project>