Author: glandais Date: 2008-03-18 10:29:04 +0000 (Tue, 18 Mar 2008) New Revision: 1388 Modified: trunk/simexplorer-is/pom.xml trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml trunk/simexplorer-is/simexplorer-is-swing/pom.xml Log: Moving jaxx and commandline in same module Modified: trunk/simexplorer-is/pom.xml =================================================================== --- trunk/simexplorer-is/pom.xml 2008-03-18 10:23:33 UTC (rev 1387) +++ trunk/simexplorer-is/pom.xml 2008-03-18 10:29:04 UTC (rev 1388) @@ -244,8 +244,7 @@ <module>simexplorer-is-storage</module> <module>simexplorer-is-service</module> <module>simexplorer-is-web</module> - <module>simexplorer-is-swing-jaxx</module> - <module>simexplorer-is-swing-commandline</module> + <module>simexplorer-is-swing-generated</module> <module>simexplorer-is-swing</module> <module>simexplorer-is-ear</module> </modules> Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-18 10:23:33 UTC (rev 1387) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-03-18 10:29:04 UTC (rev 1388) @@ -143,14 +143,9 @@ </dependency> <dependency> <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-swing-jaxx</artifactId> + <artifactId>simexplorer-is-swing-generated</artifactId> <version>0.1-SNAPSHOT</version> </dependency> - <dependency> - <groupId>simexplorer-is</groupId> - <artifactId>simexplorer-is-swing-commandline</artifactId> - <version>0.1-SNAPSHOT</version> - </dependency> <!-- librairie commandline-ui --> <dependency> <groupId>lutinlib</groupId> Modified: trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-03-18 10:23:33 UTC (rev 1387) +++ trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-03-18 10:29:04 UTC (rev 1388) @@ -5,11 +5,11 @@ <modelVersion>4.0.0</modelVersion> - <artifactId>simexplorer-is-swing-jaxx</artifactId> - <name>Swing-jaxx</name> + <artifactId>simexplorer-is-swing-generated</artifactId> + <name>Swing-jaxx and commandline</name> <version>0.1-SNAPSHOT</version> - <description>Java Swing - jaxx UI for SimExplorer-is</description> + <description>Java Swing - jaxx UI and commandline for SimExplorer-is</description> <packaging>jar</packaging> <parent> @@ -54,17 +54,37 @@ </plugin> <!-- Generate phase : this is a fully generated module - At checkout, there is no source java files, and the - ${maven.src.dir}/java directory is svn ignored. + At checkout, there is no source java files, and the + ${maven.src.dir}/java directory is svn ignored. - The jaxx generator will generate java source files in this - directory, after this, maven compiles as normal and use an unique - source directory, with no trick for generation. + The commandline generator will generate java source files in this + directory, after this, maven compiles as normal and use an unique + source directory, with no trick for generation. - We use now a fully compiliance maven process:) - --> + We use now a fully compiliance maven process:) + --> + <!--value>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions</value--> <plugin> <groupId>lutinplugin</groupId> + <artifactId>maven-commandline-plugin</artifactId> + <version>0.3</version> + <configuration> + <prefix>SimExplorer</prefix> + <source>${maven.src.dir}/resources/commandline.properties</source> + <out>${maven.java.src.dir}</out> + <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> + <concreteConfig>true</concreteConfig> + </configuration> + <executions> + <execution> + <goals> + <goal>genJava</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>lutinplugin</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>0.2-SNAPSHOT</version> <configuration> @@ -99,6 +119,7 @@ <executions> <execution> <goals> + <goal>parserJava</goal> <goal>parserJaxx</goal> <goal>gen</goal> </goals> @@ -123,5 +144,12 @@ <version>1.0.4-SNAPSHOT</version> <scope>compile</scope> </dependency> + <!-- librairie commandline --> + <dependency> + <groupId>lutinlib</groupId> + <artifactId>lutincommandline</artifactId> + <version>0.2</version> + <scope>compile</scope> + </dependency> </dependencies> </project>