Author: echatellier Date: 2012-01-17 12:09:45 +0100 (Tue, 17 Jan 2012) New Revision: 1328 Url: http://nuiton.org/repositories/revision/wikitty/1328 Log: Init branche and readd generation modification Modified: branches/wikitty-3.3.x/pom.xml branches/wikitty-3.3.x/wikitty-api/pom.xml branches/wikitty-3.3.x/wikitty-dto/pom.xml branches/wikitty-3.3.x/wikitty-generators/pom.xml branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml branches/wikitty-3.3.x/wikitty-jdbc/pom.xml branches/wikitty-3.3.x/wikitty-lucene/pom.xml branches/wikitty-3.3.x/wikitty-perf-test/pom.xml branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml branches/wikitty-3.3.x/wikitty-publication/pom.xml branches/wikitty-3.3.x/wikitty-solr/pom.xml branches/wikitty-3.3.x/wikitty-struts/pom.xml branches/wikitty-3.3.x/wp-maven-plugin/pom.xml Modified: branches/wikitty-3.3.x/pom.xml =================================================================== --- branches/wikitty-3.3.x/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -15,7 +15,7 @@ <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> <modules> Modified: branches/wikitty-3.3.x/wikitty-api/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-api/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-api/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-dto/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-dto/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-dto/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-generators/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyAbstractGenerator.java 2012-01-17 11:09:45 UTC (rev 1328) @@ -24,17 +24,6 @@ */ package org.nuiton.wikitty.generator; -import org.apache.commons.lang.StringEscapeUtils; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.eugene.java.ObjectModelTransformerToJava; -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.ObjectModelModifier; -import org.nuiton.eugene.models.object.ObjectModelOperation; - import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -46,6 +35,18 @@ import java.util.Random; import java.util.Set; +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.ObjectModelTransformerToJava; +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.ObjectModelModifier; +import org.nuiton.eugene.models.object.ObjectModelOperation; + /*{generator option: writeString = }*/ /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -131,6 +132,11 @@ addConstructors(abstractClassForThisEntity); addConstants(clazz, abstractClassForThisEntity); addToString(clazz, abstractClassForThisEntity); + + // adding a generated serialVersionUID + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(abstractClassForThisEntity, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); } processedClasses.clear(); @@ -158,17 +164,6 @@ addImport(clazz, LinkedHashSet.class); } - protected void addSerialVersionUID(ObjectModelClass clazz) { - // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(clazz, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); - } - protected void addConstructors(ObjectModelClass clazz) { ObjectModelOperation constructor = addConstructor(clazz, ObjectModelModifier.PUBLIC); Modified: branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java =================================================================== --- branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-generators/src/main/java/org/nuiton/wikitty/generator/WikittyImplementationGenerator.java 2012-01-17 11:09:45 UTC (rev 1328) @@ -32,11 +32,11 @@ import java.util.LinkedHashSet; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelModifier; @@ -137,13 +137,9 @@ setSuperClass(implementation, WikittyTransformerUtil.businessEntityToAbstractName(clazz)); // adding a generated serialVersionUID - Random random = new Random(); - Long serialVersionUIDs = random.nextLong(); - addConstant(implementation, - "serialVersionUID", - "long", - serialVersionUIDs.toString() + "L", - ObjectModelModifier.PRIVATE); + Long serialVersionUIDs = GeneratorUtil.generateSerialVersionUID(clazz); + addConstant(implementation, "serialVersionUID", "long", + serialVersionUIDs.toString() + "L", ObjectModelModifier.PRIVATE); processedClasses.put(clazz, implementation); } Modified: branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-hessian-client/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-hessian-server/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-jdbc/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-jdbc/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-jdbc/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: branches/wikitty-3.3.x/wikitty-lucene/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-lucene/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-lucene/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-perf-test/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-perf-test/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-perf-test/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId> Modified: branches/wikitty-3.3.x/wikitty-publication/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-publication/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-publication/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-publication-ui/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-solr/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-solr/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-solr/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wikitty-struts/pom.xml =================================================================== --- branches/wikitty-3.3.x/wikitty-struts/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wikitty-struts/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3</version> + <version>3.3.1-SNAPSHOT</version> </parent> <!-- ************************************************************* --> Modified: branches/wikitty-3.3.x/wp-maven-plugin/pom.xml =================================================================== --- branches/wikitty-3.3.x/wp-maven-plugin/pom.xml 2012-01-17 11:05:06 UTC (rev 1327) +++ branches/wikitty-3.3.x/wp-maven-plugin/pom.xml 2012-01-17 11:09:45 UTC (rev 1328) @@ -34,7 +34,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>wikitty</artifactId> - <version>3.3-SNAPSHOT</version> + <version>3.3.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.wikitty</groupId>