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

r1361 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:03:21 +0000 (Thu, 12 Feb 2009) New Revision: 1361 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/DAOHelperGenerator.java Log: the DAOHelper now integrates the EntityEnum 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-12 00:02:35 UTC (rev 1360) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOAbstractGenerator.java 2009-02-12 00:03:21 UTC (rev 1361) @@ -139,7 +139,7 @@ public void delete(E entity) throws TopiaException { }*/ String modelName = GeneratorUtil.capitalize(model.getName()); - String providerFQN = getProperty("defaultPackage") + "." + modelName + "EntityEnum.getImplementationClass"; + String providerFQN = getProperty("defaultPackage") + "." + modelName + "DAOHelper.getImplementationClass"; for (ObjectModelAttribute attr : clazz.getAttributes()) { String attrType = attr.getType(); String reverseAttrName = attr.getReverseAttributeName(); 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-12 00:02:35 UTC (rev 1360) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2009-02-12 00:03:21 UTC (rev 1361) @@ -46,10 +46,12 @@ /** * Ce generateur permet d'avoir une classe permettant de recuperer les DAO * sans cast. + * + * La classe générée contient aussi une énumération nommée <code>EntityEnum</code> qui permet + * d'avoir facilement les types d'entités gérées par ce dao. + * * @author poussin - * @see Deprecated you should prefer use the {@link EntityEnumGenerator} */ -@Deprecated public class DAOHelperGenerator extends ObjectModelGenerator { private Log log = LogFactory.getLog(DAOHelperGenerator.class); @@ -81,28 +83,179 @@ }*/ } String modelName = GeneratorUtil.capitalize(model.getName()); + String daoClazzName = modelName+"DAOHelper"; + String entityEnumName = modelName+"EntityEnum"; + /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.TopiaContext; +import org.codelutin.topia.TopiaException; import org.codelutin.topia.framework.TopiaContextImplementor; -import org.codelutin.topia.TopiaException; +import org.codelutin.topia.persistence.TopiaDAO; +import org.codelutin.topia.persistence.TopiaEntity; -public class <%=modelName%>DAOHelper { +public class <%=daoClazzName%> { }*/ + List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); +/*{ /** + *) + protected <%=daoClazzName%>() { + } +}*/ + + for (ObjectModelClass clazz : classes) { + String clazzFQN = clazz.getQualifiedName(); + String clazzName = clazz.getName(); +/*{ + public static <%=clazzFQN%>DAO get<%=clazzName%>DAO(TopiaContext context) throws TopiaException { + TopiaContextImplementor ci = (TopiaContextImplementor)context; + <%=clazzFQN%>DAO result = (<%=clazzFQN%>DAO)ci.getDAO(<%=clazzFQN%>.class); + return result; + } +}*/ + } +/*{ + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(TopiaContext context, Class<T> klass) throws TopiaException { + TopiaContextImplementor ci = (TopiaContextImplementor)context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + D dao = (D) ci.getDAO(constant.getContractClass()); + return dao; + } + + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(TopiaContext context, T entity) throws TopiaException { + TopiaContextImplementor ci = (TopiaContextImplementor)context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(entity); + D dao = (D) ci.getDAO(constant.getContractClass()); + return dao; + } + + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity> Class<T> getContractClass(Class<T> klass) throws TopiaException { + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getContractClass(); + } + + @SuppressWarnings({"unchecked"}) + public static <T extends TopiaEntity> Class<T> getImplementationClass(Class<T> klass) throws TopiaException { + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getImplementationClass(); + } + + @SuppressWarnings({"unchecked"}) + public static Class<? extends TopiaEntity>[] getContractClasses() { + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) java.lang.reflect.Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getContractClass(); + } + return result; + } + + @SuppressWarnings({"unchecked"}) + public static Class<? extends TopiaEntity>[] getImplementationClasses() { + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) java.lang.reflect.Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getImplementationClass(); + } + return result; + } + + public static String getImplementationClassesAsString() { + StringBuilder buffer = new StringBuilder(); + for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { + buffer.append(',').append(aClass.getName()); + } + return buffer.substring(1); + } + + /* + * Enumeration of all types of entitties dealed by this helper. + *) + public enum <%=entityEnumName%> { +}*/ + for (Iterator<ObjectModelClass> i=classes.iterator(); i.hasNext();) { + ObjectModelClass clazz = i.next(); + String clazzFQN = clazz.getQualifiedName(); + String clazzName = clazz.getName(); +/*{ + <%=clazzName%>(<%=clazzFQN%>.class)<%=(i.hasNext() ? "," : ";")%>}*/ + } +/*{ + + /** the contract of the entity *) + private Class<? extends TopiaEntity> contractClass; + + /** the fully qualified name of the implementation of the entity *) + private String implementationFQN; + + /** the implementation class of the entity (will be lazy computed at runtime)*) + private Class<? extends TopiaEntity> implementationClass; + + <%=entityEnumName%>(Class<? extends TopiaEntity > contractClass) { + this.contractClass = contractClass; + this.implementationFQN = contractClass.getName()+"Impl"; + } + + public Class<? extends TopiaEntity> getContractClass() { + return contractClass; + } + + public String getImplementationFQN() { + return implementationFQN; + } + + @SuppressWarnings({"unchecked"}) + public Class<? extends TopiaEntity> getImplementationClass() { + if (implementationClass == null) { + try { + implementationClass = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); + } catch (ClassNotFoundException e) { + throw new RuntimeException("could not find class "+implementationFQN); + } + } + return implementationClass; + } + + public static <%=entityEnumName%> valueOf(TopiaEntity entity) { + return valueOf(entity.getClass()); + } + + public static <%=entityEnumName%> valueOf(Class<?> klass) { + if (klass.isInterface()) { + return <%=entityEnumName%>.valueOf(klass.getSimpleName()); + } + for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { + if (entityEnum.getContractClass().isAssignableFrom(klass)) { + //todo check it works for inheritance + return entityEnum; + } + } + throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + java.util.Arrays.toString(<%=entityEnumName%>.values())); + } + } +}*/ String entitiesList = ""; - List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); if (classes.isEmpty()) { /*{ + /** + * @eprecated (prefer use {@link #getImplementationClassesAsString()} + *) public static final String entitiesList = ""; }*/ } else { /*{ + /** + * @eprecated (prefer use {@link #getImplementationClassesAsString()} + *) public static final String entitiesList = "" + }*/ for (Iterator<ObjectModelClass> i=classes.iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); + ObjectModelClass clazz = i.next(); String doType = TopiaGeneratorUtil.getDOType(clazz, model); entitiesList += doType + (i.hasNext()?",":""); /*{ "<%=doType%><%=(i.hasNext()?",\" +":"\";")%> @@ -112,25 +265,9 @@ if (log.isDebugEnabled()) { log.debug("Full entities list : " + entitiesList); } -/*{ /** - *) - protected <%=modelName%>DAOHelper() { - } -}*/ - for (ObjectModelClass clazz : classes) { - String clazzFQN = clazz.getQualifiedName(); - String clazzName = clazz.getName(); /*{ - static public <%=clazzFQN%>DAO get<%=clazzName%>DAO(TopiaContext context) throws TopiaException { - TopiaContextImplementor ci = (TopiaContextImplementor)context; - <%=clazzFQN%>DAO result = (<%=clazzFQN%>DAO)ci.getDAO(<%=clazzFQN%>.class); - return result; - } +} //<%=daoClazzName%> }*/ - } -/*{ -} //<%=modelName%>DAOHelper -}*/ } } //DAOHelperGenerator

1 0

r1360 - in topia/trunk/topia-persistence/src/main/java/org/codelutin/topia: generator persistence
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:02:35 +0000 (Thu, 12 Feb 2009) New Revision: 1360 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/EntityProviderGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java Log: mark as deprecated 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-12 00:02:03 UTC (rev 1359) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2009-02-12 00:02:35 UTC (rev 1360) @@ -44,6 +44,7 @@ * @author chemit * @see org.codelutin.topia.persistence.TopiaEntityEnumEntry */ +@Deprecated public class EntityEnumGenerator extends ObjectModelGenerator { private static Log log = LogFactory.getLog(EntityEnumGenerator.class); @@ -91,7 +92,9 @@ import org.codelutin.topia.persistence.TopiaEntity; import org.codelutin.topia.persistence.TopiaEntityEnumEntry; - +/** + @deprecated <%=className%> will be removed in future ToPIA version + *) @SuppressWarnings({"unchecked"}) public enum <%=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-12 00:02:03 UTC (rev 1359) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2009-02-12 00:02:35 UTC (rev 1360) @@ -77,20 +77,21 @@ }*/ } String modelName = GeneratorUtil.capitalize(model.getName()); + String clazzName = modelName + "EntityProvider"; + /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.persistence.TopiaEntity; import java.util.Map; import java.util.HashMap; -import java.util.Collections; /** - * <%=modelName%>EntityProvider. + * <%=clazzName%> * - * @deprecated <%=modelName%>EntityProvider will be removed in future ToPIA version + * @deprecated <%=clazzName%> will be removed in future ToPIA version *) @SuppressWarnings({"unchecked"}) -public class <%=modelName%>EntityProvider { +public class <%=clazzName%> { protected static Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> cache; @@ -134,16 +135,16 @@ throw new RuntimeException("could not find entity implementation class " + implFQN); } } - <%=modelName%>EntityProvider.cache = Collections.unmodifiableMap(cache); + <%=clazzName%>.cache = java.util.Collections.unmodifiableMap(cache); } /** * should have no instance *) - protected <%=modelName%>EntityProvider() { + protected <%=clazzName%>() { } -} //<%=modelName%>EntityProvider +} //<%=clazzName%> }*/ } Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2009-02-12 00:02:03 UTC (rev 1359) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2009-02-12 00:02:35 UTC (rev 1360) @@ -8,7 +8,11 @@ import java.util.List; import java.util.Map; -/** @author chemit */ +/** + * @deprecated This class is used in deprecated generator {@link org.codelutin.topia.generator.EntityEnumGenerator} + * + * @author chemit */ +@Deprecated public class TopiaEntityEnumEntry<T extends TopiaEntity> implements java.io.Serializable {

1 0

r1359 - topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence
by tchemit＠users.labs.libre-entreprise.org 12 Feb '09

12 Feb '09

Author: tchemit Date: 2009-02-12 00:02:03 +0000 (Thu, 12 Feb 2009) New Revision: 1359 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java Log: use foreach Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-02-11 19:58:38 UTC (rev 1358) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-02-12 00:02:03 UTC (rev 1359) @@ -20,7 +20,6 @@ import java.util.ArrayList; import java.util.Collection; -import java.util.Iterator; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -94,9 +93,7 @@ Collection cValue = (Collection)value; if(cValue != null && !cValue.isEmpty()) { - Iterator itOnValues = cValue.iterator(); - while(itOnValues.hasNext()) { - Object currentValue = itOnValues.next(); + for (Object currentValue : cValue) { visit(e, type, currentValue); } }

1 0

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

11 Feb '09

Author: tchemit Date: 2009-02-11 19:58:38 +0000 (Wed, 11 Feb 2009) New Revision: 1358 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: suppression du plugin build-helper-maven-plugin car generator gere desormais la generation en phase test (utiliser la propriete testPhase) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -217,33 +217,10 @@ <srcDirZuml>src/test/xmi</srcDirZuml> <srcXmiDest>${test.gen.dir}/xmi/</srcXmiDest> <srcGenDest>${test.gen.dir}/models/</srcGenDest> - <destDirGen>${test.gen.dir}/java</destDirGen> -  + <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-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-persistence/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -100,18 +100,7 @@ <artifactId>maven-processor-plugin</artifactId> </plugin> -  <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> @@ -120,6 +109,7 @@ <id>Test Generator</id> <phase>generate-test-sources</phase> <configuration> + <testPhase>true</testPhase> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> <fullPackagePath>org.codelutin.topia</fullPackagePath> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-soa/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -42,52 +42,35 @@ <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-server</artifactId> -  </dependency> <dependency> <groupId>org.apache.xmlrpc</groupId> <artifactId>xmlrpc-client</artifactId> -  </dependency> <dependency> <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> -  </dependency> <dependency> <groupId>org.codehaus.xfire</groupId> <artifactId>xfire-java5</artifactId> -  -  -  </dependency>  <dependency> <groupId>jetty</groupId> <artifactId>jetty</artifactId> -  </dependency>  <dependency> <groupId>asm</groupId> <artifactId>asm</artifactId> -  </dependency> + </dependencies>  @@ -112,23 +95,7 @@ <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> @@ -137,6 +104,7 @@ <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> + <testPhase>true</testPhase> <fullPackagePath>org.codelutin.soatest</fullPackagePath> <extractedPackages>org.codelutin.soatest</extractedPackages> <defaultPackage>org.codelutin.soatest</defaultPackage> @@ -153,7 +121,7 @@ </executions> <dependencies> <dependency> - <groupId>org.codelutin.topia</groupId> + <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> <scope>compile</scope> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-11 19:57:01 UTC (rev 1357) +++ topia/trunk/topia-ui/pom.xml 2009-02-11 19:58:38 UTC (rev 1358) @@ -60,18 +60,7 @@ <plugins> -  <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-test-source</id> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-processor-plugin</artifactId> </plugin> @@ -80,16 +69,22 @@ <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> <version>${generator.version}</version> + <configuration> + <testPhase>true</testPhase> + <fullPackagePath>org.codelutin.test</fullPackagePath> + <extractedPackages>org.codelutin.test</extractedPackages> + </configuration> <executions> <execution> <id>generate-objectmodel</id> <phase>generate-test-sources</phase> <configuration> +  + <defaultPackage>org.codelutin.test</defaultPackage> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <defaultPackage>org.codelutin.test</defaultPackage> </configuration> <goals> <goal>zargo2xmi</goal> @@ -102,8 +97,9 @@ <id>generate-statemodel</id> <phase>generate-test-sources</phase> <configuration> +  <includes>**/*.statemodel</includes> <templates>org.codelutin.topia.generator.TapestryWebGenerator</templates> <extraClassPathDirectory>target/classes</extraClassPathDirectory> @@ -121,7 +117,8 @@ <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> - <scope>runtime</scope> +  +  </dependency> </dependencies> </plugin>

1 0

r1357 - topia/trunk/topia-persistence/src/test/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:57:01 +0000 (Wed, 11 Feb 2009) New Revision: 1357 Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java Log: pourles tests, il faut que la base estun nom different a chaque fois (car quand on fait un mvn install iste ?\195?\167a peut planter lors de la seconde execution des tests...) Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java 2009-02-11 19:53:42 UTC (rev 1356) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/generator/TopiaTestCase.java 2009-02-11 19:57:01 UTC (rev 1357) @@ -69,7 +69,7 @@ config.setProperty(Environment.CURRENT_SESSION_CONTEXT_CLASS, "thread"); config.setProperty(Environment.DIALECT,"org.hibernate.dialect.H2Dialect"); config.setProperty(Environment.DRIVER,"org.h2.Driver"); - config.setProperty(Environment.URL,"jdbc:h2:file:/tmp/db/data"); + config.setProperty(Environment.URL, "jdbc:h2:file:/tmp/" + TopiaTestCase.class + "/db/data_" + System.currentTimeMillis()); } /**

1 0

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