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

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

20 Feb '09

Author: tchemit Date: 2009-02-20 14:03:55 +0000 (Fri, 20 Feb 2009) New Revision: 1391 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: [maven-release-plugin] prepare release 2.1.3 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-20 13:56:21 UTC (rev 1390) +++ topia/trunk/pom.xml 2009-02-20 14:03:55 UTC (rev 1391) @@ -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> @@ -14,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.3</version> <modules> <module>topia-persistence</module> @@ -249,9 +248,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/tags/2.1.3</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.3</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm>  Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-02-20 13:56:21 UTC (rev 1390) +++ topia/trunk/topia-persistence/pom.xml 2009-02-20 14:03:55 UTC (rev 1391) @@ -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> @@ -11,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -131,9 +130,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.3/topia-persistence</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.3/topia-persistence</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-02-20 13:56:21 UTC (rev 1390) +++ topia/trunk/topia-soa/pom.xml 2009-02-20 14:03:55 UTC (rev 1391) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -134,9 +134,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.3/topia-soa</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.3/topia-soa</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> </project> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-20 13:56:21 UTC (rev 1390) +++ topia/trunk/topia-ui/pom.xml 2009-02-20 14:03:55 UTC (rev 1391) @@ -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> @@ -11,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.3</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -108,9 +107,9 @@   <scm> - <connection>${maven.scm.connection.child}</connection> - <developerConnection>${maven.scm.developerConnection.child}</developerConnection> - <url>${maven.scm.url.child}</url> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.3/topia-ui</connection> + <developerConnection>scm:svn:svn+ssh://tchemit@labs.libre-entreprise.org/svnroot/topia/topia/tags/2.1.3/topia-ui</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/2.1.…</url> </scm> </project>

1 0

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

20 Feb '09

Author: tchemit Date: 2009-02-20 13:56:21 +0000 (Fri, 20 Feb 2009) New Revision: 1390 Modified: topia/trunk/changelog.txt topia/trunk/topia-soa/changelog.txt topia/trunk/topia-ui/changelog.txt Log: preparation release Modified: topia/trunk/changelog.txt =================================================================== --- topia/trunk/changelog.txt 2009-02-20 13:56:00 UTC (rev 1389) +++ topia/trunk/changelog.txt 2009-02-20 13:56:21 UTC (rev 1390) @@ -1,4 +1,4 @@ -2.1.3 ??? 200902?? +2.1.3 chemit 20090220 * 20090126 [chemit] - refactor poms (all dependencies in parent-pom dependencyManagment) * 20090129 [chemit] - use lutinproject 3.4 Modified: topia/trunk/topia-soa/changelog.txt =================================================================== --- topia/trunk/topia-soa/changelog.txt 2009-02-20 13:56:00 UTC (rev 1389) +++ topia/trunk/topia-soa/changelog.txt 2009-02-20 13:56:21 UTC (rev 1390) @@ -1,4 +1,4 @@ -2.1.3 ??? 200902?? +2.1.3 chemit 20090220 * 20090126 [chemit] - refactor poms (all dependencies in parent-pom dependencyManagment) 2.1.2 chemit 20090115 (follow other topia-release) Modified: topia/trunk/topia-ui/changelog.txt =================================================================== --- topia/trunk/topia-ui/changelog.txt 2009-02-20 13:56:00 UTC (rev 1389) +++ topia/trunk/topia-ui/changelog.txt 2009-02-20 13:56:21 UTC (rev 1390) @@ -1,4 +1,4 @@ -2.1.3 ??? 200902?? +2.1.3 chemit 20090220 * 20090126 [chemit] - refactor poms (all dependencies in parent-pom dependencyManagment) 2.1.2 chemit 20090115 (follow other topia-release)

1 0

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

20 Feb '09

Author: tchemit Date: 2009-02-20 13:56:00 +0000 (Fri, 20 Feb 2009) New Revision: 1389 Modified: topia/trunk/topia-persistence/changelog.txt topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/EntityVisitor.java topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java Log: ajout propriete visite dans le EntityVisitor ajout visite sur propriete indexee reusinage EntityAbstractGenerator (pas de calcul dans les <%=...%>) Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2009-02-20 12:06:29 UTC (rev 1388) +++ topia/trunk/topia-persistence/changelog.txt 2009-02-20 13:56:00 UTC (rev 1389) @@ -1,4 +1,4 @@ -2.1.3 ??? 200902?? +2.1.3 chemit 20090220 * 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 <%=...%>) Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-20 12:06:29 UTC (rev 1388) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-20 13:56:00 UTC (rev 1389) @@ -262,9 +262,9 @@ /** * Envoi via les methodes du visitor l'ensemble des champs de l'entity - * avec leur type et leur valeur. + * avec leur nom, type et valeur. * - * @param visitor : le visiteur de l'entite. + * @param visitor le visiteur de l'entite. * * @throws TopiaException if any pb while visit *) @@ -289,28 +289,23 @@ String attrType = TopiaGeneratorUtil.getSimpleName(attr.getType()); String attrName = attr.getName(); if (!GeneratorUtil.isNMultiplicity(attr)) { -/*{ visitor.visit(this, <%=attrType%>.class, <%=attrName%>); - +/*{ visitor.visit(this, "<%=attrName%>", <%=attrType%>.class, <%=attrName%>); }*/ } else { String collectionType = TopiaGeneratorUtil.getSimpleName(TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr)); -/*{ visitor.visit(this, <%=collectionType%>.class, <%=attrType%>.class, <%=attrName%>); - +/*{ visitor.visit(this, "<%=attrName%>", <%=collectionType%>.class, <%=attrType%>.class, <%=attrName%>); }*/ } } else { + String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); + assocAttrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); + String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); if (!GeneratorUtil.isNMultiplicity(attr)) { - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); - String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); -/*{ visitor.visit(this, <%=assocClassFQN%>.class, <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>); - +/*{ visitor.visit(this, "<%=assocAttrName%>", <%=assocClassFQN%>.class, <%=assocAttrName%>); }*/ } else { String collectionType = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); - String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); - String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); -/*{ visitor.visit(this, <%=collectionType%>.class, <%=assocClassFQN%>.class, <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>); - +/*{ visitor.visit(this, "<%=assocAttrName%>", <%=collectionType%>.class, <%=assocClassFQN%>.class, <%=assocAttrName%>); }*/ } } @@ -323,14 +318,13 @@ if (attr != null) { String attrType = TopiaGeneratorUtil.getSimpleName(attr.getType()); String attrName = attr.getName(); -/*{ visitor.visit(this, <%=attrType%>.class, <%=GeneratorUtil.toLowerCaseFirstLetter(attrName)%>); - + attrName = GeneratorUtil.toLowerCaseFirstLetter(attrName); +/*{ visitor.visit(this, "<%=attrName%>", <%=attrType%>.class, <%=attrName%>); }*/ } } } -/*{ - visitor.end(this); +/*{ visitor.end(this); } @Override @@ -344,11 +338,12 @@ if (attr.referenceClassifier() && attr.getClassifier().hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { if (attr.isAggregate()) { String attrName = attr.getName(); + String getterName = "get" + GeneratorUtil.capitalize(attrName); if (GeneratorUtil.isNMultiplicity(attr)) { -/*{ tmp.addAll(get<%=GeneratorUtil.capitalize(attrName)%>()); +/*{ tmp.addAll(<%=getterName%>()); }*/ } else { -/*{ tmp.add(get<%=GeneratorUtil.capitalize(attrName)%>()); +/*{ tmp.add(<%=getterName%>()); }*/ } } @@ -376,21 +371,23 @@ for (ObjectModelAttribute attr : clazz.getAttributes()) { if (attr.referenceClassifier() && attr.getClassifier().hasStereotype(TopiaGeneratorUtil.STEREOTYPE_ENTITY)) { if (attr.isComposite()) { - String attrName = attr.getName(); + String attrName = attr.getName(); + String getterName = "get" + GeneratorUtil.capitalize(attrName); if (GeneratorUtil.isNMultiplicity(attr)) { -/*{ tmp.addAll(get<%=GeneratorUtil.capitalize(attrName)%>()); +/*{ tmp.addAll(<%=getterName%>()); }*/ } else { -/*{ tmp.add(get<%=GeneratorUtil.capitalize(attrName)%>()); +/*{ tmp.add(<%=getterName%>()); }*/ } } else if (attr.hasAssociationClass()) { String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); String assocClassFQN = TopiaGeneratorUtil.getSimpleName(attr.getAssociationClass().getQualifiedName()); + String ref = "this." + GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); if (!GeneratorUtil.isNMultiplicity(attr)) { /*{ - if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> != null) { - tmp.add(this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>); + if (<%=ref%> != null) { + tmp.add(<%=ref%>); } }*/ } else { @@ -403,8 +400,8 @@ // sur les asso, le champs est dans le mapping // hibernate et donc il le faut aussi dans la classe // sinon hibernate rale lorsqu'il charge l'objet -// if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> != null) { -// tmp.addAll(this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>); +// if (<%=ref%> != null) { +// tmp.addAll(<%=ref%>); // } /*{ tmp.addAll(((TopiaContextImplementor)getTopiaContext()) 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-20 12:06:29 UTC (rev 1388) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-02-20 13:56:00 UTC (rev 1389) @@ -65,7 +65,7 @@ * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Object) */ @Override - public void visit(TopiaEntity e, Class type, Object value) { + public void visit(TopiaEntity e, String name, Class type, Object value) { // si c'est une entité if(value instanceof TopiaEntity) { TopiaEntity entity = (TopiaEntity)value; @@ -80,7 +80,7 @@ } } else { - delegateVisitor.visit(e, type, value); + delegateVisitor.visit(e, name, type, value); } } @@ -88,17 +88,37 @@ * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Class, java.lang.Object) */ @Override - public void visit(TopiaEntity e, Class collectionType, Class type, + public void visit(TopiaEntity e, String name, Class collectionType, Class type, Object value) { Collection cValue = (Collection)value; if(cValue != null && !cValue.isEmpty()) { + int i=0; for (Object currentValue : cValue) { - visit(e, type, currentValue); + visit(e, name, type, collectionType ,i++, currentValue); } } } + @Override + public void visit(TopiaEntity e, String name, Class collectionType, Class type, int index, Object value) { + // si c'est une entité + if(value instanceof TopiaEntity) { + TopiaEntity entity = (TopiaEntity)value; + try { + if(!alreadyExplored.contains(entity)) { + entity.accept(this); + } + } catch (TopiaException e1) { + if(log.isErrorEnabled()) { + log.error("Error on depth exploration", e1); + } + } + } + else { + delegateVisitor.visit(e, name, collectionType, type, index, value); + } + } /* * @see org.codelutin.topia.persistence.EntityVisitor#end(org.codelutin.topia.persistence.TopiaEntity) */ @@ -107,13 +127,12 @@ delegateVisitor.end(e); } - /** - * Pour pouvoir nettoyer le visiteur, afin de pouvoir - * réutiliser plusieurs fois de suite la même instance - * de ce visiteur. - */ - public void clean() { + @Override + public void clear() { alreadyExplored.clear(); + delegateVisitor.clear(); } + + } Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/EntityVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/EntityVisitor.java 2009-02-20 12:06:29 UTC (rev 1388) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/EntityVisitor.java 2009-02-20 13:56:00 UTC (rev 1389) @@ -19,6 +19,8 @@ /** * + * The contract of a visitor of any {@link TopiaEntity}. + * * Created: 28 janv. 2009 18:10:34 * * @author poussin @@ -29,8 +31,61 @@ */ public interface EntityVisitor { - public void start(TopiaEntity e); - public void end(TopiaEntity e); - public void visit(TopiaEntity e, Class type, Object value); - public void visit(TopiaEntity e, Class collectionType, Class type, Object value); + /** + * Start the visit of the given entity. + * + * @param e the visited entity + */ + void start(TopiaEntity e); + + /** + * Ends the visit of the given entity. + * + * @param e the visited entity + */ + void end(TopiaEntity e); + + /** + * Visit a none indexed property for the given entity. + * + * The property visited is defined by the other parameters. + * + * @param e the visited entity + * @param name the name of the visited property + * @param type the type of the visited property + * @param value the value of the visitied property + */ + void visit(TopiaEntity e, String name, Class type, Object value); + + /** + * Visit a collection property for the given entity. + * + * The property visited is defined by the other parameters. + * + * @param e the visited entity + * @param name the name of the visited property + * @param collectionType the type of the visited collection + * @param type the type of the visited property + * @param value the value of the visitied property + */ + void visit(TopiaEntity e, String name, Class collectionType, Class type, Object value); + + /** + * Visit a indexed value from a collection property for the given entity. + * + * The property visited is defined by the other parameters. + * + * @param e the visited entity + * @param name the name of the visited property + * @param collectionType the type of the container of the visited property + * @param type the type of the visited property + * @param index the index of the visited property in his container + * @param value the value of the visitied property + */ + void visit(TopiaEntity e, String name, Class collectionType, Class type, int index, Object value); + + /** + * reset all states of the visitor. + */ + void clear(); } Modified: topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java 2009-02-20 12:06:29 UTC (rev 1388) +++ topia/trunk/topia-persistence/src/test/java/org/codelutin/topia/persistence/ExportXMLVisitor.java 2009-02-20 13:56:00 UTC (rev 1389) @@ -46,9 +46,6 @@ buffer = new StringBuffer(); } - /* - * @see org.codelutin.topia.persistence.EntityVisitor#start(org.codelutin.topia.persistence.TopiaEntity) - */ @Override public void start(TopiaEntity e) { if(log.isDebugEnabled()) { @@ -62,11 +59,8 @@ buffer.append(">\n"); } - /* - * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Object) - */ @Override - public void visit(TopiaEntity e, Class type, Object value) { + public void visit(TopiaEntity e, String name, Class type, Object value) { if(log.isDebugEnabled()) { log.debug("visit : " + e); } @@ -74,18 +68,16 @@ buffer.append("<" + type.getName() + ">" + value + "</" + type.getName() + ">\n"); } - /* - * @see org.codelutin.topia.persistence.EntityVisitor#visit(org.codelutin.topia.persistence.TopiaEntity, java.lang.Class, java.lang.Class, java.lang.Object) - */ @Override - public void visit(TopiaEntity e, Class collectionType, Class type, + public void visit(TopiaEntity e, String name, Class collectionType, Class type, Object value) { + } + @Override + public void visit(TopiaEntity e, String name, Class collectionType, Class type, int index, Object value) { + visit(e, name, type, value); } - /* - * @see org.codelutin.topia.persistence.EntityVisitor#end(org.codelutin.topia.persistence.TopiaEntity) - */ @Override public void end(TopiaEntity e) { if(log.isDebugEnabled()) { @@ -100,4 +92,12 @@ String content = buffer.toString(); return content; } + + @Override + public void clear() { + // do nothing + } + + + }

1 0

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

20 Feb '09

Author: tchemit Date: 2009-02-20 12:06:29 +0000 (Fri, 20 Feb 2009) New Revision: 1388 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/TopiaEntityHelper.java Log: ajout d'un comparator d'entite sur leur topiaId Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/TopiaEntityHelper.java 2009-02-20 11:40:50 UTC (rev 1387) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/util/TopiaEntityHelper.java 2009-02-20 12:06:29 UTC (rev 1388) @@ -14,6 +14,7 @@ import java.io.IOException; import java.net.URI; import java.util.Collection; +import java.util.Comparator; /** * Une classe avec des méthodes utiles sur les entités. @@ -64,7 +65,8 @@ } /** - * Récupère une entité dans une liste d'entités. + * Récupère une entité dans une liste d'entités à partir de + * son {@link TopiaEntity#getTopiaId()}. * * @param entities la liste des entités à scanner * @param topiaId l'id de l'entité recherchée @@ -212,4 +214,25 @@ } } } + + /** + * Obtain a new {@link Comparator} pour {@link TopiaEntity} based + * on the {@link TopiaEntity#getTopiaId()} method. + */ + public static Comparator<TopiaEntity> getTopiaIdComparator() { + return new Comparator<TopiaEntity>() { + + @Override + public int compare(TopiaEntity o1, TopiaEntity o2) { + if (o1.getTopiaId() == null) { + return -1; + } + if (o2.getTopiaId() == null) { + return 1; + } + return o1.getTopiaId().compareTo(o2.getTopiaId()); + } + }; + } + }

1 0

r1387 - topia-service/trunk/src/site
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 11:40:50 +0000 (Fri, 20 Feb 2009) New Revision: 1387 Modified: topia-service/trunk/src/site/site_fr.xml Log: Update lutin skin version Modified: topia-service/trunk/src/site/site_fr.xml =================================================================== --- topia-service/trunk/src/site/site_fr.xml 2009-02-20 11:39:36 UTC (rev 1386) +++ topia-service/trunk/src/site/site_fr.xml 2009-02-20 11:40:50 UTC (rev 1387) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft>

1 0

r1386 - in topia/trunk: src/site topia-persistence/src/site topia-soa/src/site topia-ui/src/site
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 11:39:36 +0000 (Fri, 20 Feb 2009) New Revision: 1386 Modified: topia/trunk/src/site/site.xml topia/trunk/topia-persistence/src/site/site.xml topia/trunk/topia-soa/src/site/site.xml topia/trunk/topia-ui/src/site/site.xml Log: Update lutin skin version Modified: topia/trunk/src/site/site.xml =================================================================== --- topia/trunk/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft> Modified: topia/trunk/topia-persistence/src/site/site.xml =================================================================== --- topia/trunk/topia-persistence/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/topia-persistence/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft> Modified: topia/trunk/topia-soa/src/site/site.xml =================================================================== --- topia/trunk/topia-soa/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/topia-soa/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft> Modified: topia/trunk/topia-ui/src/site/site.xml =================================================================== --- topia/trunk/topia-ui/src/site/site.xml 2009-02-20 09:09:24 UTC (rev 1385) +++ topia/trunk/topia-ui/src/site/site.xml 2009-02-20 11:39:36 UTC (rev 1386) @@ -6,7 +6,7 @@ <skin> <groupId>org.codelutin</groupId> <artifactId>maven-lutin-skin</artifactId> - <version>0.2.1</version> + <version>0.2.3</version> </skin> <bannerLeft>

1 0

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

20 Feb '09

Author: chatellier Date: 2009-02-20 09:09:24 +0000 (Fri, 20 Feb 2009) New Revision: 1385 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Remove unique constraints for x->0..1 relations Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-02-20 08:58:09 UTC (rev 1384) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-02-20 09:09:24 UTC (rev 1385) @@ -343,10 +343,16 @@ } protected void generateHibernateOneToOne(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { - generateHibernateManyToOne(output, attr, true, prefix); -// boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model); +// boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model); /// *{ <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(TopiaGeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> node="<%=getName(attr)%>/@topiaId" embed-xml="false"/> //} */ + + // for hibernate many-to-one with unique="true" => one-to-one + // but if it is one-to-zero-or-one unique contraints is violated + // with null values + boolean unique = TopiaGeneratorUtil.isOneMultiplicity(attr); + generateHibernateManyToOne(output, attr, unique, prefix); + } protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr, String prefix) throws IOException {

1 0

r1384 - in topia/trunk: . topia-persistence
by chatellier＠users.labs.libre-entreprise.org 20 Feb '09

20 Feb '09

Author: chatellier Date: 2009-02-20 08:58:09 +0000 (Fri, 20 Feb 2009) New Revision: 1384 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml Log: Use test directory definided in super pom Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-19 00:26:57 UTC (rev 1383) +++ topia/trunk/pom.xml 2009-02-20 08:58:09 UTC (rev 1384) @@ -215,9 +215,9 @@ <inherited>true</inherited> <configuration> <srcDirZuml>${maven.src.dir}/test/xmi</srcDirZuml> - <srcXmiDest>${maven.gen.dir}/test-xmi/</srcXmiDest> - <srcGenDest>${maven.gen.dir}/test--models/</srcGenDest> - <destDirGen>${maven.gen.dir}/test-java</destDirGen> + <srcXmiDest>${maven.test.gen.dir}/xmi</srcXmiDest> + <srcGenDest>${maven.test.gen.dir}/models</srcGenDest> + <destDirGen>${maven.test.gen.dir}/java</destDirGen> </configuration> </plugin> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-02-19 00:26:57 UTC (rev 1383) +++ topia/trunk/topia-persistence/pom.xml 2009-02-20 08:58:09 UTC (rev 1384) @@ -78,14 +78,14 @@ <testResources> <testResource> - <directory>${maven.src.dir}/test/java</directory> + <directory>${maven.test.gen.dir}/java</directory> <includes> <include>**/*.hbm.xml</include> </includes> </testResource> <testResource> - <directory>${test.gen.dir}/java</directory> + <directory>${maven.test.gen.dir}/java</directory> <includes> <include>**/*.hbm.xml</include> </includes>

1 0

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

19 Feb '09

Author: tchemit Date: 2009-02-19 00:26:57 +0000 (Thu, 19 Feb 2009) New Revision: 1383 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Log: suppression de le generalisation redondante Serializable ajout des annotations Override sur les implantation du contrat de l'entite Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-18 23:33:29 UTC (rev 1382) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2009-02-19 00:26:57 UTC (rev 1383) @@ -153,7 +153,7 @@ extendClass += TopiaEntityAbstract.class.getSimpleName(); } -/*{public abstract class <%=clazzName%>Abstract extends <%=extendClass%> implements Serializable, <%=clazzName%> { +/*{public abstract class <%=clazzName%>Abstract extends <%=extendClass%> implements <%=clazzName%> { }*/ @@ -250,10 +250,12 @@ public <%=clazzName%>Abstract() { } + @Override public void update() throws TopiaException { ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=clazzName%>.class).update(this); } + @Override public void delete() throws TopiaException { ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=clazzName%>.class).delete(this); } @@ -266,6 +268,7 @@ * * @throws TopiaException if any pb while visit *) + @Override public void accept(EntityVisitor visitor) throws TopiaException { visitor.start(this); }*/ @@ -330,6 +333,7 @@ visitor.end(this); } + @Override public List<TopiaEntity> getAggregate() throws TopiaException { List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -362,6 +366,7 @@ return result; } + @Override public List<TopiaEntity> getComposite() throws TopiaException { List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -441,6 +446,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void set<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> value) { <%=attrType%> _oldValue = this.<%=attrName%>; fireOnPreWrite("<%=attrName%>", _oldValue, value); @@ -451,6 +457,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public <%=attrType%> get<%=GeneratorUtil.capitalize(attrName)%>() { fireOnPreRead("<%=attrName%>", <%=attrName%>); <%=attrType%> result = this.<%=attrName%>; @@ -465,6 +472,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> association) { <%=assocClassFQN%> _oldValue = this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", _oldValue, association); @@ -475,6 +483,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -488,6 +497,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#add<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void add<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> <%=attrName%>) { fireOnPreWrite("<%=attrName%>", null, <%=attrName%>); if (this.<%=attrName%> == null) { @@ -516,6 +526,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#addAll<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>>) *) + @Override public void addAll<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>> values) { if (values == null) { return; @@ -528,6 +539,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String) *) + @Override public <%=attrType%> get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String topiaId) { return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=attrName%>, topiaId); } @@ -535,6 +547,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>>) *) + @Override public void set<%=GeneratorUtil.capitalize(attrName)%>(<%=collectionInterface%><<%=attrType%>> values) { <%=collectionInterface%><<%=attrType%>> _oldValue = <%=attrName%>; fireOnPreWrite("<%=attrName%>", _oldValue, values); @@ -545,6 +558,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#remove<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%>) *) + @Override public void remove<%=GeneratorUtil.capitalize(attrName)%>(<%=attrType%> value) { fireOnPreWrite("<%=attrName%>", value, null); if ((this.<%=attrName%> == null) || (!this.<%=attrName%>.remove(value))) { @@ -568,6 +582,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#clear<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public void clear<%=GeneratorUtil.capitalize(attrName)%>() { if (this.<%=attrName%> == null) { return; @@ -601,6 +616,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#add<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void add<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> value) { fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", null, value); if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { @@ -620,6 +636,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>ByTopiaId(String) *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>ByTopiaId(String topiaId) { return org.codelutin.topia.persistence.util.TopiaEntityHelper.getEntityByTopiaId(<%=assocAttrName%>, topiaId); } @@ -627,6 +644,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>>() *) + @Override public void addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>> values) { if (values == null) { return; @@ -639,6 +657,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>>() *) + @Override public void set<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=collectionInterface%><<%=assocClassFQN%>> values) { // clear<%=GeneratorUtil.capitalize(assocAttrName)%>(); // addAll<%=GeneratorUtil.capitalize(assocAttrName)%>(values); @@ -652,6 +671,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#remove<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%>) *) + @Override public void remove<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=assocClassFQN%> value) { fireOnPreWrite("<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>", value, null); if ((this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) || (!this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>.remove(value))) { @@ -670,6 +690,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#clear<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public void clear<%=GeneratorUtil.capitalize(assocAttrName)%>() { if (this.<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return; @@ -695,6 +716,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public <%=collectionInterface%><<%=attrType%>> get<%=GeneratorUtil.capitalize(attrName)%>() { return <%=attrName%>; } @@ -702,6 +724,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#size<%=GeneratorUtil.capitalize(attrName)%>() *) + @Override public int size<%=GeneratorUtil.capitalize(attrName)%>() { if (<%=attrName%> == null) { return 0; @@ -716,6 +739,7 @@ /*{ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public <%=collectionInterface%><<%=assocClassFQN%>> get<%=GeneratorUtil.capitalize(assocAttrName)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -723,6 +747,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#get<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=attrType%>) *) + @Override public <%=assocClassFQN%> get<%=GeneratorUtil.capitalize(assocAttrName)%>(<%=attrType%> value) { if (value == null || <%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return null; @@ -738,6 +763,7 @@ /* (non-Javadoc) * @see <%=clazzFQN%>#size<%=GeneratorUtil.capitalize(assocAttrName)%>() *) + @Override public int size<%=GeneratorUtil.capitalize(assocAttrName)%>() { if (<%=GeneratorUtil.toLowerCaseFirstLetter(assocAttrName)%> == null) { return 0; @@ -772,6 +798,7 @@ /*{ /* (non-Javadoc) * @see java.lang.Object#toString() *) + @Override public String toString() { String result = new ToStringBuilder(this). }*/ @@ -807,6 +834,7 @@ /*{ /** * @param value La valeur de l'attribut <%=name%> à positionner. *) + @Override public void set<%=GeneratorUtil.capitalize(name)%>(<%=type%> value) { <%=type%> _oldValue = this.<%=GeneratorUtil.toLowerCaseFirstLetter(name)%>; fireOnPreWrite("<%=name%>", _oldValue, value); @@ -817,6 +845,7 @@ /** * @return La valeur de l'attribut <%=name%>. *) + @Override public <%=type%> get<%=GeneratorUtil.capitalize(name)%>() { return <%=GeneratorUtil.toLowerCaseFirstLetter(name)%>; }

1 0

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

18 Feb '09

Author: tchemit Date: 2009-02-18 23:33:29 +0000 (Wed, 18 Feb 2009) New Revision: 1382 Modified: topia/trunk/ topia/trunk/pom.xml Log: prefer use target/generated-sources/test-XXX instead of target/generated-test-sources/test/XXX since this is the convention. Property changes on: topia/trunk ___________________________________________________________________ Name: svn:ignore - target .classpath .project topia2.ipr .settings THIRD-PARTY.txt *.iml topia.ipr + topia2.ipr .classpath *.iml .project target topia.ipr topia.iws THIRD-PARTY.txt .settings Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 22:15:05 UTC (rev 1381) +++ topia/trunk/pom.xml 2009-02-18 23:33:29 UTC (rev 1382) @@ -173,9 +173,7 @@ <topia.version>${project.version}</topia.version> <xmlrpc.version>3.1</xmlrpc.version> - <hibernate.version>3.3.1.GA</hibernate.version> -  -  + <hibernate.version>3.3.1.GA</hibernate.version> </properties> <build> @@ -216,10 +214,10 @@ <version>${generator.version}</version> <inherited>true</inherited> <configuration> - <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>${maven.test.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${maven.test.gen.dir}/models/</srcGenDest> - <destDirGen>${maven.test.gen.dir}/java</destDirGen> + <srcDirZuml>${maven.src.dir}/test/xmi</srcDirZuml> + <srcXmiDest>${maven.gen.dir}/test-xmi/</srcXmiDest> + <srcGenDest>${maven.gen.dir}/test--models/</srcGenDest> + <destDirGen>${maven.gen.dir}/test-java</destDirGen> </configuration> </plugin>

1 0