Author: fdesbois Date: 2009-11-06 12:49:14 +0100 (Fri, 06 Nov 2009) New Revision: 1663 Modified: branches/from2.2.2-eugene2-beta/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml branches/from2.2.2-eugene2-beta/topia-soa/pom.xml branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java branches/from2.2.2-eugene2-beta/topia-ui/pom.xml Log: Evol #122 : EUGene 2 migration Modified: branches/from2.2.2-eugene2-beta/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -14,7 +14,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -194,7 +194,7 @@ <projectId>topia</projectId> <!-- libs version --> - <eugene.version>1.0.1-SNAPSHOT</eugene.version> + <eugene.version>2.0.0-beta-SNAPSHOT</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> <processor.version>1.0.1</processor.version> <i18n.version>1.0.2-SNAPSHOT</i18n.version> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -139,6 +139,7 @@ <phase>generate-test-sources</phase> <configuration> <testPhase>true</testPhase> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator,org.nuiton.topia.generator.InterfaceGenerator,org.nuiton.topia.generator.BeanGenerator</templates> <fullPackagePath>org.nuiton.topia</fullPackagePath> Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -61,14 +61,6 @@ */ public class DAOAbstractGenerator extends ObjectModelGenerator { - public DAOAbstractGenerator() { - super(); - } - - public DAOAbstractGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "DAOAbstract.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -39,14 +39,7 @@ public class DAOGenerator extends ObjectModelGenerator { - public DAOGenerator() { - super(); - } - public DAOGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "DAO.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -56,14 +56,6 @@ private Log log = LogFactory.getLog(DAOHelperGenerator.class); - public DAOHelperGenerator() { - super(); - } - - public DAOHelperGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForModel(ObjectModel model) { Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -40,14 +40,6 @@ public class DAOImplGenerator extends ObjectModelGenerator { - public DAOImplGenerator() { - super(); - } - - public DAOImplGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "DAOImpl.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -69,14 +69,6 @@ return true; } - public EntityAbstractGenerator() { - super(); - } - - public EntityAbstractGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "Abstract.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -67,14 +67,6 @@ private Map<String, String[]> columnNamesMap = new HashMap<String, String[]>(); - public EntityHibernateMappingGenerator() { - super(); - } - - public EntityHibernateMappingGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { String DOName = TopiaGeneratorUtil.getDOType(clazz, model); Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -45,14 +45,6 @@ private static final Log log = LogFactory.getLog(EntityImplGenerator.class); - public EntityImplGenerator() { - super(); - } - - public EntityImplGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "Impl.java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityInterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -63,14 +63,6 @@ private static final Log log = LogFactory .getLog(EntityInterfaceGenerator.class); - public EntityInterfaceGenerator() { - super(); - } - - public EntityInterfaceGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + ".java"; Modified: branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-persistence/src/main/java/org/nuiton/topia/generator/InterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -50,14 +50,6 @@ /** Logger for this class */ private static final Log log = LogFactory.getLog(InterfaceGenerator.class); - public InterfaceGenerator() { - super(); - } - - public InterfaceGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForClass(ObjectModelClass clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + ".java"; Modified: branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-history/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -95,13 +95,14 @@ <phase>generate-sources</phase> <id>generate-sources</id> <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <defaultPackage>org.nuiton.topia</defaultPackage> <fullPackagePath>org.nuiton.topia</fullPackagePath> <copyVersionDir>${maven.src.dir}/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> - <copyOverwrite>true</copyOverwrite> + <overwrite>true</overwrite> </configuration> <goals> <goal>zargo2xmi</goal> Modified: branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-index/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-migration/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -101,7 +101,8 @@ <execution> <id>Migration service generator</id> <phase>generate-sources</phase> - <configuration> + <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <fullPackagePath>org.nuiton.topia.migration</fullPackagePath> Modified: branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-replication/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-service-security/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -90,7 +90,8 @@ <execution> <id>generate-sources</id> <phase>generate-sources</phase> - <configuration> + <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <includes>**/*.objectmodel</includes> <templates>org.nuiton.topia.generator.TopiaMetaGenerator</templates> <defaultPackage>org.nuiton.topia</defaultPackage> Modified: branches/from2.2.2-eugene2-beta/topia-soa/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -112,6 +112,7 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> + <reader>org.nuiton.eugene.ObjectModelReader</reader> <testPhase>true</testPhase> <fullPackagePath>org.codelutin.soatest</fullPackagePath> <extractedPackages>org.codelutin.soatest</extractedPackages> Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceAbstractGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -64,14 +64,6 @@ private static final Log log = LogFactory .getLog(ServiceAbstractGenerator.class); - public ServiceAbstractGenerator() { - super(); - } - - public ServiceAbstractGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForInterface(ObjectModelInterface clazz) { return clazz.getQualifiedName().replace('.', File.separatorChar) + "Abstract.java"; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceImplGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -60,14 +60,6 @@ private static final Log log = LogFactory .getLog(ServiceImplGenerator.class); - public ServiceImplGenerator() { - super(); - } - - public ServiceImplGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForInterface(ObjectModelInterface interfacez) { return interfacez.getQualifiedName().replace('.', File.separatorChar) + "Impl.java"; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/ServiceInterfaceGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -81,14 +81,6 @@ // methodes du service <signature methode> private List<String> methods = null; - public ServiceInterfaceGenerator() { - super(); - } - - public ServiceInterfaceGenerator(Generator parent) { - super(parent); - } - @Override public String getFilenameForInterface(ObjectModelInterface interfacez) { return interfacez.getQualifiedName().replace('.', File.separatorChar) + ".java"; Modified: branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java =================================================================== --- branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-soa/src/main/java/org/nuiton/topia/generator/TopiaApplicationServiceMetaGenerator.java 2009-11-06 11:49:14 UTC (rev 1663) @@ -56,21 +56,24 @@ if(log.isDebugEnabled()) { log.debug("Generating Service Interface"); } - gen = new ServiceInterfaceGenerator(this); + gen = new ServiceInterfaceGenerator(); + gen.setParent(this); gen.generate(model, destDir); // Genere les abstract des services if(log.isDebugEnabled()) { log.debug("Generating Service Abstract"); } - gen = new ServiceAbstractGenerator(this); + gen = new ServiceAbstractGenerator(); + gen.setParent(this); gen.generate(model, destDir); // Genere les impl des services if(log.isDebugEnabled()) { log.debug("Generating Service Impl"); } - gen = new ServiceImplGenerator(this); + gen = new ServiceImplGenerator(); + gen.setParent(this); gen.generate(model, destDir); } Modified: branches/from2.2.2-eugene2-beta/topia-ui/pom.xml =================================================================== --- branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-11-06 10:55:56 UTC (rev 1662) +++ branches/from2.2.2-eugene2-beta/topia-ui/pom.xml 2009-11-06 11:49:14 UTC (rev 1663) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.2.2-SNAPSHOT</version> + <version>2.3.0-beta-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> @@ -83,6 +83,7 @@ <id>generate-statemodel</id> <phase>generate-test-sources</phase> <configuration> + <reader>org.nuiton.eugene.StateModelReader</reader> <testPhase>true</testPhase> <fullPackagePath>org.nuiton.topiauitest</fullPackagePath> <extractedPackages>org.nuiton.topiauitest</extractedPackages>