Author: tchemit Date: 2008-02-20 21:15:45 +0000 (Wed, 20 Feb 2008) New Revision: 1154 Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java Log: unused import refactor pom : ** use maven.gen.dir and maven.vcs.src.dir ** suppress lutin-processor Modified: trunk/simexplorer-is/simexplorer-is-swing/pom.xml =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-20 19:18:44 UTC (rev 1153) +++ trunk/simexplorer-is/simexplorer-is-swing/pom.xml 2008-02-20 21:15:45 UTC (rev 1154) @@ -25,8 +25,13 @@ <activeByDefault>true</activeByDefault> </activation> <properties> + <maven.verbose>false</maven.verbose> + <!-- Vcs base dir--> + <maven.vcs.src.dir>${basedir}/src</maven.vcs.src.dir> <!--Source base dir--> <maven.src.dir>${basedir}/target/src-build</maven.src.dir> + <!--Generate base dir--> + <maven.gen.dir>${basedir}/target/gen</maven.gen.dir> <!--Main class in JAR --> <maven.jar.main.class>fr.cemagref.simexplorer.is.ui.swing.SimExplorer</maven.jar.main.class> </properties> @@ -35,35 +40,8 @@ <build> <plugins> - <!--Attaching processor plugin to the Build Lifecycle--> <plugin> <groupId>lutinplugin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>0.12</version> - <executions> - <execution> - <id>Processor</id> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <srcDir>${basedir}/src</srcDir> - <destDir>${maven.src.dir}</destDir> - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - <plugin> - <groupId>lutinplugin</groupId> <artifactId>maven-jaxx-plugin</artifactId> <version>0.2-SNAPSHOT</version> <executions> @@ -84,7 +62,7 @@ <configuration> <tasks> <!-- make sure the directory exists (should be in parent) --> - <mkdir dir="${basedir}/target/gen/java"/> + <mkdir dir="${maven.gen.dir}/java"/> </tasks> </configuration> <goals> @@ -92,16 +70,17 @@ </goals> </execution> <execution> - <id>CopyGenJavaVersSrcBuild</id> - <!-- recopie des fichiers java generes vers src-build/java --> + <id>CopyJavaVersSrcBuild</id> + <!-- recopie des fichiers java sources et generes vers src-build/java --> <phase>process-sources</phase> <configuration> <tasks> - <copy todir="${maven.src.dir}/java" - verbose="${maven.verbose}" - overwrite="true"> - <fileset dir="${basedir}/target/gen/java"/> + <copy todir="${maven.src.dir}/java" verbose="${maven.verbose}" overwrite="true"> + <fileset dir="${maven.gen.dir}/java"/> </copy> + <copy todir="${maven.src.dir}/java" verbose="${maven.verbose}" overwrite="true"> + <fileset dir="${maven.vcs.src.dir}/java"/> + </copy> </tasks> </configuration> <goals> @@ -124,11 +103,9 @@ <configuration> <prefix>SimExplorer</prefix> <i18nPrefix>simexplorer</i18nPrefix> - <source>${basedir}/src/resources/commandline.properties</source> + <source>${maven.src.dir}/resources/commandline.properties</source> <parserPackageName>fr.cemagref.simexplorer.is.ui.swing.commandline</parserPackageName> - <actionSuperClass> - fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionAction - </actionSuperClass> + <actionSuperClass>fr.cemagref.simexplorer.is.ui.swing.commandline.actions.SimExplorerAbstractOptionAction</actionSuperClass> </configuration> </execution> </executions> @@ -145,7 +122,7 @@ </configuration> <executions> <execution> - <phase>generate-sources</phase> + <phase>compile</phase> <id>JavaActionConfig</id> <goals> <goal>parserJavaActionConfig</goal> @@ -154,7 +131,7 @@ <treateDefaultEntry>false</treateDefaultEntry> <entries> <entry> - <basedir>${basedir}/src/java/fr/cemagref/simexplorer/is/ui/swing/actions</basedir> + <basedir>${maven.vcs.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/actions</basedir> <includes> <param>**\/*Action.java</param> </includes> @@ -163,7 +140,7 @@ </excludes> </entry> <entry> - <basedir>${basedir}/src/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> + <basedir>${maven.vcs.src.dir}/java/fr/cemagref/simexplorer/is/ui/swing/ui</basedir> <includes> <param>SimExplorerTab.java</param> </includes> @@ -183,7 +160,7 @@ <entries> <entry> <specificGoal>parserJava</specificGoal> - <basedir>${basedir}/target/gen/java/fr/cemagref/simexplorer/is/ui/swing</basedir> + <basedir>${maven.gen.dir}/java/fr/cemagref/simexplorer/is/ui/swing/commandline</basedir> <includes> <param>**\/*Option*.java</param> <param>**\/*Config*.java</param> Modified: trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java =================================================================== --- trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-20 19:18:44 UTC (rev 1153) +++ trunk/simexplorer-is/simexplorer-is-swing/src/java/fr/cemagref/simexplorer/is/ui/swing/commandline/configs/SimExplorerConfig.java 2008-02-20 21:15:45 UTC (rev 1154) @@ -19,7 +19,6 @@ package fr.cemagref.simexplorer.is.ui.swing.commandline.configs; import fr.cemagref.simexplorer.is.exceptions.SimExplorerRuntimeException; -import fr.cemagref.simexplorer.is.ui.swing.commandline.configs.SimExplorerAbstractConfigMain; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionConfig; import fr.cemagref.simexplorer.is.ui.swing.commandline.options.SimExplorerOptionConfigFile; import fr.cemagref.simexplorer.is.ui.swing.commandline.SimExplorerOptionParser;