Author: echatellier Date: 2010-07-09 10:14:13 +0200 (Fri, 09 Jul 2010) New Revision: 940 Url: http://nuiton.org/repositories/revision/eugene/940 Log: Restore extractedPackages Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2010-07-08 08:10:40 UTC (rev 939) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/SmartGenerateMojo.java 2010-07-09 08:14:13 UTC (rev 940) @@ -235,7 +235,7 @@ protected String[] excludeTemplates; /** - * Nom par défaut du paquetage généré (model input sepcific). + * Nom par défaut du paquetage généré (model input specific). * * @parameter expression="${eugene.defaultPackage}" default-value="${project.groupId}.${project.artifactId}" * @since 0.50 @@ -243,7 +243,7 @@ protected String defaultPackage; /** - * List of packages to generate (comma separated). (model input sepcific). + * List of packages to generate (comma separated). (model input specific). * <p/> * If the parameter is not filled, will generate all packages. * @@ -251,6 +251,16 @@ * @since 1.0.0-rc-8 */ protected String generatedPackages; + + /** + * List of package to extract from xmi to models. (model input specific). + * <p/> + * If the parameter is not filled, will extract all packages. + * + * @parameter expression="${eugene.extractedPackages}" default-value="${project.groupId}.${project.artifactId}" + * @since 1.0.0-rc-8 + */ + protected String extractedPackages; /** * Maven project. @@ -386,7 +396,7 @@ properties.put(XmiChainedFileWriter.PROP_FULL_PACKAGE_PATH, fullPackagePath); - //properties.put("extractedPackages", extractedPackages); + properties.put(XmiChainedFileWriter.PROP_EXTRACTED_PACKAGES, extractedPackages); properties.put(XmiChainedFileWriter.PROP_RESOLVER, resolver); } Modified: trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java =================================================================== --- trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2010-07-08 08:10:40 UTC (rev 939) +++ trunk/maven-eugene-plugin/src/main/java/org/nuiton/eugene/plugin/writer/XmiChainedFileWriter.java 2010-07-09 08:14:13 UTC (rev 940) @@ -68,11 +68,15 @@ public static final String PROP_FULL_PACKAGE_PATH = "fullPackagePath"; + public static final String PROP_EXTRACTED_PACKAGES = "extraPackages"; + public XmiChainedFileWriter() { super(PROP_RESOLVER, "resolver", PROP_FULL_PACKAGE_PATH, - "fullPackagePath" + "fullPackagePath", + PROP_EXTRACTED_PACKAGES, + "extraPackages" ); } @@ -135,6 +139,10 @@ public String getFullPackagePath() { return getProperty(PROP_FULL_PACKAGE_PATH, String.class); } + + public String getExtractedPackages() { + return getProperty(PROP_EXTRACTED_PACKAGES, String.class); + } public String getResolver() { return getProperty(PROP_RESOLVER, String.class); @@ -236,6 +244,9 @@ transformer.setParameter(PROP_FULL_PACKAGE_PATH, getFullPackagePath() ); + transformer.setParameter(PROP_EXTRACTED_PACKAGES, + getExtractedPackages() + ); transformer.setURIResolver(fileResolver); FileOutputStream output = new FileOutputStream(result);