Author: tchemit Date: 2012-02-06 11:48:25 +0100 (Mon, 06 Feb 2012) New Revision: 2314 Url: http://nuiton.org/repositories/revision/jaxx/2314 Log: Evolution #1939: Change maven-jaxx-plugin to jaxx-maven-plugin Anomalie #1948: inherited attribute no more supported by item of site.xml Anomalie #1947: Can not use any more menu item with no href with m-site-p 3.0 Added: trunk/jaxx-maven-plugin/ trunk/jaxx-maven-plugin/pom.xml Removed: trunk/jaxx-maven-plugin/pom.xml trunk/maven-jaxx-plugin/LICENSE.txt trunk/maven-jaxx-plugin/README.txt trunk/maven-jaxx-plugin/changelog.txt trunk/maven-jaxx-plugin/pom.xml trunk/maven-jaxx-plugin/src/ Modified: trunk/jaxx-compiler/src/site/site_fr.xml trunk/jaxx-demo/pom.xml trunk/jaxx-demo/src/site/site_fr.xml trunk/jaxx-maven-plugin/src/site/site_fr.xml trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml trunk/jaxx-runtime/src/site/site_fr.xml trunk/jaxx-swing-action/src/site/site_fr.xml trunk/jaxx-tutorial-config/src/site/site_fr.xml trunk/jaxx-tutorial-css/pom.xml trunk/jaxx-tutorial-css/src/site/site_fr.xml trunk/jaxx-tutorial-databinding/pom.xml trunk/jaxx-tutorial-databinding/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld/pom.xml trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml trunk/jaxx-tutorial-helloworld2/pom.xml trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml trunk/jaxx-tutorial-validation/pom.xml trunk/jaxx-tutorial-validation/src/site/site_fr.xml trunk/jaxx-tutorial/pom.xml trunk/jaxx-tutorial/src/site/site_fr.xml trunk/jaxx-validator/src/site/site_fr.xml trunk/jaxx-widgets/pom.xml trunk/jaxx-widgets/src/site/site_fr.xml trunk/pom.xml trunk/src/site/rst/index.rst trunk/src/site/rst/tutos/helloworld.rst trunk/src/site/rst/tutos/helloworld2.rst trunk/src/site/site_fr.xml Modified: trunk/jaxx-compiler/src/site/site_fr.xml =================================================================== --- trunk/jaxx-compiler/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-compiler/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"/> + <menu name="Utilisateur"/> <menu ref="reports"/> Modified: trunk/jaxx-demo/pom.xml =================================================================== --- trunk/jaxx-demo/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-demo/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -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,7 +58,7 @@ <artifactId>jaxx-validator</artifactId> <version>${project.version}</version> </dependency> - + <dependency> <groupId>${project.groupId}</groupId> <artifactId>jaxx-widgets</artifactId> @@ -77,7 +79,7 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> - + <dependency> <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> @@ -216,7 +218,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${project.version}</version> <executions> <execution> @@ -291,6 +293,83 @@ <!-- ************************************************************* --> <profiles> + + <profile> + <id>jnlpwar-profile</id> + <dependencies> + <dependency> + <groupId>org.codehaus.mojo.webstart</groupId> + <artifactId>webstart-jnlp-servlet</artifactId> + <version>${webstartPluginVersion}</version> + </dependency> + </dependencies> + <build> + <plugins> + <!-- key store secrets availables --> + <plugin> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <executions> + <execution> + <id>get-keystore</id> + <goals> + <goal>share-server-secret</goal> + </goals> + <phase>package</phase> + <configuration> + <serverId>codelutin-keystore</serverId> + <privateKeyOut>keystorepath</privateKeyOut> + <passwordOut>keystorepass</passwordOut> + <usernameOut>keyalias</usernameOut> + <passphraseOut>keypass</passphraseOut> + </configuration> + </execution> + </executions> + </plugin> + + <!-- make webstart --> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>webstart-maven-plugin</artifactId> + <executions> + <execution> + <id>generate-jnlp</id> + <phase>package</phase> + <goals> + <goal>jnlp-download-servlet</goal> + </goals> + <configuration> + <outputDirectoryName>jnlp</outputDirectoryName> + <excludeTransitive>false</excludeTransitive> + <libPath>apps</libPath> + <outputJarVersions>true</outputJarVersions> + <!--dependencies> + <includes> + <include>be.irisnet.nova:nova-common</include> + </includes> + </dependencies--> + <jnlpFiles> + <jnlpFile> + <!--templateFilename>template_com.jnlp</templateFilename> + <outputFilename>client_com.jnlp</outputFilename--> + <jarResources> + <jarResource> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-demo</artifactId> + <version>${project.version}</version> + <mainClass>${maven.jar.main.class}</mainClass> + </jarResource> + </jarResources> + </jnlpFile> + </jnlpFiles> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> <profile> <id>release-jnlp-profile</id> @@ -305,7 +384,7 @@ <!-- key store secrets availables --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-keystore</id> @@ -326,7 +405,7 @@ <!-- make webstart --> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <executions> <execution> @@ -355,7 +434,7 @@ <reporting> <plugins> <plugin> - <groupId>org.codehaus.mojo.webstart</groupId> + <groupId>org.codehaus.mojo</groupId> <artifactId>webstart-maven-plugin</artifactId> <version>${webstartPluginVersion}</version> </plugin> Modified: trunk/jaxx-demo/src/site/site_fr.xml =================================================================== --- trunk/jaxx-demo/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-demo/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -44,7 +44,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> Deleted: trunk/jaxx-maven-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -1,227 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - JAXX :: Maven plugin - - $Id$ - $HeadURL$ - %% - Copyright (C) 2008 - 2010 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> - -<project 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> - - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - - <parent> - <groupId>org.nuiton</groupId> - <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> - </parent> - - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - - <dependencies> - - <!-- sibling dependencies --> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-validator</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-compiler</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- maven plugin project dependencies --> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> - - <!-- other dependencies --> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <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> - <artifactId>dt</artifactId> - <scope>system</scope> - <systemPath>/${java.home}/../lib/dt.jar</systemPath> - </dependency> - - <!-- tests dependencies --> - - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-verifier</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.maven.plugin-testing</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> - <classifier>tests</classifier> - </dependency> - - <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - - </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>JAXX :: Maven plugin</name> - <description> - Maven 2 plugin to generate java sources from JAXX files. - </description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>maven-plugin</packaging> - - <profiles> - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>${pluginPluginVersion}</version> - </plugin> - - </plugins> - </reporting> - - </profile> - - </profiles> - -</project> Copied: trunk/jaxx-maven-plugin/pom.xml (from rev 2312, trunk/maven-jaxx-plugin/pom.xml) =================================================================== --- trunk/jaxx-maven-plugin/pom.xml (rev 0) +++ trunk/jaxx-maven-plugin/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -0,0 +1,227 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + JAXX :: Maven plugin + + $Id$ + $HeadURL$ + %% + Copyright (C) 2008 - 2010 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as + published by the Free Software Foundation, either version 3 of the + License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Lesser Public License for more details. + + You should have received a copy of the GNU General Lesser Public + License along with this program. If not, see + <http://www.gnu.org/licenses/lgpl-3.0.html>. + #L% + --> + +<project 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> + + <!-- ************************************************************* --> + <!-- *** POM Relationships *************************************** --> + <!-- ************************************************************* --> + + <parent> + <groupId>org.nuiton</groupId> + <artifactId>jaxx</artifactId> + <version>2.5-SNAPSHOT</version> + </parent> + + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-maven-plugin</artifactId> + + <dependencies> + + <!-- sibling dependencies --> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-runtime</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-validator</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-compiler</artifactId> + <version>${project.version}</version> + </dependency> + + <!-- maven plugin project dependencies --> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + </dependency> + + <!-- other dependencies --> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + + <dependency> + <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> + <artifactId>dt</artifactId> + <scope>system</scope> + <systemPath>/${java.home}/../lib/dt.jar</systemPath> + </dependency> + + <!-- tests dependencies --> + + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-verifier</artifactId> + </dependency> + + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.maven.plugin-testing</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>helper-maven-plugin</artifactId> + <classifier>tests</classifier> + </dependency> + + <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>runtime</scope> + </dependency> + + + </dependencies> + + <!-- ************************************************************* --> + <!-- *** Project Information ************************************* --> + <!-- ************************************************************* --> + + <name>JAXX :: Maven plugin</name> + <description> + Maven 2 plugin to generate java sources from JAXX files. + </description> + + <!-- ************************************************************* --> + <!-- *** Build Settings ****************************************** --> + <!-- ************************************************************* --> + + <packaging>maven-plugin</packaging> + + <profiles> + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> + <profile> + <id>release-profile</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + <build> + <plugins> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>helpmojo</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + </profile> + + <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <reporting> + <plugins> + + <plugin> + <artifactId>maven-plugin-plugin</artifactId> + <version>${pluginPluginVersion}</version> + </plugin> + + </plugins> + </reporting> + + </profile> + + </profiles> + +</project> Modified: trunk/jaxx-maven-plugin/src/site/site_fr.xml =================================================================== --- trunk/maven-jaxx-plugin/src/site/site_fr.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Détail goals" href="plugin-info.html"> <item name="generate" href="generate-mojo.html"/> Modified: trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java =================================================================== --- trunk/maven-jaxx-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/java/org/nuiton/jaxx/plugin/JaxxBaseTest.java 2012-02-06 10:48:25 UTC (rev 2314) @@ -44,7 +44,7 @@ /** * Base test case for a jaxx:generate goal. * <p/> - * Use {@link AbstractMojoTest} from {@code maven-helper-plugin}. + * Use {@link AbstractMojoTest} from {@code helper-maven-plugin}. * * @author tchemit <chemit@codelutin.com> * @see AbstractMojoTest Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1404Test/Bug_1404.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -34,7 +34,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1722Test/Bug_1722.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1750Test/Bug_1750.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug1751Test/Bug_1751.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-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 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/bug184Test/Bug_184.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/CSSTests.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClassReferences.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ClientProperty.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorJaxxContextImplementorClass.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Errors.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ErrorsCss.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Force.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Icon.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/ImportTag.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Initializers.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/InnerClasses.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/NoLog.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/OverridingDataBindings.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/Script.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/SpecialSubclassing.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerTest/WithLog.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorErrors.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -36,7 +36,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/compilerValidatorTest/ValidatorOk.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/dataBindingTest/simpleBinding.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/decoratorTest/Decorator.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/error.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/evolution74Test/ok.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nText.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nTitle.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml =================================================================== --- trunk/maven-jaxx-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml 2012-01-04 17:18:38 UTC (rev 2311) +++ trunk/jaxx-maven-plugin/src/test/resources/org/nuiton/jaxx/plugin/i18nTest/I18nToolTipText.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -35,7 +35,7 @@ <plugins> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <configuration> <src>${basedir}/target/test-classes</src> <outJava>${basedir}/target/generated-sources/test-java</outJava> Modified: trunk/jaxx-runtime/src/site/site_fr.xml =================================================================== --- trunk/jaxx-runtime/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-runtime/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> </menu> Modified: trunk/jaxx-swing-action/src/site/site_fr.xml =================================================================== --- trunk/jaxx-swing-action/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-swing-action/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"/> + <menu name="Utilisateur"/> <menu ref="reports"/> Modified: trunk/jaxx-tutorial/pom.xml =================================================================== --- trunk/jaxx-tutorial/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -95,7 +95,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${project.version}</version> </plugin> @@ -176,7 +176,7 @@ <!-- key store secrets availables --> <plugin> <groupId>org.nuiton</groupId> - <artifactId>maven-helper-plugin</artifactId> + <artifactId>helper-maven-plugin</artifactId> <executions> <execution> <id>get-keystore</id> Modified: trunk/jaxx-tutorial/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -30,7 +30,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -42,7 +42,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> </menu> Modified: trunk/jaxx-tutorial-config/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-config/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> Modified: trunk/jaxx-tutorial-css/pom.xml =================================================================== --- trunk/jaxx-tutorial-css/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-css/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -77,7 +77,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/jaxx-tutorial-css/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-css/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> Modified: trunk/jaxx-tutorial-databinding/pom.xml =================================================================== --- trunk/jaxx-tutorial-databinding/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-databinding/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -82,7 +82,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/jaxx-tutorial-databinding/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-databinding/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> Modified: trunk/jaxx-tutorial-helloworld/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-helloworld/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -89,7 +89,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-helloworld/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> Modified: trunk/jaxx-tutorial-helloworld2/pom.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-helloworld2/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -88,7 +88,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> <goals> Modified: trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-helloworld2/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> Modified: trunk/jaxx-tutorial-validation/pom.xml =================================================================== --- trunk/jaxx-tutorial-validation/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-validation/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -178,7 +178,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${project.version}</version> <executions> <execution> Modified: trunk/jaxx-tutorial-validation/src/site/site_fr.xml =================================================================== --- trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-tutorial-validation/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"> + <menu name="Utilisateur"> <item name="Accueil" href="index.html"/> <item name="Lancer la démo" href="jnlp/launch.jnlp"/> </menu> Modified: trunk/jaxx-validator/src/site/site_fr.xml =================================================================== --- trunk/jaxx-validator/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-validator/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"/> + <menu name="Utilisateur"/> <menu ref="reports"/> Modified: trunk/jaxx-widgets/pom.xml =================================================================== --- trunk/jaxx-widgets/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-widgets/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -138,7 +138,7 @@ <plugin> <groupId>${project.groupId}</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>${project.version}</version> <executions> <execution> Modified: trunk/jaxx-widgets/src/site/site_fr.xml =================================================================== --- trunk/jaxx-widgets/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/jaxx-widgets/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>../jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -40,7 +40,7 @@ <menu ref="parent"/> - <menu name="Utilisateur" inherited="top"/> + <menu name="Utilisateur"/> <menu ref="reports"/> Deleted: trunk/maven-jaxx-plugin/LICENSE.txt =================================================================== --- trunk/maven-jaxx-plugin/LICENSE.txt 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/maven-jaxx-plugin/LICENSE.txt 2012-02-06 10:48:25 UTC (rev 2314) @@ -1,166 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - - This version of the GNU Lesser General Public License incorporates -the terms and conditions of version 3 of the GNU General Public -License, supplemented by the additional permissions listed below. - - 0. Additional Definitions. - - As used herein, "this License" refers to version 3 of the GNU Lesser -General Public License, and the "GNU GPL" refers to version 3 of the GNU -General Public License. - - "The Library" refers to a covered work governed by this License, -other than an Application or a Combined Work as defined below. - - An "Application" is any work that makes use of an interface provided -by the Library, but which is not otherwise based on the Library. -Defining a subclass of a class defined by the Library is deemed a mode -of using an interface provided by the Library. - - A "Combined Work" is a work produced by combining or linking an -Application with the Library. The particular version of the Library -with which the Combined Work was made is also called the "Linked -Version". - - The "Minimal Corresponding Source" for a Combined Work means the -Corresponding Source for the Combined Work, excluding any source code -for portions of the Combined Work that, considered in isolation, are -based on the Application, and not on the Linked Version. - - The "Corresponding Application Code" for a Combined Work means the -object code and/or source code for the Application, including any data -and utility programs needed for reproducing the Combined Work from the -Application, but excluding the System Libraries of the Combined Work. - - 1. Exception to Section 3 of the GNU GPL. - - You may convey a covered work under sections 3 and 4 of this License -without being bound by section 3 of the GNU GPL. - - 2. Conveying Modified Versions. - - If you modify a copy of the Library, and, in your modifications, a -facility refers to a function or data to be supplied by an Application -that uses the facility (other than as an argument passed when the -facility is invoked), then you may convey a copy of the modified -version: - - a) under this License, provided that you make a good faith effort to - ensure that, in the event an Application does not supply the - function or data, the facility still operates, and performs - whatever part of its purpose remains meaningful, or - - b) under the GNU GPL, with none of the additional permissions of - this License applicable to that copy. - - 3. Object Code Incorporating Material from Library Header Files. - - The object code form of an Application may incorporate material from -a header file that is part of the Library. You may convey such object -code under terms of your choice, provided that, if the incorporated -material is not limited to numerical parameters, data structure -layouts and accessors, or small macros, inline functions and templates -(ten or fewer lines in length), you do both of the following: - - a) Give prominent notice with each copy of the object code that the - Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the object code with a copy of the GNU GPL and this license - document. - - 4. Combined Works. - - You may convey a Combined Work under terms of your choice that, -taken together, effectively do not restrict modification of the -portions of the Library contained in the Combined Work and reverse -engineering for debugging such modifications, if you also do each of -the following: - - a) Give prominent notice with each copy of the Combined Work that - the Library is used in it and that the Library and its use are - covered by this License. - - b) Accompany the Combined Work with a copy of the GNU GPL and this license - document. - - c) For a Combined Work that displays copyright notices during - execution, include the copyright notice for the Library among - these notices, as well as a reference directing the user to the - copies of the GNU GPL and this license document. - - d) Do one of the following: - - 0) Convey the Minimal Corresponding Source under the terms of this - License, and the Corresponding Application Code in a form - suitable for, and under terms that permit, the user to - recombine or relink the Application with a modified version of - the Linked Version to produce a modified Combined Work, in the - manner specified by section 6 of the GNU GPL for conveying - Corresponding Source. - - 1) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (a) uses at run time - a copy of the Library already present on the user's computer - system, and (b) will operate properly with a modified version - of the Library that is interface-compatible with the Linked - Version. - - e) Provide Installation Information, but only if you would otherwise - be required to provide such information under section 6 of the - GNU GPL, and only to the extent that such information is - necessary to install and execute a modified version of the - Combined Work produced by recombining or relinking the - Application with a modified version of the Linked Version. (If - you use option 4d0, the Installation Information must accompany - the Minimal Corresponding Source and Corresponding Application - Code. If you use option 4d1, you must provide the Installation - Information in the manner specified by section 6 of the GNU GPL - for conveying Corresponding Source.) - - 5. Combined Libraries. - - You may place library facilities that are a work based on the -Library side by side in a single library together with other library -facilities that are not Applications and are not covered by this -License, and convey such a combined library under terms of your -choice, if you do both of the following: - - a) Accompany the combined library with a copy of the same work based - on the Library, uncombined with any other library facilities, - conveyed under the terms of this License. - - b) Give prominent notice with the combined library that part of it - is a work based on the Library, and explaining where to find the - accompanying uncombined form of the same work. - - 6. Revised Versions of the GNU Lesser General Public License. - - The Free Software Foundation may publish revised and/or new versions -of the GNU Lesser General Public License from time to time. Such new -versions will be similar in spirit to the present version, but may -differ in detail to address new problems or concerns. - - Each version is given a distinguishing version number. If the -Library as you received it specifies that a certain numbered version -of the GNU Lesser General Public License "or any later version" -applies to it, you have the option of following the terms and -conditions either of that published version or of any later version -published by the Free Software Foundation. If the Library as you -received it does not specify a version number of the GNU Lesser -General Public License, you may choose any version of the GNU Lesser -General Public License ever published by the Free Software Foundation. - - If the Library as you received it specifies that a proxy can decide -whether future versions of the GNU Lesser General Public License shall -apply, that proxy's public statement of acceptance of any version is -permanent authorization for you to choose that version for the -Library. - Deleted: trunk/maven-jaxx-plugin/README.txt =================================================================== --- trunk/maven-jaxx-plugin/README.txt 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/maven-jaxx-plugin/README.txt 2012-02-06 10:48:25 UTC (rev 2314) @@ -1,2 +0,0 @@ -To deploy new version of pom: mvn deploy -To install localy: mvn install Deleted: trunk/maven-jaxx-plugin/changelog.txt =================================================================== --- trunk/maven-jaxx-plugin/changelog.txt 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/maven-jaxx-plugin/changelog.txt 2012-02-06 10:48:25 UTC (rev 2314) @@ -1,37 +0,0 @@ -1.3 chemit 20090409 - * 20090327 [chemit] - add javax help mecanism - * 20090301 [chemit] - add a profile mode (-Djaxx.profile) - -1.2 letelier 2009022? - -1.1 chemit 20090220 - * 20090203 [chemit] - mojo's property src is now by default in src/main/java - * 20090202 [chemit] - introduce a property validatorClass to specify the validator implementation - * 20090124 [chemit] - introduce a flag useUIManagerForIcon to retreave icons from UIManager - - clean mojo getter and setter (not used here) - * 20090123 [chemit] - add tests for icon improvment - * 20090122 [chemit] - refactor poms (sibling dependencies, pluginsManagment,...) - - rename i18n bundles according artifactId - * 20090113 [chemit] - fix bug : when using addProjectClassPath property, sometimes does not retreave - dependancies, force it to work whatever is the phase :) - -1.0 chemit 20090111 - -0.8 chemit 200812?? - * 20081219 [chemit] - add addProjectClassPath property to add project compile class-path in plugin class-path - * 20081214 [chemit] - add addSourcesToClassPath property to add sources directories in class-path - -0.7 chemit 20081210 - * 20081208 [chemit] - javabBean attribute use to initialize bean - * 20081207 [chemit] use lutinproject 3.1 - -0.6 chemit 200811?? - * 20081108 [chemit] can add extra imports in JaxxGeneratorMojo (will be added to all generated java files). - * 20081104 [chemit] can add extra beanInfoSearchPath in JaxxGeneratorMojo - -0.5 chemit 20081002 - * 20081013 [chemit] can generate logger on jaxx files - * 20081011 [chemit] improve site - * 20081011 [chemit] refactor tests of the plugin using maven-plugin-testing-harness plugin - * 20081002 [chemit] Using lutinpluginproject 3.0, changing groupId to org.codelutin - * 20081002 [chemit] Make nearly all tests works again... Deleted: trunk/maven-jaxx-plugin/pom.xml =================================================================== --- trunk/maven-jaxx-plugin/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/maven-jaxx-plugin/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -1,227 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - JAXX :: Maven plugin - - $Id$ - $HeadURL$ - %% - Copyright (C) 2008 - 2010 CodeLutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser General Public License as - published by the Free Software Foundation, either version 3 of the - License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> - -<project 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> - - <!-- ************************************************************* --> - <!-- *** POM Relationships *************************************** --> - <!-- ************************************************************* --> - - <parent> - <groupId>org.nuiton</groupId> - <artifactId>jaxx</artifactId> - <version>2.5-SNAPSHOT</version> - </parent> - - <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> - - <dependencies> - - <!-- sibling dependencies --> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-runtime</artifactId> - <version>${project.version}</version> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-validator</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>jaxx-compiler</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- maven plugin project dependencies --> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - </dependency> - - <!-- other dependencies --> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <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> - <artifactId>dt</artifactId> - <scope>system</scope> - <systemPath>/${java.home}/../lib/dt.jar</systemPath> - </dependency> - - <!-- tests dependencies --> - - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>maven-verifier</artifactId> - </dependency> - - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>org.apache.maven.plugin-testing</groupId> - <artifactId>maven-plugin-testing-harness</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <classifier>tests</classifier> - </dependency> - - <!-- FIXME si on ne le rajoute pas, on se retrouve avec la version 1.1 qui ne convient pas --> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>runtime</scope> - </dependency> - - - </dependencies> - - <!-- ************************************************************* --> - <!-- *** Project Information ************************************* --> - <!-- ************************************************************* --> - - <name>JAXX :: Maven plugin</name> - <description> - Maven 2 plugin to generate java sources from JAXX files. - </description> - - <!-- ************************************************************* --> - <!-- *** Build Settings ****************************************** --> - <!-- ************************************************************* --> - - <packaging>maven-plugin</packaging> - - <profiles> - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>release-profile</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - <build> - <plugins> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>helpmojo</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - - </build> - </profile> - - <!-- by default jnlp is only perform on a release stage when using the maven-release-plugin --> - <profile> - <id>reporting</id> - <activation> - <property> - <name>performRelease</name> - <value>true</value> - </property> - </activation> - - <reporting> - <plugins> - - <plugin> - <artifactId>maven-plugin-plugin</artifactId> - <version>${pluginPluginVersion}</version> - </plugin> - - </plugins> - </reporting> - - </profile> - - </profiles> - -</project> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/pom.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -46,7 +46,7 @@ <module>jaxx-runtime</module> <module>jaxx-validator</module> <module>jaxx-compiler</module> - <module>maven-jaxx-plugin</module> + <module>jaxx-maven-plugin</module> <module>jaxx-widgets</module> </modules> @@ -106,8 +106,12 @@ <javaHelpVersion>2.0.05</javaHelpVersion> <swingXVersion>1.6.2-2</swingXVersion> + <!--<nuitonSkinVersion>1.1.2-SNAPSHOT</nuitonSkinVersion>--> + <webstartPluginVersion>1.0-beta-3-SNAPSHOT</webstartPluginVersion> + <site.home.url>${project.url}</site.home.url> + <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> </properties> @@ -116,7 +120,8 @@ <!-- Source control management. --> <scm> <connection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/jaxx/trunk + <developerConnection> + scm:svn:http://svn.nuiton.org/svn/jaxx/trunk </developerConnection> <url>http://www.nuiton.org/repositories/browse/jaxx/trunk</url> </scm> Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/src/site/rst/index.rst 2012-02-06 10:48:25 UTC (rev 2314) @@ -36,7 +36,20 @@ english translation at the same time. To help you wait, you can have a look to the demo_. +Nouveautés de la version 2.5 +---------------------------- +Changement de l'artifactId du plugin +____________________________________ + +Avant la version 2.4, l'artifactId du plugin était **maven-jaxx-plugin**, mais +Maven depuis la version 3 demande que nous utilisions plutôt +**jaxx-maven-plugin** car à terme la première forme d'artifactId ne sera plus +acceptée que pour les projets de maven. + +Pour plus d'information sur comment utiliser le plugin, veuillez visiter la +`page des goals`_ + Nouveautés de la version 2.4 ---------------------------- @@ -301,15 +314,15 @@ .. TODO Finish this list and add icons -.. _Isis-fish: http://isis-fish.labs.libre-entreprise.org/ +.. _Isis-fish: http://www.isis-fish.org/ .. _simExplorer-si: http://www.simexplorer.org -.. _ObServe: http://observe.labs.libre-entreprise.org/observe/ +.. _ObServe: http://maven-site.forge.codelutin.com/observe/ .. _Lima: http://maven-site.chorem.org/lima/ -.. _Vradi: http://vradi.labs.libre-entreprise.org/vradi/index.html +.. _Vradi: http://maven-site.forge.codelutin.com/vradi .. _Migration: ./migration.html @@ -326,5 +339,7 @@ .. _NavigationModel: ./NavigationModel.html .. _nuiton-validator: http://maven-site.nuiton.org/nuiton-utils/nuiton-validator + .. _eugene: http://maven-site.nuiton.org/eugene +.. _page des goals: ./jaxx-maven-plugin/plugin-info.html \ No newline at end of file Modified: trunk/src/site/rst/tutos/helloworld.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld.rst 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/src/site/rst/tutos/helloworld.rst 2012-02-06 10:48:25 UTC (rev 2314) @@ -101,7 +101,7 @@ <plugin> <groupId>org.nuiton.jaxx</groupId> - <artifactId>maven-jaxx-plugin</artifactId> + <artifactId>jaxx-maven-plugin</artifactId> <version>2.0.1</version> <executions> <execution> Modified: trunk/src/site/rst/tutos/helloworld2.rst =================================================================== --- trunk/src/site/rst/tutos/helloworld2.rst 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/src/site/rst/tutos/helloworld2.rst 2012-02-06 10:48:25 UTC (rev 2314) @@ -120,7 +120,7 @@ Les sources de ce tutoriel sont disponibles au `telechargement ici`_. -.. _telechargement ici::http://nuiton.org/projects/list_files/jaxx +.. _telechargement ici: http://nuiton.org/projects/list_files/jaxx Lancer ce tutoriel ------------------ Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2012-02-03 00:09:33 UTC (rev 2313) +++ trunk/src/site/site_fr.xml 2012-02-06 10:48:25 UTC (rev 2314) @@ -28,7 +28,7 @@ <bannerLeft> <name>${project.name}</name> - <src>${site.home.url}/jaxx.png</src> + <src>./jaxx.png</src> <href>index.html</href> </bannerLeft> @@ -55,38 +55,37 @@ <menu ref="modules"/> - <menu name="Documentation"> + <menu name="Présentation"> <item name="Accueil" href="index.html"/> <item name="Présentation/Concept" href="presentation.html"/> <item name="Qu'est-ce qu'un fichier JAXX ?" href="JAXXFile.html"/> - <item name="Fonctionalités de base"> - <item name="Utiliser les objets Swing" href="useSwingObjects.html"/> - <item name="Les scripts JAXX" href="scripting.html"/> - <item name="Le data-binding" href="dataBinding.html"/> - <item name="Utiliser des styles" href="useStylesheets.html"/> - <!--item name="Le context/cache" href=""/--> - <item name="Java beans" href="javaBeans.html"/> - <!--item name="Actions/Tabs" href=""/--> - </item> - <item name="Fonctionnalités avancées"> - <item name="Internationalisation" href="I18n.html"/> - <!--item name="Arbre de navigation" href=""/> - <item name="Validateurs" href=""/--> - <item name="Programmation par contrat" href="contractProgramming.html"/> - <!--item name="Widgets" href=""/--> - </item> - <!--item name="Bonnes pratiques" href=""/--> + </menu> + + <menu name="Fonctionalités de base"> + <item name="Utiliser les objets Swing" href="useSwingObjects.html"/> + <item name="Les scripts JAXX" href="scripting.html"/> + <item name="Le data-binding" href="dataBinding.html"/> + <item name="Utiliser des styles" href="useStylesheets.html"/> + <!--item name="Le context/cache" href=""/--> + <item name="Java beans" href="javaBeans.html"/> + <!--item name="Actions/Tabs" href=""/--> + </menu> + + <menu name="Fonctionnalités avancées"> + <item name="Internationalisation" href="I18n.html"/> + <!--item name="Arbre de navigation" href=""/> + <item name="Validateurs" href=""/--> + <item name="Programmation par contrat" href="contractProgramming.html"/> + <!--item name="Widgets" href=""/--> + </menu> + + <menu name="Démo et Tutoriels"> <item name="Démo" href="demo.html"/> - <item name="Tutoriels"> - <item name="Hello World" href="tutos/helloworld.html"/> - <item name="Hello World 2" href="tutos/helloworld2.html"/> - <item name="Feuilles de style" href="tutos/css.html"/> - <item name="Data-binding" href="tutos/data-binding.html"/> - <item name="ConfigUI" href="tutos/config.html"/> - </item> - <!--item name="Développeur"> - <item name="Comment le compilateur JAXX fonctionne"/> - </item--> + <item name="Hello World" href="tutos/helloworld.html"/> + <item name="Hello World 2" href="tutos/helloworld2.html"/> + <item name="Feuilles de style" href="tutos/css.html"/> + <item name="Data-binding" href="tutos/data-binding.html"/> + <item name="ConfigUI" href="tutos/config.html"/> </menu> <menu name="Ancienne documentation">