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

r2347 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/xmi
by fdesbois＠users.nuiton.org 25 Sep '11

25 Sep '11

Author: fdesbois Date: 2011-09-25 23:42:03 +0200 (Sun, 25 Sep 2011) New Revision: 2347 Url: http://nuiton.org/repositories/revision/topia/2347 Log: #1760 : ignore enumeration as object property in QueryHelperTransformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-09-22 17:28:22 UTC (rev 2346) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-09-25 21:42:03 UTC (rev 2347) @@ -485,8 +485,9 @@ ObjectModelClassifier referenceClass = getReferenceAttributeClassifier(attrReference); - // No reference, can add method to getPropertyObject - if (referenceClass == null) { + // No reference, can't add method to getPropertyObject + // ANO-#1648: Enum are ignored here, they will be used as simple property + if (referenceClass == null || referenceClass.isEnum()) { return null; } Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r2346 - trunk
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 19:28:22 +0200 (Thu, 22 Sep 2011) New Revision: 2346 Url: http://nuiton.org/repositories/revision/topia/2346 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) +++ trunk/pom.xml 2011-09-22 17:28:22 UTC (rev 2346) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <artifactId>topia</artifactId>

1 0

r2345 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:07:00 +0200 (Thu, 22 Sep 2011) New Revision: 2345 Url: http://nuiton.org/repositories/revision/topia/2345 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-persistence/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-service-migration/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-service-replication/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-service-security/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2344 - in tags: . topia-2.6.2
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:06:58 +0200 (Thu, 22 Sep 2011) New Revision: 2344 Url: http://nuiton.org/repositories/revision/topia/2344 Log: [maven-release-plugin] copy for tag topia-2.6.2 Added: tags/topia-2.6.2/ Property changes on: tags/topia-2.6.2 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2343 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:06:57 +0200 (Thu, 22 Sep 2011) New Revision: 2343 Url: http://nuiton.org/repositories/revision/topia/2343 Log: [maven-release-plugin] prepare release topia-2.6.2 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> <modules> <module>topia-persistence</module> @@ -356,12 +356,12 @@ </configuration> </plugin> - <plugin> +  </plugins> </pluginManagement> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.2</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-persistence/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-service-migration/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-service-replication/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-service-security/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2342 - trunk/topia-persistence/src/test/java/org/nuiton/topiatest
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:03:23 +0200 (Thu, 22 Sep 2011) New Revision: 2342 Url: http://nuiton.org/repositories/revision/topia/2342 Log: add license header Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java 2011-09-22 11:55:49 UTC (rev 2341) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java 2011-09-22 12:03:23 UTC (rev 2342) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.topiatest; /**

1 0

r2341 - trunk
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 13:55:49 +0200 (Thu, 22 Sep 2011) New Revision: 2341 Url: http://nuiton.org/repositories/revision/topia/2341 Log: T?\195?\162che #1739: Updates to eugene 2.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 10:19:23 UTC (rev 2340) +++ trunk/pom.xml 2011-09-22 11:55:49 UTC (rev 2341) @@ -67,7 +67,7 @@ <projectId>topia</projectId>  - <eugeneVersion>2.4-SNAPSHOT</eugeneVersion> + <eugeneVersion>2.4</eugeneVersion> <nuitonUtilsVersion>2.3</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion>

1 0

r2340 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 12:19:23 +0200 (Thu, 22 Sep 2011) New Revision: 2340 Url: http://nuiton.org/repositories/revision/topia/2340 Log: Anomalie #1641: Cannot use MyDAO.create(My.PROPERTY_CLIENT) with isClient() method Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java 2011-09-22 10:19:01 UTC (rev 2339) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java 2011-09-22 10:19:23 UTC (rev 2340) @@ -25,19 +25,23 @@ package org.nuiton.topia.generator; -import java.util.ArrayList; -import java.util.List; - +import org.apache.commons.lang.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; +import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.validator.ObjectModelValidator; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + /** * Validateur qui valide : - * - les types des attributs - * - les nom des attributs - * - les duplication d'attibuts + * - les types des attributs + * - les nom des attributs + * - les duplication d'attibuts * * @author chatellier <chatellier(a)codelutin.com> * @version $Id$ @@ -46,7 +50,7 @@ /** * Constructor. - * + * * @param model model to validate */ public TopiaJavaValidator(ObjectModel model) { @@ -61,20 +65,20 @@ // type null ou vide if (attr.getType() == null || attr.getType().isEmpty()) { isValid = false; - + addError(attr, "Invalid type \"" + attr.getType() + "\""); } // name = java reserved keywords if (!isJavaIdentifier(attr.getName())) { isValid = false; - + addError(attr, "Attribute name " + attr.getName() - + " is not valid java identifier"); + + " is not valid java identifier"); } // test sur les mots réservés ? - + return isValid; } @@ -83,33 +87,59 @@ protected boolean validateClass(ObjectModelClass clazz) { boolean isValid = super.validateClass(clazz); - + // test attribute names duplication - List<String> attributesName = new ArrayList<String>(); - for(ObjectModelAttribute attr : clazz.getAttributes()) { - if(attributesName.contains(attr.getName())) { - addError(attr, "Attribute name " + attr.getName() - + " already exists"); - + Set<String> attributesName = new HashSet<String>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + if (!attr.isNavigable()) { + + // not navigable, so will not use it... + continue; + } + String attrName = attr.getName(); + if (!attributesName.add(attrName)) { + addError(attr, "Attribute name " + attrName + + " already exists"); + isValid = false; } - else { - attributesName.add(attr.getName()); + } + + if (TopiaGeneratorUtil.isEntity(clazz)) { + + Set<String> methodsName = new HashSet<String>(); + for (ObjectModelAttribute attr : clazz.getAttributes()) { + + String capitalizeAttrName = StringUtils.capitalize(attr.getName()); + methodsName.add(TopiaGeneratorUtil.OPERATION_GETTER_BOOLEAN_PREFIX + capitalizeAttrName); + methodsName.add(TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX + capitalizeAttrName); + methodsName.add("set" + capitalizeAttrName); } + + // test if there is a method an already reserved name + for (ObjectModelOperation operation : clazz.getOperations()) { + String operationName = operation.getName(); + if (methodsName.contains(operationName)) { + addError(operation, "Operation name " + operationName + + " is already reserved for a getter/setter of an entity attribute"); + + isValid = false; + } + } } - + return isValid; } @Override protected boolean validateModel(ObjectModel model) { - + return super.validateModel(model); } /** * Returns true if s is a legal Java identifier. - * + * * @param s string to test * @return true if s is a legal Java identifier */

1 0

r2339 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 12:19:01 +0200 (Thu, 22 Sep 2011) New Revision: 2339 Url: http://nuiton.org/repositories/revision/topia/2339 Log: Evolution #1747: Model errors validation should not be displayed as info! at least they are warning Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2011-09-22 09:39:31 UTC (rev 2338) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaMetaTransformer.java 2011-09-22 10:19:01 UTC (rev 2339) @@ -103,8 +103,8 @@ for (ObjectModelValidator validator : validators) { if (!validator.validate()) { for (String error : validator.getErrors()) { - if (log.isInfoEnabled()) { - log.info("[VALIDATION] " + error); + if (log.isWarnEnabled()) { + log.warn("[VALIDATION] " + error); } } }

1 0

r2338 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: tchemit Date: 2011-09-22 11:39:31 +0200 (Thu, 22 Sep 2011) New Revision: 2338 Url: http://nuiton.org/repositories/revision/topia/2338 Log: fix serialVersionUID generation (miss the L) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-22 09:03:20 UTC (rev 2337) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-09-22 09:39:31 UTC (rev 2338) @@ -203,7 +203,7 @@ if (svUID == null) { // use a default one - svUID = "" + TopiaGeneratorUtil.generateSerialVersionUID(ouput); + svUID = TopiaGeneratorUtil.generateSerialVersionUID(ouput) + "L"; } addConstant(ouput, SERIAL_VERSION_UID, long.class, svUID, ObjectModelModifier.PRIVATE);

1 0