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

r1608 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: echatellier Date: 2009-07-15 16:29:38 +0200 (Wed, 15 Jul 2009) New Revision: 1608 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java Log: package refactoring codelutin>nuiton Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 14:29:38 UTC (rev 1608) @@ -409,7 +409,7 @@ // tmp.addAll(<%=ref%>); // } /*{ - org.codelutin.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); + org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); if (findAllByProperties != null) { tmp.addAll(findAllByProperties);

1 0

r1607 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: echatellier Date: 2009-07-15 15:47:24 +0200 (Wed, 15 Jul 2009) New Revision: 1607 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Log: Merge branche on trunk Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityAbstractGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -377,7 +377,9 @@ String attrName = attr.getName(); String getterName = "get" + GeneratorUtil.capitalize(attrName); if (GeneratorUtil.isNMultiplicity(attr)) { -/*{ tmp.addAll(<%=getterName%>()); +/*{ if (<%=getterName%>() != null) { + tmp.addAll(<%=getterName%>()); + } }*/ } else { /*{ tmp.add(<%=getterName%>()); @@ -407,9 +409,11 @@ // tmp.addAll(<%=ref%>); // } /*{ - tmp.addAll(((TopiaContextImplementor)getTopiaContext()) - .getDAO(<%=assocClassFQN%>.class) - .findAllByProperties("<%=reverseAttrName%>", this)); + org.codelutin.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); + List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); + if (findAllByProperties != null) { + tmp.addAll(findAllByProperties); + } }*/ } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -101,12 +101,18 @@ String tableName = TopiaGeneratorUtil.getDBName(clazz); String isAbstract = clazz.isAbstract()?"true":"false"; String clazzFQN = clazz.getQualifiedName(); - + String optionalAttributes = ""; String schema = TopiaGeneratorUtil.getSchemaName(clazz, model); if (schema != null) { optionalAttributes += "schema=\"" + schema + "\" "; } + + //On précise au proxy de quelle interface hérite l'objet + String proxyTagValue = TopiaGeneratorUtil.findTagValue(TopiaGeneratorUtil.TAG_PROXY_INTERFACE, clazz, model); + if (proxyTagValue == null || !proxyTagValue.equals("none")) { + optionalAttributes += "proxy=\"" + clazzFQN + "\" "; + } if (haveSuper) { ObjectModelClass superClass = clazz.getSuperclasses().iterator().next(); @@ -115,15 +121,14 @@ log.debug("superClass for " + clazz.getQualifiedName() + " is " + superClassname); } String superClassDOType = TopiaGeneratorUtil.getDOType(superClassname, model); - //On précise au proxy de quelle interface hérite l'objet -/*{ <union-subclass name="<%=clazzDOType%>" extends="<%=superClassDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" proxy="<%=clazzFQN%>" <%=optionalAttributes%>> +/*{ <union-subclass name="<%=clazzDOType%>" extends="<%=superClassDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" <%=optionalAttributes%>>  }*/ // FIXME mieux gerer le cas haveSuper noneNaturalAttributes.addAll(clazz.getAttributes()); } else { -/*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" proxy="<%=clazzFQN%>" <%=optionalAttributes%>> +/*{ <class name="<%=clazzDOType%>" table="<%=tableName%>" node="<%=clazzDOType%>" abstract="<%=isAbstract%>" <%=optionalAttributes%>> <id name="topiaId" type="string" length="255" node="@topiaId"/> }*/ // on detecte les attributs des clef metiers Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -103,6 +103,15 @@ public static final String TAG_NOT_NULL = "notNull"; /** Tag pour spécifier la caractère embed-xml d'une association */ public static final String TAG_EMBED_XML = "embedXml"; + /** + * Tag pour configurer l'interface du proxy sur autre chose que l'implementation par defaut. + * + * Par defaut : + * null > generere le proxy sur l'interface de l'implementation + * Autre valeur : + * "none" > laisse la configuration par defaut d'hibernate + */ + public static final String TAG_PROXY_INTERFACE = "hibernateProxyInterface"; /** Tag pour spécifier le permissions à la création */ public static final String TAG_SECURITY_CREATE = "securityCreate"; /** Tag pour spécifier le permissions au chargement */

1 0

r1606 - in branches/2.1.6.x: . topia-persistence topia-soa topia-ui
by echatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: echatellier Date: 2009-07-15 15:28:00 +0200 (Wed, 15 Jul 2009) New Revision: 1606 Modified: branches/2.1.6.x/pom.xml branches/2.1.6.x/topia-persistence/pom.xml branches/2.1.6.x/topia-soa/pom.xml branches/2.1.6.x/topia-ui/pom.xml Log: Prepare next development iteration Modified: branches/2.1.6.x/pom.xml =================================================================== --- branches/2.1.6.x/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -243,9 +243,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x</url> </scm>  Modified: branches/2.1.6.x/topia-persistence/pom.xml =================================================================== --- branches/2.1.6.x/topia-persistence/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/topia-persistence/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -130,9 +130,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-persistence</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-persistence</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-persiste…</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-pers…</url> </scm> Modified: branches/2.1.6.x/topia-soa/pom.xml =================================================================== --- branches/2.1.6.x/topia-soa/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/topia-soa/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -134,9 +134,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-soa</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-soa</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-soa</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-soa</url> </scm> </project> Modified: branches/2.1.6.x/topia-ui/pom.xml =================================================================== --- branches/2.1.6.x/topia-ui/pom.xml 2009-07-15 13:25:23 UTC (rev 1605) +++ branches/2.1.6.x/topia-ui/pom.xml 2009-07-15 13:28:00 UTC (rev 1606) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1</version> + <version>2.1.6.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -107,9 +107,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-ui</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-ui</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-ui</url> + <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-ui</url> </scm> </project>

1 0

r1605 - in tags: . 2.1.6.1
by echatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: echatellier Date: 2009-07-15 15:25:23 +0200 (Wed, 15 Jul 2009) New Revision: 1605 Added: tags/2.1.6.1/ Log: Tag 2.1.6.1 Property changes on: tags/2.1.6.1 ___________________________________________________________________ Added: svn:ignore + topia2.ipr .classpath *.iml .project target topia.ipr topia.iws THIRD-PARTY.txt .settings Added: svn:mergeinfo +

1 0

r1604 - in branches/2.1.6.x: . topia-persistence topia-soa topia-ui
by echatellier＠users.labs.libre-entreprise.org 15 Jul '09

15 Jul '09

Author: echatellier Date: 2009-07-15 15:24:28 +0200 (Wed, 15 Jul 2009) New Revision: 1604 Modified: branches/2.1.6.x/pom.xml branches/2.1.6.x/topia-persistence/pom.xml branches/2.1.6.x/topia-soa/pom.xml branches/2.1.6.x/topia-ui/pom.xml Log: Prepare release 2.1.6.1 Modified: branches/2.1.6.x/pom.xml =================================================================== --- branches/2.1.6.x/pom.xml 2009-07-06 17:30:50 UTC (rev 1603) +++ branches/2.1.6.x/pom.xml 2009-07-15 13:24:28 UTC (rev 1604) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.6.1-SNAPSHOT</version> + <version>2.1.6.1</version> <modules> <module>topia-persistence</module> @@ -243,9 +243,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x</url> + <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1</url> </scm>  Modified: branches/2.1.6.x/topia-persistence/pom.xml =================================================================== --- branches/2.1.6.x/topia-persistence/pom.xml 2009-07-06 17:30:50 UTC (rev 1603) +++ branches/2.1.6.x/topia-persistence/pom.xml 2009-07-15 13:24:28 UTC (rev 1604) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1-SNAPSHOT</version> + <version>2.1.6.1</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -130,9 +130,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-persistence</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-persistence</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-pers…</url> + <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-persiste…</url> </scm> Modified: branches/2.1.6.x/topia-soa/pom.xml =================================================================== --- branches/2.1.6.x/topia-soa/pom.xml 2009-07-06 17:30:50 UTC (rev 1603) +++ branches/2.1.6.x/topia-soa/pom.xml 2009-07-15 13:24:28 UTC (rev 1604) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1-SNAPSHOT</version> + <version>2.1.6.1</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -134,9 +134,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-soa</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-soa</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-soa</url> + <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-soa</url> </scm> </project> Modified: branches/2.1.6.x/topia-ui/pom.xml =================================================================== --- branches/2.1.6.x/topia-ui/pom.xml 2009-07-06 17:30:50 UTC (rev 1603) +++ branches/2.1.6.x/topia-ui/pom.xml 2009-07-15 13:24:28 UTC (rev 1604) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.6.1-SNAPSHOT</version> + <version>2.1.6.1</version> </parent> <groupId>org.codelutin.topia</groupId> @@ -107,9 +107,9 @@   <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/branches/2.1.6.x/topia-ui</connection> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/2.1.6.1/topia-ui</connection> <developerConnection>${project.scm.connection}</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/branches/2.1.6.x/topia-ui</url> + <url>http://www.nuiton.org/repositories/browse/topia/tags/2.1.6.1/topia-ui</url> </scm> </project>

1 0