Index: maven-generator-plugin/src/java/org/codelutin/generator/plugin/Xmi2ObjectModel.java diff -u maven-generator-plugin/src/java/org/codelutin/generator/plugin/Xmi2ObjectModel.java:1.1.1.1 maven-generator-plugin/src/java/org/codelutin/generator/plugin/Xmi2ObjectModel.java:1.2 --- maven-generator-plugin/src/java/org/codelutin/generator/plugin/Xmi2ObjectModel.java:1.1.1.1 Fri Apr 14 12:07:46 2006 +++ maven-generator-plugin/src/java/org/codelutin/generator/plugin/Xmi2ObjectModel.java Fri Apr 28 08:17:09 2006 @@ -23,9 +23,9 @@ * Created: 14 avril 2006 * * @author ruchaud - * @version $Revision: 1.1.1.1 $ + * @version $Revision: 1.2 $ * - * Last update: $Date: 2006/04/14 12:07:46 $ + * Last update: $Date: 2006/04/28 08:17:09 $ * by : $Author: ruchaud $ */ @@ -39,7 +39,9 @@ import org.apache.tools.ant.BuildLogger; import org.apache.tools.ant.NoBannerLogger; import org.apache.tools.ant.Project; +import org.apache.tools.ant.taskdefs.Copy; import org.apache.tools.ant.taskdefs.XSLTProcess.Param; +import org.apache.tools.ant.types.FileSet; import org.codelutin.xml.XSLAntTask; /** @@ -88,17 +90,13 @@ public void execute() throws MojoExecutionException, MojoFailureException { getLog().info("Converti les fichiers XMI en fichier ObjectModel"); - /* Création d'un projet ant */ - Project project = new Project(); - - BuildLogger logger = new NoBannerLogger(); - logger.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); - logger.setOutputPrintStream(System.out); - logger.setErrorPrintStream(System.err); + actionXsl(); + actionCopy(); + } - project.init(); - project.getBaseDir(); - project.addBuildListener(logger); + private void actionXsl() { + /* Création d'un projet ant */ + Project project = createProject(); /* Création de la tâche ant */ XSLAntTask xsl = new XSLAntTask(); @@ -117,7 +115,6 @@ xsl.setExtSubstitution("objectmodel"); xsl.setStyle("xmi1.2ToObjectModel.xsl"); - Param createParam = xsl.createParam(); createParam.setName("fullPackagePath"); createParam.setExpression(fullPackagePath); @@ -128,4 +125,43 @@ /* Execution */ xsl.execute(); } + + private void actionCopy(){ + /* Création d'un projet ant */ + Project project = createProject(); + + /* Création de la tâche ant Copy */ + Copy copy = new Copy(); + copy.setProject(project); + copy.setTaskName("Copy ressources"); + + /* Configuration */ + copy.setTodir(destDirObjectModel); + copy.setPreserveLastModified(true); + copy.setOverwrite(overwrite); + + FileSet fileSet = new FileSet(); + fileSet.setDir(srcDirXmi); + fileSet.setIncludes("**/*.properties"); + copy.addFileset(fileSet); + + /* Execution */ + copy.execute(); + } + + private Project createProject() { + /* Création d'un projet ant */ + Project project = new Project(); + + BuildLogger logger = new NoBannerLogger(); + logger.setMessageOutputLevel(org.apache.tools.ant.Project.MSG_INFO); + logger.setOutputPrintStream(System.out); + logger.setErrorPrintStream(System.err); + + project.init(); + project.getBaseDir(); + project.addBuildListener(logger); + return project; + } + }