Author: echatellier Date: 2010-07-08 14:57:25 +0200 (Thu, 08 Jul 2010) New Revision: 180 Url: http://nuiton.org/repositories/revision/wikitty/180 Log: Merge branche http://svn.nuiton.org/svn/wikitty/branches/2.0-eugene2 Modified: trunk/ trunk/pom.xml trunk/wikitty-api/pom.xml trunk/wikitty-generators/pom.xml trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java Property changes on: trunk ___________________________________________________________________ Added: svn:mergeinfo + /branches/2.0-eugene2:164-179 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-08 12:48:03 UTC (rev 179) +++ trunk/pom.xml 2010-07-08 12:57:25 UTC (rev 180) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.2.1</version> + <version>2.2.2.1</version> </parent> <!-- ************************************************************* --> @@ -163,7 +163,7 @@ <!-- common versions used in sub-poms --> <!-- <gwt.version>1.7.0</gwt.version> --> - <eugene.version>1.0.1</eugene.version> + <eugene.version>2.0.2</eugene.version> <spring.version>3.0.1.RELEASE</spring.version> <hessian.version>3.1.6</hessian.version> <jetty.version>6.1.22</jetty.version> Modified: trunk/wikitty-api/pom.xml =================================================================== --- trunk/wikitty-api/pom.xml 2010-07-08 12:48:03 UTC (rev 179) +++ trunk/wikitty-api/pom.xml 2010-07-08 12:57:25 UTC (rev 180) @@ -199,8 +199,11 @@ <execution> <id>api-generation</id> <phase>generate-sources</phase> - <!--<configuration> - <inputs>src/main/uml/wikitty-api:**\/*.uml</inputs> + <configuration> + <inputs> + <input>zargo:src/main/uml/wikitty-api:*.zargo</input> + <input>xmi:src/main/uml/wikitty-api:*.uml</input> + </inputs> <fullPackagePath>org.nuiton.wikitty</fullPackagePath> <defaultPackage>org.nuiton.wikitty</defaultPackage> <extractedPackages>org.nuiton.wikitty</extractedPackages> @@ -208,26 +211,6 @@ </configuration> <goals> <goal>smart-generate</goal> - </goals>--> - <configuration> - <addCompileDirectory>true</addCompileDirectory> - <zargoResources> - <input>${maven.src.dir}/main/uml/wikitty-api</input> - </zargoResources> - <xmiResources> - <inputs><input>${maven.gen.dir}/xmi</input></inputs> - </xmiResources> - <includes>**/*.objectmodel</includes> - <templates>org.nuiton.wikitty.generator.WikittyMetaGenerator</templates> - <fullPackagePath>org.nuiton.wikitty</fullPackagePath> - <defaultPackage>org.nuiton.wikitty</defaultPackage> - <extractedPackages>org.nuiton.wikitty</extractedPackages> - <generatedPackages>org.nuiton.wikitty</generatedPackages> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> </goals> </execution> </executions> Modified: trunk/wikitty-generators/pom.xml =================================================================== --- trunk/wikitty-generators/pom.xml 2010-07-08 12:48:03 UTC (rev 179) +++ trunk/wikitty-generators/pom.xml 2010-07-08 12:57:25 UTC (rev 180) @@ -41,7 +41,7 @@ <build> <plugins> - <!-- processsor plugin --> + <!-- processor plugin --> <plugin> <groupId>org.nuiton.processor</groupId> <artifactId>maven-processor-plugin</artifactId> Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java 2010-07-08 12:48:03 UTC (rev 179) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikengoCommonGenerator.java 2010-07-08 12:57:25 UTC (rev 180) @@ -16,13 +16,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; -import org.nuiton.eugene.ImportsManager; -import org.nuiton.eugene.ObjectModelGenerator; +import org.nuiton.eugene.java.ImportsManager; +import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelDependency; import org.nuiton.eugene.models.object.ObjectModelElement; +import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; @@ -40,6 +41,21 @@ } } + @Override + protected boolean canGenerateElement(Object element) { + + boolean canGenerate = true; + + if (element instanceof ObjectModel) { + // fail with no model name + canGenerate = false; + } + else { + canGenerate = super.canGenerateElement(element); + } + return canGenerate; + } + protected void addImport(String fqn) { if (containsClassAndGeneric(fqn)) { String[] type = getClassAndGeneric(fqn); Modified: trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java =================================================================== --- trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-07-08 12:48:03 UTC (rev 179) +++ trunk/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyMetaGenerator.java 2010-07-08 12:57:25 UTC (rev 180) @@ -11,8 +11,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.ObjectModelGenerator; import org.nuiton.eugene.models.object.ObjectModel; +import org.nuiton.eugene.models.object.ObjectModelGenerator; import org.nuiton.util.Resource; public class WikittyMetaGenerator extends ObjectModelGenerator { @@ -105,7 +105,7 @@ } @Override - public void generate(ObjectModel model, File destDir) throws IOException { + public void applyTemplate(ObjectModel model, File destDir) throws IOException { for (Class<? extends ObjectModelGenerator> generatorClass : getGenerators()) { ObjectModelGenerator generator; if (excludeTemplates != null && excludeTemplates.contains(generatorClass.getName())) { @@ -130,7 +130,7 @@ if (log.isDebugEnabled()) { log.debug("call template : " + generatorClass.getSimpleName()); } - generator.generate(model, destDir); + generator.applyTemplate(model, destDir); } }