- Jaxx-commits - mailman.cloud.codelutin.com

r1713 - in trunk: . jaxx-compiler jaxx-demo jaxx-runtime jaxx-swing-action jaxx-widgets maven-jaxx-plugin
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 04:12:48 +0100 (Thu, 07 Jan 2010) New Revision: 1713 Modified: trunk/jaxx-compiler/pom.xml trunk/jaxx-demo/pom.xml trunk/jaxx-runtime/pom.xml trunk/jaxx-swing-action/pom.xml trunk/jaxx-widgets/pom.xml trunk/maven-jaxx-plugin/pom.xml trunk/pom.xml Log: [maven-release-plugin] prepare release jaxx-2.0.0-beta-4 Modified: trunk/jaxx-compiler/pom.xml =================================================================== --- trunk/jaxx-compiler/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) +++ trunk/jaxx-compiler/pom.xml 2010-01-07 03:12:48 UTC (rev 1713) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) +++ trunk/jaxx-demo/pom.xml 2010-01-07 03:12:48 UTC (rev 1713) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-runtime/pom.xml =================================================================== --- trunk/jaxx-runtime/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) +++ trunk/jaxx-runtime/pom.xml 2010-01-07 03:12:48 UTC (rev 1713) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-swing-action/pom.xml =================================================================== --- trunk/jaxx-swing-action/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) +++ trunk/jaxx-swing-action/pom.xml 2010-01-07 03:12:48 UTC (rev 1713) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) +++ trunk/jaxx-widgets/pom.xml 2010-01-07 03:12:48 UTC (rev 1713) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) +++ trunk/maven-jaxx-plugin/pom.xml 2010-01-07 03:12:48 UTC (rev 1713) @@ -1,6 +1,4 @@ -<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> @@ -11,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> </parent> <groupId>org.nuiton.jaxx</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) +++ trunk/pom.xml 2010-01-07 03:12:48 UTC (rev 1713) @@ -13,7 +13,7 @@ </parent> <artifactId>jaxx</artifactId> - <version>2.0.0-beta-4-SNAPSHOT</version> + <version>2.0.0-beta-4</version> <modules> <module>jaxx-runtime</module> @@ -403,9 +403,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0.0-beta-4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/tags/jaxx-2.0.0-beta-4</developerConnection> + <url>http://www.nuiton.org/repositories/browse/jaxx/tags/jaxx-2.0.0-beta-4</url> </scm> </project>

1 0

r1712 - trunk
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 04:10:11 +0100 (Thu, 07 Jan 2010) New Revision: 1712 Modified: trunk/pom.xml Log: use mavenpom 1.1.4 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 02:46:32 UTC (rev 1711) +++ trunk/pom.xml 2010-01-07 03:10:11 UTC (rev 1712) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.4-SNAPSHOT</version> + <version>1.1.4</version> </parent> <artifactId>jaxx</artifactId>

1 0

r1711 - in trunk: . jaxx-compiler/src/site jaxx-demo/src/main/resources/i18n jaxx-demo/src/site jaxx-runtime/src/site jaxx-runtime/src/site/rst jaxx-swing-action/src/site jaxx-widgets/src/site jaxx-widgets/src/site/rst maven-jaxx-plugin/src/site maven-jaxx-plugin/src/site/rst src/site src/site/rst
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 03:46:32 +0100 (Thu, 07 Jan 2010) New Revision: 1711 Added: trunk/jaxx-compiler/src/site/site_fr.xml trunk/jaxx-demo/src/site/site_fr.xml trunk/jaxx-runtime/src/site/rst/index.rst trunk/jaxx-runtime/src/site/site_fr.xml trunk/jaxx-swing-action/src/site/site_fr.xml trunk/jaxx-widgets/src/site/site_fr.xml trunk/maven-jaxx-plugin/src/site/site_fr.xml trunk/src/site/site_fr.xml Removed: trunk/jaxx-compiler/src/site/site.xml trunk/jaxx-demo/src/site/site.xml trunk/jaxx-runtime/src/site/site.xml trunk/jaxx-swing-action/src/site/site.xml trunk/jaxx-widgets/src/site/site.xml trunk/maven-jaxx-plugin/src/site/site.xml trunk/src/site/site.xml Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties trunk/jaxx-widgets/src/site/rst/index.rst trunk/maven-jaxx-plugin/src/site/rst/index.rst trunk/pom.xml trunk/src/site/rst/index.rst Log: update doc and make it compatible with mavenpom Deleted: trunk/jaxx-compiler/src/site/site.xml =================================================================== --- trunk/jaxx-compiler/src/site/site.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/jaxx-compiler/src/site/site.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherited="top"/> - - <menu ref="reports"/> - - <menu ref="modules"/> - - </body> -</project> Copied: trunk/jaxx-compiler/src/site/site_fr.xml (from rev 1706, trunk/jaxx-compiler/src/site/site.xml) =================================================================== --- trunk/jaxx-compiler/src/site/site_fr.xml (rev 0) +++ trunk/jaxx-compiler/src/site/site_fr.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"/> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2010-01-07 02:46:32 UTC (rev 1711) @@ -143,7 +143,7 @@ jaxxdemo.action.exit.tip=Quit JAXXDemo jaxxdemo.action.fullscreen=Full screen jaxxdemo.action.fullscreen.tip=Change to full screen mode -jaxxdemo.action.help= +jaxxdemo.action.help=Help jaxxdemo.action.help.tip=Display help jaxxdemo.action.locale.fr=French jaxxdemo.action.locale.fr.tip=Change to french language @@ -151,8 +151,8 @@ jaxxdemo.action.locale.uk.tip=Change to english language jaxxdemo.action.normalscreen=Normal screen jaxxdemo.action.normalscreen.tip=Change to normal screen mode -jaxxdemo.action.remove= -jaxxdemo.action.show= +jaxxdemo.action.remove=Remove +jaxxdemo.action.show=show jaxxdemo.action.site=Web site jaxxdemo.action.site.tip=Go to the web site jaxxdemo.config.category.directories=Files @@ -161,7 +161,7 @@ jaxxdemo.config.category.other.description=Others preferences jaxxdemo.config.configFileName.description=Configuration file name jaxxdemo.config.ui.= -jaxxdemo.config.ui.demo.path= +jaxxdemo.config.ui.demo.path=Path of demo to select when starting application jaxxdemo.config.ui.fullscreen=To change the screen mode (true for full screen) jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popupBorderText=Popup title @@ -175,7 +175,7 @@ jaxxdemo.init.ui.done=UI initialized. jaxxdemo.menu.file=File jaxxdemo.menu.file.locale=Languages -jaxxdemo.menu.help= +jaxxdemo.menu.help=Help jaxxdemo.message.config.loaded=Configuration of JAXXDemo v. %1$s loaded. jaxxdemo.message.goto.site=Go to JAXXDemo Web site jaxxdemo.navigation.actor.title= Deleted: trunk/jaxx-demo/src/site/site.xml =================================================================== --- trunk/jaxx-demo/src/site/site.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/jaxx-demo/src/site/site.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherited="top"> - <item name="Accueil" href="index.html"/> - <item name="Lancer la démo" href="jnlp/launch.jnlp"/> - </menu> - - <menu ref="reports"/> - - <menu ref="modules"/> - - </body> -</project> Copied: trunk/jaxx-demo/src/site/site_fr.xml (from rev 1706, trunk/jaxx-demo/src/site/site.xml) =================================================================== --- trunk/jaxx-demo/src/site/site_fr.xml (rev 0) +++ trunk/jaxx-demo/src/site/site_fr.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"> + <item name="Accueil" href="index.html"/> + <item name="Lancer la démo" href="jnlp/launch.jnlp"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project> Added: trunk/jaxx-runtime/src/site/rst/index.rst =================================================================== --- trunk/jaxx-runtime/src/site/rst/index.rst (rev 0) +++ trunk/jaxx-runtime/src/site/rst/index.rst 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,13 @@ +jaxx-runtime +============ + +.. contents:: + + +Présentation +------------ + +Api des objets utilisables au runtime. + +**Veuillez consulter la JavaDoc pour de plus ample détails sur les différentes +librairies.** Deleted: trunk/jaxx-runtime/src/site/site.xml =================================================================== --- trunk/jaxx-runtime/src/site/site.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/jaxx-runtime/src/site/site.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherited="top"/> - - <menu ref="reports"/> - - <menu ref="modules"/> - - </body> -</project> Copied: trunk/jaxx-runtime/src/site/site_fr.xml (from rev 1706, trunk/jaxx-runtime/src/site/site.xml) =================================================================== --- trunk/jaxx-runtime/src/site/site_fr.xml (rev 0) +++ trunk/jaxx-runtime/src/site/site_fr.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"> + <item name="Accueil" href="index.html"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project> Deleted: trunk/jaxx-swing-action/src/site/site.xml =================================================================== --- trunk/jaxx-swing-action/src/site/site.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/jaxx-swing-action/src/site/site.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherited="top"/> - - <menu ref="reports"/> - - <menu ref="modules"/> - - </body> -</project> Copied: trunk/jaxx-swing-action/src/site/site_fr.xml (from rev 1706, trunk/jaxx-swing-action/src/site/site.xml) =================================================================== --- trunk/jaxx-swing-action/src/site/site_fr.xml (rev 0) +++ trunk/jaxx-swing-action/src/site/site_fr.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"/> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project> Modified: trunk/jaxx-widgets/src/site/rst/index.rst =================================================================== --- trunk/jaxx-widgets/src/site/rst/index.rst 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/jaxx-widgets/src/site/rst/index.rst 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,40 +1,26 @@ -=================== -Examples/Components -=================== +============ +JAXX Widgets +============ -The Components demo displays many different Swing components being used in a variety of ways; it is JAXX's equivalent -of the SwingSet demo. Various pages use advanced features such as data binding, scripting, event handling, and -CSS stylesheets. +The modules of rich widgets for swing desinged in jaxx. -Examples/Calculator -=================== +Editors +======= -This is an implementation of Challenge #2 from the `XUL Grand Coding Challenge 2004`_ . Because this example program -has been implemented in so many different languages, you can easily compare JAXX's -syntax against the competition and decide for yourself which you prefer. +TODO Explain editors Screen shot ----------- -.. image:: images/Components-screenshot.gif +TODO -Set it in action ----------------- +Widgets +======= -|webstart| +TODO Explain widgets -To run this example in `Java Web Start`_, click the `following link`_. - -Source code +Screen shot ----------- -Unlike the other examples, the source code for Components is too big to display here. You can view it yourself by -downloading JAXX, and you can also view the source code for the individual demos by clicking the "Source" tabs. - - -.. _Java Web Start: http://java.sun.com/products/javawebstart/ - -.. |webstart| image:: images/webstart.gif - -.. _following link: ./launch-demo.jnlp +TODO \ No newline at end of file Deleted: trunk/jaxx-widgets/src/site/site.xml =================================================================== --- trunk/jaxx-widgets/src/site/site.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/jaxx-widgets/src/site/site.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,25 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherited="top"/> - - <menu ref="reports"/> - - <menu ref="modules"/> - - </body> -</project> Copied: trunk/jaxx-widgets/src/site/site_fr.xml (from rev 1706, trunk/jaxx-widgets/src/site/site.xml) =================================================================== --- trunk/jaxx-widgets/src/site/site_fr.xml (rev 0) +++ trunk/jaxx-widgets/src/site/site_fr.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"/> + + <menu ref="reports"/> + + <menu ref="modules"/> + + </body> +</project> Modified: trunk/maven-jaxx-plugin/src/site/rst/index.rst =================================================================== --- trunk/maven-jaxx-plugin/src/site/rst/index.rst 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/maven-jaxx-plugin/src/site/rst/index.rst 2010-01-07 02:46:32 UTC (rev 1711) @@ -7,12 +7,13 @@ Introduction ------------ -The plugin permits to generate java files from jaxx files via the `generate`_ goal. +The plugin permits to generate java files from jaxx files via the **generate** goal. -You can also generate the java help system via the `generate-help`_ goal and generate search index via -the `generate-help-search`_ goal. +You can also generate the java help system via the **generate-helpXXX* goals. +for more information, consult the `documentation of each mojo`_. + Default layout -------------- @@ -23,7 +24,6 @@ * the generated java files should be under *target/generated-sources/java* * the java help files should be under *src/main/help* * the generated help search index should be under *target/generated-sources/help* - -.. _generate: generate-mojo.html -.. _generate-help: generate-help-mojo.html -.. _generate-help-search: generate-help-search-mojo.html + + +.. _documentation of each mojo: plugin-info.html Deleted: trunk/maven-jaxx-plugin/src/site/site.xml =================================================================== --- trunk/maven-jaxx-plugin/src/site/site.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/maven-jaxx-plugin/src/site/site.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <body> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu ref="parent"/> - - <menu name="Utilisateur" inherited="top"> - <item name="Accueil" href="index.html"/> - <item name="Détail goals" href="plugin-info.html"> - <item name="generate" href="generate-mojo.html"/> - <item name="generate-help" href="generate-help-mojo.html"/> - <item name="generate-help-search" href="generate-help-search-mojo.html"/> - <item name="help" href="help-mojo.html"/> - </item> - </menu> - - <menu name="Développeur" inherit="top"> - <item name="A faire" href="Todo.html"/> - </menu> - - <menu ref="reports"/> - - <menu ref="modules"/> - </body> -</project> Copied: trunk/maven-jaxx-plugin/src/site/site_fr.xml (from rev 1706, trunk/maven-jaxx-plugin/src/site/site.xml) =================================================================== --- trunk/maven-jaxx-plugin/src/site/site_fr.xml (rev 0) +++ trunk/maven-jaxx-plugin/src/site/site_fr.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur" inherited="top"> + <item name="Accueil" href="index.html"/> + <item name="Détail goals" href="plugin-info.html"> + <item name="generate" href="generate-mojo.html"/> + <item name="generate-help" href="generate-help-mojo.html"/> + <item name="generate-help-search" href="generate-help-search-mojo.html"/> + <item name="help" href="help-mojo.html"/> + </item> + </menu> + + <menu name="Développeur" inherit="top"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="reports"/> + + <menu ref="modules"/> + </body> +</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/pom.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -362,8 +362,6 @@ <lutinutil.version>1.1.0</lutinutil.version> <i18n.version>1.0.1</i18n.version> -  -  <jxlayer.version>3.0.3</jxlayer.version> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/src/site/rst/index.rst 2010-01-07 02:46:32 UTC (rev 1711) @@ -45,6 +45,26 @@ * NavigationTreeModel_ +Who use JAXX ? +-------------- + +Here is a list of projects using JAXX : + + * Isis-fish + + * simExplorer-si + + * ObServe + + * Lima + + * Vradi + + * Nuiton-i18n-editor + + TODO Finish this list and add icons and links to site + + .. _Migration: migration.html .. _Core: Core.html Deleted: trunk/src/site/site.xml =================================================================== --- trunk/src/site/site.xml 2010-01-07 02:20:02 UTC (rev 1710) +++ trunk/src/site/site.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="${project.name}"> - - <bannerLeft> - <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> - <href>index.html</href> - </bannerLeft> - - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="${project.url}/images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> - </poweredBy> - - <body> - <links> - <item name="original JAXX" href="http://buix.labs.libre-entreprise.org/original-jaxx"/> - </links> - - <breadcrumbs> - <item name="${project.name}" href="${project.url}" /> - </breadcrumbs> - - <menu name="Utilisateur"> - <item name="Accueil" href="index.html"/> - <item name="Migration JAXX 2.0" href="migration.html"/> - </menu> - - <menu name="Développeur"> - <item name="A faire" href="Todo.html"/> - </menu> - - <menu ref="modules"/> - - <menu ref="reports"/> - </body> -</project> Copied: trunk/src/site/site_fr.xml (from rev 1706, trunk/src/site/site.xml) =================================================================== --- trunk/src/site/site_fr.xml (rev 0) +++ trunk/src/site/site_fr.xml 2010-01-07 02:46:32 UTC (rev 1711) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="${project.name}"> + + <bannerLeft> + <name>${project.name}</name> + <src>${site.home.url}/jaxx.png</src> + <href>index.html</href> + </bannerLeft> + + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="${project.url}/images/logos/maven-feather.png"/> + <logo href="http://maven-site.nuiton.org/jrst" name="JRst" img="${project.url}/images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="${project.url}/images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="original JAXX" href="http://buix.labs.libre-entreprise.org/original-jaxx"/> + </links> + + <breadcrumbs> + <item name="${project.name}" href="index.html" /> + </breadcrumbs> + + <menu name="Utilisateur"> + <item name="Accueil" href="index.html"/> + <item name="Migration JAXX 2.0" href="migration.html"/> + </menu> + + <menu name="Développeur"> + <item name="A faire" href="Todo.html"/> + </menu> + + <menu ref="modules"/> + + <menu ref="reports"/> + </body> +</project>

1 0

r1710 - in trunk: . jaxx-widgets src/site/rst
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 03:20:02 +0100 (Thu, 07 Jan 2010) New Revision: 1710 Modified: trunk/jaxx-widgets/pom.xml trunk/pom.xml trunk/src/site/rst/JAXXContext.rst trunk/src/site/rst/NavigationTreeModel.rst Log: no more need of swingWorker + reuse the last mavenpom + fix rst Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2010-01-07 00:57:50 UTC (rev 1709) +++ trunk/jaxx-widgets/pom.xml 2010-01-07 02:20:02 UTC (rev 1710) @@ -31,10 +31,10 @@ <artifactId>swingx</artifactId> </dependency> - <dependency> +  <dependency> <groupId>commons-io</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-07 00:57:50 UTC (rev 1709) +++ trunk/pom.xml 2010-01-07 02:20:02 UTC (rev 1710) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -250,11 +250,11 @@ <version>1.6</version> </dependency> - <dependency> +  <dependency> <groupId>log4j</groupId> @@ -362,10 +362,10 @@ <lutinutil.version>1.1.0</lutinutil.version> <i18n.version>1.0.1</i18n.version> - <helper.version>1.2.0</helper.version> - <jredmin.version>1.1</jredmin.version> +  +  - <jxlayer.version>3.0.4</jxlayer.version> + <jxlayer.version>3.0.3</jxlayer.version> <javahelp.version>2.0.02</javahelp.version> Modified: trunk/src/site/rst/JAXXContext.rst =================================================================== --- trunk/src/site/rst/JAXXContext.rst 2010-01-07 00:57:50 UTC (rev 1709) +++ trunk/src/site/rst/JAXXContext.rst 2010-01-07 02:20:02 UTC (rev 1710) @@ -41,7 +41,7 @@ * *getContextValue(Class)* récupère la donnée *non nommée* dont le type correspond à celui passé. - * *getContextValue(Class,String)* récupère la donnée nommé dont le type correspond à celui passé. + * *getContextValue(Class,String)* récupère la donnée nommée dont le type correspond à celui passé. Les méthodes d'écriture *********************** @@ -82,13 +82,13 @@ réellement la donnée, ce qui est important pour conserver la cohérence des contexts dans les contexts chaînés. Pour traiter le context parent, aucune méthode publique supplémentaire n'a été rajoutée, il suffit d'injecter un objet -de type *JAXXContext* *non nommé* qui le context courant qui sera détecté comme une entrée de type context. +de type *JAXXContext* non nommé qui le context courant qui sera détecté comme une entrée de type context. Cette entrée spéciale ne sera pas stockée avec les autres entrées afin d'optimiser les algorithmes d'injection et de restitution. jaxx.runtime.context.JAXXInitialContext -******************************* +*************************************** On a implanté un second type de context qui lui peut servir à l'initialisation des JAXXObject. Modified: trunk/src/site/rst/NavigationTreeModel.rst =================================================================== --- trunk/src/site/rst/NavigationTreeModel.rst 2010-01-07 00:57:50 UTC (rev 1709) +++ trunk/src/site/rst/NavigationTreeModel.rst 2010-01-07 02:20:02 UTC (rev 1710) @@ -35,7 +35,7 @@ Il apporte les nouvelles propriétés suivantes : - * *navigationPAth* : nom de chemin de navigation de ce noeud. + * *navigationPath* : nom de chemin de navigation de ce noeud. * *jaxxClass* : nom qualifié de la classe d'ui associé à ce noeud (doit être obligatoirement un *JAXXObject*)

1 0

r1709 - trunk
by tchemit＠users.nuiton.org Jan. 7, 2010

Jan. 7, 2010

Author: tchemit Date: 2010-01-07 01:57:50 +0100 (Thu, 07 Jan 2010) New Revision: 1709 Modified: trunk/pom.xml Log: bumps to stable version + jx libraries Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-04 17:25:05 UTC (rev 1708) +++ trunk/pom.xml 2010-01-07 00:57:50 UTC (rev 1709) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.4-SNAPSHOT</version> + <version>1.1.3</version> </parent> <artifactId>jaxx</artifactId> @@ -247,7 +247,7 @@ <dependency> <groupId>org.swinglabs</groupId> <artifactId>swingx</artifactId> - <version>1.0</version> + <version>1.6</version> </dependency> <dependency> @@ -361,16 +361,14 @@ <projectId>jaxx</projectId> <lutinutil.version>1.1.0</lutinutil.version> - <i18n.version>1.0.2-SNAPSHOT</i18n.version> + <i18n.version>1.0.1</i18n.version> + <helper.version>1.2.0</helper.version> + <jredmin.version>1.1</jredmin.version> - <jxlayer.version>3.0.3</jxlayer.version> + <jxlayer.version>3.0.4</jxlayer.version> <javahelp.version>2.0.02</javahelp.version> -  -  - <redmine.includeAttached>false</redmine.includeAttached> - </properties> <build>

1 0

r1708 - in trunk: jaxx-compiler/src/main/java/jaxx/compiler/tags maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test
by tchemit＠users.nuiton.org Jan. 4, 2010

Jan. 4, 2010

Author: tchemit Date: 2010-01-04 18:25:05 +0100 (Mon, 04 Jan 2010) New Revision: 1708 Added: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug184Test.java trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/MyPanel.jaxx Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java Log: Anomalie #184: Bug dans constructorParams Modified: trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java =================================================================== --- trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2010-01-04 16:11:17 UTC (rev 1707) +++ trunk/jaxx-compiler/src/main/java/jaxx/compiler/tags/DefaultObjectHandler.java 2010-01-04 17:25:05 UTC (rev 1708) @@ -674,9 +674,13 @@ // adds dependencies as a side effect compiler.preprocessScript(value); } else if (name.equals(CONSTRUCTOR_PARAMS_ATTRIBUTE)) { - for (String param : value.split("\\s*,\\s*")) { - compiler.preprocessScript(param); - } + //fix bug 178 : if a constructor parameter contains a comma + // the split will not works. + // using this hack will always works :) (but still a hack) + compiler.preprocessScript("java.util.Arrays.toString(" + value + ")"); +// for (String param : value.split("\\s*,\\s*")) { +// compiler.preprocessScript(param); +// } } else if (value.startsWith("{") && value.endsWith("}")) { compiler.preprocessScript(value.substring(1, value.length() - 1)); } Added: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug184Test.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug184Test.java (rev 0) +++ trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug184Test.java 2010-01-04 17:25:05 UTC (rev 1708) @@ -0,0 +1,23 @@ +package org.nuiton.jaxx.plugin; + +import org.junit.Test; + +/** + * Created: 4 janv. 2010 + * + * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin + * @version $Revision$ + * <p/> + * Mise a jour: $Date$ par : + * $Author: tchemit $ + */ +public class Bug184Test extends JaxxBaseTest { + + @Test + public void Bug_184() throws Exception { + getMojo().execute(); + assertNumberJaxxFiles(1); + } + + +} \ No newline at end of file Property changes on: trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/Bug184Test.java ___________________________________________________________________ Added: svn:keywords + "Author Date Id Revision HeadURL Added: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml (rev 0) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml 2010-01-04 17:25:05 UTC (rev 1708) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.nuiton.jaxx.test</groupId> + <artifactId>test</artifactId> + <version>0</version> + <build> + <plugins> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>maven-jaxx-plugin</artifactId> + <configuration> + <src>${basedir}/target/test-classes</src> + <outJava>${basedir}/target/generated-sources/test-java</outJava> + <force>true</force> + <verbose>true</verbose> + <includes> + <value>**/bug184Test/*.jaxx</value> + </includes> + </configuration> + </plugin> + </plugins> + </build> +</project> \ No newline at end of file Added: trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/MyPanel.jaxx =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/MyPanel.jaxx (rev 0) +++ trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/MyPanel.jaxx 2010-01-04 17:25:05 UTC (rev 1708) @@ -0,0 +1,13 @@ +<JPanel> + +<script> + +private static final int[] yo = new int[]{65,66,67}; + +protected String myMethod(String a, String b, String c) { + return ""; +} + +</script> + <JButton constructorParams='myMethod("a", new String(yo, 1, 2), "c")'/> +</JPanel> \ No newline at end of file

1 0

r1707 - trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org Jan. 4, 2010

Jan. 4, 2010

Author: tchemit Date: 2010-01-04 17:11:17 +0100 (Mon, 04 Jan 2010) New Revision: 1707 Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java Log: fix expression Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2010-01-01 17:24:15 UTC (rev 1706) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2010-01-04 16:11:17 UTC (rev 1707) @@ -47,7 +47,7 @@ /** * The directory where to create or update help files. * - * @parameter expression="${jaxx.outuptHelp}" default-value="${project.basedir}/src/main/help" + * @parameter expression="${jaxx.outputHelp}" default-value="${project.basedir}/src/main/help" * @required * @since 2.0.0 */

1 0

r1706 - trunk/maven-jaxx-plugin
by tchemit＠users.nuiton.org Jan. 1, 2010

Jan. 1, 2010

Author: tchemit Date: 2010-01-01 18:24:15 +0100 (Fri, 01 Jan 2010) New Revision: 1706 Modified: trunk/maven-jaxx-plugin/pom.xml Log: use javadoc configuration from mavenpom Modified: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2010-01-01 16:18:48 UTC (rev 1705) +++ trunk/maven-jaxx-plugin/pom.xml 2010-01-01 17:24:15 UTC (rev 1706) @@ -1,6 +1,7 @@ +<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>  @@ -61,7 +62,7 @@ <groupId>org.codehaus.plexus</groupId> <artifactId>plexus-velocity</artifactId> </dependency> - +  <dependency> <groupId>com.sun</groupId> @@ -77,7 +78,7 @@ <groupId>org.apache.maven.shared</groupId> <artifactId>maven-verifier</artifactId> </dependency> - + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> @@ -129,366 +130,18 @@ </execution> </executions> </plugin> - + </plugins> - <pluginManagement> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <taglets> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - <executions> - <execution> - <id>attach-javadocs</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </pluginManagement> </build> <reporting> <plugins> + <plugin> <artifactId>maven-plugin-plugin</artifactId> </plugin> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <version>${javadoc.version}</version> - <configuration> - <taglets> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet</tagletClass> - <tagletArtifact> - <groupId>org.apache.maven.plugin-tools</groupId> - <artifactId>maven-plugin-tools-javadoc</artifactId> - <version>2.4.2</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - <taglet> - <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> - <tagletArtifact> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-javadoc</artifactId> - <version>1.0</version> - </tagletArtifact> - </taglet> - </taglets> - </configuration> - </plugin> </plugins> </reporting>

1 0

r1705 - trunk
by tchemit＠users.nuiton.org Jan. 1, 2010

Jan. 1, 2010

Author: tchemit Date: 2010-01-01 17:18:48 +0100 (Fri, 01 Jan 2010) New Revision: 1705 Modified: trunk/pom.xml Log: add FIXME to resolve... Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-29 17:45:48 UTC (rev 1704) +++ trunk/pom.xml 2010-01-01 16:18:48 UTC (rev 1705) @@ -328,6 +328,12 @@ <artifactId>maven-reporting-api</artifactId> </exclusion> +  + </exclusions> </dependency>

1 0

r1704 - in trunk: . jaxx-demo jaxx-demo/src/main/resources/i18n jaxx-widgets/src/main/resources/i18n maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin
by tchemit＠users.nuiton.org Dec. 29, 2009

Dec. 29, 2009

Author: tchemit Date: 2009-12-29 18:45:48 +0100 (Tue, 29 Dec 2009) New Revision: 1704 Modified: trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java trunk/pom.xml Log: use last version of mavenpom and i18n Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/jaxx-demo/pom.xml 2009-12-29 17:45:48 UTC (rev 1704) @@ -179,6 +179,7 @@ <execution> <goals> <goal>parserJava</goal> + <goal>gen</goal> <goal>bundle</goal> </goals> </execution> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-en_GB.properties 2009-12-29 17:45:48 UTC (rev 1704) @@ -34,7 +34,6 @@ Editable= Email\ Address\:= Email\:= -Empty\ I18n\ editor\:= Enabled= EnumEditor\ (country)\ \:= EnumEditor\ (language)\ \:= @@ -49,9 +48,6 @@ Green\:= Greet= Help= -I18n\ editor\ with\ no\ icon\ \:= -I18n\ editor\ with\ no\ text\ \:= -I18n\ editor\:= Inc\ (+)= Italic= JAXX\ Demo= @@ -111,7 +107,6 @@ edit=Edit edit2=Edit 2 edit3=Edit 3 -editor.getSelectedLocale()= f0= f1= file...= @@ -167,9 +162,7 @@ jaxxdemo.config.configFileName.description=Configuration file name jaxxdemo.config.ui.= jaxxdemo.config.ui.demo.path= -jaxxdemo.config.ui.fontSize= jaxxdemo.config.ui.fullscreen=To change the screen mode (true for full screen) -jaxxdemo.config.ui.locale=Locale of the application jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popupBorderText=Popup title jaxxdemo.i18neditor.selected.locale=Selected Language @@ -230,19 +223,9 @@ model1.isF0()\ ||\ model1.isF1()= model1.isF1()= movies=Movies -numbereditor.normal.float=Signed float -numbereditor.normal.int=Signed integer -numbereditor.positive.float=Positive float -numbereditor.positive.int=Positive integer -numbereditor.type=Type -numbereditor.with.auto.popup=With auto popup -numbereditor.without.auto.popup=Without auto popup -show/hide\ label1= -show/hide\ label2= t0.isSelected()= t0.isSelected()\ &&\ t1.isSelected()= t0.isSelected()\ ||\ t1.isSelected()= t1.isSelected()= -test= valid= x= Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo-fr_FR.properties 2009-12-29 17:45:48 UTC (rev 1704) @@ -34,7 +34,6 @@ Editable=Editable Email\ Address\:=Courriel Email\:=Courriel -Empty\ I18n\ editor\:=Editeur I18n vide Enabled=Activ\u00E9 EnumEditor\ (country)\ \:=Editeur de pays EnumEditor\ (language)\ \:=Editeur de langue @@ -49,9 +48,6 @@ Green\:=Vert \: Greet= Help= -I18n\ editor\ with\ no\ icon\ \:=Editeur I18n sans icone \: -I18n\ editor\ with\ no\ text\ \:=Editeur I18n sans texte \: -I18n\ editor\:=Editeur I18n Inc\ (+)=Incr\u00E9menter (+) Italic=Italique JAXX\ Demo= @@ -111,7 +107,6 @@ edit=Editer edit2=Editer 2 edit3=Editer 3 -editor.getSelectedLocale()= f0= f1= file...= @@ -167,9 +162,7 @@ jaxxdemo.config.configFileName.description=Le nom du fichier de configuration jaxxdemo.config.ui.= jaxxdemo.config.ui.demo.path= -jaxxdemo.config.ui.fontSize= jaxxdemo.config.ui.fullscreen=Pour afficher l'aplication en mode pleine \u00E9cran -jaxxdemo.config.ui.locale=Langue utilis\u00E9e par l'application (fr_FR, en_GB ou es_ES) jaxxdemo.i18neditor.configuration=Configuration jaxxdemo.i18neditor.popupBorderText=Titre de la popup jaxxdemo.i18neditor.selected.locale=Langue s\u00E9lectionn\u00E9e @@ -230,19 +223,9 @@ model1.isF0()\ ||\ model1.isF1()= model1.isF1()= movies=Films -numbereditor.normal.float=D\u00E9cimal primitif \: [%1$s] -numbereditor.normal.int=Entier primitif \: [%1$s] -numbereditor.positive.float=D\u00E9cimal primitif positif \: [%1$s] -numbereditor.positive.int=Entier primitif positif \: [%1$s] -numbereditor.type=Type d'\u00E9diteur -numbereditor.with.auto.popup=Avec popup auto -numbereditor.without.auto.popup=Sans popup auto -show/hide\ label1= -show/hide\ label2= t0.isSelected()= t0.isSelected()\ &&\ t1.isSelected()= t0.isSelected()\ ||\ t1.isSelected()= t1.isSelected()= -test= valid=valide x=x Modified: trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties =================================================================== --- trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-12-29 17:45:48 UTC (rev 1704) @@ -1,64 +1,64 @@ -aboutframe.about=\u00c0 propos +aboutframe.about=\u00C0 propos aboutframe.license=Licence aboutframe.ok=OK aboutframe.thirdparty=Tierce partie -columnselector.action.tip=S\u00e9lectionner les colonnes +columnselector.action.tip=S\u00E9lectionner les colonnes config.action.quit=Quitter -config.action.quit.tip=Quitter l'\u00e9diteur de configuration +config.action.quit.tip=Quitter l'\u00E9diteur de configuration config.action.reset=Annuler -config.action.reset.tip=Annuler les modifications de cette cat\u00e9gorie +config.action.reset.tip=Annuler les modifications de cette cat\u00E9gorie config.action.save=Enregistrer -config.action.save.tip=Sauver les modifications de cette cat\u00e9gorie -config.category.needReloadApplication=Cat\u00e9gorie '%1$s' \: -config.category.needReloadUI=Cat\u00e9gorie '%1$s' \: -config.category.saved=La cat\u00e9gorie '%1$s' a \u00e9t\u00e9 modifi\u00e9e \: +config.action.save.tip=Sauver les modifications de cette cat\u00E9gorie +config.category.needReloadApplication=Cat\u00E9gorie '%1$s' \: +config.category.needReloadUI=Cat\u00E9gorie '%1$s' \: +config.category.saved=La cat\u00E9gorie '%1$s' a \u00E9t\u00E9 modifi\u00E9e \: config.choice.cancel=Annuler config.choice.continue=Continuer config.choice.doNotSave=Ne pas enregistrer config.choice.ok=Ok config.choice.save=Enregistrer -config.defaultValue=Valeur par d\u00e9faut -config.defaultValue.tip=Valeur par d\u00e9faut de l'option +config.defaultValue=Valeur par d\u00E9faut +config.defaultValue.tip=Valeur par d\u00E9faut de l'option config.descrition=Description -config.error.category.already.exists=La cat\u00e9gorie de nom '%1$s' existe d\u00e9j\u00e0\! -config.error.category.not.found=La cat\u00e9gorie de nom '%1$s' n'existe pas\! +config.error.category.already.exists=La cat\u00E9gorie de nom '%1$s' existe d\u00E9j\u00E0\! +config.error.category.not.found=La cat\u00E9gorie de nom '%1$s' n'existe pas\! config.key=Clef config.key.tip=Clef de l'option -config.message.quit.invalid.category=La cat\u00e9gorie '%1$s' n'est pas valide\! -config.message.quit.valid.and.modified.category=La cat\u00e9gorie '%1$s' poss\u00e8dent des options modifi\u00e9es \: -config.model.needReloadApplication=Des options ont \u00e9t\u00e9 modifi\u00e9es qui n\u00e9cessitent le red\u00e9marrage de l'application.\n -config.model.needReloadUI=Des options ont \u00e9t\u00e9 modifi\u00e9es qui n\u00e9cessitent le red\u00e9marrage de l'interface graphique.\n -config.modified=Option modifi\u00e9e (valeur originale \: %1$s) -config.no.option.selected=< Pas d'option s\u00e9lectionn\u00e9e > +config.message.quit.invalid.category=La cat\u00E9gorie '%1$s' n'est pas valide\! +config.message.quit.valid.and.modified.category=La cat\u00E9gorie '%1$s' poss\u00E8dent des options modifi\u00E9es \: +config.model.needReloadApplication=Des options ont \u00E9t\u00E9 modifi\u00E9es qui n\u00E9cessitent le red\u00E9marrage de l'application.\n +config.model.needReloadUI=Des options ont \u00E9t\u00E9 modifi\u00E9es qui n\u00E9cessitent le red\u00E9marrage de l'interface graphique.\n +config.modified=Option modifi\u00E9e (valeur originale \: %1$s) +config.no.option.selected=< Pas d'option s\u00E9lectionn\u00E9e > config.option.final=Option non modifiable config.option.label=Option '%1$s' (%2$s) -config.option.modified=Valeur modifi\u00e9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > -config.title=Pr\u00e9f\u00e9rences +config.option.modified=Valeur modifi\u00E9e < ancienne valeur \: '%1$s' - nouvelle valeur \: '%2$s' > +config.title=Pr\u00E9f\u00E9rences config.title.need.confirm=Une confirmation de votre part est requise... -config.title.will.reload.application=L'application doit \u00eatre red\u00e9marrer... -config.title.will.reload.ui=L'interface graphique doit \u00eatre relancer... -config.unmodifiable=Ne peut pas \u00eatre modifi\u00e9 +config.title.will.reload.application=L'application doit \u00EAtre red\u00E9marrer... +config.title.will.reload.ui=L'interface graphique doit \u00EAtre relancer... +config.unmodifiable=Ne peut pas \u00EAtre modifi\u00E9 config.unvalid=Option non valide (valeur originale \: %1$s, type requis \: %2$s) config.value=Valeur config.value.tip=Valeur de l'option -entitycombobox.action.reset.tip=R\u00e9initialiser la valeur de la liste d\u00e9roulante -entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00e9roulante +entitycombobox.action.reset.tip=R\u00E9initialiser la valeur de la liste d\u00E9roulante +entitycombobox.action.sort.tip=Modifier le tri de la liste d\u00E9roulante entitycombobox.popup.label=Objet '%1$s' entitycombobox.popup.title=Modifier le tri -entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00e9t\u00e9 '%1$s' -entitycombobox.sort.on=Le tri est effectu\u00e9 sur la propri\u00e9t\u00e9 '%1$s' +entitycombobox.sort.off=Cliquer pour activer le tri sur la propri\u00E9t\u00E9 '%1$s' +entitycombobox.sort.on=Le tri est effectu\u00E9 sur la propri\u00E9t\u00E9 '%1$s' entitycombobox.unknown.type=Objet de type inconnu errorUI.action.close=Fermer errorUI.message=Une erreur est survenue \! errorUI.title=Erreur... -fontsize.action.default.tip=Retour sur la taille par d\u00e9faut +fontsize.action.default.tip=Retour sur la taille par d\u00E9faut fontsize.action.down.tip=Diminuer la taille de la police fontsize.action.up.tip=Augmenter la taille de la police hidor.hideTip=Cacher hidor.showTip=Voir -i18neditor.empty.locales=< Aucune locale \u00e0 s\u00e9lectionner > +i18neditor.empty.locales=< Aucune locale \u00E0 s\u00E9lectionner > i18neditor.popup.title=Changer de langue -i18neditor.selected=Langue actuellement utilis\u00e9e \: %1$s +i18neditor.selected=Langue actuellement utilis\u00E9e \: %1$s i18neditor.unselected=Pour utiliser cette langue \: %1$s listSelector.hideList=Cacher la liste listSelector.showList=Afficher la liste @@ -74,8 +74,8 @@ numbereditor.7=7 numbereditor.8=8 numbereditor.9=9 -numbereditor.action.reset.tip=R\u00e9initialiser -numbereditor.action.show.tip=Afficher le pav\u00e9 num\u00e9rique +numbereditor.action.reset.tip=R\u00E9initialiser +numbereditor.action.show.tip=Afficher le pav\u00E9 num\u00E9rique numbereditor.clearAll=C numbereditor.clearOne=CE numbereditor.toggleSign=+/- Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractGenerateHelpMojo.java 2009-12-29 17:45:48 UTC (rev 1704) @@ -18,6 +18,7 @@ * ##%*/ package org.nuiton.jaxx.plugin; +import org.apache.commons.lang.StringUtils; import org.apache.maven.plugin.MojoFailureException; import org.nuiton.i18n.I18n; @@ -105,9 +106,10 @@ protected abstract void postDoAction(); @Override - protected boolean init() throws Exception { + protected void init() throws Exception { +// protected boolean init() throws Exception { - if (locales == null || locales.trim().isEmpty()) { + if (StringUtils.isEmpty(locales)) { throw new MojoFailureException("You must set the 'locales' property properly (was " + locales + ")."); } @@ -123,7 +125,7 @@ } if (tmp.isEmpty()) { - throw new MojoFailureException("you must set the 'locales' property."); + throw new MojoFailureException("No locale to react, you must set the 'locales' property."); } localesToTreate = tmp.toArray(new Locale[tmp.size()]); @@ -131,15 +133,24 @@ createDirectoryIfNecessary(getTargetDirectory()); +// return true; + } + + @Override + protected boolean checkSkip() { + if (!generateHelp) { + getLog().info("generateHelp flag is off, will skip goal."); + return false; + } return true; } @Override protected void doAction() throws Exception { - if (skipAction()) { - return; - } +// if (skipAction()) { +// return; +// } for (Locale locale : localesToTreate) { @@ -160,13 +171,13 @@ postDoAction(); } - protected boolean skipAction() { - if (!generateHelp) { - getLog().info("generateHelp flag is off, generate nothing."); - return true; - } - return false; - } +// protected boolean skipAction() { +// if (!generateHelp) { +// getLog().info("generateHelp flag is off, will skip goal."); +// return true; +// } +// return false; +// } public File getOutputHelpIds() { return outputHelpIds; Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/AbstractJaxxMojo.java 2009-12-29 17:45:48 UTC (rev 1704) @@ -18,14 +18,11 @@ * ##%*/ package org.nuiton.jaxx.plugin; -import org.apache.maven.model.Resource; import org.apache.maven.project.MavenProject; import org.nuiton.plugin.AbstractPlugin; import org.nuiton.util.FileUtil; import java.io.File; -import java.io.IOException; -import java.util.List; /** * Abstract Jaxx Mojo. @@ -82,7 +79,9 @@ @Override protected boolean checkPackaging() { - return project != null && !"pom".equals(project.getPackaging()) && !"site".equals(project.getPackaging()); + // not accept pom modules + return !acceptPackaging(Packaging.pom); +// return project != null && !"pom".equals(project.getPackaging()) && !"site".equals(project.getPackaging()); } @Override @@ -121,78 +120,12 @@ this.force = force; } - /** - * TODO-TC20091221 Should move this to AbstractPlugin - * Create the directory if necessary. - * - * @param dir the directory to create if not already existing - * @throws IOException if could not create the directory - */ - protected void createDirectoryIfNecessary(File dir) throws IOException { - if (!dir.exists()) { - if (verbose) { - getLog().info("mkdir " + dir); - } - boolean b = dir.mkdirs(); - if (!b) { - throw new IOException("could not create directory " + dir); - } - } - } - - //TODO-TC20091221 move this api to PluginHelper - public static boolean addResourceDir(File dir, MavenProject project, String... includes) { - List<?> resources = project.getResources(); - boolean added = addResourceDir(dir, project, resources, includes); - return added; - } - - //TODO-TC20091221 move this api to PluginHelper - public static boolean addTestResourceDir(File newresourceDir, MavenProject project, String... includes) { - List<?> resources = project.getTestResources(); - boolean added = addResourceDir(newresourceDir, project, resources, includes); - return added; - } - - //TODO-TC20091221 move this api to PluginHelper - public static boolean addResourceDir(File dir, MavenProject project, List<?> resources, String... includes) { - String newresourceDir = dir.getAbsolutePath(); - boolean shouldAdd = true; - for (Object o : resources) { - Resource r = (Resource) o; - if (!r.getDirectory().equals(newresourceDir)) { - continue; - } - - for (String i : includes) { - if (!r.getIncludes().contains(i)) { - r.addInclude(i); - } - } - shouldAdd = false; - break; - } - if (shouldAdd) { - Resource r = new Resource(); - r.setDirectory(newresourceDir); - for (String i : includes) { - if (!r.getIncludes().contains(i)) { - r.addInclude(i); - } - } - project.addResource(r); - } - return shouldAdd; - } - - class GetLastModifiedFileAction implements FileUtil.FileAction { protected File lastFile; public GetLastModifiedFileAction(File lastFile) { this.lastFile = lastFile; - } @Override Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpFilesMojo.java 2009-12-29 17:45:48 UTC (rev 1704) @@ -31,7 +31,7 @@ /** * Mojo to generate javax help files for your project. - * + * * @author chemit * @goal generate-help-files * @phase process-sources @@ -115,6 +115,7 @@ protected String indexFileName; protected String tocFileName; protected int touchedFiles; + protected File idsFile; /** * The help ids discovered. @@ -132,11 +133,13 @@ } @Override - public boolean init() throws Exception { + public void init() throws Exception { +// public boolean init() throws Exception { if (!generateHelp) { + return; +// return true; + } - return true; - } // check ressources checkResource(helpsetTemplate); checkResource(mapTemplate); @@ -149,68 +152,96 @@ tocFileName = helpsetName + "TOC.xml"; touchedFiles = 0; - boolean b = super.init(); - if (!b) { - return false; - } + super.init(); +// boolean b = super.init(); +// if (!b) { +// return false; +// } + // load ids from idsStore file - File idsFile; +// File idsFile; if (isForce()) { idsFile = getMergeHelpIdsStoreFile(); - if (!idsFile.exists()) { - if (isVerbose()) { - getLog().info("Force flag is on, but no helpIdStore-all to react at " + idsFile); - } - return true; - } +// if (!idsFile.exists()) { +// if (isVerbose()) { +// getLog().info("Force flag is on, but no helpIdStore-all to react at " + idsFile); +// } +// return true; +// } } else { idsFile = getHelpIdsStoreFile(); - if (!idsFile.exists()) { - if (isVerbose()) { - getLog().info("no helpIdStore to react at " + idsFile); - } - return true; - } +// if (!idsFile.exists()) { +// if (isVerbose()) { +// getLog().info("no helpIdStore to react at " + idsFile); +// } +// return true; +// } } + if (!idsFile.exists()) { + return; + } + helpIds = new SortedProperties(); // loading all ids Set<String> ids = loadHelpIds(idsFile); - if (ids.isEmpty()) { +// if (ids.isEmpty()) { +// +// // no ids detected +// if (isVerbose()) { +// getLog().info("No helpIds detected, will skip."); +// } +// return true; +// } - // no ids detected - if (isVerbose()) { - getLog().info("No helpIds detected, will skip."); - } - return true; - } - for (String id : ids) { String path = id.replaceAll("\\.", File.separator) + ".html"; helpIds.put(id, path); } - return true; +// return true; } @Override - protected boolean skipAction() { - boolean b = super.skipAction(); - if (!b) { + protected boolean checkSkip() { + boolean b = super.checkSkip(); + if (b) { + + if (!idsFile.exists()) { + // pas de fichier a traiter + if (isForce()) { + getLog().info("Force flag is on, but no helpIdStore-all to react at " + idsFile); + } else { + getLog().info("no helpIdStore to react at " + idsFile); + } + return false; + } if (helpIds == null || helpIds.isEmpty()) { getLog().info("No help ids to treate."); - return true; + return false; } } - return false; + return b; } // @Override +// protected boolean skipAction() { +// boolean b = super.skipAction(); +// if (!b) { +// if (helpIds == null || helpIds.isEmpty()) { +// getLog().info("No help ids to treate."); +// return true; +// } +// } +// return false; +// } + +// @Override // public void doAction() throws Exception { // // if (skipAction()) { Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpIdsMojo.java 2009-12-29 17:45:48 UTC (rev 1704) @@ -9,7 +9,7 @@ /** * Generate the help ids files from the previous jaxx generation. - * + * <p/> * Created: 22 déc. 2009 * * @author Tony Chemit <chemit(a)codelutin.com> Copyright Code Lutin @@ -25,17 +25,26 @@ */ public class GenerateHelpIdsMojo extends AbstractGenerateHelpMojo { + /** + * help ids to react. + */ + protected Set<String> helpIds; + @Override - public boolean init() throws Exception { + public void init() throws Exception { +// public boolean init() throws Exception { if (!generateHelp) { - return true; + return; +// return true; } - if (!super.init()) { - return false; - } + super.init(); +// if (!super.init()) { +// return false; +// } + // check there is some bundle if (getHelpIdsFilename() == null) { throw new MojoFailureException("you must set the 'helpIdStore' property."); @@ -44,27 +53,48 @@ throw new MojoFailureException("you must set the 'helpIdStoreAll' property."); } - return true; + helpIds = HelpRootCompiledObjectDecorator.getHelpIds(); + + // always clean helpIdsStore before all + cleanHelpIdsStore(); + +// return true; } @Override - public void doAction() throws Exception { + protected boolean checkSkip() { + boolean b = super.checkSkip(); + if (b) { - if (skipAction()) { - return; - } - - Set<String> helpIds = HelpRootCompiledObjectDecorator.getHelpIds(); - - if (helpIds.isEmpty()) { + if (helpIds.isEmpty()) { // if (isVerbose()) { - // no ids detected in this compilation round - getLog().info("No helpIds detected."); + // no ids detected in this compilation round + getLog().info("No help ids to treate, will skip goal."); // } - cleanHelpIdsStore(); - return; + return false; + } } + return b; + } + @Override + public void doAction() throws Exception { + +// if (skipAction()) { +// return; +// } + +// Set<String> helpIds = HelpRootCompiledObjectDecorator.getHelpIds(); +// +// if (helpIds.isEmpty()) { +//// if (isVerbose()) { +// // no ids detected in this compilation round +// getLog().info("No helpIds detected."); +//// } +// cleanHelpIdsStore(); +// return; +// } + // store current jaxx session detected help ids File idsStore = getHelpIdsStoreFile(); @@ -92,6 +122,7 @@ @Override protected void doActionForLocale(Locale locale, boolean isDefaultLocale, File source, String localePath) throws Exception { + // nothing to do specific to locale } @Override Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpMojo.java 2009-12-29 17:45:48 UTC (rev 1704) @@ -45,12 +45,12 @@ public void setTargetDirectory(File targetDirectory) { } - @Override - public boolean init() throws Exception { +// @Override +// public boolean init() throws Exception { +// +// return true; +// } - return true; - } - @Override public void doAction() throws Exception { Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateHelpSearchMojo.java 2009-12-29 17:45:48 UTC (rev 1704) @@ -59,19 +59,22 @@ protected String timestamp; @Override - public boolean init() throws Exception { - if (!generateHelp) { + public void init() throws Exception { +// public boolean init() throws Exception { + if (!generateHelp || !generateSearch) { - return true; + return; +// return true; } - if (!generateSearch) { -// getLog().info("Do not generate search."); - return true; - } +// if (!generateSearch) { +//// getLog().info("Do not generate search."); +// return true; +// } timestamp = "-" + System.currentTimeMillis(); - return super.init(); + super.init(); +// return super.init(); } @Override @@ -84,18 +87,30 @@ this.outputHelpSearch = targetDirectory; } - protected boolean skipAction() { - if (!generateHelp) { - getLog().info("generateHelp flag is off, generate nothing."); - return true; + @Override + protected boolean checkSkip() { + boolean b = super.checkSkip(); + if (b) { + if (!generateSearch) { + getLog().info("generateHelpsearch flag is off, will skip goal."); + return false; + } } - if (!generateSearch) { - getLog().info("generateHelpsearch flag is off, generate nothing."); - return true; - } - return false; + return b; } +// protected boolean skipAction() { +// if (!generateHelp) { +// getLog().info("generateHelp flag is off, generate nothing."); +// return true; +// } +// if (!generateSearch) { +// getLog().info("generateHelpsearch flag is off, generate nothing."); +// return true; +// } +// return false; +// } + @Override protected void doActionForLocale(Locale locale, boolean isDefaultLocale, File source, String localePath) throws Exception { @@ -165,7 +180,7 @@ protected void postDoAction() { // add resources to the project - addResourceDir(getTargetDirectory(), getProject(), "**/*"); + addResourceDir(getTargetDirectory(), "**/*"); } protected void generateSearchIndex(File source, File target, Locale locale) throws Exception { Modified: trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java =================================================================== --- trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/maven-jaxx-plugin/src/main/java/org/nuiton/jaxx/plugin/GenerateMojo.java 2009-12-29 17:45:48 UTC (rev 1704) @@ -289,7 +289,8 @@ @SuppressWarnings("unchecked") @Override - public boolean init() throws Exception { + public void init() throws Exception { +// public boolean init() throws Exception { fixCompileSourceRoots(); @@ -306,7 +307,8 @@ nofiles = files == null || files.length == 0; if (nofiles) { - return true; + return; +// return true; } cl = initClassLoader(getProject(), @@ -359,16 +361,25 @@ getLog().info("will parse " + file); } } +// return true; + } + + @Override + protected boolean checkSkip() { + if (nofiles) { + getLog().info("Nothing to generate - all files are up to date."); + return false; + } return true; } @Override public void doAction() throws Exception { - if (nofiles) { - getLog().info("Nothing to generate - all files are uo to date."); - return; - } +// if (nofiles) { +// getLog().info("Nothing to generate - all files are uo to date."); +// return; +// } getLog().info("Detects " + files.length + " modified jaxx file(s). "); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-23 09:14:47 UTC (rev 1703) +++ trunk/pom.xml 2009-12-29 17:45:48 UTC (rev 1704) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.3</version> + <version>1.1.4-SNAPSHOT</version> </parent> <artifactId>jaxx</artifactId> @@ -355,7 +355,7 @@ <projectId>jaxx</projectId> <lutinutil.version>1.1.0</lutinutil.version> - <i18n.version>1.0.1</i18n.version> + <i18n.version>1.0.2-SNAPSHOT</i18n.version> <jxlayer.version>3.0.3</jxlayer.version>

1 0