Author: tchemit Date: 2008-07-31 13:55:06 +0000 (Thu, 31 Jul 2008) New Revision: 942 Modified: trunk/commandline/commandline-core/pom.xml trunk/commandline/commandline-demo/pom.xml trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst trunk/commandline/commandline-ui-action/pom.xml trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties trunk/commandline/commandline-ui/pom.xml trunk/commandline/maven-plugin/pom.xml trunk/commandline/pom.xml Log: mise en place de la version 0.3 de jaxx avec utilisation d'un processor d'annotation pour traiter les jaxx-actions plutot qu'un plugin maven. Du coup on travaille uniquement par annotation, plus aucune autre config n?\195?\169cessaire dans maven :) dernier commit dans commandline :) ? ;) Modified: trunk/commandline/commandline-core/pom.xml =================================================================== --- trunk/commandline/commandline-core/pom.xml 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-core/pom.xml 2008-07-31 13:55:06 UTC (rev 942) @@ -7,14 +7,14 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>commandline-core</artifactId> <name>core</name> <packaging>jar</packaging> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> <description>lutincommandline core library</description> <build> Modified: trunk/commandline/commandline-demo/pom.xml =================================================================== --- trunk/commandline/commandline-demo/pom.xml 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-demo/pom.xml 2008-07-31 13:55:06 UTC (rev 942) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>commandline-demo</artifactId> @@ -53,7 +53,7 @@ <!-- ************************************************************* --> <name>commandline-demo</name> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> <description>commandline demo module</description> <!-- ************************************************************* --> @@ -164,10 +164,6 @@ <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <configuration> - <copyToCP>true</copyToCP> - <actionsFile>/jaxx/commandlinedemo-actions.properties</actionsFile> - </configuration> <executions> <execution> <id>generate jaxx</id> @@ -175,35 +171,6 @@ <goal>generate</goal> </goals> </execution> - <execution> - <id>jaxx-generate-actions-provider</id> - <goals> - <goal>generate-actions-provider</goal> - </goals> - <configuration> - <fqn>org.codelutin.commandline.demo.ui.CommandLineDemoActionProvider</fqn> - <fqnAction>org.codelutin.commandline.demo.ui.actions.CommandLineDemoBaseAction</fqnAction> - <providerName>commandlinedemo</providerName> - </configuration> - </execution> - <execution> - <id>jaxx-generate-actions</id> - <goals> - <goal>generate-actions-properties</goal> - </goals> - <configuration> - <includes> - <param> - org\/codelutin\/commandline\/demo\/ui\/actions\/**\/*Action.java - </param> - </includes> - <excludes> - <param> - org\/codelutin\/commandline\/demo\/ui\/actions\/**\/*AbstractAction.java - </param> - </excludes> - </configuration> - </execution> </executions> </plugin> Modified: trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java =================================================================== --- trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-demo/src/main/java/org/codelutin/commandline/demo/ui/actions/CommandLineDemoBaseAction.java 2008-07-31 13:55:06 UTC (rev 942) @@ -16,9 +16,14 @@ import org.codelutin.commandline.demo.DemoContext; import org.codelutin.commandline.demo.DemoMain; +import org.codelutin.jaxx.action.ActionProviderAnnotation; import org.codelutin.jaxx.action.MyAbstractAction; /** @author chemit */ +@ActionProviderAnnotation( + name = "commandlinedemo", + fqn = "org.codelutin.commandline.demo.ui.CommandLineDemoActionProvider" +) public class CommandLineDemoBaseAction extends MyAbstractAction { private static final long serialVersionUID = -810023044364620841L; Modified: trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst =================================================================== --- trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-demo/src/site/en/rst/user/CommandLineDemoUsage.rst 2008-07-31 13:55:06 UTC (rev 942) @@ -90,7 +90,7 @@ commandlinedemo.config.main.userMail.description -#. version (VersionNumber) <defaultValue:0.7> +#. version (VersionNumber) <defaultValue:0.8> commandlinedemo.config.main.version.description Modified: trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst =================================================================== --- trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-demo/src/site/fr/rst/user/CommandLineDemoUsage.rst 2008-07-31 13:55:06 UTC (rev 942) @@ -90,7 +90,7 @@ commandlinedemo.config.main.userMail.description -#. version (VersionNumber) <defaultValue:0.7> +#. version (VersionNumber) <defaultValue:0.8> commandlinedemo.config.main.version.description Modified: trunk/commandline/commandline-ui/pom.xml =================================================================== --- trunk/commandline/commandline-ui/pom.xml 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-ui/pom.xml 2008-07-31 13:55:06 UTC (rev 942) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>commandline-ui</artifactId> @@ -37,7 +37,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>ui</name> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> <description>lutin commandline UI librairy</description> <inceptionYear>2008</inceptionYear> Modified: trunk/commandline/commandline-ui-action/pom.xml =================================================================== --- trunk/commandline/commandline-ui-action/pom.xml 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-ui-action/pom.xml 2008-07-31 13:55:06 UTC (rev 942) @@ -11,7 +11,7 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>commandline-ui-action</artifactId> @@ -35,7 +35,7 @@ <!-- ************************************************************* --> <name>commandine-ui-action</name> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> <description>basic actions implemented using jaxx-swing-action framework</description> <!-- ************************************************************* --> @@ -105,48 +105,13 @@ <plugin> <groupId>org.codelutin.jaxx</groupId> <artifactId>maven-jaxx-plugin</artifactId> - <configuration> - <copyToCP>true</copyToCP> - <actionsFile>/jaxx/commandline-jaxx-actions.properties</actionsFile> - </configuration> <executions> <execution> <id>jaxx-generate</id> <goals> <goal>generate</goal> </goals> - </execution> - - <execution> - <id>jaxx-generate-actions-provider</id> - <goals> - <goal>generate-actions-provider</goal> - </goals> - <configuration> - <fqn>org.codelutin.option.ui.CommandlineActionProvider</fqn> - <fqnAction>org.codelutin.option.ui.actions.CommandLineBaseAction</fqnAction> - <providerName>commandline</providerName> - </configuration> - </execution> - <execution> - <id>jaxx-generate-actions</id> - <goals> - <goal>generate-actions-properties</goal> - </goals> - <configuration> - <includes> - <param> - org\/codelutin\/option/ui\/actions\/**\/*Action.java - </param> - </includes> - <excludes> - <param> - org\/codelutin\/option\/jaxx\/actions\/**\/*AbstractAction.java - </param> - </excludes> - </configuration> - </execution> </executions> <dependencies> <dependency> Modified: trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java =================================================================== --- trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-ui-action/src/main/java/org/codelutin/option/ui/actions/CommandLineBaseAction.java 2008-07-31 13:55:06 UTC (rev 942) @@ -14,11 +14,16 @@ */ package org.codelutin.option.ui.actions; +import org.codelutin.jaxx.action.ActionProviderAnnotation; import org.codelutin.jaxx.action.MyAbstractAction; import org.codelutin.option.Context; import org.codelutin.option.ContextProvider; /** @author chemit */ +@ActionProviderAnnotation( + name = "commandline", + fqn = "org.codelutin.option.ui.CommandlineActionProvider" +) public class CommandLineBaseAction extends MyAbstractAction { private static final long serialVersionUID = -810023044364620841L; Modified: trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties =================================================================== --- trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-en_GB.properties 2008-07-31 13:55:06 UTC (rev 942) @@ -1,3 +1,4 @@ +commandline= commandline.action.about=About commandline.action.about.help= commandline.action.about.tooltip= Modified: trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties =================================================================== --- trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/commandline-ui-action/src/main/resources/i18n/commandline-ui-action-fr_FR.properties 2008-07-31 13:55:06 UTC (rev 942) @@ -1,3 +1,4 @@ +commandline= commandline.action.about=A propos commandline.action.about.help= commandline.action.about.tooltip= Modified: trunk/commandline/maven-plugin/pom.xml =================================================================== --- trunk/commandline/maven-plugin/pom.xml 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/maven-plugin/pom.xml 2008-07-31 13:55:06 UTC (rev 942) @@ -12,7 +12,7 @@ <parent> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-pom</artifactId> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> </parent> <artifactId>maven-commandline-plugin</artifactId> @@ -50,7 +50,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> <description> Plugin maven 2 pour la generation du parser d'options, des Modified: trunk/commandline/pom.xml =================================================================== --- trunk/commandline/pom.xml 2008-07-31 12:42:28 UTC (rev 941) +++ trunk/commandline/pom.xml 2008-07-31 13:55:06 UTC (rev 942) @@ -37,7 +37,7 @@ <!-- *** Project Information ************************************* --> <!-- ************************************************************* --> <name>pom</name> - <version>0.7-SNAPSHOT</version> + <version>0.8</version> <description>lutincommandline library main pom</description> <inceptionYear>2008</inceptionYear> @@ -153,10 +153,10 @@ <properties> <!-- current version --> - <current.version>0.7-SNAPSHOT</current.version> + <current.version>0.8</current.version> <!-- jaxx version --> - <jaxx.version>0.2-SNAPSHOT</jaxx.version> + <jaxx.version>0.3</jaxx.version> <!-- id du projet du labs --> <labs.id>12</labs.id> @@ -275,7 +275,7 @@ <artifactId>commandline-ui-action</artifactId> <version>${current.version}</version> </dependency> - + <dependency> <groupId>org.apache.maven</groupId> <artifactId>maven-plugin-api</artifactId>