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

r1651 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by echatellier＠users.nuiton.org 19 Oct '09

19 Oct '09

Author: echatellier Date: 2009-10-19 17:42:52 +0200 (Mon, 19 Oct 2009) New Revision: 1651 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java Log: Update code formatting and javadoc. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-10-19 14:11:28 UTC (rev 1650) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-10-19 15:42:52 UTC (rev 1651) @@ -116,7 +116,9 @@ } /** - * Model version + * Model version. + * + * @return model version *) public static String getModelVersion() { return "<%=modelVersion%>"; @@ -194,7 +196,7 @@ public static <%=entityEnumName%>[] getContracts() { return <%=entityEnumName%>.values(); } - }*/ +}*/ if (generateOperator) { /*{ @SuppressWarnings({"unchecked"}) @@ -202,7 +204,7 @@ <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); return (EntityOperator<T>) EntityOperatorStore.getOperator(constant); } - }*/ +}*/ } /*{ /* @@ -257,13 +259,13 @@ public synchronized void setImplementationFQN(String implementationFQN) { this.implementationFQN = implementationFQN; this.implementation = null; - }*/ - if (generateOperator) { +}*/ + if (generateOperator) { /*{ // on reinitialise le magasin d'operators EntityOperatorStore.clear(); - }*/ +}*/ } -/*{ } +/*{ } @Override public boolean accept(Class<? extends TopiaEntity> klass) {

1 0

r1650 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/xmi
by fdesbois＠users.nuiton.org 19 Oct '09

19 Oct '09

Author: fdesbois Date: 2009-10-19 16:11:28 +0200 (Mon, 19 Oct 2009) New Revision: 1650 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Log: Evol #95 : Add model version Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-10-11 11:27:39 UTC (rev 1649) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperGenerator.java 2009-10-19 14:11:28 UTC (rev 1650) @@ -87,6 +87,7 @@ }*/ String modelName = GeneratorUtil.capitalize(model.getName()); + String modelVersion = model.getVersion(); String daoHelperClazzName = modelName+"DAOHelper"; String entityEnumName = modelName+"EntityEnum"; List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model,true); @@ -113,6 +114,13 @@ *) protected <%=daoHelperClazzName%>() { } + + /** + * Model version + *) + public static String getModelVersion() { + return "<%=modelVersion%>"; + } }*/ for (ObjectModelClass clazz : classes) { Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r1649 - trunk
by tchemit＠users.nuiton.org 11 Oct '09

11 Oct '09

Author: tchemit Date: 2009-10-11 13:27:39 +0200 (Sun, 11 Oct 2009) New Revision: 1649 Modified: trunk/pom.xml Log: - use jrst.Version - use redmine.releaseFiles to collect files to send to redmine - bump junit, i18n and processor versions Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-10-10 17:04:44 UTC (rev 1648) +++ trunk/pom.xml 2009-10-11 11:27:39 UTC (rev 1649) @@ -151,7 +151,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.6</version> + <version>4.7</version> <scope>test</scope> </dependency> @@ -195,7 +195,7 @@  <eugene.version>1.0.1-SNAPSHOT</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> - <processor.version>1.0.1-SNAPSHOT</processor.version> + <processor.version>1.0.1</processor.version> <i18n.version>1.0.2-SNAPSHOT</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version> @@ -248,7 +248,7 @@ <dependency> <groupId>org.nuiton.jrst</groupId> <artifactId>doxia-module-jrst</artifactId> - <version>1.0.0</version> + <version>${jrst.version}</version> </dependency> </dependencies> </plugin>

1 0

r1648 - trunk
by tchemit＠users.nuiton.org 10 Oct '09

10 Oct '09

Author: tchemit Date: 2009-10-10 19:04:44 +0200 (Sat, 10 Oct 2009) New Revision: 1648 Modified: trunk/pom.xml Log: utilisation de mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-29 16:50:18 UTC (rev 1647) +++ trunk/pom.xml 2009-10-10 17:04:44 UTC (rev 1648) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.3-SNAPSHOT</version> + <version>1.1.0-SNAPSHOT</version> </parent> <artifactId>topia</artifactId>

1 0

r1647 - trunk
by tchemit＠users.nuiton.org 29 Sep '09

29 Sep '09

Author: tchemit Date: 2009-09-29 18:50:18 +0200 (Tue, 29 Sep 2009) New Revision: 1647 Modified: trunk/pom.xml Log: use mavenpom 1.0.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-24 13:09:10 UTC (rev 1646) +++ trunk/pom.xml 2009-09-29 16:50:18 UTC (rev 1647) @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.0.2</version> + <version>1.0.3-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> @@ -193,10 +193,10 @@ <projectId>topia</projectId>  - <eugene.version>1.0.0</eugene.version> + <eugene.version>1.0.1-SNAPSHOT</eugene.version> <lutinutil.version>1.1.1</lutinutil.version> - <processor.version>1.0.0</processor.version> - <i18n.version>1.0.1</i18n.version> + <processor.version>1.0.1-SNAPSHOT</processor.version> + <i18n.version>1.0.2-SNAPSHOT</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version>

1 0

r1646 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by sletellier＠users.nuiton.org 24 Sep '09

24 Sep '09

Author: sletellier Date: 2009-09-24 15:09:10 +0200 (Thu, 24 Sep 2009) New Revision: 1646 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java Log: Fix concurent acces error Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2009-09-24 12:55:10 UTC (rev 1645) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2009-09-24 13:09:10 UTC (rev 1646) @@ -84,6 +84,7 @@ import java.util.Set; import java.util.WeakHashMap; import java.util.zip.GZIPInputStream; +import org.apache.commons.collections.set.SynchronizedSet; import org.nuiton.topia.persistence.TopiaDAOImpl; import static org.nuiton.i18n.I18n._; @@ -156,7 +157,9 @@ * Set des sous context creer avec un beginTransaction et donc sur lequel * nous sommes listener */ - protected Set<TopiaContextImplementor> childContext = MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>()); + // by sletellier 24/09/09 : Fix concurent acces error +// protected Set<TopiaContextImplementor> childContext = MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>()); + protected Set<TopiaContextImplementor> childContext = SynchronizedSet.decorate(MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>())); /** key: service name; value: service instance */ protected Map<String, TopiaService> services = null; /** */ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2009-09-24 12:55:10 UTC (rev 1645) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFiresSupport.java 2009-09-24 13:09:10 UTC (rev 1646) @@ -526,8 +526,13 @@ TopiaContextImplementor result = null; // on copie la liste pour evite les acces concurrent (parcours durant la // creation d'un sous context) - ArrayList<TopiaContextImplementor> children = new ArrayList(parent.getChildContext()); - for (TopiaContextImplementor context : children) { + + Set<TopiaContextImplementor> contextChilds = new HashSet(parent.getChildContext()); + for (TopiaContextImplementor context : contextChilds) { + +// by sletellier 24/09/09 : Fix concurent acces error +// ArrayList<TopiaContextImplementor> children = new ArrayList(parent.getChildContext()); +// for (TopiaContextImplementor context : children) { try { if (context.getHibernate() == hibernate) { result = context;

1 0

r1645 - in branches/2.0.28.1/src/main/java/org/codelutin/topia: framework generator
by sletellier＠users.nuiton.org 24 Sep '09

24 Sep '09

Author: sletellier Date: 2009-09-24 14:55:10 +0200 (Thu, 24 Sep 2009) New Revision: 1645 Modified: branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java branches/2.0.28.1/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java Log: Fix concurent acces error Modified: branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java =================================================================== --- branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2009-09-15 07:40:33 UTC (rev 1644) +++ branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaContextImpl.java 2009-09-24 12:55:10 UTC (rev 1645) @@ -54,6 +54,7 @@ import java.util.zip.GZIPInputStream; import org.apache.commons.collections.set.MapBackedSet; +import org.apache.commons.collections.set.SynchronizedSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.codelutin.topia.TopiaContext; @@ -175,7 +176,9 @@ * Set des sous context creer avec un beginTransaction et donc sur lequel * nous sommes listener */ - protected Set<TopiaContextImplementor> childContext = MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>()); +// by sletellier 24/09/09 : Fix concurent acces error +// protected Set<TopiaContextImplementor> childContext = MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>()); + protected Set<TopiaContextImplementor> childContext = SynchronizedSet.decorate(MapBackedSet.decorate(new WeakHashMap<TopiaContextImplementor, Object>()));; /** key: service name; value: service instance */ protected Map<String, TopiaService> services = null; Modified: branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java =================================================================== --- branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java 2009-09-15 07:40:33 UTC (rev 1644) +++ branches/2.0.28.1/src/main/java/org/codelutin/topia/framework/TopiaFiresSupport.java 2009-09-24 12:55:10 UTC (rev 1645) @@ -541,8 +541,14 @@ */ protected TopiaContextImplementor getContext( TopiaContextImplementor parent, Session hibernate) { + TopiaContextImplementor result = null; - for (TopiaContextImplementor context : parent.getChildContext()) { + Set<TopiaContextImplementor> contextChilds = new HashSet(parent.getChildContext()); + for (TopiaContextImplementor context : contextChilds) { + +// by sletellier 24/09/09 : Fix concurent acces error +// TopiaContextImplementor result = null; +// for (TopiaContextImplementor context : parent.getChildContext()) { try { if (context.getHibernate() == hibernate) { result = context; Modified: branches/2.0.28.1/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- branches/2.0.28.1/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-09-15 07:40:33 UTC (rev 1644) +++ branches/2.0.28.1/src/main/java/org/codelutin/topia/generator/EntityHibernateMappingGenerator.java 2009-09-24 12:55:10 UTC (rev 1645) @@ -330,8 +330,9 @@ String lazy = "lazy=\""; if (attr.getTagValue("lazy") != null){ lazy += attr.getTagValue("lazy"); - } - else { + } else if (attr.getMinMultiplicity() == 0){ + lazy += "false"; + } else { lazy += "true"; } lazy += "\"";

1 0

r1644 - trunk
by echatellier＠users.nuiton.org 15 Sep '09

15 Sep '09

Author: echatellier Date: 2009-09-15 09:40:33 +0200 (Tue, 15 Sep 2009) New Revision: 1644 Modified: trunk/pom.xml Log: #20 : Update to hibernate 3.3.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-09-03 21:35:26 UTC (rev 1643) +++ trunk/pom.xml 2009-09-15 07:40:33 UTC (rev 1644) @@ -198,7 +198,7 @@ <processor.version>1.0.0</processor.version> <i18n.version>1.0.1</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> - <hibernate.version>3.3.1.GA</hibernate.version> + <hibernate.version>3.3.2.GA</hibernate.version> </properties>

1 0

r1643 - trunk/topia-service-migration/src/site/rst
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 23:35:26 +0200 (Thu, 03 Sep 2009) New Revision: 1643 Modified: trunk/topia-service-migration/src/site/rst/manualMigration.rst Log: fix doc Modified: trunk/topia-service-migration/src/site/rst/manualMigration.rst =================================================================== --- trunk/topia-service-migration/src/site/rst/manualMigration.rst 2009-09-03 21:32:07 UTC (rev 1642) +++ trunk/topia-service-migration/src/site/rst/manualMigration.rst 2009-09-03 21:35:26 UTC (rev 1643) @@ -134,7 +134,7 @@ :: - topia.service.migration.no.migrate.on.init=true + topia.service.migration.migrate.on.init=false Il est ensuite possible de récupérer le service de migration et d'effectuer

1 0

r1642 - tags/topia-2.2.1/topia-service-migration/src/site/rst
by tchemit＠users.nuiton.org 03 Sep '09

03 Sep '09

Author: tchemit Date: 2009-09-03 23:32:07 +0200 (Thu, 03 Sep 2009) New Revision: 1642 Modified: tags/topia-2.2.1/topia-service-migration/src/site/rst/manualMigration.rst Log: fix doc Modified: tags/topia-2.2.1/topia-service-migration/src/site/rst/manualMigration.rst =================================================================== --- tags/topia-2.2.1/topia-service-migration/src/site/rst/manualMigration.rst 2009-09-03 21:04:42 UTC (rev 1641) +++ tags/topia-2.2.1/topia-service-migration/src/site/rst/manualMigration.rst 2009-09-03 21:32:07 UTC (rev 1642) @@ -134,7 +134,7 @@ :: - topia.service.migration.no.migrate.on.init=true + topia.service.migration.migrate.on.init=false Il est ensuite possible de récupérer le service de migration et d'effectuer

1 0