Author: tchemit Date: 2008-07-25 13:50:16 +0000 (Fri, 25 Jul 2008) New Revision: 1511 Modified: trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml Log: using jaxx-swing-action new layout Modified: trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-07-25 13:50:03 UTC (rev 1510) +++ trunk/simexplorer-is/simexplorer-is-swing-generated/pom.xml 2008-07-25 13:50:16 UTC (rev 1511) @@ -18,53 +18,15 @@ <version>${current.version}</version> </parent> - <profiles> - <profile> - <id>project</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <properties> - <maven.verbose>false</maven.verbose> - <maven.java.src.dir>${maven.src.dir}/java</maven.java.src.dir> - <maven.classes.dir>${basedir}/target/classes</maven.classes.dir> - </properties> - </profile> - </profiles> + <properties> + <maven.java.src.dir>${maven.src.dir}/java</maven.java.src.dir> + <maven.classes.dir>${basedir}/target/classes</maven.classes.dir> + <maven.gen.dir>${basedir}/target/generated-sources</maven.gen.dir> + </properties> <build> <plugins> - <plugin> - <!--- Clean phase : we must clean also src/java files --> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>clean</phase> - <configuration> - <tasks> - <delete includeemptydirs="true"> - <fileset dir="${maven.java.src.dir}" includes="**/*"/> - </delete> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> - </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. - - 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:) - --> - <!--value>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerCommonActions</value--> <plugin> <groupId>org.codelutin.commandline</groupId> <artifactId>maven-commandline-plugin</artifactId> @@ -72,25 +34,34 @@ <configuration> <prefix>SimExplorer</prefix> <packageName>fr.cemagref.simexplorer.is.ui.swing.commandline</packageName> - <source>${maven.src.dir}/resources/commandline.properties</source> - <concreteConfig>true</concreteConfig> - <rstFilePath>${basedir}/src/site/@bundle@/rst/user</rstFilePath> - <_projectName>SimExplorer-SI</_projectName> - <_configFileName>.simexplorer-si-1</_configFileName> - <_version>${current.version}</_version> </configuration> <executions> <execution> + <!-- do not use generate phase, since it will be reexecuted a second time... --> + <phase>process-resources</phase> <id>genJava</id> <goals> <goal>genJava</goal> </goals> + <configuration> + <source>${maven.src.dir}/resources/commandline.properties</source> + <out>${maven.gen.dir}/java</out> + <concreteConfig>true</concreteConfig> + <_projectName>SimExplorer-SI</_projectName> + <_configFileName>.simexplorer-si-1</_configFileName> + <_version>${current.version}</_version> + </configuration> </execution> <execution> <id>genRst</id> <goals> <goal>genRst</goal> </goals> + <configuration> + <rstFilePath>${maven.src.dir}/site/@bundle@/rst/user</rstFilePath> + <out>${basedir}/target/classes</out> + <i18nCP>${maven.src.dir}/resources</i18nCP> + </configuration> </execution> </executions> </plugin> @@ -99,7 +70,7 @@ <artifactId>maven-jaxx-plugin</artifactId> <version>${jaxx.version}</version> <configuration> - <out>${maven.java.src.dir}</out> + <src>${maven.src.dir}/uimodel</src> </configuration> <executions> <execution> @@ -140,28 +111,16 @@ </configuration> <executions> <execution> - <phase>process-classes</phase> - <id>jaxx</id> + <phase>process-classes</phase> + <id>java</id> <goals> - <goal>parserJaxx</goal> - </goals> - </execution> - <execution> - <phase>process-classes</phase> - <id>commandline</id> - <goals> <goal>parserJava</goal> <goal>gen</goal> </goals> <configuration> - <ea>true</ea> - <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <basedir>${maven.src.dir}/java</basedir> - <excludes> - <param>fr\/cemagref\/simexplorer\/is\/ui\/swing\/ui\/**\/*</param> - </excludes> + <basedir>${maven.gen.dir}/java</basedir> </entry> </entries> </configuration> @@ -190,6 +149,6 @@ <dependency> <groupId>org.codelutin.commandline</groupId> <artifactId>commandline-core</artifactId> - </dependency> + </dependency> </dependencies> </project>