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

r1196 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 25 Oct '08

25 Oct '08

Author: tchemit Date: 2008-10-25 23:15:44 +0000 (Sat, 25 Oct 2008) New Revision: 1196 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Log: add dbName of table if explicit in javadoc Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-10-24 12:22:35 UTC (rev 1195) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-10-25 23:15:44 UTC (rev 1196) @@ -96,7 +96,16 @@ /** * Implantation POJO pour l'entité <%=Util.capitalize(clazz.getName())%>. - *) +}*/ + { +String dbName = clazz.getTagValue(GeneratorUtil.TAG_DB_NAME); + if (dbName!=null) { +/*{ * + * <p>Nom de l'entité en BD : <%=dbName%>.</p> +}*/ + } + } +/*{ *) public abstract class <%=clazz.getName()%>Abstract extends }*/ String extendClass = ""; for (Iterator i=clazz.getSuperclasses().iterator(); i.hasNext();) { @@ -153,7 +162,7 @@ }*/ } if (dbName != null) { -/*{ * Nom de l'attribut en BD : <%=attr.getTagValue(GeneratorUtil.TAG_DB_NAME)%>. +/*{ * Nom de l'attribut en BD : <%=dbName%>. }*/ } /*{ *)

1 0

r1195 - topia/trunk/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 24 Oct '08

24 Oct '08

Author: chatellier Date: 2008-10-24 12:22:35 +0000 (Fri, 24 Oct 2008) New Revision: 1195 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Remove comment Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-23 22:00:44 UTC (rev 1194) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-24 12:22:35 UTC (rev 1195) @@ -25,6 +25,8 @@ * * Mise a jour: $Date$ * par : $Author$ +* Mise a jour: $Date$ +* par : $Author$ */ package org.codelutin.topia.generator; @@ -323,12 +325,7 @@ String cascade = ""; if (attr.isComposite() || attr.hasAssociationClass()) { cascade += "cascade=\"all,delete-orphan\""; - - // 20071123 : dans le cas d'une relation composite, jamais d'inverse - // 20080407 : probleme lors du save d'entité abstraite - //isInverse = false; } - //cascade += ""; String lazy = "lazy=\""; if (attr.getTagValue("lazy") != null){

1 0

r1194 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 23 Oct '08

23 Oct '08

Author: tchemit Date: 2008-10-23 22:00:44 +0000 (Thu, 23 Oct 2008) New Revision: 1194 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java Log: fix bug when no entity defined in model + improve and clean code Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 22:00:44 UTC (rev 1194) @@ -85,7 +85,6 @@ if (model.getClasses().isEmpty()) { /*{ public static final String entitiesList = ""; - public static final Class [] entitiesClasses = new Class []{}; }*/ } else { /*{

1 0

r1193 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 23 Oct '08

23 Oct '08

Author: tchemit Date: 2008-10-23 22:00:21 +0000 (Thu, 23 Oct 2008) New Revision: 1193 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java Log: fix bug when no entity defined in model + improve and clean code Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/DAOHelperGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) @@ -80,38 +80,38 @@ public class <%=model.getName()%>DAOHelper { +}*/ + String entitiesList = ""; + if (model.getClasses().isEmpty()) { +/*{ + public static final String entitiesList = ""; + public static final Class [] entitiesClasses = new Class []{}; +}*/ + } else { +/*{ public static final String entitiesList = "" + }*/ - String entitiesList = ""; - for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ - entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); + + for (Iterator i=model.getClasses().iterator(); i.hasNext();) { + ObjectModelClass clazz = (ObjectModelClass)i.next(); + if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ + entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); /*{ "<%=GeneratorUtil.getDOType(clazz, model)%><%=(i.hasNext()?",\" +":"\";")%> }*/ + } } } -// log.info("Full entities list : " + entitiesList); -/* - public static final Class [] entitiesClasses = new Class []{ - */ - //for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - // ObjectModelClass clazz = (ObjectModelClass)i.next(); - // if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ -/* <%=GeneratorUtil.getDOType(clazz, model)%>.class, -*/ - // } - //} -// }; - + if (log.isDebugEnabled()) { + log.debug("Full entities list : " + entitiesList); + } /*{ /** *) protected <%=model.getName()%>DAOHelper() { } }*/ - for (Iterator i=model.getClasses().iterator(); i.hasNext();) { - ObjectModelClass clazz = (ObjectModelClass)i.next(); - if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ + for (ObjectModelClass objectModelClass : model.getClasses()) { + ObjectModelClass clazz = objectModelClass; + if (/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)) { /*{ static public <%=clazz.getQualifiedName()%>DAO get<%=clazz.getName()%>DAO(TopiaContext context) throws TopiaException { TopiaContextImplementor ci = (TopiaContextImplementor)context; @@ -126,4 +126,4 @@ }*/ } -} // DAOGenerator +} // DAOHelperGenerator Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityProviderGenerator.java 2008-10-23 22:00:21 UTC (rev 1193) @@ -37,10 +37,12 @@ import org.codelutin.generator.models.object.ObjectModelClass; /** - * Ce generateur permet d'avoir une classe permettant de recuperer les DAO - * sans cast. - * @author poussin + * Ce generateur permet d'avoir les implantations des entites concretes a partir des + * interfaces des entites de maniere dynamique (i.e qu'on n'aura pas dans cette classe + * les classes desces implantations) : ceci permet la modularite. * + * @author chemit + * */ public class EntityProviderGenerator extends ObjectModelGenerator { @@ -68,20 +70,25 @@ /*{package <%=getProperty("defaultPackage")%>; import org.codelutin.topia.persistence.TopiaEntity; -import java.util.Map; @SuppressWarnings({"unchecked"}) public class <%=model.getName()%>EntityProvider { protected static java.util.Map<Class<? extends TopiaEntity>, Class<? extends TopiaEntity>> cache; - protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{ }*/ - String entitiesList = ""; + if (model.getClasses().isEmpty()) { +/*{ + protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{}; +}*/ + } else { +/*{ + protected static Class<? extends TopiaEntity>[] entitiesClass = new Class[]{ +}*/ + } for (Iterator i=model.getClasses().iterator(); i.hasNext();) { ObjectModelClass clazz = (ObjectModelClass)i.next(); if(/*!clazz.isAbstract() && */clazz.hasStereotype(STEREOTYPE_ENTITY)){ - entitiesList += GeneratorUtil.getDOType(clazz, model) + (i.hasNext()?",":""); /*{ <%=clazz.getQualifiedName()%>.class<%=(i.hasNext()?", ":"\n};")%> }*/ } @@ -111,6 +118,7 @@ } } + /** * should have no instance *) @@ -120,4 +128,4 @@ }*/ } -} // DAOGenerator +} // EntityPoviderGenerator

1 0

r1192 - topia/trunk/src/main/java/org/codelutin/topia/generator
by tchemit＠users.labs.libre-entreprise.org 23 Oct '08

23 Oct '08

Author: tchemit Date: 2008-10-23 15:42:48 +0000 (Thu, 23 Oct 2008) New Revision: 1192 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: use foreach, unecessary cast, unecessary initializer Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-21 00:55:24 UTC (rev 1191) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-10-23 15:42:48 UTC (rev 1192) @@ -33,7 +33,6 @@ import java.io.IOException; import java.io.Writer; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; import org.apache.commons.logging.Log; @@ -93,7 +92,7 @@ boolean haveSuper = clazz.getSuperclasses().size() > 0; if (haveSuper) { - ObjectModelClass superClass = (ObjectModelClass)clazz.getSuperclasses().iterator().next(); + ObjectModelClass superClass = clazz.getSuperclasses().iterator().next(); String superClassname = superClass.getQualifiedName(); if (log.isDebugEnabled()) {log.debug("superClass for " + clazz.getQualifiedName() + " is " + superClassname);} /*{ <union-subclass }*/ @@ -130,10 +129,10 @@ }*/ } - for (Iterator it = clazz.getAttributes().iterator(); it.hasNext(); ) { - ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + for (Object o : clazz.getAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; ObjectModelAttribute reverse = attr.getReverseAttribute(); - + // pour les asso quoi qu'il arrive il faut les lier des 2 cotes // pour pouvoir supprimer en cascade l'asso lors de la suppression // d'un des cotes @@ -167,17 +166,17 @@ //Attributs pour les classes d'association if (clazz instanceof ObjectModelAssociationClass) { ObjectModelAssociationClass assoc = (ObjectModelAssociationClass)clazz; - for (Iterator i = assoc.getParticipantsAttributes().iterator(); i.hasNext(); ) { - ObjectModelAttribute attr = (ObjectModelAttribute) i.next(); + for (Object o : assoc.getParticipantsAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; if (attr != null) { - + // Note(poussin) pour moi quoi qu'il arrive sur la classe d'association il faut // un many-to-one, sinon on a des problemes. // if ((!attr.getReverseAttribute().isNavigable()) || !Util.isNMultiplicity(attr.getReverseAttribute())) { // / *{ <one-to-one name="<%=getName(attr, true)%>" class="<%=getType(attr, true)%>"<%=(GeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=(attr.isComposite()?" cascade=\"delete\"":"")%>/> // } */ // } else { - + /*{ <many-to-one name="<%=getName(attr, true)%>" class="<%=getType(attr, true)%>" column="<%=GeneratorUtil.getDBName(attr)%>" node="<%=getName(attr, true)%>/@topiaId" embed-xml="false"/> }*/ // } @@ -233,7 +232,7 @@ if (bracketIndex != -1) { type = typeString.substring(0, bracketIndex); int bracketEndIndex = typeString.indexOf(')', bracketIndex + 1); - String colmunList = null; + String colmunList; if (bracketEndIndex != -1) { colmunList = typeString.substring(bracketIndex + 1, bracketEndIndex); } else {

1 0

r1191 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org 21 Oct '08

21 Oct '08

Author: tchemit Date: 2008-10-21 00:55:24 +0000 (Tue, 21 Oct 2008) New Revision: 1191 Modified: topia-test/trunk/pom.xml Log: scm generic values after release Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-10-21 00:48:06 UTC (rev 1190) +++ topia-test/trunk/pom.xml 2008-10-21 00:55:24 UTC (rev 1191) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -128,9 +129,10 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/trun…</url> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> </scm> + </project>

1 0

r1190 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org 21 Oct '08

21 Oct '08

Author: tchemit Date: 2008-10-21 00:48:06 +0000 (Tue, 21 Oct 2008) New Revision: 1190 Modified: topia-test/trunk/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-10-21 00:48:03 UTC (rev 1189) +++ topia-test/trunk/pom.xml 2008-10-21 00:48:06 UTC (rev 1190) @@ -54,7 +54,7 @@  <name>ToPIA Testing</name> - <version>2.0.27</version> + <version>2.0.28-SNAPSHOT</version> <description>Test de ToPIA</description> <inceptionYear>2007</inceptionYear> @@ -128,9 +128,9 @@   <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.0.27</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.0.27</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/trunk</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/trun…</url> </scm> </project>

1 0

r1189 - in topia-test/tags: . 2.0.27 2.0.27/src 2.0.27/src/test/java/org/codelutin/topiatest
by tchemit＠users.labs.libre-entreprise.org 21 Oct '08

21 Oct '08

Author: tchemit Date: 2008-10-21 00:48:03 +0000 (Tue, 21 Oct 2008) New Revision: 1189 Added: topia-test/tags/2.0.27/ topia-test/tags/2.0.27/pom.xml topia-test/tags/2.0.27/src/site/ topia-test/tags/2.0.27/src/test/java/org/codelutin/topiatest/TopiaTestCase.java Removed: topia-test/tags/2.0.27/pom.xml topia-test/tags/2.0.27/src/test/java/org/codelutin/topiatest/TopiaTestCase.java Log: [maven-release-plugin] copy for tag 2.0.27 Copied: topia-test/tags/2.0.27 (from rev 1176, topia-test/trunk) Deleted: topia-test/tags/2.0.27/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-10-21 00:19:51 UTC (rev 1176) +++ topia-test/tags/2.0.27/pom.xml 2008-10-21 00:48:03 UTC (rev 1189) @@ -1,136 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <modelVersion>4.0.0</modelVersion> - -  -  -  - - <parent> - <groupId>org.codelutin</groupId> - <artifactId>lutinproject</artifactId> - <version>3.0</version> - </parent> - - <artifactId>topiatest</artifactId> - - <dependencies> - -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.4</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.61</version> - <scope>test</scope> - </dependency> - - </dependencies> - -  -  -  - - <name>ToPIA Testing</name> - <version>2.0.27</version> - <description>Test de ToPIA</description> - <inceptionYear>2007</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> - -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <topia.version>2.0.27</topia.version> - - </properties> - - <build> - <plugins> - - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-generator-plugin</artifactId> - <version>0.60</version> - <executions> - <execution> - <id>Generator</id> - <phase>generate-sources</phase> - <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> - <fullPackagePath>org.codelutin.topia</fullPackagePath> - <extractedPackages>org.codelutin.topia</extractedPackages> -  - <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> - <includes>**/*.objectmodel</includes> - <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/generated-sources/java</destDirGen> - <defaultPackage>org.codelutin.topia</defaultPackage> - </configuration> - <goals> - <goal>zargo2xmi</goal> - <goal>xmi2objectmodel</goal> - <goal>generate</goal> - </goals> - </execution> - </executions> - <dependencies> - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>${topia.version}</version> - <scope>compile</scope> - </dependency> - </dependencies> - </plugin> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topiatest/tags/2.0.27</connection> - <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topiatest/tags/2.0.27</developerConnection> - <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topiatest/tags/…</url> - </scm> - -</project> Copied: topia-test/tags/2.0.27/pom.xml (from rev 1188, topia-test/trunk/pom.xml) =================================================================== --- topia-test/tags/2.0.27/pom.xml (rev 0) +++ topia-test/tags/2.0.27/pom.xml 2008-10-21 00:48:03 UTC (rev 1189) @@ -0,0 +1,136 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.codelutin</groupId> + <artifactId>lutinproject</artifactId> + <version>3.0</version> + </parent> + + <artifactId>topia-test</artifactId> + + <dependencies> + +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>4.4</version> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.61</version> + <scope>test</scope> + </dependency> + + </dependencies> + +  +  +  + + <name>ToPIA Testing</name> + <version>2.0.27</version> + <description>Test de ToPIA</description> + <inceptionYear>2007</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> + +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <topia.version>2.0.27</topia.version> + + </properties> + + <build> + <plugins> + + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-generator-plugin</artifactId> + <version>0.60</version> + <executions> + <execution> + <id>Generator</id> + <phase>generate-sources</phase> + <configuration> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> + <fullPackagePath>org.codelutin.topia</fullPackagePath> + <extractedPackages>org.codelutin.topia</extractedPackages> +  + <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> + <includes>**/*.objectmodel</includes> + <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> + <destDirGen>target/generated-sources/java</destDirGen> + <defaultPackage>org.codelutin.topia</defaultPackage> + </configuration> + <goals> + <goal>zargo2xmi</goal> + <goal>xmi2objectmodel</goal> + <goal>generate</goal> + </goals> + </execution> + </executions> + <dependencies> + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> + </dependencies> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.0.27</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.0.27</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> + </scm> + +</project> Copied: topia-test/tags/2.0.27/src/site (from rev 1187, topia-test/trunk/src/site) Deleted: topia-test/tags/2.0.27/src/test/java/org/codelutin/topiatest/TopiaTestCase.java =================================================================== --- topia-test/trunk/src/test/java/org/codelutin/topiatest/TopiaTestCase.java 2008-10-21 00:19:51 UTC (rev 1176) +++ topia-test/tags/2.0.27/src/test/java/org/codelutin/topiatest/TopiaTestCase.java 2008-10-21 00:48:03 UTC (rev 1189) @@ -1,173 +0,0 @@ -/* *##% ToPIA Testing - * Copyright (C) 2007 - 2008 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ - -package org.codelutin.topiatest; - -import java.util.Properties; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.codelutin.topia.TopiaContext; -import org.codelutin.topia.TopiaContextFactory; -import org.codelutin.topia.TopiaException; -import org.codelutin.topia.TopiaNotFoundException; -import org.codelutin.topia.TopiaTestDAOHelper; -import org.hibernate.cfg.Environment; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; -import static org.junit.Assert.assertEquals; - -/** - * TopiaTestCase - * - * @author chatellier - * @version $Revision$ - * - * Last update : $Date$ - * By : $Author$ - */ -public class TopiaTestCase { - - /** Logger */ - private final static Log log = LogFactory.getLog(TopiaTestCase.class); - - /** Proprietes */ - protected Properties config = null; - - /** TopiaContext */ - protected TopiaContext context = null; - - /** - * Retourne les proprietes de connection a la base - * @return la config - */ - protected Properties getProperties() { - - // javassist pour les out of memery error de cglib - System.setProperty("hibernate.bytecode.provider", "javassist"); - - Properties config = new Properties(); - config.setProperty("topia.persistence.classes",TopiaTestDAOHelper.entitiesList); - - config.setProperty(Environment.USER, "sa"); - config.setProperty(Environment.PASS, ""); - 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"); - - return config; - } - - /** - * Init - */ - protected void init() { - if(config == null) { - config = getProperties(); - } - } - - @Before - public void setUp() { - if(log.isInfoEnabled()) { - log.info("Junit beforeTest"); - } - - init(); - - try { - context = TopiaContextFactory.getContext(config); - - try { - context.createSchema(); - } catch (TopiaException e) { - log.error("Erreur à la creation du schema",e); - } - } catch (TopiaNotFoundException e) { - log.error("Erreur à la creation du topia context",e); - } - } - - @Test - public void testCompositeAssociations() { - if(log.isInfoEnabled()) { - log.info("Junit Test testCompositeAssociations"); - } - - try { - TopiaContext newContext = context.beginTransaction(); - - CompanyDAO companyDAO = TopiaTestDAOHelper.getCompanyDAO(newContext); - DepartmentDAO departmentDAO = TopiaTestDAOHelper.getDepartmentDAO(newContext); - - Company company = companyDAO.create(); - company.setName("Ma société"); - - - Department dep1 = departmentDAO.create(); - dep1.setName("Departement 1"); - Department dep2 = departmentDAO.create(); - dep2.setName("Departement 2"); - Department dep3 = departmentDAO.create(); - dep3.setName("Departement 3"); - Department dep4 = departmentDAO.create(); - dep4.setName("Departement 7"); - - departmentDAO.update(dep1); - departmentDAO.update(dep2); - departmentDAO.update(dep3); - departmentDAO.update(dep4); - - company.addDepartment(dep1); - company.addDepartment(dep2); - company.addDepartment(dep3); - company.addDepartment(dep4); - - companyDAO.update(company); - newContext.commitTransaction(); - - newContext = context.beginTransaction(); - - companyDAO = TopiaTestDAOHelper.getCompanyDAO(newContext); - - company = companyDAO.findByTopiaId(company.getTopiaId()); - - assertEquals(company.getName(),"Ma société"); - assertEquals(company.getDepartment().size(),4); - - newContext.commitTransaction(); - } catch (TopiaException e) { - log.error("Erreur pendant le test testCompositeAssociations",e); - } - } - - /*@Test - public void testOther() { - if(log.isInfoEnabled()) { - log.info("Junit Test testOther"); - } - }*/ - - @After - public void tearDown() { - if(log.isInfoEnabled()) { - log.info("Junit afterTest"); - } - } -} Copied: topia-test/tags/2.0.27/src/test/java/org/codelutin/topiatest/TopiaTestCase.java (from rev 1186, topia-test/trunk/src/test/java/org/codelutin/topiatest/TopiaTestCase.java) =================================================================== --- topia-test/tags/2.0.27/src/test/java/org/codelutin/topiatest/TopiaTestCase.java (rev 0) +++ topia-test/tags/2.0.27/src/test/java/org/codelutin/topiatest/TopiaTestCase.java 2008-10-21 00:48:03 UTC (rev 1189) @@ -0,0 +1,174 @@ +/* *##% ToPIA Testing + * Copyright (C) 2007 - 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%*/ + +package org.codelutin.topiatest; + +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.codelutin.topia.TopiaContext; +import org.codelutin.topia.TopiaContextFactory; +import org.codelutin.topia.TopiaException; +import org.codelutin.topia.TopiaNotFoundException; +import org.codelutin.topia.TopiaTestDAOHelper; +import org.hibernate.cfg.Environment; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import static org.junit.Assert.assertEquals; + +/** + * TopiaTestCase + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public class TopiaTestCase { + + /** Logger */ + private final static Log log = LogFactory.getLog(TopiaTestCase.class); + + /** Proprietes */ + protected Properties config = null; + + /** TopiaContext */ + protected TopiaContext context = null; + + /** + * Retourne les proprietes de connection a la base + * @return la config + */ + protected Properties getProperties() { + + // javassist pour les out of memery error de cglib + System.setProperty("hibernate.bytecode.provider", "javassist"); + + Properties config = new Properties(); + config.setProperty("topia.persistence.classes",TopiaTestDAOHelper.entitiesList); + + config.setProperty(Environment.USER, "sa"); + config.setProperty(Environment.PASS, ""); + 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"); + + return config; + } + + /** + * Init + */ + protected void init() { + if(config == null) { + config = getProperties(); + } + } + + @Before + public void setUp() { + if(log.isInfoEnabled()) { + log.info("Junit beforeTest"); + } + + init(); + + try { + context = TopiaContextFactory.getContext(config); + + try { + context.createSchema(); + } catch (TopiaException e) { + log.error("Erreur à la creation du schema",e); + } + } catch (TopiaNotFoundException e) { + log.error("Erreur à la creation du topia context",e); + } + } + + @Test + public void testCompositeAssociations() { + if(log.isInfoEnabled()) { + log.info("Junit Test testCompositeAssociations"); + } + + try { + TopiaContext newContext = context.beginTransaction(); + + CompanyDAO companyDAO = TopiaTestDAOHelper.getCompanyDAO(newContext); + DepartmentDAO departmentDAO = TopiaTestDAOHelper.getDepartmentDAO(newContext); + + Company company = companyDAO.create(); + company.setName("Ma société"); + + + Department dep1 = departmentDAO.create(); + dep1.setName("Departement 1"); + Department dep2 = departmentDAO.create(); + dep2.setName("Departement 2"); + Department dep3 = departmentDAO.create(); + dep3.setName("Departement 3"); + Department dep4 = departmentDAO.create(); + dep4.setName("Departement 7"); + + departmentDAO.update(dep1); + departmentDAO.update(dep2); + departmentDAO.update(dep3); + departmentDAO.update(dep4); + + company.addDepartment(dep1); + company.addDepartment(dep2); + company.addDepartment(dep3); + company.addDepartment(dep4); + + companyDAO.update(company); + newContext.commitTransaction(); + + newContext = context.beginTransaction(); + + companyDAO = TopiaTestDAOHelper.getCompanyDAO(newContext); + + company = companyDAO.findByTopiaId(company.getTopiaId()); + + assertEquals(company.getName(),"Ma société"); + assertEquals(company.getDepartment().size(),4); + + newContext.commitTransaction(); + newContext.closeContext(); + } catch (TopiaException e) { + log.error("Erreur pendant le test testCompositeAssociations",e); + } + } + + /*@Test + public void testOther() { + if(log.isInfoEnabled()) { + log.info("Junit Test testOther"); + } + }*/ + + @After + public void tearDown() { + if(log.isInfoEnabled()) { + log.info("Junit afterTest"); + } + } +}

1 0

r1188 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org 21 Oct '08

21 Oct '08

Author: tchemit Date: 2008-10-21 00:47:58 +0000 (Tue, 21 Oct 2008) New Revision: 1188 Modified: topia-test/trunk/pom.xml Log: [maven-release-plugin] prepare release 2.0.27 Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-10-21 00:46:17 UTC (rev 1187) +++ topia-test/trunk/pom.xml 2008-10-21 00:47:58 UTC (rev 1188) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -55,7 +54,7 @@  <name>ToPIA Testing</name> - <version>2.0.27-SNAPSHOT</version> + <version>2.0.27</version> <description>Test de ToPIA</description> <inceptionYear>2007</inceptionYear> @@ -129,9 +128,9 @@   <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.0.27</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia-test/tags/2.0.27</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia-test/tags…</url> </scm> </project>

1 0

r1187 - topia-test/trunk/src
by tchemit＠users.labs.libre-entreprise.org 21 Oct '08

21 Oct '08

Author: tchemit Date: 2008-10-21 00:46:17 +0000 (Tue, 21 Oct 2008) New Revision: 1187 Added: topia-test/trunk/src/site/ Log: add site directory

1 0