Author: tchemit Date: 2009-01-15 17:41:24 +0000 (Thu, 15 Jan 2009) New Revision: 1301 Modified: topia/trunk/changelog.txt topia/trunk/pom.xml topia/trunk/topia-persistence/changelog.txt topia/trunk/topia-persistence/pom.xml topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java topia/trunk/topia-soa/changelog.txt topia/trunk/topia-soa/pom.xml topia/trunk/topia-ui/changelog.txt topia/trunk/topia-ui/pom.xml Log: re-release 2.1.2 Modified: topia/trunk/changelog.txt =================================================================== --- topia/trunk/changelog.txt 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/changelog.txt 2009-01-15 17:41:24 UTC (rev 1301) @@ -1,4 +1,4 @@ -2.1.2 ??? 200901?? +2.1.2 chemit 20090115 * 20090114 [chemit] - using lutinproject 3.3 2.1.1 chemit 20081215 Modified: topia/trunk/pom.xml =================================================================== --- topia/trunk/pom.xml 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/pom.xml 2009-01-15 17:41:24 UTC (rev 1301) @@ -13,7 +13,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> <modules> <module>topia-persistence</module> Modified: topia/trunk/topia-persistence/changelog.txt =================================================================== --- topia/trunk/topia-persistence/changelog.txt 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/topia-persistence/changelog.txt 2009-01-15 17:41:24 UTC (rev 1301) @@ -1,5 +1,6 @@ -2.1.2 ??? 200901?? -* 20090114 [chemit] - improve exportXML (prepare queries then executes then when parameters are known to be fine) +2.1.2 chemit 20090115 +* 20090115 [chemit] - pour le moment pas d'embed-xml sur les association multiples +* 20090114 [chemit] - improve exportXML (prepare queries then executes then when parameters are known to be fine) * 20090106 [chemit] - amélioration du générateur de mapping hibernate : - génération des clefs metier dans le mapping hibernate via la tag value naturalId - mise en constantes des tagValues utiliser dans le génératuer du mapping hibernate Modified: topia/trunk/topia-persistence/pom.xml =================================================================== --- topia/trunk/topia-persistence/pom.xml 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/topia-persistence/pom.xml 2009-01-15 17:41:24 UTC (rev 1301) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> Modified: topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/topia-persistence/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-01-15 17:41:24 UTC (rev 1301) @@ -381,14 +381,8 @@ if (!needsIndex) { //fixme pour le moment, on ne calcule pas si on doit autoriser le embed-xml à true // on le positionne manuellement - String embedXml = attr.getTagValue(GeneratorUtil.TAG_EMBED_XML); - if (notEmpty(embedXml)) { - embedXml = embedXml.trim(); - } else { - embedXml="true"; - } - -/*{<%=prefix%> <<%=collType%> name="<%=getName(attr)%>"<%=orderBy%><%=((!isInverse)?"":" inverse=\"true\"")%><%=fetch%><%=lazy%><%=cascade%> node="<%=getName(attr)%>" embed-xml="<%=embedXml%>"> + //TC-20090115 embed-xml wasat true but nobody could tellme why +/*{<%=prefix%> <<%=collType%> name="<%=getName(attr)%>"<%=orderBy%><%=((!isInverse)?"":" inverse=\"true\"")%><%=fetch%><%=lazy%><%=cascade%> node="<%=getName(attr)%>" embed-xml="false"> <%=prefix%> <key column="<%=GeneratorUtil.getReverseDBName(attr)%>"/> <%=prefix%> <one-to-many class="<%=getType(attr)%>" node="topiaId" embed-xml="false"/> <%=prefix%> </<%=collType%>> Modified: topia/trunk/topia-soa/changelog.txt =================================================================== --- topia/trunk/topia-soa/changelog.txt 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/topia-soa/changelog.txt 2009-01-15 17:41:24 UTC (rev 1301) @@ -1,3 +1,5 @@ +2.1.2 chemit 20090115 (follow other topia-release) + 2.1.1 chemit 20081215 * 20081215 [chemit] - new release for isis-fish :) 2.1.0 chemit 20081210 Modified: topia/trunk/topia-soa/pom.xml =================================================================== --- topia/trunk/topia-soa/pom.xml 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/topia-soa/pom.xml 2009-01-15 17:41:24 UTC (rev 1301) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId> Modified: topia/trunk/topia-ui/changelog.txt =================================================================== --- topia/trunk/topia-ui/changelog.txt 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/topia-ui/changelog.txt 2009-01-15 17:41:24 UTC (rev 1301) @@ -1,3 +1,4 @@ +2.1.2 chemit 20090115 (follow other topia-release) 2.1.1 chemit 20081215 * 20081215 [chemit] - new release for isis-fish :) 2.1.0 chemit 20081210 Modified: topia/trunk/topia-ui/pom.xml =================================================================== --- topia/trunk/topia-ui/pom.xml 2009-01-15 17:01:24 UTC (rev 1300) +++ topia/trunk/topia-ui/pom.xml 2009-01-15 17:41:24 UTC (rev 1301) @@ -10,7 +10,7 @@ <parent> <groupId>org.codelutin</groupId> <artifactId>topia</artifactId> - <version>2.1.3-SNAPSHOT</version> + <version>2.1.2-SNAPSHOT</version> </parent> <groupId>org.codelutin.topia</groupId>