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

r1216 - in topia/tags: . topia-2.0.28
by chatellier＠users.labs.libre-entreprise.org 14 Nov '08

14 Nov '08

Author: chatellier Date: 2008-11-14 09:37:08 +0000 (Fri, 14 Nov 2008) New Revision: 1216 Added: topia/tags/topia-2.0.28/ topia/tags/topia-2.0.28/pom.xml Removed: topia/tags/topia-2.0.28/pom.xml Log: [maven-release-plugin] copy for tag topia-2.0.28 Copied: topia/tags/topia-2.0.28 (from rev 1213, topia/trunk) Deleted: topia/tags/topia-2.0.28/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-13 16:48:45 UTC (rev 1213) +++ topia/tags/topia-2.0.28/pom.xml 2008-11-14 09:37:08 UTC (rev 1216) @@ -1,207 +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>topia</artifactId> - - <dependencies> -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>0.31</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutingenerator</artifactId> - <version>0.61-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-core</artifactId> - <version>3.3.1.GA</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javassist</groupId> - <artifactId>javassist</artifactId> - <version>3.4.GA</version> - </dependency> - -  - <dependency> - <groupId>postgresql</groupId> - <artifactId>postgresql</artifactId> - <version>8.2-507.jdbc4</version> - <scope>test</scope> - </dependency> - -  - -  - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-server</artifactId> - <version>3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.xmlrpc</groupId> - <artifactId>xmlrpc-client</artifactId> - <version>3.1</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-java5</artifactId> - <version>1.2.6</version> - <exclusions> -  - <exclusion> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - </exclusion> - </exclusions> - </dependency> - -  - <dependency> - <groupId>jetty</groupId> - <artifactId>jetty</artifactId> - <version>5.1.10</version> - </dependency> - -  - <dependency> - <groupId>asm</groupId> - <artifactId>asm</artifactId> - <version>1.5.3</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.tapestry</groupId> - <artifactId>tapestry-core</artifactId> - <version>5.0.7</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.79</version> - <scope>test</scope> - </dependency> - </dependencies> - -  -  -  - - <name>ToPIA - Tools for Portable and Independent Architecture</name> - <version>2.0.28-SNAPSHOT</version> - <description>Framework de persistance et de distribution d'application.</description> - <inceptionYear>2004</inceptionYear> - -  -  -  - - <packaging>jar</packaging> - - <properties> -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <maven.test.skip>true</maven.test.skip> - </properties> - - <build> - <plugins> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>0.16</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> -  -  - <addCompileDirectory>true</addCompileDirectory> - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - - </plugins> - </build> - -  -  -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -</project> Copied: topia/tags/topia-2.0.28/pom.xml (from rev 1215, topia/trunk/pom.xml) =================================================================== --- topia/tags/topia-2.0.28/pom.xml (rev 0) +++ topia/tags/topia-2.0.28/pom.xml 2008-11-14 09:37:08 UTC (rev 1216) @@ -0,0 +1,207 @@ +<?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</artifactId> + + <dependencies> +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>0.31</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutingenerator</artifactId> + <version>0.61</version> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + <version>3.3.1.GA</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javassist</groupId> + <artifactId>javassist</artifactId> + <version>3.4.GA</version> + </dependency> + +  + <dependency> + <groupId>postgresql</groupId> + <artifactId>postgresql</artifactId> + <version>8.2-507.jdbc4</version> + <scope>test</scope> + </dependency> + +  + +  + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-server</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.xmlrpc</groupId> + <artifactId>xmlrpc-client</artifactId> + <version>3.1</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.1</version> + <scope>runtime</scope> + </dependency> + + <dependency> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-java5</artifactId> + <version>1.2.6</version> + <exclusions> +  + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> + </dependency> + +  + <dependency> + <groupId>jetty</groupId> + <artifactId>jetty</artifactId> + <version>5.1.10</version> + </dependency> + +  + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> + <version>1.5.3</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.tapestry</groupId> + <artifactId>tapestry-core</artifactId> + <version>5.0.7</version> + <scope>compile</scope> + </dependency> + +  + <dependency> + <groupId>com.h2database</groupId> + <artifactId>h2</artifactId> + <version>1.0.79</version> + <scope>test</scope> + </dependency> + </dependencies> + +  +  +  + + <name>ToPIA - Tools for Portable and Independent Architecture</name> + <version>2.0.28</version> + <description>Framework de persistance et de distribution d'application.</description> + <inceptionYear>2004</inceptionYear> + +  +  +  + + <packaging>jar</packaging> + + <properties> +  + <labs.id>21</labs.id> + +  + <labs.project>topia</labs.project> + +  + <maven.test.skip>true</maven.test.skip> + </properties> + + <build> + <plugins> +  + <plugin> + <groupId>org.codelutin</groupId> + <artifactId>maven-processor-plugin</artifactId> + <version>0.16</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>process</goal> + </goals> + </execution> + </executions> + <configuration> +  +  + <addCompileDirectory>true</addCompileDirectory> + <includes> + <include>**/*.java</include> + </includes> + <filters> + org.codelutin.processor.filters.GeneratorTemplatesFilter, + org.codelutin.processor.filters.ActiveLogsCodeFilter + </filters> + <verbose>${maven.verbose}</verbose> + </configuration> + </plugin> + + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + + </plugins> + </build> + +  +  +  + <scm> + <connection>scm:svn:svn://anonymous@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.0.28</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.0.28</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> + </scm> + +</project>

1 0

r1215 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org 14 Nov '08

14 Nov '08

Author: chatellier Date: 2008-11-14 09:37:04 +0000 (Fri, 14 Nov 2008) New Revision: 1215 Modified: topia/trunk/pom.xml Log: [maven-release-plugin] prepare release topia-2.0.28 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-14 09:36:24 UTC (rev 1214) +++ topia/trunk/pom.xml 2008-11-14 09:37:04 UTC (rev 1215) @@ -136,7 +136,7 @@  <name>ToPIA - Tools for Portable and Independent Architecture</name> - <version>2.0.28-SNAPSHOT</version> + <version>2.0.28</version> <description>Framework de persistance et de distribution d'application.</description> <inceptionYear>2004</inceptionYear> @@ -199,9 +199,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/topia-2.0.28</connection> + <developerConnection>scm:svn:svn+ssh://chatellier@labs.libre-entreprise.org/svnroot/topia/topia/tags/topia-2.0.28</developerConnection> + <url>http://labs.libre-entreprise.org/plugins/scmsvn/viewcvs.php/topia/tags/topi…</url> </scm> </project>

1 0

r1214 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org 14 Nov '08

14 Nov '08

Author: chatellier Date: 2008-11-14 09:36:24 +0000 (Fri, 14 Nov 2008) New Revision: 1214 Modified: topia/trunk/pom.xml Log: Version stable de lutin gen Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-13 16:48:45 UTC (rev 1213) +++ topia/trunk/pom.xml 2008-11-14 09:36:24 UTC (rev 1214) @@ -27,7 +27,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> - <version>0.61-SNAPSHOT</version> + <version>0.61</version> <scope>provided</scope> </dependency>

1 0

r1213 - in topia/trunk: . src/main/java/org/codelutin/topia/generator
by schorlet＠users.labs.libre-entreprise.org 13 Nov '08

13 Nov '08

Author: schorlet Date: 2008-11-13 16:48:45 +0000 (Thu, 13 Nov 2008) New Revision: 1213 Modified: topia/trunk/changelog topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: - correction du bug sur la navigation bidirectionnelle entre deux entit?\195?\169s - ajout du support du lazy loading sur un attribut ?\195?\160 multiplicit?\195?\169 0..* d'une entit?\195?\169 Modified: topia/trunk/changelog =================================================================== --- topia/trunk/changelog 2008-11-07 17:03:09 UTC (rev 1212) +++ topia/trunk/changelog 2008-11-13 16:48:45 UTC (rev 1213) @@ -1,4 +1,6 @@ ver-2-0-28 ?? 2008?? + * 20081113 [chorlet] add support for lazy loading on attribute with 0..* multiplicity + * 20081113 [chorlet] fix bug on bidirectional association by adding inverse attribute in the one side of two hibernate mapping files * 20081107 [chatellier] fix "result" named attribute generation in model * 20081107 [chatellier] fix ant:ant, org.apache.ant:ant conflict * 20081107 [chatellier] set lutingenerator provided scope @@ -141,4 +143,4 @@ * Correction du support des classes d'associations (mauvais mapping Hibernate) * Support de super classes pour les classes d'association (LutinGenerator 0.29) - \ No newline at end of file + Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-11-07 17:03:09 UTC (rev 1212) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-11-13 16:48:45 UTC (rev 1213) @@ -404,7 +404,10 @@ /*{ <%=attr.getName()%>.set<%=Util.capitalize(reverse.getName())%>(this); }*/ } else { -/*{ <%=attr.getName()%>.get<%=Util.capitalize(reverse.getName())%>().add(this); +/*{ if (<%=attr.getName()%>.get<%=Util.capitalize(reverse.getName())%>() == null) { + <%=attr.getName()%>.set<%=Util.capitalize(reverse.getName())%>(new <%=collectionObject%><<%=reverse.getType()%>>()); + } + <%=attr.getName()%>.get<%=Util.capitalize(reverse.getName())%>().add(this); }*/ } } Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-11-07 17:03:09 UTC (rev 1212) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2008-11-13 16:48:45 UTC (rev 1213) @@ -361,7 +361,12 @@ protected void generateHibernateMany(Writer output, ObjectModelAttribute attr) throws IOException { boolean needsIndex = attr.isIndexed(); String collType = GeneratorUtil.getNMultiplicityHibernateType(attr); -/*{ <<%=collType%> name="<%=getName(attr)%>" node="<%=getName(attr)%>" embed-xml="true"> + String lazy = ""; + if (attr.getTagValue("lazy") != null) { + lazy = "lazy=\"" + attr.getTagValue("lazy") + "\""; + } + +/*{ <<%=collType%> name="<%=getName(attr)%>" node="<%=getName(attr)%>" embed-xml="true" <%=lazy%>> <key column="OWNER"/> }*/ if (needsIndex) { @@ -406,8 +411,10 @@ // Dans le cas contraire, les modifications dans la relation ne seront // pas sauvegardées. Ceci n'est vrai que si les deux coté sont navigable boolean isInverse = attr.isNavigable() && attr.getReverseAttribute().isNavigable(); - isInverse |= !Util.isFirstAttribute(attr); - isInverse = false; // 20070117 poussin: pour du many, jamais de inverse + //isInverse |= !Util.isFirstAttribute(attr); + //isInverse = false; // 20070117 poussin: pour du many, jamais de inverse + isInverse &= Util.isFirstAttribute(attr); + boolean needsIndex = attr.isIndexed(); String cascade = ""; if (attr.isComposite() || attr.hasAssociationClass()) {

1 0

r1212 - in topia/trunk/src/main/java/org/codelutin/topia: . framework
by ruchaud＠users.labs.libre-entreprise.org 07 Nov '08

07 Nov '08

Author: ruchaud Date: 2008-11-07 17:03:09 +0000 (Fri, 07 Nov 2008) New Revision: 1212 Modified: topia/trunk/src/main/java/org/codelutin/topia/TopiaContext.java topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java Log: Modification des signatures Modified: topia/trunk/src/main/java/org/codelutin/topia/TopiaContext.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/TopiaContext.java 2008-11-07 16:59:23 UTC (rev 1211) +++ topia/trunk/src/main/java/org/codelutin/topia/TopiaContext.java 2008-11-07 17:03:09 UTC (rev 1212) @@ -53,9 +53,9 @@ /* Adders */ public void addTopiaEntityListener(TopiaEntityListener listener); - public void addTopiaEntityListener(Class<TopiaEntity> entityClass, TopiaEntityListener listener); + public void addTopiaEntityListener(Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener); public void addTopiaEntityVetoable(TopiaEntityVetoable vetoable); - public void addTopiaEntityVetoable(Class<TopiaEntity> entityClass, TopiaEntityVetoable vetoable); + public void addTopiaEntityVetoable(Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable); public void addTopiaTransactionListener(TopiaTransactionListener listener); public void addTopiaTransactionVetoable(TopiaTransactionVetoable vetoable); public void addPropertyChangeListener(PropertyChangeListener listener); @@ -64,9 +64,9 @@ /* Removers */ public void removeTopiaEntityListener(TopiaEntityListener listener); - public void removeTopiaEntityListener(Class<TopiaEntity> entityClass, TopiaEntityListener listener); + public void removeTopiaEntityListener(Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener); public void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable); - public void removeTopiaEntityVetoable(Class<TopiaEntity> entityClass, TopiaEntityVetoable vetoable); + public void removeTopiaEntityVetoable(Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable); public void removeTopiaTransactionListener(TopiaTransactionListener listener); public void removeTopiaTransactionVetoable(TopiaTransactionVetoable vetoable); public void removePropertyChangeListener(PropertyChangeListener listener); Modified: topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-11-07 16:59:23 UTC (rev 1211) +++ topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2008-11-07 17:03:09 UTC (rev 1212) @@ -1166,7 +1166,7 @@ getFiresSupport().addTopiaEntityListener(listener); } - public void addTopiaEntityListener(Class<TopiaEntity> entityClass, TopiaEntityListener listener) { + public void addTopiaEntityListener(Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener) { getFiresSupport().addTopiaEntityListener(entityClass, listener); } @@ -1174,7 +1174,7 @@ getFiresSupport().addTopiaEntityVetoable(TopiaEntity.class, vetoable); } - public void addTopiaEntityVetoable(Class<TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { + public void addTopiaEntityVetoable(Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { getFiresSupport().addTopiaEntityVetoable(entityClass, vetoable); } @@ -1199,7 +1199,7 @@ getFiresSupport().removeTopiaEntityListener(TopiaEntity.class, listener); } - public void removeTopiaEntityListener(Class<TopiaEntity> entityClass, TopiaEntityListener listener) { + public void removeTopiaEntityListener(Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener) { getFiresSupport().removeTopiaEntityListener(entityClass, listener); } @@ -1207,7 +1207,7 @@ getFiresSupport().removeTopiaEntityVetoable(TopiaEntity.class, vetoable); } - public void removeTopiaEntityVetoable(Class<TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { + public void removeTopiaEntityVetoable(Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { getFiresSupport().removeTopiaEntityVetoable(entityClass, vetoable); } Modified: topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java 2008-11-07 16:59:23 UTC (rev 1211) +++ topia/trunk/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java 2008-11-07 17:03:09 UTC (rev 1212) @@ -758,7 +758,7 @@ addTopiaEntityListener(TopiaEntity.class, listener); } - public void addTopiaEntityListener(Class<TopiaEntity> entityClass, TopiaEntityListener listener) { + public void addTopiaEntityListener(Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener) { entityListeners.add(entityClass, listener); } @@ -766,7 +766,7 @@ addTopiaEntityVetoable(TopiaEntity.class, vetoable); } - public void addTopiaEntityVetoable(Class<TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { + public void addTopiaEntityVetoable(Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { entityVetoables.add(entityClass, vetoable); } @@ -795,7 +795,7 @@ removeTopiaEntityListener(TopiaEntity.class, listener); } - public void removeTopiaEntityListener(Class<TopiaEntity> entityClass, TopiaEntityListener listener) { + public void removeTopiaEntityListener(Class<? extends TopiaEntity> entityClass, TopiaEntityListener listener) { entityListeners.remove(entityClass, listener); } @@ -803,7 +803,7 @@ removeTopiaEntityVetoable(TopiaEntity.class, vetoable); } - public void removeTopiaEntityVetoable(Class<TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { + public void removeTopiaEntityVetoable(Class<? extends TopiaEntity> entityClass, TopiaEntityVetoable vetoable) { entityVetoables.remove(entityClass, vetoable); }

1 0

r1211 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org 07 Nov '08

07 Nov '08

Author: chatellier Date: 2008-11-07 16:59:23 +0000 (Fri, 07 Nov 2008) New Revision: 1211 Modified: topia/trunk/changelog Log: Update changelog Modified: topia/trunk/changelog =================================================================== --- topia/trunk/changelog 2008-11-07 11:49:20 UTC (rev 1210) +++ topia/trunk/changelog 2008-11-07 16:59:23 UTC (rev 1211) @@ -1,4 +1,7 @@ ver-2-0-28 ?? 2008?? + * 20081107 [chatellier] fix "result" named attribute generation in model + * 20081107 [chatellier] fix ant:ant, org.apache.ant:ant conflict + * 20081107 [chatellier] set lutingenerator provided scope * 20081101 [chemit] bump lutingenerator to 0.61 * 20081101 [chemit] add a EntityEnum to have a generic way to access Entities. * 20081101 [chemit] improve generators :

1 0

r1210 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org 07 Nov '08

07 Nov '08

Author: chatellier Date: 2008-11-07 11:49:20 +0000 (Fri, 07 Nov 2008) New Revision: 1210 Modified: topia/trunk/pom.xml Log: Remove ant:ant (we already have org.apache.ant) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-07 11:38:17 UTC (rev 1209) +++ topia/trunk/pom.xml 2008-11-07 11:49:20 UTC (rev 1210) @@ -91,6 +91,13 @@ <groupId>org.codehaus.xfire</groupId> <artifactId>xfire-java5</artifactId> <version>1.2.6</version> + <exclusions> +  + <exclusion> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + </exclusion> + </exclusions> </dependency>

1 0

r1209 - topia/trunk/src/main/java/org/codelutin/topia/generator
by chatellier＠users.labs.libre-entreprise.org 07 Nov '08

07 Nov '08

Author: chatellier Date: 2008-11-07 11:38:17 +0000 (Fri, 07 Nov 2008) New Revision: 1209 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java Log: Add "this.", compilation fail if attribute is called "result" in our model. Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-11-03 08:39:44 UTC (rev 1208) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityAbstractGenerator.java 2008-11-07 11:38:17 UTC (rev 1209) @@ -357,7 +357,7 @@ *) public <%=attr.getType()%> get<%=Util.capitalize(attr.getName())%>() { fireOnPreRead("<%=attr.getName()%>", <%=attr.getName()%>); - <%=attr.getType()%> result = <%=attr.getName()%>; + <%=attr.getType()%> result = this.<%=attr.getName()%>; fireOnPostRead("<%=attr.getName()%>", <%=attr.getName()%>); return result; }

1 0

r1208 - topia/trunk
by chatellier＠users.labs.libre-entreprise.org 03 Nov '08

03 Nov '08

Author: chatellier Date: 2008-11-03 08:39:44 +0000 (Mon, 03 Nov 2008) New Revision: 1208 Modified: topia/trunk/pom.xml Log: Change lutingenerator to provided scope (useless at runtime) Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-11-02 20:08:40 UTC (rev 1207) +++ topia/trunk/pom.xml 2008-11-03 08:39:44 UTC (rev 1208) @@ -28,7 +28,7 @@ <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> <version>0.61-SNAPSHOT</version> - <scope>compile</scope> + <scope>provided</scope> </dependency> <dependency>

1 0

r1207 - in topia/trunk/src/main/java/org/codelutin/topia: generator persistence
by tchemit＠users.labs.libre-entreprise.org 02 Nov '08

02 Nov '08

Author: tchemit Date: 2008-11-02 20:08:40 +0000 (Sun, 02 Nov 2008) New Revision: 1207 Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java Log: add somes method on TopiaEntityEnumEntry (should add all TopiaEntity ones...) Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2008-11-01 22:16:50 UTC (rev 1206) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityEnumGenerator.java 2008-11-02 20:08:40 UTC (rev 1207) @@ -89,7 +89,7 @@ /*{public enum <%=className%> { }*/ - List<ObjectModelClass> classes = GeneratorUtil.getEntityClasses(model,true); + List<ObjectModelClass> classes = GeneratorUtil.getEntityClasses(model, true); if (classes.isEmpty()) { /*{ TopiaEntity(TopiaEntity.class); @@ -111,8 +111,9 @@ <%=className%>(Class<? extends TopiaEntity> contractClass) { entry = new TopiaEntityEnumEntry(contractClass); } +}*/ - public Class<? extends TopiaEntity> getContractClass() { +/* public Class<? extends TopiaEntity> getContractClass() { return entry.getContractClass(); } @@ -128,14 +129,18 @@ return entry.create(ctxt); } - public TopiaEntity update(TopiaEntity entity, TopiaContext ctxt) throws TopiaException { + public TopiaEntity update(TopiaEntity entity, TopiaContext + ctxt) throws TopiaException + { return entry.update(entity, ctxt); } public void delete(TopiaEntity entity, TopiaContext ctxt) throws TopiaException { entry.delete(entity, ctxt); } +*/ +/*{ public static <%=className%> valueOf(TopiaEntity entity) { return valueOf(entity.getClass()); } @@ -145,7 +150,7 @@ return <%=modelName%>EntityEnum.valueOf(klass.getSimpleName()); } for (<%=className%> entityEnum : <%=className%>.values()) { - if (entityEnum.getContractClass().isAssignableFrom(klass)) { + if (entityEnum.entry.getContractClass().isAssignableFrom(klass)) { return entityEnum; } } @@ -153,20 +158,22 @@ } public static <T extends TopiaEntity> Class<T> getContractClass(Class<T> klass) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (Class<T>) e.getContractClass(); + return (Class<T>) e.entry.getContractClass(); } public static <T extends TopiaEntity> Class<T> getImplementationClass(Class<T> klass) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (Class<T>) e.getImplementationClass(); + return (Class<T>) e.entry.getImplementationClass(); } public static Class<? extends TopiaEntity>[] getContractClasses() { <%=className%>[] values = <%=className%>.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(); + result[i] = values[i].entry.getContractClass(); } return result; } @@ -175,7 +182,7 @@ <%=className%>[] values = <%=className%>.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(); + result[i] = values[i].entry.getImplementationClass(); } return result; } @@ -189,29 +196,54 @@ } public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(Class<T> klass, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (D) e.getDAO(ctxt); + return (D) e.entry.getDAO(ctxt); } public static <T extends TopiaEntity, D extends TopiaDAO<? super T>> D getDAO(T entity, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(entity); <%=className%> e = <%=className%>.valueOf(entity); - return (D) e.getDAO(ctxt); + return (D) e.entry.getDAO(ctxt); } - public static <T extends TopiaEntity> T doCreate(Class<T> klass, TopiaContext ctxt) throws TopiaException { + public static <T extends TopiaEntity> T create(Class<T> klass, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); <%=className%> e = <%=className%>.valueOf(klass); - return (T) e.create(ctxt); + return (T) e.entry.create(ctxt); } - public static <T extends TopiaEntity> T doUpdate(T entity, TopiaContext ctxt) throws TopiaException { + public static <T extends TopiaEntity> T update(T entity, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(entity); <%=className%> e = <%=className%>.valueOf(entity); - return (T) e.update(entity, ctxt); + return (T) e.entry.update(entity, ctxt); } - public static <T extends TopiaEntity> void doDelete(T entity, TopiaContext ctxt) throws TopiaException { + public static <T extends TopiaEntity> void delete(T entity, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(entity); <%=className%> e = <%=className%>.valueOf(entity); - e.delete(entity, ctxt); + e.entry.delete(entity, ctxt); } + + public static <T extends TopiaEntity> java.util.List<T> findAll(Class<T> klass, TopiaContext ctxt) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); + return entry.findAll(ctxt); + } + + public static <T extends TopiaEntity> T findByTopiaId(Class<T> klass, TopiaContext ctxt,String topiaId) throws TopiaException { + TopiaEntityEnumEntry<T> entry = getEntry(klass); + return entry.findByTopiaId(topiaId,ctxt); + } + + public static <T extends TopiaEntity> TopiaEntityEnumEntry<T> getEntry(T entity) throws TopiaException { + <%=className%> e = <%=className%>.valueOf(entity); + return (TopiaEntityEnumEntry<T>)e.entry; + } + + public static <T extends TopiaEntity> TopiaEntityEnumEntry<T> getEntry(Class<T> klass) throws TopiaException { + <%=className%> e = <%=className%>.valueOf(klass); + return (TopiaEntityEnumEntry<T>)e.entry; + } } }*/ } Modified: topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-01 22:16:50 UTC (rev 1206) +++ topia/trunk/src/main/java/org/codelutin/topia/persistence/TopiaEntityEnumEntry.java 2008-11-02 20:08:40 UTC (rev 1207) @@ -4,6 +4,8 @@ import org.codelutin.topia.TopiaException; import org.codelutin.topia.framework.TopiaContextImplementor; +import java.util.List; + /** @author chemit */ public class TopiaEntityEnumEntry<T extends TopiaEntity> implements java.io.Serializable { @@ -58,4 +60,14 @@ dao.delete(entity); } + public List<T> findAll(TopiaContext ctxt) throws TopiaException { + TopiaDAO<T> dao = getDAO(ctxt); + return dao.findAll(); + } + + public T findByTopiaId(String topiaId, TopiaContext ctxt) throws TopiaException { + TopiaDAO<T> dao = getDAO(ctxt); + return dao.findByTopiaId(topiaId); + } + }

1 0