Author: tchemit Date: 2009-12-16 19:01:51 +0100 (Wed, 16 Dec 2009) New Revision: 758 Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/StateModelReader.java trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java trunk/maven-eugene-plugin/pom.xml trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml trunk/maven-eugene-plugin/src/it/generate/generators/pom.xml trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToObjectModelFileWriter.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToStateModelFileWriter.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoModelFileWriter.java trunk/pom.xml Log: - there is no description tagglet for plexus components, just use the javadoc of the parameter :) (idem for mojo parameters) - use one javadoc config for all project Modified: trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/eugene/src/main/java/org/nuiton/eugene/ObjectModelReader.java 2009-12-16 18:01:51 UTC (rev 758) @@ -48,7 +48,7 @@ import org.xml.sax.SAXException; /** - * ObjectModelReader + * To read object model files into an memory object model. * * Created: 26 oct. 2009 * @@ -58,7 +58,7 @@ * Mise a jour: $Date$ * par : $Author$ * - * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="objectmodel" description="Object model reader" + * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="objectmodel" */ public class ObjectModelReader extends ModelReader<ObjectModel> { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/StateModelReader.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/StateModelReader.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/eugene/src/main/java/org/nuiton/eugene/StateModelReader.java 2009-12-16 18:01:51 UTC (rev 758) @@ -36,7 +36,7 @@ import org.xml.sax.SAXException; /** - * StateModelReader + * To read state model files into a memory state model. * * Created: 26 oct. 2009 * @@ -46,7 +46,7 @@ * Mise a jour: $Date$ * par : $Author$ * - * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="statemodel" description="State model reader" + * @plexus.component role="org.nuiton.eugene.ModelReader" role-hint="statemodel" */ public class StateModelReader extends ModelReader<StateModel> { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/object/xml/ObjectModelImpl.java 2009-12-16 18:01:51 UTC (rev 758) @@ -50,7 +50,7 @@ * Last update : $Date$ * by : $Author$ * - * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="objectmodel" description="Object model implementation" + * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="objectmodel" */ public class ObjectModelImpl implements ObjectModel { Modified: trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java =================================================================== --- trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/eugene/src/main/java/org/nuiton/eugene/models/state/xml/StateModelImpl.java 2009-12-16 18:01:51 UTC (rev 758) @@ -29,7 +29,7 @@ import org.nuiton.eugene.models.state.StateModelStateChart; /** - * StateModelImpl.java + * Implementation of the {@link StateModel}. * * @author chatellier * @version $Revision$ @@ -37,7 +37,7 @@ * Last update : $Date$ * By : $Author$ * - * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="statemodel" description="State model implementation" + * @plexus.component role="org.nuiton.eugene.models.Model" role-hint="statemodel" */ public class StateModelImpl implements StateModel { Modified: trunk/maven-eugene-plugin/pom.xml =================================================================== --- trunk/maven-eugene-plugin/pom.xml 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/pom.xml 2009-12-16 18:01:51 UTC (rev 758) @@ -100,7 +100,7 @@ <pluginManagement> <plugins> - <plugin> + <!--plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> @@ -287,7 +287,7 @@ </taglet> </taglets> </configuration> - </plugin> + </plugin--> <plugin> <artifactId>maven-invoker-plugin</artifactId> @@ -308,7 +308,7 @@ </plugin> - <plugin> + <!--plugin> <artifactId>maven-javadoc-plugin</artifactId> <version>${javadoc.version}</version> <configuration> @@ -499,7 +499,7 @@ </reports> </reportSet> </reportSets> - </plugin> + </plugin--> </plugins> </reporting> @@ -518,8 +518,10 @@ <artifactId>maven-invoker-plugin</artifactId> <configuration> <pomIncludes> - <!--<pomInclude>generate/generators/pom.xml</pomInclude>--> - <pomInclude>**/pom.xml</pomInclude> + <pomInclude>generate-model-files/testIncludeWithNoProtocol/pom.xml</pomInclude> + <pomInclude>generate-model-files/testIncludeWithOnlyProtocol/pom.xml</pomInclude> + <pomInclude>generate/generators/pom.xml</pomInclude> + <!--<pomInclude>**/pom.xml</pomInclude>--> </pomIncludes> <postBuildHookScript>verify</postBuildHookScript> <localRepositoryPath>${basedir}/target/local-repo</localRepositoryPath> Modified: trunk/maven-eugene-plugin/src/it/generate/generators/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/generate/generators/pom.xml 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/it/generate/generators/pom.xml 2009-12-16 18:01:51 UTC (rev 758) @@ -85,19 +85,23 @@ <groupId>org.nuiton.eugene</groupId> <artifactId>maven-eugene-plugin</artifactId> <version>${project.version}</version> + <configuration> + <extraClassPathDirectory>target/classes</extraClassPathDirectory> + <modelType>objectmodel</modelType> + <testPhase>true</testPhase> + <generateResources> + <input>src/main/models</input> + </generateResources> + <defaultPackage>org.nuiton.eugene.test</defaultPackage> + </configuration> <executions> <execution> <id>Test Regression Generator</id> <phase>generate-test-sources</phase> <configuration> - <reader>org.nuiton.eugene.ObjectModelReader</reader> + <!--<reader>org.nuiton.eugene.ObjectModelReader</reader>--> <includes>dtotest.objectmodel</includes> <templates>org.nuiton.eugene.test.generator.BeanGenerator</templates> - <defaultPackage>org.nuiton.eugene.test</defaultPackage> - <extraClassPathDirectory>target/classes</extraClassPathDirectory> - <generateResources> - <input>src/main/models</input> - </generateResources> </configuration> <goals> <goal>generate</goal> @@ -109,11 +113,6 @@ <configuration> <reader>org.nuiton.eugene.test.generator.TestReader</reader> <templates>org.nuiton.eugene.java.JavaGenerator</templates> - <defaultPackage>org.nuiton.eugene.test</defaultPackage> - <extraClassPathDirectory>target/classes</extraClassPathDirectory> - <generateResources> - <input>src/main/models</input> - </generateResources> </configuration> <goals> <goal>generate</goal> @@ -123,14 +122,9 @@ <id>Test Bean Transformer</id> <phase>generate-test-sources</phase> <configuration> - <reader>org.nuiton.eugene.ObjectModelReader</reader> + <!--<reader>org.nuiton.eugene.ObjectModelReader</reader>--> <includes>dtotest2.objectmodel</includes> <templates>org.nuiton.eugene.test.generator.BeanTransformer</templates> - <defaultPackage>org.nuiton.eugene.test</defaultPackage> - <extraClassPathDirectory>target/classes</extraClassPathDirectory> - <generateResources> - <input>src/main/models</input> - </generateResources> </configuration> <goals> <goal>generate</goal> Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithNoProtocol/pom.xml 2009-12-16 18:01:51 UTC (rev 758) @@ -65,9 +65,9 @@ <phase>generate-sources</phase> <configuration> <modelType>objectmodel</modelType> - <includes> - <include>src/main/zargo:**/*.zargo</include> - </includes> + <inputFiles> + <inputFile>src/main/zargo:**/*.zargo</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> </configuration> @@ -80,9 +80,9 @@ <phase>generate-sources</phase> <configuration> <modelType>statemodel</modelType> - <includes> - <include>src/main/zargo:**/*.zargo</include> - </includes> + <inputFiles> + <inputFile>src/main/zargo:**/*.zargo</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> </configuration> @@ -95,9 +95,9 @@ <phase>generate-sources</phase> <configuration> <modelType>objectmodel</modelType> - <includes> - <include>src/main/xmi:**/*.xmi</include> - </includes> + <inputFiles> + <inputFile>src/main/xmi:**/*.xmi</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia</fullPackagePath> <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> </configuration> @@ -110,9 +110,9 @@ <phase>generate-sources</phase> <configuration> <modelType>statemodel</modelType> - <includes> - <include>src/main/xmi:**/*.xmi</include> - </includes> + <inputFiles> + <inputFile>src/main/xmi:**/*.xmi</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia</fullPackagePath> <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> </configuration> Modified: trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml =================================================================== --- trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/it/generate-model-files/testIncludeWithOnlyProtocol/pom.xml 2009-12-16 18:01:51 UTC (rev 758) @@ -65,9 +65,9 @@ <phase>generate-sources</phase> <configuration> <modelType>objectmodel</modelType> - <includes> - <include>zargo</include> - </includes> + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> <outputDirectory>target/generated-sources-zargo2ObjectModel</outputDirectory> </configuration> @@ -80,9 +80,9 @@ <phase>generate-sources</phase> <configuration> <modelType>statemodel</modelType> - <includes> - <include>zargo</include> - </includes> + <inputFiles> + <inputFile>zargo</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia.test.entities</fullPackagePath> <outputDirectory>target/generated-sources-zargo2StateModel</outputDirectory> </configuration> @@ -95,9 +95,9 @@ <phase>generate-sources</phase> <configuration> <modelType>objectmodel</modelType> - <includes> - <include>xmi</include> - </includes> + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia</fullPackagePath> <outputDirectory>target/generated-sources-xmi2ObjectModel</outputDirectory> </configuration> @@ -110,9 +110,9 @@ <phase>generate-sources</phase> <configuration> <modelType>statemodel</modelType> - <includes> - <include>xmi</include> - </includes> + <inputFiles> + <inputFile>xmi</inputFile> + </inputFiles> <fullPackagePath>org.nuiton.topia</fullPackagePath> <outputDirectory>target/generated-sources-xmi2StateModel</outputDirectory> </configuration> Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneMojo.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/AbstractEugeneMojo.java 2009-12-16 18:01:51 UTC (rev 758) @@ -25,7 +25,10 @@ import org.apache.maven.settings.Settings; import org.nuiton.eugene.models.Model; import org.nuiton.plugin.AbstractPlugin; +import org.nuiton.plugin.PluginIOContext; +import java.io.File; +import java.util.Arrays; import java.util.Map; /** @@ -38,14 +41,14 @@ /** * Maven project. * - * @description Dépendance du projet. * @parameter default-value="${project}" * @readonly * @since 2.0.0 */ protected MavenProject project; /** - * @description le settings (pour obtenir le mode offline) + * Le settings (pour obtenir le mode offline). + * * @parameter default-value="${settings}" * @readonly * @since 2.0.0 @@ -87,12 +90,21 @@ * @since 2.0.0 */ protected String modelType; - - + /** + * An extra directory to be added to the classpath. + * + * @parameter expression="${eugene.extraClassPathDirectory}" + * @since 2.0.0 + */ + private File extraClassPathDirectory; + /** + * class instance of the given {@link #modelType} + */ protected Class<? extends Model> modelClass; /** - * All available models + * All available models (obtain by plexus, keys are plexus roles, values are a + * instance of corresponding model). * * @component role="org.nuiton.eugene.models.Model" */ @@ -111,7 +123,49 @@ return true; } + /** + * Build the resources data to use for a goal. + * + * @param resources incoming resources data (form the goal + * @param defaultIn the default input directory + * @param defaultOut the default output directory + * @param defaultTestIn the default test input directory + * @param defaultTestOut the default test output directory + * @return the new {@link org.nuiton.plugin.PluginIOContext} to use in the goal + */ + protected PluginIOContext initResources(PluginIOContext resources, File defaultIn, File defaultOut, File defaultTestIn, File defaultTestOut) { + if (resources == null) { + resources = new PluginIOContext(); + } + + // adding default inputs only if not consumed + if (resources.getInputs() == null) { + if (testPhase) { + resources.setInput(defaultTestIn); + } else { + resources.setInput(defaultIn); + } + getLog().info(" using default in : " + Arrays.asList(resources.getInputs())); + } else { + getLog().info(" in : " + Arrays.asList(resources.getInputs())); + } + + if (resources.getOutput() == null) { + if (testPhase) { + resources.setOutput(defaultTestOut); + } else { + resources.setOutput(defaultOut); + } + getLog().info(" using default out : " + resources.getOutput()); + } else { + getLog().info(" out : " + resources.getOutput()); + } + + return resources; + } + + @Override public MavenProject getProject() { return project; @@ -158,4 +212,27 @@ return settings.isOffline(); } + public boolean isTestPhase() { + return testPhase; + } + + public void setTestPhase(boolean testPhase) { + this.testPhase = testPhase; + } + + public Class<? extends Model> getModelClass() { + return modelClass; + } + + public void setModelClass(Class<? extends Model> modelClass) { + this.modelClass = modelClass; + } + + public File getExtraClassPathDirectory() { + return extraClassPathDirectory; + } + + public void setExtraClassPathDirectory(File extraClassPathDirectory) { + this.extraClassPathDirectory = extraClassPathDirectory; + } } Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugeneAbstractMojo.java 2009-12-16 18:01:51 UTC (rev 758) @@ -21,8 +21,11 @@ package org.nuiton.eugene.plugin; import org.nuiton.plugin.PluginIOContext; + import java.io.File; +import java.io.IOException; import java.util.Arrays; + import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; import org.apache.maven.settings.Settings; @@ -30,7 +33,7 @@ /** * La classe de base pour definir des mojos dans eugene. - * + * * @author chemit * @since 1.0.0-rc-8 */ @@ -39,14 +42,14 @@ /** * Maven project. * - * @description Dépendance du projet. * @parameter default-value="${project}" * @readonly * @since 1.0.0-rc-8 */ protected MavenProject project; /** - * @description le settings (pour obtenir le mode offline) + * Le settings (pour obtenir le mode offline). + * * @parameter default-value="${settings}" * @readonly * @since 1.0.0-rc-4 @@ -82,16 +85,13 @@ protected boolean testPhase; /** - * * Note : l'objet peut etre {@code null} si la configuration ne definit * pas la propriété associées dans l'implentation. * <p/> - * * Dans tous les cas, une fois la methode {@link #initResources()} appele, * l'objet devrait ne plus être null! - * + * * @return l'io du plugin ou {@code null} si non initialisé - * */ protected abstract PluginIOContext getResources(); @@ -99,16 +99,16 @@ * Initialiser les io du plugins. * * @return l'io intialisé (avec les valeurs par défaut, là où rien n'a - * été renseigné). + * été renseigné). */ protected abstract PluginIOContext initResources(); /** * Build the {@link #getResources()} data. * - * @param defaultIn the default input directory - * @param defaultOut the default output directory - * @param defaultTestIn the default test input directory + * @param defaultIn the default input directory + * @param defaultOut the default output directory + * @param defaultTestIn the default test input directory * @param defaultTestOut the default test output directory * @return the new {@link PluginIOContext} to use in the goal */ @@ -158,7 +158,12 @@ throw new MojoExecutionException("no output defined"); } - p.getOutput().mkdirs(); + if (!p.getOutput().exists()) { + boolean b = p.getOutput().mkdirs(); + if (!b) { + throw new IOException("could not create directory " + p.getOutput()); + } + } return true; } Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/EugenePlugin.java 2009-12-16 18:01:51 UTC (rev 758) @@ -53,9 +53,11 @@ * <p/> * Last update: $Date$ * by : $Author$ - * @goal generate - * @projectRequired true + * @goal generate-old + * @requiresProject true + * @deprecated since 2.0.0, use now the {@link GenerateMojo}. */ +@Deprecated public class EugenePlugin extends EugeneAbstractMojo { /** @@ -199,19 +201,11 @@ for (Template<M> template : templatesList) { getLog().info("Apply " + template.getClass().getSimpleName() + " generator"); - //TC-20090829 fix when loading more than one model together... - try { template.applyTemplate(model, generateResources.getOutput()); } catch (IOException eee) { throw new MojoExecutionException("Generation problem", eee); } -// for (File modelFile : modelFiles) { -// getLog().debug(" on " + modelFile.getAbsolutePath()); -// -// // generation -// generator.generate(modelFile, destDirGen); -// } } } @@ -254,37 +248,8 @@ return modelFiles.toArray(new File[modelFiles.size()]); } -// protected File[] getModelFiles() { -// // get file to generate -// // TODO improve this loop -// // TODO too strange code -// //TODO TC-20090820 use a DirectoryScanner which understand ant-like regex patterns :) -// List<File> modelFiles = new ArrayList<File>(); -// String[] includePatterns = includes.split(","); -// for (File srcDirGen : generateResources.getInputs()) { -// for (String includePattern : includePatterns) { -// includePattern = includePattern.trim(); -// boolean recursive = false; -// if (includePattern.startsWith("**/")) { -// recursive = true; -// includePattern = includePattern.substring(3); -// } -// // transform pattern in java regex -// includePattern = includePattern.replaceAll("\\.", "\\\\."); -// includePattern = includePattern.replaceAll("\\*", ".*"); -// // log java regex -// if (verbose) { -// getLog().info("Search for " + includePattern + " in " + srcDirGen.getAbsolutePath()); -// } -// List<File> currentFiles = FileUtil.find(srcDirGen, includePattern, recursive); -// modelFiles.addAll(currentFiles); -// } -// } -// return modelFiles.toArray(new File[modelFiles.size()]); -// } - protected ModelReader<?> getReader() throws MojoFailureException, MojoExecutionException { - ModelReader<?> modelReader = null; + ModelReader<?> modelReader; try { ClassLoader fixedClassLoader = fixClassLoader(); modelReader = (ModelReader<?>) Class.forName(reader, true, fixedClassLoader).newInstance(); Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToObjectModelFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToObjectModelFileWriter.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToObjectModelFileWriter.java 2009-12-16 18:01:51 UTC (rev 758) @@ -33,10 +33,12 @@ import java.io.IOException; /** + * To write a object model files from xmi files. + * <p/> * This {@link org.nuiton.eugene.ModelFileWriter} transform xmi files to object model file. * * @author tchemit - * @plexus.component role="org.nuiton.eugene.ModelFileWriter" role-hint="xmi2objectmodel" description="xmi to object model" + * @plexus.component role="org.nuiton.eugene.ModelFileWriter" role-hint="xmi2objectmodel" * @since 2.0.0 */ public class XmiToObjectModelFileWriter extends BaseXmiToModelFileWriter { Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToStateModelFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToStateModelFileWriter.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiToStateModelFileWriter.java 2009-12-16 18:01:51 UTC (rev 758) @@ -26,8 +26,10 @@ import java.io.File; /** + * To write state model files from xmi files. + * * @author tchemit - * @plexus.component role="org.nuiton.eugene.ModelFileWriter" role-hint="xmi2statemodel" description="xmi to state model" + * @plexus.component role="org.nuiton.eugene.ModelFileWriter" role-hint="xmi2statemodel" * @since 2.0.0 */ public class XmiToStateModelFileWriter extends BaseXmiToModelFileWriter { Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoModelFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoModelFileWriter.java 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/ZargoModelFileWriter.java 2009-12-16 18:01:51 UTC (rev 758) @@ -28,8 +28,10 @@ import java.io.IOException; /** + * To write model files from zargo files. + * * @author tchemit - * @plexus.component role="org.nuiton.eugene.ModelFileWriter" role-hint="zargo2xmi" description="zargo to xmi model" + * @plexus.component role="org.nuiton.eugene.ModelFileWriter" role-hint="zargo2xmi" * @since 2.0.0 */ public class ZargoModelFileWriter extends BaseModelFileWriter { Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-16 11:21:30 UTC (rev 757) +++ trunk/pom.xml 2009-12-16 18:01:51 UTC (rev 758) @@ -287,11 +287,398 @@ <version>1.4.0</version> </plugin> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <docencoding>${project.reporting.outputEncoding}</docencoding> + <encoding>${project.reporting.outputEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <quiet>true</quiet> + <skip>${maven.javadoc.skip}</skip> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.3.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.3.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.3.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + </plugin> + </plugins> </pluginManagement> </build> + <reporting> + <plugins> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <version>${javadoc.version}</version> + <configuration> + <quiet>true</quiet> + <skip>${maven.javadoc.skip}</skip> + <docencoding>${project.build.sourceEncoding}</docencoding> + <encoding>${project.build.sourceEncoding}</encoding> + <charset>${project.reporting.outputEncoding}</charset> + <excludePackageNames>${maven.javadoc.excludePackageNames}</excludePackageNames> + <taglets> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoAggregatorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoComponentFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoConfiguratorTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecuteTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoExecutionStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoGoalTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInheritByDefaultTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoInstantiationStrategyTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoParameterFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoPhaseTypeTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoReadOnlyFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiredFieldTaglet</tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass> + org.apache.maven.tools.plugin.javadoc.MojoRequiresDependencyResolutionTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresDirectInvocationTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresOnLineTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresProjectTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.apache.maven.tools.plugin.javadoc.MojoRequiresReportsTypeTaglet + </tagletClass> + <tagletArtifact> + <groupId>org.apache.maven.plugin-tools</groupId> + <artifactId>maven-plugin-tools-javadoc</artifactId> + <version>2.5.1</version> + </tagletArtifact> + </taglet> + + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusComponentTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.3.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusConfigurationTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.3.0</version> + </tagletArtifact> + </taglet> + <taglet> + <tagletClass>org.codehaus.plexus.javadoc.PlexusRequirementTaglet</tagletClass> + <tagletArtifact> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-component-javadoc</artifactId> + <version>1.3.0</version> + </tagletArtifact> + </taglet> + </taglets> + </configuration> + <reportSets> + <reportSet> + <reports> + <report>javadoc</report> + <report>test-javadoc</report> + </reports> + </reportSet> + </reportSets> + </plugin> + </plugins> + </reporting> + <!-- ************************************************************* --> <!-- *** Build Environment ************************************** --> <!-- ************************************************************* -->