- Topia-commits - mailman.cloud.codelutin.com

r1356 - topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 19:53:42 +0000 (Wed, 11 Feb 2009) New Revision: 1356 Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/TopiaApplicationServiceMetaGenerator.java Log: passage des log en debug + javadoc + un peu de menage Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/TopiaApplicationServiceMetaGenerator.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-02-11 16:08:20 UTC (rev 1355) +++ topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-02-11 19:53:42 UTC (rev 1356) @@ -31,11 +31,8 @@ public class TopiaApplicationServiceMetaGenerator extends ObjectModelGenerator { /** logger */ - protected static Log log = LogFactory.getLog(TopiaApplicationServiceMetaGenerator.class); + private static final Log log = LogFactory.getLog(TopiaApplicationServiceMetaGenerator.class); - /* - * @see org.codelutin.generator.ObjectModelGenerator#generate(org.codelutin.generator.models.object.ObjectModel, java.io.File) - */ @Override public void generate(ObjectModel model, File destDir) throws IOException { @@ -44,34 +41,34 @@ } /** - * Appel les autres generateu des services. + * Appel les autres generateurs des services. * - * @param model - * @param destDir - * @throws IOException + * @param model le modele à utiliser pour la génération + * @param destDir le répertoire où générer + * @throws IOException si des erreurs d'IO pendant la génération */ public void generateApplicationService(ObjectModel model, File destDir) throws IOException { - ObjectModelGenerator gen = null; + ObjectModelGenerator gen; // Genere les interfaces des services - if(log.isInfoEnabled()) { - log.info("Generating Service Interface"); + if(log.isDebugEnabled()) { + log.debug("Generating Service Interface"); } gen = new ServiceInterfaceGenerator(this); gen.generate(model, destDir); // Genere les abstract des services - if(log.isInfoEnabled()) { - log.info("Generating Service Abstract"); + if(log.isDebugEnabled()) { + log.debug("Generating Service Abstract"); } gen = new ServiceAbstractGenerator(this); gen.generate(model, destDir); // Genere les impl des services - if(log.isInfoEnabled()) { - log.info("Generating Service Impl"); + if(log.isDebugEnabled()) { + log.debug("Generating Service Impl"); } gen = new ServiceImplGenerator(this); gen.generate(model, destDir);

1 0

r1355 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: chatellier Date: 2009-02-11 16:08:20 +0000 (Wed, 11 Feb 2009) New Revision: 1355 Modified: topia-service/trunk/pom.xml Log: Update lutingenerator config Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-11 15:59:32 UTC (rev 1354) +++ topia-service/trunk/pom.xml 2009-02-11 16:08:20 UTC (rev 1355) @@ -107,6 +107,7 @@ <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.codelutin.topia</defaultPackage> + <fullPackagePath>org.codelutin.topia</fullPackagePath> <extractedPackages>org.codelutin.topia.tass</extractedPackages> <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles>

1 0

r1354 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: chatellier Date: 2009-02-11 15:59:32 +0000 (Wed, 11 Feb 2009) New Revision: 1354 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java Log: Capitalize model name first letter. Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java 2009-02-11 15:45:43 UTC (rev 1353) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java 2009-02-11 15:59:32 UTC (rev 1354) @@ -138,7 +138,8 @@ public void delete(E entity) throws TopiaException { }*/ - String providerFQN = getProperty("defaultPackage") + "." + model.getName() + "EntityEnum.getImplementationClass"; + String modelName = GeneratorUtil.capitalize(model.getName()); + String providerFQN = getProperty("defaultPackage") + "." + modelName + "EntityEnum.getImplementationClass"; for (ObjectModelAttribute attr : clazz.getAttributes()) { String attrType = attr.getType(); String reverseAttrName = attr.getReverseAttributeName();

1 0

r1353 - topia/trunk/topia-ui
by chatellier＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: chatellier Date: 2009-02-11 15:45:43 +0000 (Wed, 11 Feb 2009) New Revision: 1353 Modified: topia/trunk/topia-ui/pom.xml Log: Udpate generator configuration Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-11 10:50:27 UTC (rev 1352) +++ topia/trunk/topia-ui/pom.xml 2009-02-11 15:45:43 UTC (rev 1353) @@ -85,6 +85,8 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> + <fullPackagePath>org.codelutin.test</fullPackagePath> + <extractedPackages>org.codelutin.test</extractedPackages> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> <defaultPackage>org.codelutin.test</defaultPackage> @@ -99,7 +101,9 @@ <execution> <id>generate-statemodel</id> <phase>generate-test-sources</phase> - <configuration> + <configuration> + <fullPackagePath>org.codelutin.test</fullPackagePath> + <extractedPackages>org.codelutin.test</extractedPackages> <includes>**/*.statemodel</includes> <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> <extraClassPathDirectory>target/classes</extraClassPathDirectory>

1 0

r1352 - in topia/trunk/topia-persistence: . src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: chatellier Date: 2009-02-11 10:50:27 +0000 (Wed, 11 Feb 2009) New Revision: 1352 Modified: topia/trunk/topia-persistence/changelog.txt topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java Log: Capitalize model name first letter. Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/changelog.txt 2009-02-11 10:50:27 UTC (rev 1352) @@ -1,4 +1,5 @@ 2.1.3 ??? 200902?? +* 20090410 [chatellier] - add first letter capitalize on model name use * 20090129 [chemit] - add methods in TopiaGeneratorUtil class to optimize imports * 20090129 [thimel] - Refactor generators (part1 : remove any methods calls in <%=...%>) * 20090129 [thimel] - Renamed GeneratorUtil to TopiaGeneratorUtil Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-11 10:50:27 UTC (rev 1352) @@ -38,6 +38,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.generator.Generator; +import org.codelutin.generator.GeneratorUtil; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; @@ -63,9 +64,12 @@ @Override public String getFilenameForModel(ObjectModel model) { + + String modelName = GeneratorUtil.capitalize(model.getName()); + return (getProperty("defaultPackage") + ".").replace('.', File.separatorChar) - + model.getName() + "DAOHelper.java"; + + modelName + "DAOHelper.java"; } @Override @@ -76,7 +80,7 @@ /*{<%=copyright%> }*/ } - String modelName = model.getName(); + String modelName = GeneratorUtil.capitalize(model.getName()); /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.TopiaContext; Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2009-02-11 10:50:27 UTC (rev 1352) @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.generator.Generator; +import org.codelutin.generator.GeneratorUtil; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; @@ -57,16 +58,19 @@ @Override public String getFilenameForModel(ObjectModel model) { + + String modelName = GeneratorUtil.capitalize(model.getName()); + return (getProperty("defaultPackage") + ".").replace('.', File.separatorChar) - + model.getName() + "EntityEnum.java"; + + modelName + "EntityEnum.java"; } @Override public void generateFromModel(Writer output, ObjectModel model) throws IOException { String copyright = TopiaGeneratorUtil.getCopyright(model); - String modelName = model.getName(); + String modelName = GeneratorUtil.capitalize(model.getName()); String className = modelName + "EntityEnum"; if (log.isDebugEnabled()) { log.debug("generating " + className); Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2009-02-11 10:45:33 UTC (rev 1351) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2009-02-11 10:50:27 UTC (rev 1352) @@ -31,6 +31,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.generator.Generator; +import org.codelutin.generator.GeneratorUtil; import org.codelutin.generator.ObjectModelGenerator; import org.codelutin.generator.models.object.ObjectModel; import org.codelutin.generator.models.object.ObjectModelClass; @@ -59,9 +60,12 @@ @Override public String getFilenameForModel(ObjectModel model) { + + String modelName = GeneratorUtil.capitalize(model.getName()); + return (getProperty("defaultPackage") + ".").replace('.', File.separatorChar) - + model.getName() + "EntityProvider.java"; + + modelName + "EntityProvider.java"; } @Override @@ -72,7 +76,7 @@ /*{<%=copyright%> }*/ } - String modelName = model.getName(); + String modelName = GeneratorUtil.capitalize(model.getName()); /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.persistence.TopiaEntity; @@ -80,6 +84,11 @@ import java.util.HashMap; import java.util.Collections; +/** + * <%=modelName%>EntityProvider. + * + * @deprecated <%=modelName%>EntityProvider will be removed in future ToPIA version + *) @SuppressWarnings({"unchecked"}) public class <%=modelName%>EntityProvider {

1 0

r1351 - topia/branches/hibernate_to_jpa_migration
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 10:45:33 +0000 (Wed, 11 Feb 2009) New Revision: 1351 Modified: topia/branches/hibernate_to_jpa_migration/pom.xml Log: ajout repository codelutin dans les poms des projets Modified: topia/branches/hibernate_to_jpa_migration/pom.xml =================================================================== --- topia/branches/hibernate_to_jpa_migration/pom.xml 2009-02-11 10:35:39 UTC (rev 1350) +++ topia/branches/hibernate_to_jpa_migration/pom.xml 2009-02-11 10:45:33 UTC (rev 1351) @@ -243,6 +243,23 @@ <url>${maven.scm.url}</url> </scm> +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <profiles>  <profile>

1 0

r1350 - topia/trunk
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 10:35:39 +0000 (Wed, 11 Feb 2009) New Revision: 1350 Modified: topia/trunk/pom.xml Log: ajout repository codelutin dans les poms des projets Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-11 10:35:37 UTC (rev 1349) +++ topia/trunk/pom.xml 2009-02-11 10:35:39 UTC (rev 1350) @@ -282,6 +282,23 @@ <url>${maven.scm.url}</url> </scm> +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <profiles>  <profile>

1 0

r1349 - topia-service/trunk
by tchemit＠users.labs.libre-entreprise.org 11 Feb '09

11 Feb '09

Author: tchemit Date: 2009-02-11 10:35:37 +0000 (Wed, 11 Feb 2009) New Revision: 1349 Modified: topia-service/trunk/pom.xml Log: ajout repository codelutin dans les poms des projets Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-10 08:36:15 UTC (rev 1348) +++ topia-service/trunk/pom.xml 2009-02-11 10:35:37 UTC (rev 1349) @@ -183,6 +183,23 @@ <url>${maven.scm.url}</url> </scm> +  + <repositories> + <repository> + <id>codelutin-repository</id> + <name>CodeLutinRepository</name> + <url>http://lutinbuilder.labs.libre-entreprise.org/maven2</url> + <snapshots> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </snapshots> + <releases> + <enabled>true</enabled> + <checksumPolicy>warn</checksumPolicy> + </releases> + </repository> + </repositories> + <profiles> <profile> <id>release-profile</id>

1 0

r1348 - in topia/trunk: topia-soa topia-soa/src/main/java/org/codelutin/topia/generator topia-soa/src/test topia-soa/src/test/xmi topia-ui
by chatellier＠users.labs.libre-entreprise.org 10 Feb '09

10 Feb '09

Author: chatellier Date: 2009-02-10 08:36:15 +0000 (Tue, 10 Feb 2009) New Revision: 1348 Added: topia/trunk/topia-soa/src/test/xmi/ topia/trunk/topia-soa/src/test/xmi/soaTest.properties topia/trunk/topia-soa/src/test/xmi/soaTest.zargo Modified: topia/trunk/topia-soa/pom.xml topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java topia/trunk/topia-ui/pom.xml Log: Ajout d'un d?\195?\169but de test dans topia-soa. Generation de service simple et service li?\195?\169 avec des DAO. Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) +++ topia/trunk/topia-soa/pom.xml 2009-02-10 08:36:15 UTC (rev 1348) @@ -112,6 +112,54 @@ <artifactId>maven-processor-plugin</artifactId> </plugin> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>add-test-source</id> + <phase>process-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <executions> + <execution> + <id>generate-objectmodel</id> + <phase>generate-test-sources</phase> + <configuration> + <fullPackagePath>org.codelutin.soatest</fullPackagePath> + <extractedPackages>org.codelutin.soatest</extractedPackages> + <defaultPackage>org.codelutin.soatest</defaultPackage> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaApplicationServiceMetaGenerator</templates> + <extraClassPathDirectory>target/classes</extraClassPathDirectory> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin.topia</groupId> + <artifactId>topia-persistence</artifactId> + <version>${project.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> </plugins> </build> Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java 2009-02-09 19:41:35 UTC (rev 1347) +++ topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceAbstractGenerator.java 2009-02-10 08:36:15 UTC (rev 1348) @@ -99,7 +99,8 @@ // generer les signatures des methodes des entites (getter/setter) generateMethodsGetter(output, interfacez); -/*{} //<%=interfacez.getName()%> +/*{ +} //<%=interfacez.getName()%> }*/ } @@ -141,11 +142,13 @@ } /*{ -public abstract class <%=classifierName%>Abstract extends TopiaApplicationServiceAbstract implements <%=classifierName%>{ }*/ +public abstract class <%=classifierName%>Abstract extends TopiaApplicationServiceAbstract implements <%=classifierName%> { +}*/ } private void generateMethodsGetter(Writer output, ObjectModelClassifier classifier) throws IOException { -/*{ public String[] getMethods(){ +/*{ + public String[] getMethods(){ return methods; } }*/ @@ -157,7 +160,6 @@ String opVisibility = op.getVisibility(); String opType = op.getReturnType(); /*{ - /** * Implementation a la charge du developpeur }*/ @@ -190,7 +192,6 @@ comma = ", "; } /*{; - }*/ } } Modified: topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java =================================================================== --- topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java 2009-02-09 19:41:35 UTC (rev 1347) +++ topia/trunk/topia-soa/src/main/java/org/codelutin/topia/generator/ServiceInterfaceGenerator.java 2009-02-10 08:36:15 UTC (rev 1348) @@ -79,7 +79,7 @@ private static final String DAO = "dao"; // methodes du service <signature methode> - private List<String> methods = new ArrayList<String>(); + private List<String> methods = null; public ServiceInterfaceGenerator() { super(); @@ -97,6 +97,9 @@ @Override public void generateFromInterface(Writer output, ObjectModelInterface interfacez) throws IOException { + // reset la liste a chaque interface traitée + methods = new ArrayList<String>(); + if (!interfacez.hasStereotype(TopiaGeneratorUtil.STEREOTYPE_SERVICE)) { return; } @@ -176,12 +179,12 @@ } /*{<%=extendClass%>TopiaApplicationService { - }*/ } private void generateMethodsGetter(Writer output, ObjectModelClassifier classifier) throws IOException { -/*{ public abstract String[] getMethods(); +/*{ + public abstract String[] getMethods(); // methodes utilisant celles des entites }*/ @@ -230,7 +233,6 @@ comma = ", "; } /*{; - }*/ // ajout des methodes methods.add(method + ")"); Added: topia/trunk/topia-soa/src/test/xmi/soaTest.properties =================================================================== --- topia/trunk/topia-soa/src/test/xmi/soaTest.properties (rev 0) +++ topia/trunk/topia-soa/src/test/xmi/soaTest.properties 2009-02-10 08:36:15 UTC (rev 1348) @@ -0,0 +1 @@ +model.tagvalue.usecaseengineextendedclass=BasePage \ No newline at end of file Added: topia/trunk/topia-soa/src/test/xmi/soaTest.zargo =================================================================== (Binary files differ) Property changes on: topia/trunk/topia-soa/src/test/xmi/soaTest.zargo ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) +++ topia/trunk/topia-ui/pom.xml 2009-02-10 08:36:15 UTC (rev 1348) @@ -117,7 +117,7 @@ <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> - <scope>test</scope> + <scope>runtime</scope> </dependency> </dependencies> </plugin>

1 0

r1347 - in topia/trunk: . topia-persistence topia-ui
by tchemit＠users.labs.libre-entreprise.org 09 Feb '09

09 Feb '09

Author: tchemit Date: 2009-02-09 19:41:35 +0000 (Mon, 09 Feb 2009) New Revision: 1347 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-ui/pom.xml Log: refactor poms (again!) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) +++ topia/trunk/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) @@ -171,6 +171,9 @@ <xmlrpc.version>3.1</xmlrpc.version> <hibernate.version>3.3.1.GA</hibernate.version> <topia.version>${project.version}</topia.version> + +  + <test.gen.dir>${project.build.directory}/generated-test-sources</test.gen.dir> </properties> <build> @@ -205,6 +208,42 @@ </configuration> </plugin> + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>${generator.version}</version> + <inherited>true</inherited> + <configuration> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>${test.gen.dir}/xmi/</srcXmiDest> + <srcGenDest>${test.gen.dir}/models/</srcGenDest> + <destDirGen>${test.gen.dir}/java</destDirGen> +  + </configuration> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <id>add-test-source</id> + <phase>process-test-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${test.gen.dir}/java</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) +++ topia/trunk/topia-persistence/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) @@ -32,43 +32,31 @@ <dependency> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> -  </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> -  </dependency> <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-ehcache</artifactId> -  </dependency> <dependency> <groupId>javassist</groupId> <artifactId>javassist</artifactId> -  </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> -  </dependency>  <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> -  </dependency> </dependencies> @@ -86,7 +74,7 @@ <packaging>jar</packaging> <build> - + <testResources> <testResource> @@ -97,12 +85,12 @@ </testResource> <testResource> - <directory>${maven.gen.dir}/test-java</directory> + <directory>${test.gen.dir}/java</directory> <includes> <include>**/*.hbm.xml</include> </includes> </testResource> - + </testResources> <plugins> @@ -116,19 +104,9 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> <id>add-test-source</id> - <phase>process-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>${maven.gen.dir}/test-java</source> - </sources> - </configuration> </execution> </executions> </plugin> @@ -142,15 +120,10 @@ <id>Test Generator</id> <phase>generate-test-sources</phase> <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/test-xmi/</srcXmiDest> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> -  - <srcGenDest>${maven.gen.dir}/test-objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>${maven.gen.dir}/test-java</destDirGen> + <fullPackagePath>org.codelutin.topia</fullPackagePath> + <extractedPackages>org.codelutin.topia</extractedPackages> <defaultPackage>org.codelutin.topia</defaultPackage> <extraClassPathDirectory>target/classes</extraClassPathDirectory> </configuration> @@ -160,7 +133,7 @@ <goal>generate</goal> </goals> </execution> - </executions> + </executions> </plugin> </plugins> </build> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-09 15:56:49 UTC (rev 1346) +++ topia/trunk/topia-ui/pom.xml 2009-02-09 19:41:35 UTC (rev 1347) @@ -25,7 +25,7 @@ <version>${project.version}</version> <scope>test</scope> </dependency> - + <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> @@ -39,8 +39,6 @@ <dependency> <groupId>org.apache.tapestry</groupId> <artifactId>tapestry-core</artifactId> -  </dependency> </dependencies> @@ -66,23 +64,13 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> - <version>1.2</version> <executions> <execution> - <id>add-test-source</id> - <phase>process-test-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/generated-test-sources/java</source> - </sources> - </configuration> + <id>add-test-source</id> </execution> </executions> </plugin> - + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-processor-plugin</artifactId> @@ -97,12 +85,8 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>target/generated-test-sources/xmi/</srcXmiDest> - <srcGenDest>target/generated-test-sources/models/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/generated-test-sources/java</destDirGen> <defaultPackage>org.codelutin.test</defaultPackage> </configuration> <goals> @@ -111,17 +95,13 @@ <goal>generate</goal> </goals> </execution> - + <execution> <id>generate-statemodel</id> <phase>generate-test-sources</phase> - <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>target/generated-test-sources/xmi/</srcXmiDest> - <srcGenDest>target/generated-test-sources/models/</srcGenDest> + <configuration> <includes>**/*.statemodel</includes> <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> - <destDirGen>target/generated-test-sources/java</destDirGen> <extraClassPathDirectory>target/classes</extraClassPathDirectory> </configuration> <goals> @@ -131,12 +111,13 @@ </goals> </execution> </executions> + <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> - <scope>compile</scope> + <scope>test</scope> </dependency> </dependencies> </plugin>

1 0