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

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

18 Feb '09

Author: tchemit Date: 2009-02-18 22:15:05 +0000 (Wed, 18 Feb 2009) New Revision: 1381 Modified: topia/trunk/pom.xml Log: zeroConf in license-switcher and jrst pass to stable versions Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 19:39:05 UTC (rev 1380) +++ topia/trunk/pom.xml 2009-02-18 22:15:05 UTC (rev 1381) @@ -168,7 +168,8 @@ <generator.version>0.64</generator.version> <processor.version>0.17</processor.version> <lutinutil.version>1.0.3</lutinutil.version> - + <jrst.version>0.8.4</jrst.version> + <license-switcher.version>0.6</license-switcher.version> <topia.version>${project.version}</topia.version> <xmlrpc.version>3.1</xmlrpc.version> @@ -230,17 +231,12 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.4</version> - <configuration> - <directoryIn>${maven.src.dir}/site</directoryIn> - <directoryOut>${maven.site.gen.dir}</directoryOut> - <defaultLocale>fr</defaultLocale> - <inputEncoding>${project.build.sourceEncoding}</inputEncoding> - <outputEncoding>${project.build.sourceEncoding}</outputEncoding> + <version>${jrst.version}</version> + <configuration> + <defaultLocale>fr</defaultLocale> </configuration> <executions> - <execution> - <phase>pre-site</phase> + <execution> <goals> <goal>jrst</goal> </goals> @@ -293,10 +289,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.6</version> - <configuration> - <licenseName>${license-switcher.licenseName}</licenseName> - </configuration> + <version>${license-switcher.version}</version> <executions> <execution> <id>attach-licenses</id>

1 0

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

18 Feb '09

Author: tchemit Date: 2009-02-18 19:39:05 +0000 (Wed, 18 Feb 2009) New Revision: 1380 Modified: topia-service/trunk/pom.xml Log: utilisation lutinproject 3.4 Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-18 19:37:58 UTC (rev 1379) +++ topia-service/trunk/pom.xml 2009-02-18 19:39:05 UTC (rev 1380) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <artifactId>topia-service</artifactId> @@ -82,8 +82,8 @@  <topia.version>2.1.3-SNAPSHOT</topia.version> - <generator.version>0.64-SNAPSHOT</generator.version> - <lutinutil.version>1.0.2</lutinutil.version> + <generator.version>0.64</generator.version> + <lutinutil.version>1.0.3</lutinutil.version> </properties> @@ -154,7 +154,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -217,7 +217,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

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

18 Feb '09

Author: tchemit Date: 2009-02-18 19:37:58 +0000 (Wed, 18 Feb 2009) New Revision: 1379 Modified: topia/trunk/pom.xml Log: variable test.gen.dir chang?\195?\169 en maven.test.Gen.dir comme dans lutinproject Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 19:33:53 UTC (rev 1378) +++ topia/trunk/pom.xml 2009-02-18 19:37:58 UTC (rev 1379) @@ -216,9 +216,9 @@ <inherited>true</inherited> <configuration> <srcDirZuml>src/test/xmi</srcDirZuml> - <srcXmiDest>${test.gen.dir}/xmi/</srcXmiDest> - <srcGenDest>${test.gen.dir}/models/</srcGenDest> - <destDirGen>${test.gen.dir}/java</destDirGen> + <srcXmiDest>${maven.test.gen.dir}/xmi/</srcXmiDest> + <srcGenDest>${maven.test.gen.dir}/models/</srcGenDest> + <destDirGen>${maven.test.gen.dir}/java</destDirGen> </configuration> </plugin>

1 0

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

18 Feb '09

Author: tchemit Date: 2009-02-18 19:33:53 +0000 (Wed, 18 Feb 2009) New Revision: 1378 Modified: topia/trunk/pom.xml Log: utilisation lutinproject 3.4 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 15:26:58 UTC (rev 1377) +++ topia/trunk/pom.xml 2009-02-18 19:33:53 UTC (rev 1378) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>lutinproject</artifactId> - <version>3.4-SNAPSHOT</version> + <version>3.4</version> </parent> <artifactId>topia</artifactId> @@ -165,9 +165,9 @@ <labs.project>topia</labs.project>  - <generator.version>0.64-SNAPSHOT</generator.version> - <processor.version>0.17-SNAPSHOT</processor.version> - <lutinutil.version>1.0</lutinutil.version> + <generator.version>0.64</generator.version> + <processor.version>0.17</processor.version> + <lutinutil.version>1.0.3</lutinutil.version> <topia.version>${project.version}</topia.version> @@ -230,7 +230,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>0.8.3</version> + <version>0.8.4</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> @@ -293,7 +293,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>0.5</version> + <version>0.6</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

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

18 Feb '09

Author: tchemit Date: 2009-02-18 15:26:58 +0000 (Wed, 18 Feb 2009) New Revision: 1377 Modified: topia-service/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: topia-service/trunk/pom.xml =================================================================== --- topia-service/trunk/pom.xml 2009-02-18 15:26:50 UTC (rev 1376) +++ topia-service/trunk/pom.xml 2009-02-18 15:26:58 UTC (rev 1377) @@ -84,7 +84,7 @@ <topia.version>2.1.3-SNAPSHOT</topia.version> <generator.version>0.64-SNAPSHOT</generator.version> <lutinutil.version>1.0.2</lutinutil.version> - + </properties> <build> @@ -154,13 +154,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <version>0.8.3</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -217,7 +217,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.5</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

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

18 Feb '09

Author: tchemit Date: 2009-02-18 15:26:50 +0000 (Wed, 18 Feb 2009) New Revision: 1376 Modified: topia/trunk/pom.xml Log: suppression des versions de nos librairies de lutinproject Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-18 11:06:05 UTC (rev 1375) +++ topia/trunk/pom.xml 2009-02-18 15:26:50 UTC (rev 1376) @@ -168,12 +168,13 @@ <generator.version>0.64-SNAPSHOT</generator.version> <processor.version>0.17-SNAPSHOT</processor.version> <lutinutil.version>1.0</lutinutil.version> + + <topia.version>${project.version}</topia.version> + <xmlrpc.version>3.1</xmlrpc.version> <hibernate.version>3.3.1.GA</hibernate.version> - <topia.version>${project.version}</topia.version> -  - <test.gen.dir>${project.build.directory}/generated-test-sources</test.gen.dir> +  </properties> <build> @@ -229,13 +230,13 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-jrst-plugin</artifactId> - <version>${jrst.version}</version> + <version>0.8.3</version> <configuration> <directoryIn>${maven.src.dir}/site</directoryIn> <directoryOut>${maven.site.gen.dir}</directoryOut> <defaultLocale>fr</defaultLocale> - <inputEncoding>${maven.compile.encoding}</inputEncoding> - <outputEncoding>${maven.compile.encoding}</outputEncoding> + <inputEncoding>${project.build.sourceEncoding}</inputEncoding> + <outputEncoding>${project.build.sourceEncoding}</outputEncoding> </configuration> <executions> <execution> @@ -292,7 +293,7 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-license-switcher-plugin</artifactId> - <version>${license-switcher.version}</version> + <version>0.5</version> <configuration> <licenseName>${license-switcher.licenseName}</licenseName> </configuration>

1 0

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

18 Feb '09

Author: tchemit Date: 2009-02-18 11:06:05 +0000 (Wed, 18 Feb 2009) New Revision: 1375 Modified: topia/trunk/pom.xml topia/trunk/topia-persistence/pom.xml topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/pom.xml Log: use process 0.17-SNAPSHOT, no version in plugin invocation when declared in pluginManagment Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-02-17 17:55:51 UTC (rev 1374) +++ topia/trunk/pom.xml 2009-02-18 11:06:05 UTC (rev 1375) @@ -166,7 +166,7 @@  <generator.version>0.64-SNAPSHOT</generator.version> - <processor.version>0.16</processor.version> + <processor.version>0.17-SNAPSHOT</processor.version> <lutinutil.version>1.0</lutinutil.version> <xmlrpc.version>3.1</xmlrpc.version> <hibernate.version>3.3.1.GA</hibernate.version> Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-02-17 17:55:51 UTC (rev 1374) +++ topia/trunk/topia-persistence/pom.xml 2009-02-18 11:06:05 UTC (rev 1375) @@ -103,7 +103,6 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> <executions> <execution> <id>Test Generator</id> Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-02-17 17:55:51 UTC (rev 1374) +++ topia/trunk/topia-soa/pom.xml 2009-02-18 11:06:05 UTC (rev 1375) @@ -13,14 +13,14 @@ <version>2.1.3-SNAPSHOT</version> </parent> - <groupId>org.codelutin.topia</groupId> + <groupId>org.codelutin.topia</groupId> <artifactId>topia-soa</artifactId> <dependencies>  - <dependency> + <dependency> <groupId>${project.groupId}</groupId> <artifactId>topia-persistence</artifactId> <version>${project.version}</version> @@ -98,7 +98,6 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> <executions> <execution> <id>generate-objectmodel</id> Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-02-17 17:55:51 UTC (rev 1374) +++ topia/trunk/topia-ui/pom.xml 2009-02-18 11:06:05 UTC (rev 1375) @@ -78,7 +78,6 @@ <plugin> <groupId>org.codelutin</groupId> <artifactId>maven-generator-plugin</artifactId> - <version>${generator.version}</version> <executions> <execution>

1 0

r1374 - in topia/trunk/topia-persistence/src/main/java/org/codelutin/topia: . framework
by tchemit＠users.labs.libre-entreprise.org 17 Feb '09

17 Feb '09

Author: tchemit Date: 2009-02-17 17:55:51 +0000 (Tue, 17 Feb 2009) New Revision: 1374 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaContext.java topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java Log: ajout d'une methode sur TopiaContext pour pouvoir repliquer qu'une seule entite Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaContext.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaContext.java 2009-02-17 11:00:34 UTC (rev 1373) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/TopiaContext.java 2009-02-17 17:55:51 UTC (rev 1374) @@ -245,6 +245,19 @@ public void replicate(TopiaContext dstCtxt, Object... entityAndCondition) throws TopiaException, IllegalArgumentException; + /** + * Permet de dupliquer une entité du type donné vers un autre context. + * + * @param dstCtxt le context de la base destination + * @param entities l'entité à répliquer + * @param <T> le type des entités à répliquer + * @throws TopiaException si une erreur pendant la duplication + * @throws IllegalArgumentException si l'un des context n'est pas ouvert, ou si on essaye de + * dupliquer dans la même base. + */ + public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) + throws TopiaException, IllegalArgumentException; + /** * Permet de dupliquer les entités du type donné vers un autre context. * Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2009-02-17 11:00:34 UTC (rev 1373) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2009-02-17 17:55:51 UTC (rev 1374) @@ -1047,6 +1047,17 @@ } @Override + public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) throws TopiaException, IllegalArgumentException { + checkClosed("Ce contexte a ete ferme, impossible d'effectuer l'export"); + TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; + dstContextImpl.checkClosed("Ce contexte a ete ferme, impossible d'effectuer l'export"); + if (getRootContext().equals(dstContextImpl.getRootContext())) { + throw new IllegalArgumentException("Impossible de dupliquer dans la même base"); + } + replicate0(dstContextImpl, entity); + } + + @Override public <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, List<T> entities) throws TopiaException, IllegalArgumentException { checkClosed("Ce contexte a ete ferme, impossible d'effectuer l'export"); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt;

1 0

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

17 Feb '09

Author: tchemit Date: 2009-02-17 11:00:34 +0000 (Tue, 17 Feb 2009) New Revision: 1373 Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java Log: ajout d'une methode pour pouvoir nettoyer le visiteur en profondeur Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-02-17 10:59:39 UTC (rev 1372) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/persistence/DepthEntityVisitor.java 2009-02-17 11:00:34 UTC (rev 1373) @@ -106,4 +106,14 @@ public void end(TopiaEntity e) { delegateVisitor.end(e); } + + /** + * Pour pouvoir nettoyer le visiteur, afin de pouvoir + * réutiliser plusieurs fois de suite la même instance + * de ce visiteur. + */ + public void clean() { + alreadyExplored.clear(); + } + }

1 0

r1372 - in topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia: security/entities/user taas/entities test/entities
by tchemit＠users.labs.libre-entreprise.org 17 Feb '09

17 Feb '09

Author: tchemit Date: 2009-02-17 10:59:39 +0000 (Tue, 17 Feb 2009) New Revision: 1372 Modified: 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/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/entities/PersonImpl.hbm.xml topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PetImpl.hbm.xml Log: reformat des maapings Modified: 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 2009-02-13 14:00:36 UTC (rev 1371) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaGroupImpl.hbm.xml 2009-02-17 10:59:39 UTC (rev 1372) @@ -7,12 +7,12 @@ <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"> + <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"> + <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="false"> <key column="superGroup"/> <one-to-many class="org.codelutin.topia.security.entities.user.TopiaGroupImpl" node="topiaId" embed-xml="false"/> </bag> Modified: 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 2009-02-13 14:00:36 UTC (rev 1371) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/security/entities/user/TopiaUserImpl.hbm.xml 2009-02-17 10:59:39 UTC (rev 1372) @@ -10,7 +10,7 @@ <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" inverse="true" lazy="true" node="topiaGroup" embed-xml="true"> + <bag name="topiaGroup" table="topiagroup_topiauser" inverse="true" 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> Modified: 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 2009-02-13 14:00:36 UTC (rev 1371) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasPrincipalImpl.hbm.xml 2009-02-17 10:59:39 UTC (rev 1372) @@ -6,7 +6,7 @@ <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"> + <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> Modified: 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 2009-02-13 14:00:36 UTC (rev 1371) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/taas/entities/TaasUserImpl.hbm.xml 2009-02-17 10:59:39 UTC (rev 1372) @@ -12,7 +12,7 @@ <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"> + <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> Modified: 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 2009-02-13 14:00:36 UTC (rev 1371) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PersonImpl.hbm.xml 2009-02-17 10:59:39 UTC (rev 1372) @@ -7,7 +7,7 @@ <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"> + <bag name="pet" inverse="true" lazy="true" node="pet" embed-xml="false"> <key column="person"/> <one-to-many class="org.codelutin.topia.test.entities.PetImpl" node="topiaId" embed-xml="false"/> </bag> Modified: 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 2009-02-13 14:00:36 UTC (rev 1371) +++ topia-service/trunk/src/main/resources/oldmappings/TopiaService/0/org/codelutin/topia/test/entities/PetImpl.hbm.xml 2009-02-17 10:59:39 UTC (rev 1372) @@ -7,6 +7,6 @@ <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"/> + <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