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

r1162 - topia-test/trunk
by tchemit＠users.labs.libre-entreprise.org Oct. 20, 2008

Oct. 20, 2008

Author: tchemit Date: 2008-10-20 22:43:09 +0000 (Mon, 20 Oct 2008) New Revision: 1162 Modified: topia-test/trunk/pom.xml Log: mise ?\195?\160 jour du pom, reformatage ?\195?\160 MA sauce, mise a jour des dependances et des plugins. Modified: topia-test/trunk/pom.xml =================================================================== --- topia-test/trunk/pom.xml 2008-10-20 22:40:26 UTC (rev 1161) +++ topia-test/trunk/pom.xml 2008-10-20 22:43:09 UTC (rev 1162) @@ -2,109 +2,103 @@ <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>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>2.2</version> + <version>3.0</version> </parent> - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/topia/htdocs/topia-service</url> - </site> - </distributionManagement> - -  <artifactId>topiatest</artifactId> - <name>ToPIA Testing</name> -  - <packaging>jar</packaging> + <dependencies> -  - <version>2.0.25-SNAPSHOT</version> +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> -  - <description> - Test de ToPIA - </description> + <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-SNAPSHOT</version> + <description>Test de ToPIA</description> <inceptionYear>2007</inceptionYear> -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=41</url> - </issueManagement> +  +  +  + + <packaging>jar</packaging> + <properties> -  - <maven.src.dir>${basedir}/target/src-build</maven.src.dir> -  - <maven.test.skip>false</maven.test.skip> +  + <labs.id>21</labs.id> -  - <maven.compile.source>1.5</maven.compile.source> - <maven.compile.target>1.5</maven.compile.target> +  + <labs.project>topia</labs.project> -  -  +  + <topia.version>2.0.27-SNAPSHOT</topia.version> -  - <maven.verbose>false</maven.verbose> </properties> <build> <plugins> -  - <plugin> - <groupId>lutinplugin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>0.12</version> - <executions> - <execution> - <id>Processor</id> - <phase>generate-sources</phase> - <goals> - <goal>process</goal> - </goals> - </execution> - </executions> - <configuration> - <srcDir>${basedir}/src</srcDir> - <destDir>${maven.src.dir}</destDir> - <includes> - <include>**/*.java</include> - </includes> - <filters> - org.codelutin.processor.filters.GeneratorTemplatesFilter, - org.codelutin.processor.filters.ActiveLogsCodeFilter - </filters> - <verbose>${maven.verbose}</verbose> - </configuration> - </plugin> <plugin> - <groupId>lutinplugin</groupId> + <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.51-SNAPSHOT</version> + <version>0.60</version> <executions> <execution> <id>Generator</id> <phase>generate-sources</phase> <configuration> - <srcDirZuml>src/xmi</srcDirZuml> - <srcXmiDest>target/gen/xmi/</srcXmiDest> + <srcDirZuml>src/test/xmi</srcDirZuml> + <srcXmiDest>target/generated-sources/xmi/</srcXmiDest> <fullPackagePath>org.codelutin.topia</fullPackagePath> <extractedPackages>org.codelutin.topia</extractedPackages>  - <srcGenDest>target/gen/objectmodel/</srcGenDest> + <srcGenDest>target/generated-sources/objectmodel/</srcGenDest> <includes>**/*.objectmodel</includes> <templates>org.codelutin.topia.generator.TopiaMetaGenerator</templates> - <destDirGen>target/gen/java</destDirGen> + <destDirGen>target/generated-sources/java</destDirGen> <defaultPackage>org.codelutin.topia</defaultPackage> </configuration> <goals> @@ -116,78 +110,28 @@ </executions> <dependencies> <dependency> - <groupId>lutinlib</groupId> + <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.0.25-SNAPSHOT</version> + <version>${topia.version}</version> <scope>compile</scope> </dependency> </dependencies> </plugin> <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <id>CopyGenJavaVersSrcBuild</id> - <phase>process-sources</phase> - <configuration> - <tasks> - <copy todir="${basedir}/target/src-build/java" verbose="${maven.verbose}" - overwrite="false"> - <fileset dir="${basedir}/target/gen/java"/> - </copy> - </tasks> - </configuration> - <goals> - <goal>run</goal> - </goals> - </execution> - </executions> + <artifactId>maven-javadoc-plugin</artifactId> </plugin> </plugins> </build> -  - <dependencies> +  +  +  + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> -  - <dependency> - <groupId>lutinlib</groupId> - <artifactId>topia</artifactId> - <version>2.0.25-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.1</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> - </project>

1 0

r1161 - in topia-test/trunk/src: . test test/java
by tchemit＠users.labs.libre-entreprise.org Oct. 20, 2008

Oct. 20, 2008

Author: tchemit Date: 2008-10-20 22:40:26 +0000 (Mon, 20 Oct 2008) New Revision: 1161 Added: topia-test/trunk/src/test/java/ topia-test/trunk/src/test/java/org/ topia-test/trunk/src/test/resources/ topia-test/trunk/src/test/xmi/ Removed: topia-test/trunk/src/resources/ topia-test/trunk/src/test/org/ topia-test/trunk/src/xmi/ Log: maven 2 directory layout ok Copied: topia-test/trunk/src/test/java/org (from rev 1160, topia-test/trunk/src/test/org) Copied: topia-test/trunk/src/test/resources (from rev 1160, topia-test/trunk/src/resources) Copied: topia-test/trunk/src/test/xmi (from rev 1160, topia-test/trunk/src/xmi)

1 0

r1160 - in topia-service/trunk: . src/site
by tchemit＠users.labs.libre-entreprise.org Oct. 20, 2008

Oct. 20, 2008

Author: tchemit Date: 2008-10-20 22:17:03 +0000 (Mon, 20 Oct 2008) New Revision: 1160 Modified: topia-service/trunk/pom.xml topia-service/trunk/src/site/site_fr.xml Log: mise ?\195?\160 jour du pom, reformatage ?\195?\160 MA sauce, mise a jour dependance lutingenerator. mise ?\195?\160 jour du site avec les dernieres ameliorations. TODO : il serait bien que les tests passent de nouveau Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-20 22:12:16 UTC (rev 1159) +++ topia-service/trunk/pom.xml 2008-10-20 22:17:03 UTC (rev 1160) @@ -2,85 +2,92 @@ <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> - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/topia/htdocs/topia-service</url> - </site> - </distributionManagement> - -  <artifactId>topia-service</artifactId> - <name>ToPIA Service</name> -  - <packaging>jar</packaging> + <dependencies> -  - <version>0.9-SNAPSHOT</version> +  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>topia</artifactId> + <version>${topia.version}</version> + <scope>compile</scope> + </dependency> -  + <dependency> + <groupId>org.codelutin</groupId> + <artifactId>lutinutil</artifactId> + <version>0.31</version> + <scope>compile</scope> + </dependency> + + <dependency> + <groupId>org.apache.lucene</groupId> + <artifactId>lucene-core</artifactId> + <version>2.3.2</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 Service</name> + <version>0.9-SNAPSHOT</version> <description> ToPIA Service est une librairie de ToPIA pour la gestion de sercices. </description> <inceptionYear>2006</inceptionYear> +  +  +  + + <packaging>jar</packaging> + <properties>  <labs.id>21</labs.id> - +  <labs.project>topia</labs.project> - -  + +  + <topia.version>2.0.27-SNAPSHOT</topia.version> + +  <maven.test.skip>true</maven.test.skip> </properties> -  - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - -  - <contributors> - <contributor> - <name>Ruchaud Julien</name> - <email>ruchaud(a)codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - - <contributor> - <name>Arnaud Thimel</name> - <email>thimel(a)codelutin.com</email> - <timezone>+2</timezone> - <roles> - <role>Developpeur</role> - </roles> - </contributor> - </contributors> - <build> - + <plugins> - <plugin> + + <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>0.51-SNAPSHOT</version> + <version>0.60</version> <executions> <execution> <phase>process-sources</phase> @@ -95,11 +102,11 @@ <destDirGen>${maven.gen.dir}/java</destDirGen> <defaultPackage>org.codelutin.topia</defaultPackage> <extractedPackages>org.codelutin.topia.tass</extractedPackages> - + <copyVersionDir>src/main/resources/oldmappings/%MODELNAME%</copyVersionDir> <copyVersionFiles>**/*.hbm.xml</copyVersionFiles> <copyOverwrite>true</copyOverwrite> - </configuration> + </configuration> <goals> <goal>zargo2xmi</goal> <goal>xmi2objectmodel</goal> @@ -112,51 +119,26 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.0.27-SNAPSHOT</version> + <version>${topia.version}</version> <scope>compile</scope> </dependency> </dependencies> </plugin> <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-jrst-plugin</artifactId> + <artifactId>maven-javadoc-plugin</artifactId> </plugin> + </plugins> </build> -  - <dependencies> +  +  +  + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> -  - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>topia</artifactId> - <version>2.0.27-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.codelutin</groupId> - <artifactId>lutinutil</artifactId> - <version>0.31</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>2.3.2</version> - <scope>compile</scope> - </dependency> - -  - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <version>1.0.79</version> - <scope>test</scope> - </dependency> - - </dependencies> </project> Modified: topia-service/trunk/src/site/site_fr.xml =================================================================== --- topia-service/trunk/src/site/site_fr.xml 2008-10-20 22:12:16 UTC (rev 1159) +++ topia-service/trunk/src/site/site_fr.xml 2008-10-20 22:17:03 UTC (rev 1160) @@ -1,47 +1,62 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="ToPIA-Service"> - - <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2</version> - </skin> - - <bannerLeft> - <name>ToPIA Service</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> +<project name="${project.name}"> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> + <publishDate format="dd/MM/yyyy"/> - <body> - <links> - <item name="ToPIA" href="http://topia.labs.libre-entreprise.org/"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.1</version> + </skin> - <menu name="Utilisateur"> - <item href="/index.html" name="Accueil"></item> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/topia-se…" name="Téléchargement"/> - </menu> + <bannerLeft> + <name>${project.name}</name> +  + <href>index.html</href> + </bannerLeft> - <menu name="Developpeur"> - <item name="Historique" href="/History.html"/> - <item name="Sécurité" href="/Security.html"/> - <item name="Recherche" href="/Search.html"/> - <item name="Migration" href="/Migration.html"/> - </menu> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> - ${reports} - - </body> + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> + + <body> + <links> + <item name="ToPIA" href="http://topia.labs.libre-entreprise.org/topia"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="${project.organization.name}" href="${project.organization.url}"/> + </links> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="/index.html" name="Accueil"/> +  + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> + + <menu name="Developpeur"> + <item name="Historique" href="/History.html"/> + <item name="Sécurité" href="/Security.html"/> + <item name="Recherche" href="/Search.html"/> + <item name="Migration" href="/Migration.html"/> + </menu> + + <menu ref="reports"/> + + </body> </project>

1 0

Oct. 20, 2008

Author: tchemit Date: 2008-10-20 22:12:16 +0000 (Mon, 20 Oct 2008) New Revision: 1159 Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/history/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/history/entities/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/history/entities/HistoryImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PersonImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PetImpl.hbm.xml Log: ajout des mapping de migration Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/history/entities/HistoryImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/history/entities/HistoryImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/history/entities/HistoryImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.history.entities"> + <class name="org.codelutin.topia.history.entities.HistoryImpl" table="history" node="org.codelutin.topia.history.entities.HistoryImpl" abstract="false" proxy="org.codelutin.topia.history.entities.History" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="actionDate" type="java.util.Date" access="field" column="actionDate" node="actionDate"/> + <property name="userId" type="text" access="field" column="userId" node="userId"/> + <property name="action" type="int" access="field" column="action" node="action"/> + <property name="type" type="text" access="field" column="type" node="type"/> + <property name="target" type="text" access="field" column="target" node="target"/> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAssociationAuthorizationImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> + <union-subclass name="org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" extends="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAssociationAuthorization" node="org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorizationImpl" abstract="false" proxy="org.codelutin.topia.security.entities.authorization.TopiaAssociationAuthorization" > +  + <property name="idBeginAssociation" type="text" access="field" column="idBeginAssociation" node="idBeginAssociation"/> + <property name="nameAssociation" type="text" access="field" column="nameAssociation" node="nameAssociation"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + <property name="principals" type="serializable" access="field" column="principals" node="principals"/> + </union-subclass> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaAuthorizationImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> + <class name="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaAuthorization" node="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" abstract="true" proxy="org.codelutin.topia.security.entities.authorization.TopiaAuthorization" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaEntityAuthorizationImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> + <union-subclass name="org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" extends="org.codelutin.topia.security.entities.authorization.TopiaAuthorizationImpl" table="topiaEntityAuthorization" node="org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorizationImpl" abstract="false" proxy="org.codelutin.topia.security.entities.authorization.TopiaEntityAuthorization" > +  + <property name="expression" type="text" access="field" column="expression" node="expression"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + <property name="principals" type="serializable" access="field" column="principals" node="principals"/> + </union-subclass> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/authorization/TopiaExpressionLinkImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.authorization"> + <class name="org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkImpl" table="topiaExpressionLink" node="org.codelutin.topia.security.entities.authorization.TopiaExpressionLinkImpl" abstract="false" proxy="org.codelutin.topia.security.entities.authorization.TopiaExpressionLink" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="replace" type="text" access="field" column="replace" node="replace"/> + <property name="by" type="text" access="field" column="by" node="by"/> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.user"> + <class name="org.codelutin.topia.security.entities.user.TopiaGroupImpl" table="topiaGroup" node="org.codelutin.topia.security.entities.user.TopiaGroupImpl" abstract="false" proxy="org.codelutin.topia.security.entities.user.TopiaGroup" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="description" type="text" access="field" column="description" node="description"/> + <bag name="topiaUser" table="topiagroup_topiauser" lazy="true" node="topiaUser" embed-xml="true"> + <key column="topiaGroup"/> + <many-to-many class="org.codelutin.topia.security.entities.user.TopiaUserImpl" column="topiaUser" node="topiaId"/> + </bag> + <many-to-one name="superGroup" class="org.codelutin.topia.security.entities.user.TopiaGroupImpl" column="superGroup" node="superGroup/@topiaId" embed-xml="false"/> + <bag name="subGroup" inverse="true" lazy="true" node="subGroup" embed-xml="true"> + <key column="superGroup"/> + <one-to-many class="org.codelutin.topia.security.entities.user.TopiaGroupImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.security.entities.user"> + <class name="org.codelutin.topia.security.entities.user.TopiaUserImpl" table="topiaUser" node="org.codelutin.topia.security.entities.user.TopiaUserImpl" abstract="false" proxy="org.codelutin.topia.security.entities.user.TopiaUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="note" type="text" access="field" column="note" node="note"/> + <property name="linkApplication" type="text" access="field" column="linkApplication" node="linkApplication"/> + <bag name="topiaGroup" table="topiagroup_topiauser" lazy="true" node="topiaGroup" embed-xml="true"> + <key column="topiaUser"/> + <many-to-many class="org.codelutin.topia.security.entities.user.TopiaGroupImpl" column="topiaGroup" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasAuthorizationImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.taas.entities"> + <class name="org.codelutin.topia.taas.entities.TaasAuthorizationImpl" table="taasAuthorization" node="org.codelutin.topia.taas.entities.TaasAuthorizationImpl" abstract="false" proxy="org.codelutin.topia.taas.entities.TaasAuthorization" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="expression" type="text" access="field" column="expression" node="expression"/> + <property name="actions" type="int" access="field" column="actions" node="actions"/> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.taas.entities"> + <class name="org.codelutin.topia.taas.entities.TaasPrincipalImpl" table="taasPrincipal" node="org.codelutin.topia.taas.entities.TaasPrincipalImpl" abstract="false" proxy="org.codelutin.topia.taas.entities.TaasPrincipal" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <bag name="authorizations" table="authorizations_principals" lazy="false" node="authorizations" embed-xml="true"> + <key column="principals"/> + <many-to-many class="org.codelutin.topia.taas.entities.TaasAuthorizationImpl" column="authorizations" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.taas.entities"> + <class name="org.codelutin.topia.taas.entities.TaasUserImpl" table="taasUser" node="org.codelutin.topia.taas.entities.TaasUserImpl" abstract="false" proxy="org.codelutin.topia.taas.entities.TaasUser" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="login" type="text" access="field" column="login" node="login"/> + <property name="password" type="text" access="field" column="password" node="password"/> + <property name="email" type="text" access="field" column="email" node="email"/> + <property name="enabled" type="boolean" access="field" column="enabled" node="enabled"/> + <property name="lastConnectionDate" type="java.util.Date" access="field" column="lastConnectionDate" node="lastConnectionDate"/> + <property name="numberOfConnection" type="int" access="field" column="numberOfConnection" node="numberOfConnection"/> + <property name="link" type="text" access="field" column="link" node="link"/> + <bag name="principals" table="principals_users" lazy="true" node="principals" embed-xml="true"> + <key column="users"/> + <many-to-many class="org.codelutin.topia.taas.entities.TaasPrincipalImpl" column="principals" node="topiaId"/> + </bag> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PersonImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PersonImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PersonImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.test.entities"> + <class name="org.codelutin.topia.test.entities.PersonImpl" table="person" node="org.codelutin.topia.test.entities.PersonImpl" abstract="false" proxy="org.codelutin.topia.test.entities.Person" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="firstname" type="text" access="field" column="firstname" node="firstname"/> + <bag name="pet" inverse="true" lazy="true" node="pet" embed-xml="true"> + <key column="person"/> + <one-to-many class="org.codelutin.topia.test.entities.PetImpl" node="topiaId" embed-xml="false"/> + </bag> + </class> +</hibernate-mapping> Added: topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PetImpl.hbm.xml =================================================================== --- topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PetImpl.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PetImpl.hbm.xml 2008-10-20 22:12:16 UTC (rev 1159) @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping default-access="field" auto-import="true" package="org.codelutin.topia.test.entities"> + <class name="org.codelutin.topia.test.entities.PetImpl" table="pet" node="org.codelutin.topia.test.entities.PetImpl" abstract="false" proxy="org.codelutin.topia.test.entities.Pet" > + <id name="topiaId" type="string" length="255" node="@topiaId"/> + <version name="topiaVersion" type="long" node="@topiaVersion"/> + <property name="topiaCreateDate" type="date" node="@topiaCreateDate"/> + <property name="name" type="text" access="field" column="name" node="name"/> + <property name="type" type="text" access="field" column="type" node="type"/> + <many-to-one name="person" class="org.codelutin.topia.test.entities.PersonImpl" column="person" node="person/@topiaId" embed-xml="false"/> + </class> +</hibernate-mapping>

1 0

r1158 - in topia/trunk: . src/main/java/org/codelutin/topia/generator src/site
by tchemit＠users.labs.libre-entreprise.org Oct. 20, 2008

Oct. 20, 2008

Author: tchemit Date: 2008-10-20 21:38:35 +0000 (Mon, 20 Oct 2008) New Revision: 1158 Modified: topia/trunk/pom.xml topia/trunk/src/main/java/org/codelutin/topia/generator/DTOGenerator.java topia/trunk/src/main/java/org/codelutin/topia/generator/EntityDTOGenerator.java topia/trunk/src/site/site.xml Log: ajout de java.beans.PropertyChangeSupport sur les Dto pour pouvoir utiliser le macanisme de validation dans les ui jaxx mise ?\195?\160 jour du pom, reformatage ?\195?\160 MA sauce, mise a jour dependance lutingenerator. mise ?\195?\160 jour du site avec les dernieres ameliorations. TODO : il serait bien que les tests passent de nouveau Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-10-13 13:11:31 UTC (rev 1157) +++ topia/trunk/pom.xml 2008-10-20 21:38:35 UTC (rev 1158) @@ -2,93 +2,20 @@ <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> -  - <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <name>ToPIA - Tools for Portable and Independent Architecture</name> -  - <packaging>jar</packaging> - -  - <version>2.0.27-SNAPSHOT</version> - -  - <description> - Framework de persistance et de distribution d'application. - </description> - <inceptionYear>2004</inceptionYear> - - <properties> -  - <labs.id>21</labs.id> - -  - <labs.project>topia</labs.project> - -  - <maven.test.skip>true</maven.test.skip> - </properties> - -  - <repositories> -  - <repository> - <id>jboss-repository</id> - <url>http://repository.jboss.com/maven2</url> - </repository> - </repositories> - - <scm> - <connection>${maven.scm.connection}</connection> - <developerConnection>${maven.scm.developerConnection}</developerConnection> - <url>${maven.scm.url}</url> - </scm> - - <build> - <plugins> -  - <plugin> - <groupId>org.codelutin</groupId> - <artifactId>maven-processor-plugin</artifactId> - <version>0.15</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> - </plugins> - </build> - -  <dependencies>  <dependency> @@ -101,7 +28,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutingenerator</artifactId> - <version>0.51-SNAPSHOT</version> + <version>0.60</version> <scope>compile</scope> </dependency> @@ -183,6 +110,96 @@ <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.27-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> + +  +  +  + + <repositories> +  + <repository> + <id>jboss-repository</id> + <url>http://repository.jboss.com/maven2</url> + </repository> + </repositories> + + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> + </project> Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/DTOGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/DTOGenerator.java 2008-10-13 13:11:31 UTC (rev 1157) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/DTOGenerator.java 2008-10-20 21:38:35 UTC (rev 1158) @@ -30,7 +30,6 @@ package org.codelutin.topia.generator; import static org.codelutin.topia.generator.GeneratorUtil.TAG_ANNOTATION; -import static org.codelutin.topia.generator.GeneratorUtil.hasUnidirectionalRelationOnAbstractType; import java.io.File; import java.io.IOException; @@ -69,10 +68,7 @@ public boolean isDTO(String type) { ObjectModelClassifier clazz = model.getClassifier(type); - if (clazz == null) { - return false; - } - return clazz.hasStereotype(GeneratorUtil.STEREOTYPE_DTO); + return clazz != null && clazz.hasStereotype(GeneratorUtil.STEREOTYPE_DTO); } @Override @@ -88,6 +84,7 @@ /*{package <%=clazz.getPackageName()%>; import org.apache.commons.lang.builder.ToStringBuilder; +import java.beans.PropertyChangeListener; /** * DTO implantation for <%=Util.capitalize(clazz.getName())%> entity. @@ -191,8 +188,8 @@ //Déclaration des attributs d'une classe d'associations 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) { /*{ <%=attr.getVisibility()%> <%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>; }*/ @@ -200,12 +197,14 @@ } } /*{ + protected java.beans.PropertyChangeSupport p; + }*/ /*{ /** * Default constructor of <%=clazz.getName()%>DTO. *) - public <%=clazz.getName()%>DTO() {} + public <%=clazz.getName()%>DTO() { p = new java.beans.PropertyChangeSupport(this); } }*/ @@ -215,20 +214,20 @@ public <%=clazz.getName()%>DTO(}*/ boolean une_fois = true; - for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { - ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); - + for (Object o : clazz.getAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; + if (!(attr.isNavigable() - || attr.hasAssociationClass())) { + || attr.hasAssociationClass())) { continue; } - + if (une_fois) { - une_fois = false; + une_fois = false; } else { - /*{, }*/ + /*{, }*/ } - + if (!Util.isNMultiplicity(attr)) { if (!attr.hasAssociationClass()) { /*{<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=attr.getName()%>}*/ @@ -244,22 +243,23 @@ /*{<%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>DTO> <%=Util.toLowerCaseFirstLetter(assocAttrName)%>}*/ } } - - + + } // end for /*{ ) { + this(); }*/ - - for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { - ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); - + + for (Object o : clazz.getAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; + if (!(attr.isNavigable() - || attr.hasAssociationClass())) { + || attr.hasAssociationClass())) { continue; } - + if (!Util.isNMultiplicity(attr)) { if (!attr.hasAssociationClass()) { /*{ this.<%=attr.getName()%> = <%=attr.getName()%>; @@ -282,23 +282,41 @@ } /*{ } + public void addPropertyChangeListener(PropertyChangeListener listener) { + p.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + p.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.removePropertyChangeListener(propertyName, listener); + } + }*/ /* * Définition des getteurs et setteurs */ - 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(); - + if (!attr.isNavigable()) { continue; } if (!Util.isNMultiplicity(attr)) { if (!attr.hasAssociationClass()) { /*{ public void set<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> value) { + <%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> oldValue = this.<%=attr.getName()%>; this.<%=attr.getName()%> = value; + p.firePropertyChange("<%=attr.getName()%>", oldValue, value); } public <%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> get<%=Util.capitalize(attr.getName())%>() { @@ -308,9 +326,13 @@ }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ public void set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>DTO association) { + <%=attr.getAssociationClass().getQualifiedName()%>DTO oldAssocation= this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>; this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = association; + p.firePropertyChange("<%=attr.getName()%>", oldAssocation, assocation); } public <%=attr.getAssociationClass().getQualifiedName()%>DTO get<%=Util.capitalize(assocAttrName)%>() { @@ -322,39 +344,45 @@ } else { //NMultiplicity if (!attr.hasAssociationClass()) { //Méthodes remplacées par des accesseurs sur les classes d'assoc /*{ public void set<%=Util.capitalize(attr.getName())%>(<%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%>> values) { + <%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%>> oldValues = this.<%=attr.getName()%>; this.<%=attr.getName()%> = values; + p.firePropertyChange("<%=attr.getName()%>", oldValues, values); } }*/ - - //AddChild + + //AddChild /*{ public <%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> addChild(<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=attr.getName()%>) { this.<%=attr.getName()%>.add(<%=attr.getName()%>); }*/ - if (reverse.isNavigable()) { + if (reverse.isNavigable()) { /*{ <%=attr.getName()%>.set<%=Util.capitalize(reverse.getName())%>(this); }*/ - } + } /*{ return <%=attr.getName()%>; } }*/ - //RemoveChild + //RemoveChild /*{ public void removeChild(<%=attr.getType()%><%=(isDTO(attr.getType())?"DTO":"")%> <%=attr.getName()%>) { this.<%=attr.getName()%>.remove(<%=attr.getName()%>); }*/ - if (reverse.isNavigable()) { + if (reverse.isNavigable()) { /*{ <%=attr.getName()%>.set<%=Util.capitalize(reverse.getName())%>(null); }*/ - } + } /*{ } -}*/ +}*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ public void set<%=Util.capitalize(assocAttrName)%>(<%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>DTO> values) { + <%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>DTO> oldValues =this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>; this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = values; + p.firePropertyChange("<%=attr.getName()%>", oldValues, values); } }*/ @@ -367,7 +395,9 @@ }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ public <%=((attr.isOrdered())?"java.util.List":"java.util.Collection")%><<%=attr.getAssociationClass().getQualifiedName()%>DTO> get<%=Util.capitalize(assocAttrName)%>() { return this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -377,19 +407,17 @@ } } -/*{ /* (non-Javadoc) - * @see java.lang.Object#toString() - *) +/*{ @Override public String toString() { String result = new ToStringBuilder(this). }*/ - for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { - ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + for (Object o : clazz.getAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; if (!(attr.isNavigable() || attr.hasAssociationClass())) { - continue; - } + continue; + } //FIXME possibilité de boucles (non directes) ObjectModelClass attrEntity = null; if (model.hasClass(attr.getType())) { Modified: topia/trunk/src/main/java/org/codelutin/topia/generator/EntityDTOGenerator.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/generator/EntityDTOGenerator.java 2008-10-13 13:11:31 UTC (rev 1157) +++ topia/trunk/src/main/java/org/codelutin/topia/generator/EntityDTOGenerator.java 2008-10-20 21:38:35 UTC (rev 1158) @@ -70,10 +70,7 @@ public boolean isEntity(String type) { ObjectModelClassifier clazz = model.getClassifier(type); - if (clazz == null) { - return false; - } - return clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY); + return clazz != null && clazz.hasStereotype(GeneratorUtil.STEREOTYPE_ENTITY); } @Override @@ -89,6 +86,7 @@ /*{package <%=clazz.getPackageName()%>; import org.apache.commons.lang.builder.ToStringBuilder; +import java.beans.PropertyChangeListener; /** * Implantation DTO pour l'entité <%=Util.capitalize(clazz.getName())%>. @@ -166,8 +164,8 @@ //Déclaration des attributs d'une classe d'associations 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) { /*{ <%=attr.getVisibility()%> <%=attr.getType()%><%=(isEntity(attr.getType())?"DTO":"")%> <%=Util.toLowerCaseFirstLetter(attr.getName())%>; @@ -176,17 +174,38 @@ } } +/*{ + protected java.beans.PropertyChangeSupport p; + +}*/ + /*{ /** * Constructeur de <%=clazz.getName()%>DTO par défaut. *) - public <%=clazz.getName()%>DTO() {} + public <%=clazz.getName()%>DTO() { p = new java.beans.PropertyChangeSupport(this); } + public void addPropertyChangeListener(PropertyChangeListener listener) { + p.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + p.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + p.removePropertyChangeListener(propertyName, listener); + } + }*/ - 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(); - + if (!(attr.isNavigable() || hasUnidirectionalRelationOnAbstractType(reverse, model))) { continue; @@ -194,7 +213,9 @@ if (!Util.isNMultiplicity(attr)) { if (!attr.hasAssociationClass()) { /*{ public void set<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%><%=(isEntity(attr.getType())?"DTO":"")%> value) { + <%=attr.getType()%><%=(isEntity(attr.getType())?"DTO":"")%> oldValue = this.<%=attr.getName()%>; this.<%=attr.getName()%> = value; + p.firePropertyChange("<%=attr.getName()%>", oldValue, value); } public <%=attr.getType()%><%=(isEntity(attr.getType())?"DTO":"")%> get<%=Util.capitalize(attr.getName())%>() { @@ -204,9 +225,13 @@ }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ public void set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>DTO association) { + <%=attr.getAssociationClass().getQualifiedName()%>DTO oldAssocation= this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>; this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = association; + p.firePropertyChange("<%=attr.getName()%>", oldAssocation, assocation); } public <%=attr.getAssociationClass().getQualifiedName()%>DTO get<%=Util.capitalize(assocAttrName)%>() { @@ -218,15 +243,21 @@ } else { //NMultiplicity if (!attr.hasAssociationClass()) { //Méthodes remplacées par des accesseurs sur les classes d'assoc /*{ public void set<%=Util.capitalize(attr.getName())%>(<%=attr.getType()%><%=(isEntity(attr.getType())?"DTO":"")%>[] values) { + <%=attr.getType()%><%=(isEntity(attr.getType())?"DTO":"")%>[] oldValues = this.<%=attr.getName()%>; this.<%=attr.getName()%> = values; + p.firePropertyChange("<%=attr.getName()%>", oldValues, values); } }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ public void set<%=Util.capitalize(assocAttrName)%>(<%=attr.getAssociationClass().getQualifiedName()%>DTO[] values) { + <%=attr.getAssociationClass().getQualifiedName()%>DTO[] oldValues = this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>; this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%> = values; + p.firePropertyChange("<%=attr.getName()%>", oldValues, values); } }*/ @@ -239,7 +270,9 @@ }*/ } else { String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - if (log.isTraceEnabled()) { log.trace("assocAttrName: " + assocAttrName); } + if (log.isTraceEnabled()) { + log.trace("assocAttrName: " + assocAttrName); + } /*{ public <%=attr.getAssociationClass().getQualifiedName()%>DTO[] get<%=Util.capitalize(assocAttrName)%>() { return this.<%=Util.toLowerCaseFirstLetter(assocAttrName)%>; } @@ -249,14 +282,13 @@ } } -/*{ /* (non-Javadoc) - * @see java.lang.Object#toString() - *) +/*{ + @Override public String toString() { String result = new ToStringBuilder(this). }*/ - for (Iterator it = clazz.getAttributes().iterator(); it.hasNext();) { - ObjectModelAttribute attr = (ObjectModelAttribute)it.next(); + for (Object o : clazz.getAttributes()) { + ObjectModelAttribute attr = (ObjectModelAttribute) o; //FIXME possibilité de boucles (non directes) ObjectModelClass attrEntity = null; if (model.hasClass(attr.getType())) { Modified: topia/trunk/src/site/site.xml =================================================================== --- topia/trunk/src/site/site.xml 2008-10-13 13:11:31 UTC (rev 1157) +++ topia/trunk/src/site/site.xml 2008-10-20 21:38:35 UTC (rev 1158) @@ -1,49 +1,64 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="Topia"> - - <skin> - <groupId>org.codelutin</groupId> - <artifactId>maven-lutin-skin</artifactId> - <version>0.2</version> - </skin> - - <bannerLeft> - <name>Topia</name> - </bannerLeft> - - <bannerRight> - <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> - <href>http://www.codelutin.com</href> - </bannerRight> +<project name="${project.name}"> - <poweredBy> - <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> - <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> - <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" img="images/restructuredtext-logo.png"/> - </poweredBy> + <publishDate format="dd/MM/yyyy"/> - <body> - <links> - <item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/> - <item name="Labs" href="http://labs.libre-entreprise.org/"/> - <item name="Code Lutin" href="http://www.codelutin.com/"/> - </links> + <skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2.1</version> + </skin> - <menu name="Utilisateur"> - <item href="/index.html" name="Accueil"></item> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/topia/" name="Téléchargement"/> - </menu> + <bannerLeft> + <name>${project.name}</name> +  + <href>index.html</href> + </bannerLeft> - <menu name="Developpeur"> - <item name="Todo" href="Todo.html"/> - <item name="Mapping hibernate" href="HibernateMapping.html"/> - <item name="Gestion des evenements" href="event.html"/> - <item name="Isolation" href="Isolation.html"/> - <item name="Schema migration" href="SchemaMigration.html"/> - <item name="Securité" href="security.html"/> - </menu> + <bannerRight> + <src>http://www.codelutin.com/images/lutinorange-codelutin.png</src> + <href>${project.organization.url}</href> + </bannerRight> - ${reports} + <poweredBy> + <logo href="http://maven.apache.org" name="Maven" img="images/logos/maven-feather.png"/> + <logo href="http://jrst.labs.libre-entreprise.org" name="JRst" img="images/jrst-logo.png"/> + <logo href="http://docutils.sourceforge.net/rst.html" name="ReStructuredText" + img="images/restructuredtext-logo.png"/> + </poweredBy> - </body> + <body> + <links> + <item name="ToPIA Service" href="http://topia.labs.libre-entreprise.org/topia-service"/> + <item name="Labs" href="http://labs.libre-entreprise.org/"/> + <item name="Code Lutin" href="http://www.codelutin.com/"/> + </links> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item href="/index.html" name="Accueil"/> +  + </menu> + + <menu name="Téléchargement"> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}/${project.version}" + name="Télécharger la dernière version"/> + <item href="${labs.builder.url}/org/codelutin/${project.artifactId}" + name="Voir toutes les versions"/> + </menu> + + <menu name="Developpeur"> + <item name="Todo" href="Todo.html"/> + <item name="Mapping hibernate" href="HibernateMapping.html"/> + <item name="Gestion des evenements" href="event.html"/> + <item name="Isolation" href="Isolation.html"/> + <item name="Schema migration" href="SchemaMigration.html"/> + <item name="Securité" href="security.html"/> + </menu> + + <menu ref="reports"/> + + </body> </project>

1 0

r1157 - in topia-service/trunk/src/main: java/org/codelutin/topia/migration/mappings resources resources/org resources/org/codelutin resources/org/codelutin/topia resources/org/codelutin/topia/migration resources/org/codelutin/topia/migration/mappings
by chatellier＠users.labs.libre-entreprise.org Oct. 13, 2008

Oct. 13, 2008

Author: chatellier Date: 2008-10-13 13:11:31 +0000 (Mon, 13 Oct 2008) New Revision: 1157 Added: topia-service/trunk/src/main/resources/org/ topia-service/trunk/src/main/resources/org/codelutin/ topia-service/trunk/src/main/resources/org/codelutin/topia/ topia-service/trunk/src/main/resources/org/codelutin/topia/migration/ topia-service/trunk/src/main/resources/org/codelutin/topia/migration/mappings/ topia-service/trunk/src/main/resources/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml Removed: topia-service/trunk/src/main/java/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml Log: Move mapping to resources Deleted: topia-service/trunk/src/main/java/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml =================================================================== --- topia-service/trunk/src/main/java/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml 2008-10-06 09:44:21 UTC (rev 1156) +++ topia-service/trunk/src/main/java/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml 2008-10-13 13:11:31 UTC (rev 1157) @@ -1,10 +0,0 @@ -<?xml version="1.0"?> -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> - -<hibernate-mapping> - <class name="org.codelutin.topia.migration.mappings.TMSVersion" table="tms_version"> - <id name="version" column="version"/> - </class> -</hibernate-mapping> \ No newline at end of file Copied: topia-service/trunk/src/main/resources/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml (from rev 1149, topia-service/trunk/src/main/java/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml) =================================================================== --- topia-service/trunk/src/main/resources/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml (rev 0) +++ topia-service/trunk/src/main/resources/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml 2008-10-13 13:11:31 UTC (rev 1157) @@ -0,0 +1,10 @@ +<?xml version="1.0"?> +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> + +<hibernate-mapping> + <class name="org.codelutin.topia.migration.mappings.TMSVersion" table="tms_version"> + <id name="version" column="version"/> + </class> +</hibernate-mapping> \ No newline at end of file Property changes on: topia-service/trunk/src/main/resources/org/codelutin/topia/migration/mappings/TMSVersion.hbm.xml ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:mergeinfo + Name: svn:eol-style + native

1 0

r1156 - in topia/trunk: . src/main/java/org/codelutin/topia/persistence/hibernate
by chatellier＠users.labs.libre-entreprise.org Oct. 6, 2008

Oct. 6, 2008

Author: chatellier Date: 2008-10-06 09:44:21 +0000 (Mon, 06 Oct 2008) New Revision: 1156 Modified: topia/trunk/pom.xml topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java Log: Switch on hibernate 3.3.1 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-10-06 09:42:30 UTC (rev 1155) +++ topia/trunk/pom.xml 2008-10-06 09:44:21 UTC (rev 1156) @@ -12,13 +12,6 @@ <version>3.0</version> </parent> - <distributionManagement> - <site> - <id>labs</id> - <url>scp://labs.libre-entreprise.org/home/groups/${pom.artifactId}/htdocs/</url> - </site> - </distributionManagement> -  <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> @@ -36,11 +29,6 @@ </description> <inceptionYear>2004</inceptionYear> -  - <issueManagement> - <url>http://labs.libre-entreprise.org/tracker/?group_id=21</url> - </issueManagement> - <properties>  <labs.id>21</labs.id> @@ -52,6 +40,15 @@ <maven.test.skip>true</maven.test.skip> </properties> +  + <repositories> +  + <repository> + <id>jboss-repository</id> + <url>http://repository.jboss.com/maven2</url> + </repository> + </repositories> + <scm> <connection>${maven.scm.connection}</connection> <developerConnection>${maven.scm.developerConnection}</developerConnection> @@ -97,7 +94,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.31-SNAPSHOT</version> + <version>0.31</version> <scope>compile</scope> </dependency> @@ -117,8 +114,8 @@ <dependency> <groupId>org.hibernate</groupId> - <artifactId>hibernate</artifactId> - <version>3.2.6.ga-eventpatch</version> + <artifactId>hibernate-core</artifactId> + <version>3.3.1.GA</version> <scope>compile</scope> </dependency> Modified: topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java =================================================================== --- topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java 2008-10-06 09:42:30 UTC (rev 1155) +++ topia/trunk/src/main/java/org/codelutin/topia/persistence/hibernate/FlatFilePersister.java 2008-10-06 09:44:21 UTC (rev 1156) @@ -33,6 +33,7 @@ import org.hibernate.MappingException; import org.hibernate.cache.CacheConcurrencyStrategy; import org.hibernate.cache.CacheKey; +import org.hibernate.cache.access.EntityRegionAccessStrategy; import org.hibernate.cache.entry.CacheEntryStructure; import org.hibernate.cache.entry.UnstructuredCacheEntry; import org.hibernate.engine.CascadeStyle; @@ -718,4 +719,13 @@ // FIXME a renseigner return null; } + + /* + * @see org.hibernate.persister.entity.EntityPersister#getCacheAccessStrategy() + */ + @Override + public EntityRegionAccessStrategy getCacheAccessStrategy() { + // FIXME a renseigner + return null; + } }

1 0

r1155 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 6, 2008

Oct. 6, 2008

Author: chatellier Date: 2008-10-06 09:42:30 +0000 (Mon, 06 Oct 2008) New Revision: 1155 Modified: topia-service/trunk/pom.xml Log: Use stable lutinutil Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-03 12:55:06 UTC (rev 1154) +++ topia-service/trunk/pom.xml 2008-10-06 09:42:30 UTC (rev 1155) @@ -139,7 +139,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.31-SNAPSHOT</version> + <version>0.31</version> <scope>compile</scope> </dependency>

1 0

r1154 - topia-service/trunk
by chatellier＠users.labs.libre-entreprise.org Oct. 3, 2008

Oct. 3, 2008

Author: chatellier Date: 2008-10-03 12:55:06 +0000 (Fri, 03 Oct 2008) New Revision: 1154 Modified: topia-service/trunk/pom.xml Log: Update libs Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2008-10-02 16:55:50 UTC (rev 1153) +++ topia-service/trunk/pom.xml 2008-10-03 12:55:06 UTC (rev 1154) @@ -139,7 +139,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.30</version> + <version>0.31-SNAPSHOT</version> <scope>compile</scope> </dependency> @@ -154,7 +154,7 @@ <dependency> <groupId>com.h2database</groupId> <artifactId>h2</artifactId> - <version>1.0.78</version> + <version>1.0.79</version> <scope>test</scope> </dependency>

1 0

r1153 - in topia/trunk: . src src/site src/site/rst
by chatellier＠users.labs.libre-entreprise.org Oct. 2, 2008

Oct. 2, 2008

Author: chatellier Date: 2008-10-02 16:55:50 +0000 (Thu, 02 Oct 2008) New Revision: 1153 Added: topia/trunk/src/site/ topia/trunk/src/site/rst/ Removed: topia/trunk/doc/ topia/trunk/site/ Modified: topia/trunk/ topia/trunk/pom.xml topia/trunk/src/site/site.xml Log: Update site Property changes on: topia/trunk ___________________________________________________________________ Name: svn:ignore - target .classpath .project topia2.ipr .settings + target .classpath .project topia2.ipr .settings THIRD-PARTY.txt Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2008-10-02 16:52:26 UTC (rev 1152) +++ topia/trunk/pom.xml 2008-10-02 16:55:50 UTC (rev 1153) @@ -47,8 +47,17 @@  <labs.project>topia</labs.project> + +  + <maven.test.skip>true</maven.test.skip> </properties> + <scm> + <connection>${maven.scm.connection}</connection> + <developerConnection>${maven.scm.developerConnection}</developerConnection> + <url>${maven.scm.url}</url> + </scm> + <build> <plugins>  @@ -88,7 +97,7 @@ <dependency> <groupId>org.codelutin</groupId> <artifactId>lutinutil</artifactId> - <version>0.30</version> + <version>0.31-SNAPSHOT</version> <scope>compile</scope> </dependency> Copied: topia/trunk/src/site (from rev 1149, topia/trunk/site) Property changes on: topia/trunk/src/site ___________________________________________________________________ Name: svn:mergeinfo + Copied: topia/trunk/src/site/rst (from rev 1149, topia/trunk/doc) Property changes on: topia/trunk/src/site/rst ___________________________________________________________________ Name: svn:mergeinfo + Modified: topia/trunk/src/site/site.xml =================================================================== --- topia/trunk/site/site.xml 2008-10-02 15:24:17 UTC (rev 1149) +++ topia/trunk/src/site/site.xml 2008-10-02 16:55:50 UTC (rev 1153) @@ -2,10 +2,10 @@ <project name="Topia"> <skin> - <groupId>lutinlib</groupId> - <artifactId>lutin-site-skin</artifactId> - <version>0.1</version> - </skin> + <groupId>org.codelutin</groupId> + <artifactId>maven-lutin-skin</artifactId> + <version>0.2</version> + </skin> <bannerLeft> <name>Topia</name> @@ -31,7 +31,7 @@ <menu name="Utilisateur"> <item href="/index.html" name="Accueil"></item> - <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/lutinlib/topia/" name="Téléchargement"/> + <item href="http://lutinbuilder.labs.libre-entreprise.org/maven2/org/codelutin/topia/" name="Téléchargement"/> </menu> <menu name="Developpeur">

1 0