- I18n-commits - mailman.cloud.codelutin.com

r1887 - trunk/nuiton-i18n/src/main/java/org/nuiton/i18n
by echatellier＠users.nuiton.org 24 Feb '11

24 Feb '11

Author: echatellier Date: 2011-02-24 15:53:25 +0100 (Thu, 24 Feb 2011) New Revision: 1887 Url: http://nuiton.org/repositories/revision/i18n/1887 Log: Fix message Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java Modified: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java =================================================================== --- trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-02-16 21:11:03 UTC (rev 1886) +++ trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java 2011-02-24 14:53:25 UTC (rev 1887) @@ -419,7 +419,7 @@ if (log.isWarnEnabled()) { log.warn("\n\nI18n was not initialized! will init it with " + "default initializer and default locale, it might " + - "not translate anything fro you...\nPlease use the " + + "not translate anything for you...\nPlease use the " + "method I18n.init(I18nInitializer, Locale) before " + "any calling to a translation...\n\n"); }

1 0

r1886 - trunk
by tchemit＠users.nuiton.org 16 Feb '11

16 Feb '11

Author: tchemit Date: 2011-02-16 22:11:03 +0100 (Wed, 16 Feb 2011) New Revision: 1886 Url: http://nuiton.org/repositories/revision/i18n/1886 Log: Update mavenpom4redmineAndCentral to 2.5.1. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-14 15:58:13 UTC (rev 1885) +++ trunk/pom.xml 2011-02-16 21:11:03 UTC (rev 1886) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5</version> + <version>2.5.1</version> </parent> <artifactId>i18n</artifactId>

1 0

r1885 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by hudson＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: hudson Date: 2011-02-14 16:58:13 +0100 (Mon, 14 Feb 2011) New Revision: 1885 Url: http://nuiton.org/repositories/revision/i18n/1885 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2011-02-14 15:58:11 UTC (rev 1884) +++ trunk/ant-i18n-task/pom.xml 2011-02-14 15:58:13 UTC (rev 1885) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-02-14 15:58:11 UTC (rev 1884) +++ trunk/maven-i18n-plugin/pom.xml 2011-02-14 15:58:13 UTC (rev 1885) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2011-02-14 15:58:11 UTC (rev 1884) +++ trunk/nuiton-i18n/pom.xml 2011-02-14 15:58:13 UTC (rev 1885) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-14 15:58:11 UTC (rev 1884) +++ trunk/pom.xml 2011-02-14 15:58:13 UTC (rev 1885) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.3.1</version> + <version>2.3.2-SNAPSHOT</version> <modules> <module>nuiton-i18n</module> @@ -200,11 +200,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.3.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.3.1 + scm:svn:http://svn.nuiton.org/svn/i18n/trunk </developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-2.3.1</url> + <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> </scm> <profiles>

1 0

r1884 - tags
by hudson＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: hudson Date: 2011-02-14 16:58:11 +0100 (Mon, 14 Feb 2011) New Revision: 1884 Url: http://nuiton.org/repositories/revision/i18n/1884 Log: [maven-release-plugin] copy for tag i18n-2.3.1 Added: tags/i18n-2.3.1/

1 0

r1883 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by hudson＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: hudson Date: 2011-02-14 16:58:10 +0100 (Mon, 14 Feb 2011) New Revision: 1883 Url: http://nuiton.org/repositories/revision/i18n/1883 Log: [maven-release-plugin] prepare release i18n-2.3.1 Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2011-02-14 15:54:14 UTC (rev 1882) +++ trunk/ant-i18n-task/pom.xml 2011-02-14 15:58:10 UTC (rev 1883) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-02-14 15:54:14 UTC (rev 1882) +++ trunk/maven-i18n-plugin/pom.xml 2011-02-14 15:58:10 UTC (rev 1883) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2011-02-14 15:54:14 UTC (rev 1882) +++ trunk/nuiton-i18n/pom.xml 2011-02-14 15:58:10 UTC (rev 1883) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-14 15:54:14 UTC (rev 1882) +++ trunk/pom.xml 2011-02-14 15:58:10 UTC (rev 1883) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>2.3.1-SNAPSHOT</version> + <version>2.3.1</version> <modules> <module>nuiton-i18n</module> @@ -200,11 +200,11 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/i18n/trunk</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.3.1</connection> <developerConnection> - scm:svn:http://svn.nuiton.org/svn/i18n/trunk + scm:svn:http://svn.nuiton.org/svn/i18n/tags/i18n-2.3.1 </developerConnection> - <url>http://www.nuiton.org/repositories/browse/i18n/trunk</url> + <url>http://www.nuiton.org/repositories/browse/i18n/tags/i18n-2.3.1</url> </scm> <profiles>

1 0

r1882 - in trunk: . ant-i18n-task ant-i18n-task/src/license 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/apt maven-i18n-plugin maven-i18n-plugin/src/it maven-i18n-plugin/src/it/ano-672 maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n maven-i18n-plugin/src/it/ano-672/src/test/resources maven-i18n-plugin/src/it/parsers/newProject maven-i18n-plugin
by tchemit＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: tchemit Date: 2011-02-14 16:54:14 +0100 (Mon, 14 Feb 2011) New Revision: 1882 Url: http://nuiton.org/repositories/revision/i18n/1882 Log: add svn key words make ant-i18n-task module compilable again (processor does not contains any of i18n classes previously used...) Added: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractor.java trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nFilter.java Modified: trunk/LICENSE.txt trunk/README.txt trunk/ant-i18n-task/LICENSE.txt trunk/ant-i18n-task/README.txt trunk/ant-i18n-task/changelog.txt trunk/ant-i18n-task/pom.xml trunk/ant-i18n-task/src/license/THIRD-PARTY.properties 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/en/apt/index.apt trunk/ant-i18n-task/src/site/site_en.xml trunk/ant-i18n-task/src/site/site_fr.xml trunk/changelog.txt trunk/maven-i18n-plugin/LICENSE.txt trunk/maven-i18n-plugin/README.txt trunk/maven-i18n-plugin/changelog.txt trunk/maven-i18n-plugin/src/it/ano-672/LICENSE.txt trunk/maven-i18n-plugin/src/it/ano-672/README.txt trunk/maven-i18n-plugin/src/it/ano-672/changelog.txt trunk/maven-i18n-plugin/src/it/ano-672/invoker.properties trunk/maven-i18n-plugin/src/it/ano-672/pom.xml trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java trunk/maven-i18n-plugin/src/it/ano-672/src/test/resources/log4j.properties trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy trunk/maven-i18n-plugin/src/it/parsers/newProject/LICENSE.txt trunk/maven-i18n-plugin/src/it/parsers/newProject/README.txt trunk/maven-i18n-plugin/src/it/parsers/newProject/changelog.txt trunk/maven-i18n-plugin/src/it/parsers/newProject/invoker.properties trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyGWTBean.java trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/MyTml.tml trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/LICENSE.txt trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/README.txt trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/changelog.txt trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/invoker.properties trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/MyTml.tml trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy trunk/maven-i18n-plugin/src/it/settings.xml trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties 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/AbstractMakeI18nBundleMojo.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/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/ParserExecutor.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/ParserJspMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java trunk/maven-i18n-plugin/src/main/resources/log4j.properties trunk/maven-i18n-plugin/src/main/resources/xwork-validator-1.0.2.dtd trunk/maven-i18n-plugin/src/site/apt/index.apt trunk/maven-i18n-plugin/src/site/apt/usages.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/maven-i18n-plugin/src/site/site_fr.xml trunk/nuiton-i18n-editor/LICENSE.txt trunk/nuiton-i18n-editor/README.txt trunk/nuiton-i18n-editor/changelog.txt trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties trunk/nuiton-i18n-editor/src/main/assembly/bin.xml trunk/nuiton-i18n-editor/src/main/assembly/go.bat trunk/nuiton-i18n-editor/src/main/assembly/go.sh trunk/nuiton-i18n-editor/src/main/filters/nuiton-i18n-editor.properties trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProject.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectConfigurePanelUI.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.css trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.css trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.css trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.css trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/TreeModelMode.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectStep.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.css trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.css trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx trunk/nuiton-i18n-editor/src/main/jnlp/jxlayer.jnlp trunk/nuiton-i18n-editor/src/main/jnlp/sun.jnlp trunk/nuiton-i18n-editor/src/main/resources/META-INF/services/org.nuiton.i18n.editor.project.I18nProjectProvider trunk/nuiton-i18n-editor/src/site/apt/index.apt trunk/nuiton-i18n-editor/src/site/site_fr.xml trunk/nuiton-i18n/README.txt trunk/nuiton-i18n/changelog.txt 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/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/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/i18n/package.html trunk/nuiton-i18n/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter trunk/nuiton-i18n/src/site/en/apt/index.apt trunk/nuiton-i18n/src/site/site_en.xml trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties 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 Property changes on: trunk/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2011-02-14 15:48:22 UTC (rev 1881) +++ trunk/ant-i18n-task/pom.xml 2011-02-14 15:54:14 UTC (rev 1882) @@ -42,13 +42,6 @@ <dependencies> -  - <dependency> <groupId>org.nuiton.processor</groupId> <artifactId>nuiton-processor</artifactId> Property changes on: trunk/ant-i18n-task/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractor.java =================================================================== --- trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractor.java (rev 0) +++ trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractor.java 2011-02-14 15:54:14 UTC (rev 1882) @@ -0,0 +1,172 @@ +/* + * #%L + * I18n :: Ant task + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.i18n.ant; + +import org.nuiton.processor.ProcessorUtil; + +import java.io.BufferedWriter; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.LineNumberReader; +import java.io.OutputStreamWriter; +import java.io.PrintWriter; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; + +public class I18nExtractor { + + protected I18nFilter filter = new I18nFilter(); + + protected Map<String, List<String>> store = + new HashMap<String, List<String>>(); + + /** + * Process input file to target. + * + * @param srcFiles source files + * @param outputFile target file + * @param encoding encoding used to read and write files + * @throws IOException if any io problems + * @since 1.0.4 + */ + public void extract(File[] srcFiles, File outputFile, String encoding) throws IOException { + PrintWriter writer = new PrintWriter( + new BufferedWriter( + new OutputStreamWriter( + new FileOutputStream(outputFile), encoding))); + try { + for (File srcFile : srcFiles) { + processFile(srcFile, encoding); + } + + for (Object o : store.keySet()) { + String i18nString = (String) o; + List<?> locations = store.get(i18nString); + for (Object location1 : locations) { + String location = (String) location1; + writer.println("# " + location); + } + writer.println(i18nString + "="); + } + } finally { + writer.close(); + } + } + + /** + * @param srcFiles source files + * @param outputFile target file + * @throws IOException if any io problems + * @deprecated since 1.0.4, prefer use the {@link #extract(File[], File, String)} + */ + @Deprecated + public void extract(File[] srcFiles, File outputFile) throws IOException { + extract(srcFiles, outputFile, "UTF-8"); +// PrintWriter writer = new PrintWriter( +// new BufferedWriter( +// new OutputStreamWriter( +// new FileOutputStream(outputFile), "UTF-8"))); +// try { +// for (File srcFile : srcFiles) { +// processFile(srcFile); +// } +// +// for (Object o : store.keySet()) { +// String i18nString = (String) o; +// List<?> locations = store.get(i18nString); +// for (Object location1 : locations) { +// String location = (String) location1; +// writer.println("# " + location); +// } +// writer.println(i18nString + "="); +// } +// } finally { +// writer.close(); +// } + } + + protected void processFile(File srcFile, String encoding) throws IOException { + LineNumberReader lnr = new LineNumberReader( + new InputStreamReader(new FileInputStream(srcFile), encoding)); + try { + while (lnr.ready()) { + String line = lnr.readLine(); + int lineNumber = lnr.getLineNumber(); + processLine(line, srcFile, lineNumber); + } + } finally { + lnr.close(); + } + } + + protected void processLine(String line, File srcFile, int lineNumber) { + String i18nStringsSet = filter.parse(line); + if (I18nFilter.EMPTY_STRING.equals(i18nStringsSet)) { + // Found a set of i18n Strings, split it. + String[] i18nStrings = i18nStringsSet.split("="); + for (String i18nString : i18nStrings) { + List<String> locations = store.get(i18nString); + if (locations == null) { + locations = new ArrayList<String>(); + store.put(i18nString, locations); + } + locations.add(srcFile.getPath() + "(" + lineNumber + ")"); + } + } + } + + public static void main(String[] args) { + Logger logger = Logger.getLogger("org.nuiton.processor.I18nExtractor."); + + if (args.length < 2) { + logger.log(Level.SEVERE, + "Please give at least sources and destination file"); + System.exit(0); + } else if (args.length > 2) { + File[] sources = new File[args.length - 1]; + for (int i = 0; i < args.length - 1; i++) { + sources[i] = new File(args[i]); + } + File destination = new File(args[args.length - 1]); + try { + String encoding = ProcessorUtil.DEFAULT_ENCODING; + logger.log(Level.INFO, "Will use system encoding " + encoding); + new I18nExtractor().extract(sources, destination, encoding); + } catch (IOException eee) { + + logger.log(Level.SEVERE, + "Error during i18n extraction : " + eee, eee); + } + } + + } +} \ No newline at end of file Property changes on: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractor.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native 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 2011-02-14 15:48:22 UTC (rev 1881) +++ trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java 2011-02-14 15:54:14 UTC (rev 1882) @@ -29,7 +29,6 @@ import org.apache.tools.ant.DirectoryScanner; import org.apache.tools.ant.Project; import org.apache.tools.ant.taskdefs.MatchingTask; -import org.nuiton.processor.I18nExtractor; import org.nuiton.processor.ProcessorUtil; import java.io.File; Property changes on: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nExtractorTask.java ___________________________________________________________________ Added: svn:eol-style + native Added: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nFilter.java =================================================================== --- trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nFilter.java (rev 0) +++ trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nFilter.java 2011-02-14 15:54:14 UTC (rev 1882) @@ -0,0 +1,143 @@ +/* + * #%L + * I18n :: Ant task + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.i18n.ant; + +import org.nuiton.processor.filters.DefaultFilter; + +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class I18nFilter extends DefaultFilter { // I18nFilter + + private String header = "_\$\\s*\""; + + private String footer = "\"\\s*(\$|,|\\+|$)"; + + private Pattern headerPattern = Pattern.compile(getHeader()); + + private Pattern footerPattern = Pattern.compile(getFooter()); + + private Matcher matcher; + + protected void setFooter(String footer) { + this.footer = footer; + } + + protected void setHeader(String header) { + this.header = header; + } + + @Override + protected String getHeader() { + return header; + } + + @Override + protected String getFooter() { + return footer; + } + + @Override + public int getMatchIndexFor(String input, String sequence) { + int index = NOT_FOUND; + + setMatcher(null); + if (sequence.equals(getHeader())) { + setMatcher(getHeaderPattern().matcher(input)); + } else if (sequence.equals(getFooter())) { + setMatcher(getFooterPattern().matcher(input)); + } + if (getMatcher() != null) { + try { + getMatcher().find(); + index = getMatcher().start(); + } catch (RuntimeException e) { + } + } + + return index; + } + + @Override + public int getMatchLengthFor(String sequence) { + int length = NOT_FOUND; + + try { + length = getMatcher().end() - getMatcher().start(); + } catch (RuntimeException e) { + } + + return length; + } + + /** + * methode appele lorsqu'on a la chaine entiere entre le header et le + * footer. + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + @Override + protected String performInFilter(String ch) { + return ch.replaceAll("\"\\s*\\+\\s*\"", "") + "="; + } + + @Override + public String performHeaderFooterFilter(String ch) { + return ch.substring(ch.indexOf('"') + 1, ch.lastIndexOf('"')); + } + + /** + * methode appele lorsqu'on a la chaine entiere a l'exterieur du + * header/footer + * + * @param ch la chaine trouve + * @return ce qu'il faut ecrire dans le fichier de sortie + */ + @Override + protected String performOutFilter(String ch) { + return EMPTY_STRING; + } + + /** @return Returns the footerPattern. */ + protected Pattern getFooterPattern() { + return footerPattern; + } + + /** @return Returns the headerPattern. */ + protected Pattern getHeaderPattern() { + return headerPattern; + } + + /** @return Returns the matcher. */ + protected Matcher getMatcher() { + return matcher; + } + + /** @param matcher The matcher to set. */ + protected void setMatcher(Matcher matcher) { + this.matcher = matcher; + } +} // I18nFilter Property changes on: trunk/ant-i18n-task/src/main/java/org/nuiton/i18n/ant/I18nFilter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/src/site/site_en.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/ant-i18n-task/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/invoker.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_en_GB.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/main/resources/i18n/ano-672_fr_FR.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/test/java/org/nuiton/i18n/I18nTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/ano-672/verify.groovy ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/invoker.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/i18n/jsp.rules ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyBean.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/java/org/nuiton/i18n/test/MyGWTBean.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/jsp/MyJsp.jsp ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/src/main/webapp/tapestry/MyTml.tml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/newProject/verify.groovy ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/invoker.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/pom.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/MyJsp.jsp ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/i18n/jsp.rules ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/java/org/nuiton/i18n/test/MyBean.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/i18n/parsers-withNewKeys_fr_FR.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/resources/org/nuiton/i18n/test/MyBean-validation.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/jsp/MyJsp.jsp ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/src/main/webapp/tapestry/MyTml.tml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/parsers/withNewKeys/verify.groovy ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/it/settings.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractI18nBundleMojo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/AbstractMakeI18nBundleMojo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/BundleMojo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/CollectI18nArtifactsMojo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/I18nArtifact.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/bundle/TapestryBundleMojo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/AbstractFileParser.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/FileParser.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nParserConfiguration.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/I18nSourceEntry.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/SourceEntry.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserXmlUserMojo.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/main/resources/xwork-validator-1.0.2.dtd ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/site/apt/usages.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/site/en/apt/usages.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/site/site_en.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/maven-i18n-plugin/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18n.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nBundleBridge.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nLanguage.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nStore.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/I18nUtil.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/bundle/I18nBundleUtil.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/ClassPathI18nInitializer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/DefaultI18nInitializer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/I18nInitializer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/init/UserI18nInitializer.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/java/org/nuiton/i18n/package.html ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/site/site_en.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/test/java/org/nuiton/i18n/I18nStoreTest.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest-definition.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_en_GB.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n/src/test/resources/META-INF/I18nStoreTest_fr_FR.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/LICENSE.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/README.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/changelog.txt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/assembly/bin.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/assembly/go.bat ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/assembly/go.sh ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/filters/nuiton-i18n-editor.properties ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditor.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorConfig.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/I18nEditorContext.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProject.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/AbstractI18nProjectProvider.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProject.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectConfigurePanelUI.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectFactory.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/I18nProjectProvider.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProject.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectConfigurePanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/DirectoryI18nProjectProvider.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProject.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectConfigurePanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/project/impl/JarI18nProjectProvider.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleCheckBoxMenuUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValueUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/BundleValuesUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreateBundleUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/CreatePackageUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/I18nEditorUIHandler.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/PackageCheckBoxMenuUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/TreeModelMode.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectStep.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/ProjectUIModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/SelectBundlesTableModel.java ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.css ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/AbstractProjectTabPanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ChooseProjectTypePanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ConfigureProjectPanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/PersistPanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/ResumePanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/java/org/nuiton/i18n/editor/ui/project/tabs/SelectBundlesPanelUI.jaxx ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/jnlp/jxlayer.jnlp ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/jnlp/sun.jnlp ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/main/resources/META-INF/services/org.nuiton.i18n.editor.project.I18nProjectProvider ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/nuiton-i18n-editor/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/application.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/bestPractices.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/extendInitializer.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/helloWorld.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/library.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/apt/presentation.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/application.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/bestPractices.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/extendInitializer.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/helloWorld.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/index.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/library.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/en/apt/presentation.apt ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/site_en.xml ___________________________________________________________________ Added: svn:eol-style + native Property changes on: trunk/src/site/site_fr.xml ___________________________________________________________________ Added: svn:eol-style + native

1 0

r1881 - trunk
by tchemit＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: tchemit Date: 2011-02-14 16:48:22 +0100 (Mon, 14 Feb 2011) New Revision: 1881 Url: http://nuiton.org/repositories/revision/i18n/1881 Log: Evolution #1282: Updates to processor 1.2.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) +++ trunk/pom.xml 2011-02-14 15:48:22 UTC (rev 1881) @@ -187,7 +187,7 @@  <projectId>i18n</projectId> - <processorVersion>1.2</processorVersion> + <processorVersion>1.2.1</processorVersion>  <locales>fr,en</locales> Property changes on: trunk/pom.xml ___________________________________________________________________ Added: svn:eol-style + native

1 0

r1880 - in trunk: . ant-i18n-task maven-i18n-plugin nuiton-i18n
by hudson＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: hudson Date: 2011-02-14 16:35:46 +0100 (Mon, 14 Feb 2011) New Revision: 1880 Url: http://nuiton.org/repositories/revision/i18n/1880 Log: pass to version 2.3.1-SNAPSHOT for little release Modified: trunk/ant-i18n-task/pom.xml trunk/maven-i18n-plugin/pom.xml trunk/nuiton-i18n/pom.xml trunk/pom.xml Modified: trunk/ant-i18n-task/pom.xml =================================================================== --- trunk/ant-i18n-task/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/ant-i18n-task/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/maven-i18n-plugin/pom.xml =================================================================== --- trunk/maven-i18n-plugin/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/maven-i18n-plugin/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/nuiton-i18n/pom.xml =================================================================== --- trunk/nuiton-i18n/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/nuiton-i18n/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.i18n</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-14 14:46:15 UTC (rev 1879) +++ trunk/pom.xml 2011-02-14 15:35:46 UTC (rev 1880) @@ -37,7 +37,7 @@ </parent> <artifactId>i18n</artifactId> - <version>3.0-SNAPSHOT</version> + <version>2.3.1-SNAPSHOT</version> <modules> <module>nuiton-i18n</module>

1 0

r1879 - in trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser: . impl
by tchemit＠users.nuiton.org 14 Feb '11

14 Feb '11

Author: tchemit Date: 2011-02-14 15:46:15 +0100 (Mon, 14 Feb 2011) New Revision: 1879 Url: http://nuiton.org/repositories/revision/i18n/1879 Log: remove old commented code Evolution #1318: Try to make jsp parser more friendly Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java 2011-02-10 12:10:18 UTC (rev 1878) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/ParserExecutor.java 2011-02-14 14:46:15 UTC (rev 1879) @@ -31,7 +31,6 @@ import org.nuiton.plugin.PluginHelper; import java.io.File; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; @@ -219,7 +218,7 @@ parser.parseFile(file); - } catch (IOException e) { + } catch (Exception e) { if (getLog().isErrorEnabled()) { getLog().error("could not parse file " + file, e); } Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2011-02-10 12:10:18 UTC (rev 1878) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/AbstractParserXmlMojo.java 2011-02-14 14:46:15 UTC (rev 1879) @@ -257,12 +257,12 @@ */ private String readInputStream(InputStream in) throws IOException { StringBuilder sb = new StringBuilder(); -// byte[] buffer = new byte[BUFFER_SIZE]; - BufferedReader reader = new BufferedReader(new InputStreamReader(in, getEncoding())); + BufferedReader reader = new BufferedReader( + new InputStreamReader(in, getEncoding())); try { String line; - while ((line = reader.readLine())!=null) { + while ((line = reader.readLine()) != null) { line = line.trim(); if (line.startsWith("#")) { @@ -271,22 +271,12 @@ } sb.append(" ").append(line); } -// sb.append(PluginHelper.readAsString(reader)); } finally { reader.close(); } -// -// while (in.read(buffer, 0, BUFFER_SIZE) != -1) { -// String tmp = new String(buffer); -// sb.append(tmp); -// } -// in.close(); - // Suppression + // Suppression des espaces au début et à la fin String txt = sb.toString().trim(); - // suppression des commentaires -// txt = txt.replaceAll("#.*\n", ""); - // contruction du xpath avec des ou txt = txt.replaceAll("\\s+", " | "); @@ -379,6 +369,15 @@ public void parseFile(File file) throws IOException { File fileToProcess = prepareFile(file); + if (fileToProcess == null) { + + // this case means not to treate the file + if (verbose) { + getLog().info("Skip file " + file); + } + return; + } + try { // Recherche des clés à partir d'un xpath Modified: trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java =================================================================== --- trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2011-02-10 12:10:18 UTC (rev 1878) +++ trunk/maven-i18n-plugin/src/main/java/org/nuiton/i18n/plugin/parser/impl/ParserJspMojo.java 2011-02-14 14:46:15 UTC (rev 1879) @@ -25,10 +25,12 @@ package org.nuiton.i18n.plugin.parser.impl; +import org.apache.commons.lang.StringUtils; import org.nuiton.i18n.plugin.parser.I18nSourceEntry; import org.nuiton.i18n.plugin.parser.SourceEntry; import org.nuiton.io.FileUpdater; import org.nuiton.io.MirroredFileUpdater; +import org.nuiton.plugin.PluginHelper; import org.nuiton.processor.ProcessorUtil; import org.nuiton.processor.filters.DefaultFilter; import org.nuiton.processor.filters.Filter; @@ -168,13 +170,39 @@ createDirectoryIfNecessary(result.getParentFile()); JspFileProcessor processor = new JspFileProcessor(); processor.process(file, result, getEncoding()); + String resultFileContent = + PluginHelper.readAsString(result, getEncoding()); + resultFileContent = resultFileContent.trim(); + + if (StringUtils.isBlank(resultFileContent)) { + + // nothing to scan inside this file + result = null; + } else { + + if (resultFileContent.startsWith("<html") || + resultFileContent.startsWith("<HTML") || + resultFileContent.startsWith("<?xml") + ) { + + // document should be well-formed... + + } else { + // to be sure, document is well formed, add a start and end tag + resultFileContent = "<div>\n" + resultFileContent + "\n</div>"; + + PluginHelper.writeString(result, resultFileContent, getEncoding()); + } + + } + return result; } @Override public String extract(String i18nString) { String s = null; - if (!i18nString.trim().isEmpty()) { + if (!StringUtils.isEmpty(i18nString.trim())) { s = i18nString.trim(); } if (getLog().isDebugEnabled()) { @@ -214,11 +242,18 @@ "%" + ">" ); + protected ProcessorHelper.FragmentRemover remover3 = + new ProcessorHelper.FragmentRemover( + "<" + "!" + "-" + "-", + "-" + "-" + ">" + ); + public JspFileProcessor() { setInputFilter( new Filter[]{ remover1, remover2, + remover3, new JspAttributeWithTagFilter() } );

1 0

r1878 - trunk
by tchemit＠users.nuiton.org 10 Feb '11

10 Feb '11

Author: tchemit Date: 2011-02-10 13:10:18 +0100 (Thu, 10 Feb 2011) New Revision: 1878 Url: http://nuiton.org/repositories/revision/i18n/1878 Log: Update mavenpom4redmineAndCentral to 2.5. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-09 08:14:18 UTC (rev 1877) +++ trunk/pom.xml 2011-02-10 12:10:18 UTC (rev 1878) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.4.4</version> + <version>2.5</version> </parent> <artifactId>i18n</artifactId>

1 0