Author: tchemit Date: 2010-11-18 18:12:45 +0100 (Thu, 18 Nov 2010) New Revision: 2127 Url: http://nuiton.org/repositories/revision/jaxx/2127 Log: Evolution #1074: Update i18n to 2.0 Evolution #1073: Optimize dependencies Added: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_en_GB.properties trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_fr_FR.properties Removed: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-en_GB.properties trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-fr_FR.properties Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-tutorial-config/pom.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-compiler/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -51,6 +51,21 @@ </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> </dependency> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-demo/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -24,7 +24,9 @@ #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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -35,7 +37,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -56,6 +58,41 @@ <version>${project.version}</version> </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>swingx-core</artifactId> + </dependency> + + <dependency> + <groupId>org.swinglabs</groupId> + <artifactId>jxlayer</artifactId> + </dependency> + <!-- test dependencies --> <dependency> @@ -104,10 +141,10 @@ <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath> <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath> <jaxx.autoImportCss>true</jaxx.autoImportCss> - + <!-- generate license bundled files --> <license.generateBundle>true</license.generateBundle> - + </properties> <build> @@ -151,11 +188,13 @@ </configuration> <executions> <execution> - <goals><goal>jar</goal></goals> + <goals> + <goal>jar</goal> + </goals> </execution> </executions> </plugin> - + </plugins> </pluginManagement> @@ -321,7 +360,8 @@ </property> </activation> <properties> - <jnlp.codebase>http://maven-site.liosalfar/jaxx/jaxx-demo/jnlp</jnlp.codebase> + <jnlp.codebase>http://maven-site.liosalfar/jaxx/jaxx-demo/jnlp + </jnlp.codebase> </properties> </profile> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-runtime/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -48,10 +48,25 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + <!-- pour utiliser javaHelp --> <dependency> <groupId>javax.help</groupId> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> </parent> <groupId>org.nuiton.jaxx</groupId> @@ -100,7 +100,7 @@ <plugin> <artifactId>maven-compiler-plugin</artifactId> - <version>2.3.1</version> + <version>2.3.2</version> </plugin> <plugin> @@ -111,7 +111,7 @@ <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> - <version>1.2.2</version> + <version>2.0-SNAPSHOT</version> </plugin> </plugins> Modified: trunk/jaxx-tutorial-config/pom.xml =================================================================== --- trunk/jaxx-tutorial-config/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial-config/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Deleted: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-en_GB.properties =================================================================== --- trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-en_GB.properties 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-en_GB.properties 2010-11-18 17:12:45 UTC (rev 2127) @@ -1,14 +0,0 @@ -config.title= -demo.action.reload.application=Reload application -demo.action.reload.ui=Reload UI -jaxxdemo.config.category.directories=Files -jaxxdemo.config.category.directories.description=Files used by application -jaxxdemo.config.category.other=Others -jaxxdemo.config.category.other.description=Others preferences -jaxxdemo.config.configFileName.description=Configuration file name -jaxxdemo.config.ui.fontSize=default font size to use in sources -jaxxdemo.config.ui.fullscreen=To change the screen mode (true for full screen) -jaxxdemo.config.ui.locale=Language used in application -jaxxdemo.message.config.loaded=Configuration of JAXXDemo v. %1$s loaded. -jaxxdemo.warning.nimbus.landf=Could not init nymbus look and feel, you need at leasr version 1.6u10 of java. -jaxxdemo.warning.no.ui=No ui environnement detected Deleted: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-fr_FR.properties =================================================================== --- trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-fr_FR.properties 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-fr_FR.properties 2010-11-18 17:12:45 UTC (rev 2127) @@ -1,14 +0,0 @@ -config.title= -demo.action.reload.application=Redemarrer l'application -demo.action.reload.ui=Recharger l'interface graphique -jaxxdemo.config.category.directories=R\u00E9pertoires -jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application -jaxxdemo.config.category.other=Autre -jaxxdemo.config.category.other.description=Autres options -jaxxdemo.config.configFileName.description=Le nom du fichier de configuration -jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources -jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran -jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application -jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. -jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. -jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 Copied: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_en_GB.properties (from rev 2126, trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-en_GB.properties) =================================================================== --- trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_en_GB.properties (rev 0) +++ trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_en_GB.properties 2010-11-18 17:12:45 UTC (rev 2127) @@ -0,0 +1,14 @@ +config.title= +demo.action.reload.application=Reload application +demo.action.reload.ui=Reload UI +jaxxdemo.config.category.directories=Files +jaxxdemo.config.category.directories.description=Files used by application +jaxxdemo.config.category.other=Others +jaxxdemo.config.category.other.description=Others preferences +jaxxdemo.config.configFileName.description=Configuration file name +jaxxdemo.config.ui.fontSize=default font size to use in sources +jaxxdemo.config.ui.fullscreen=To change the screen mode (true for full screen) +jaxxdemo.config.ui.locale=Language used in application +jaxxdemo.message.config.loaded=Configuration of JAXXDemo v. %1$s loaded. +jaxxdemo.warning.nimbus.landf=Could not init nymbus look and feel, you need at leasr version 1.6u10 of java. +jaxxdemo.warning.no.ui=No ui environnement detected Property changes on: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Copied: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_fr_FR.properties (from rev 2126, trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config-fr_FR.properties) =================================================================== --- trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_fr_FR.properties (rev 0) +++ trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_fr_FR.properties 2010-11-18 17:12:45 UTC (rev 2127) @@ -0,0 +1,14 @@ +config.title= +demo.action.reload.application=Redemarrer l'application +demo.action.reload.ui=Recharger l'interface graphique +jaxxdemo.config.category.directories=R\u00E9pertoires +jaxxdemo.config.category.directories.description=R\u00E9pertoires de l'application +jaxxdemo.config.category.other=Autre +jaxxdemo.config.category.other.description=Autres options +jaxxdemo.config.configFileName.description=Le nom du fichier de configuration +jaxxdemo.config.ui.fontSize=La taille de la police \u00E0 utiliser pour visualiser dans les sources +jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran +jaxxdemo.config.ui.locale=La langue utilis\u00E9e par l'application +jaxxdemo.message.config.loaded=Configuration de JAXX Demo v. %1$s charg\u00E9e. +jaxxdemo.warning.nimbus.landf=Le look and Feel Nimbus n'a pas \u00E9t\u00E9 trouv\u00E9, il faut au moins la version 1.6u10 de java. +jaxxdemo.warning.no.ui=Aucun environnement graphique d\u00E9tect\u00E9 Property changes on: trunk/jaxx-tutorial-config/src/main/resources/i18n/jaxx-tutorial-config_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial-css/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial-databinding/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton.jaxx</groupId> <artifactId>jaxx-tutorial</artifactId> - <version>2.2.3-SNAPSHOT</version> + <version>2.2.4-SNAPSHOT</version> <relativePath>../jaxx-tutorial</relativePath> </parent> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/jaxx-widgets/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -24,7 +24,9 @@ #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"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -56,12 +58,37 @@ <artifactId>swingx-core</artifactId> </dependency> - <!--dependency> - <groupId>org.swinglabs</groupId> - <artifactId>swing-worker</artifactId> - </dependency--> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>commons-primitives</groupId> + <artifactId>commons-primitives</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + </dependency> + + <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> </dependency> @@ -71,7 +98,7 @@ <artifactId>log4j</artifactId> <scope>test</scope> </dependency> - + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/maven-jaxx-plugin/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -83,15 +83,25 @@ </dependency> <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>javax.help</groupId> + <artifactId>javahelp</artifactId> + </dependency> + <!-- pour acceder aux BeansInfos swing via Introspector --> <dependency> <groupId>com.sun</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-11-18 16:42:25 UTC (rev 2126) +++ trunk/pom.xml 2010-11-18 17:12:45 UTC (rev 2127) @@ -488,7 +488,20 @@ </configuration> </plugin> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-license-plugin</artifactId> + <configuration> + <!-- remove this while using mavenpom > 2.4 --> + <excludes> + <exclude>**/i18n/*.properties</exclude> + <exclude>**/THIRD-PARTY.properties</exclude> + </excludes> + </configuration> + </plugin> + + <plugin> <artifactId>maven-release-plugin</artifactId> <configuration> <prepareVerifyArgs>-Ptutorial,demo</prepareVerifyArgs>