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

r2082 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org July 19, 2010

July 19, 2010

Author: tchemit Date: 2010-07-19 12:03:11 +0200 (Mon, 19 Jul 2010) New Revision: 2082 Url: http://nuiton.org/repositories/revision/topia/2082 Log: Anomalie #771: Can't use EntityDao.delete on it-self entity association Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-07-19 06:50:45 UTC (rev 2081) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2010-07-19 10:03:11 UTC (rev 2082) @@ -452,7 +452,8 @@ if (attr.isAggregate()) { body.append("" /*{ - item.delete(); + getContext().getDAO(<%=attrSimpleType%>.class).delete(item); + //item.delete(); }*/ ); }

1 0

r2081 - trunk
by tchemit＠users.nuiton.org July 19, 2010

July 19, 2010

Author: tchemit Date: 2010-07-19 08:50:45 +0200 (Mon, 19 Jul 2010) New Revision: 2081 Url: http://nuiton.org/repositories/revision/topia/2081 Log: use eugene 2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-18 18:02:20 UTC (rev 2080) +++ trunk/pom.xml 2010-07-19 06:50:45 UTC (rev 2081) @@ -230,7 +230,7 @@ <projectId>topia</projectId>  - <eugene.version>2.1.1-SNAPSHOT</eugene.version> + <eugene.version>2.1.1</eugene.version> <lutinutil.version>1.4</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version>

1 0

r2080 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework generator
by tchemit＠users.nuiton.org July 18, 2010

July 18, 2010

Author: tchemit Date: 2010-07-18 20:02:20 +0200 (Sun, 18 Jul 2010) New Revision: 2080 Url: http://nuiton.org/repositories/revision/topia/2080 Log: - add in TopiaContext a specialized method to obtain a specialized DAO without any cast for user code. - improve DAOHelper generator (separate generation of DAOHelper en EntityEnum) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 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 2010-07-18 16:51:11 UTC (rev 2079) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-07-18 18:02:20 UTC (rev 2080) @@ -663,12 +663,6 @@ /* -------------------- CHILD CONTEXT AND DAOS --------------------------*/ - /* - * (non-Javadoc) - * - * @see org.nuiton.topia.framework.TopiaContextImplementor#getDAO(java.lang.Class) - */ - @Override public <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) throws TopiaException { @@ -718,6 +712,12 @@ return result; } + @Override + public <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityClass, + Class<D> daoClass) throws TopiaException { + return (D) getDAO(entityClass); + } + /* * (non-Javadoc) * Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2010-07-18 16:51:11 UTC (rev 2079) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2010-07-18 18:02:20 UTC (rev 2080) @@ -114,6 +114,19 @@ <E extends TopiaEntity> TopiaDAO<E> getDAO(Class<E> entityClass) throws TopiaException; + /** + * Get DAO for specified class. If Specialized DAO exists then it returned + * otherwize TopiaDAO<entityClass> is returned + * + * @param <E> + * @param entityClass + * @param daoClass + * @return a doa + * @throws TopiaException + */ + <E extends TopiaEntity, D extends TopiaDAO<E>> D getDAO(Class<E> entityClass,Class<D> daoClass) + throws TopiaException; + TopiaFiresSupport getFiresSupport(); void removeChildContext(TopiaContextImplementor child); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-18 16:51:11 UTC (rev 2079) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-18 18:02:20 UTC (rev 2080) @@ -25,7 +25,6 @@ package org.nuiton.topia.generator; -import org.apache.commons.lang.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelType; @@ -41,10 +40,8 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.topia.persistence.util.EntityOperatorStore; -import org.nuiton.util.StringUtil; import java.lang.reflect.Array; -import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.List; @@ -68,59 +65,109 @@ @Override public void transformFromModel(ObjectModel model) { - ObjectModelClass resultClass; String packageName = getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); String modelName = model.getName(); String daoHelperClazzName = modelName + "DAOHelper"; - String modelVersion = model.getVersion(); + String entityEnumName = modelName+"EntityEnum"; - resultClass = createClass(daoHelperClazzName, packageName); + List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); - List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); boolean generateOperator = TopiaGeneratorUtil.shouldgenerateOperatorForDAOHelper(null, model); boolean generateStandaloneEnum = TopiaGeneratorUtil.shouldGnerateStandaloneEnumForDAOHelper(null, model); - addImport(resultClass, TopiaContextImplementor.class); - addImport(resultClass, TopiaDAO.class); - addImport(resultClass, TopiaEntity.class); - addImport(resultClass, TopiaContext.class); - addImport(resultClass, Array.class); - addImport(resultClass, Arrays.class); + ObjectModelClass daoHelper = createClass(daoHelperClazzName, packageName); + ObjectModelEnumeration entityEnum; + + if (generateStandaloneEnum) { + if (log.isDebugEnabled()) { + log.debug("Will generate standalone " + entityEnumName + + " in package " + packageName); + } + entityEnum = createEnumeration(entityEnumName, packageName); + addImport(entityEnum, TopiaEntity.class); + addImport(entityEnum, EntityOperatorStore.class); + addImport(entityEnum, Arrays.class); + + } else { + entityEnum = (ObjectModelEnumerationImpl) + addInnerClassifier(daoHelper, + ObjectModelType.OBJECT_MODEL_ENUMERATION, + entityEnumName + ); +// addImport(daoHelper, TopiaEntity.class); + addImport(daoHelper, TopiaEntityEnum.class); + addImport(daoHelper, EntityOperatorStore.class); + addImport(daoHelper, Arrays.class); + } + + // generate DAOHelper + createDAOHelper(model, + daoHelper, + daoHelperClazzName, + entityEnumName, + generateOperator, + classes + ); + + // generate TopiaEntityEnum + createEntityEnum(entityEnum, + daoHelperClazzName, + entityEnumName, + generateOperator, + generateStandaloneEnum, + classes + ); + } + + protected void createDAOHelper(ObjectModel model, + ObjectModelClass daoHelper, + String daoHelperClazzName, + String entityEnumName, + boolean generateOperator, + List<ObjectModelClass> classes) { + + String modelName = model.getName(); + String modelVersion = model.getVersion(); + + addImport(daoHelper, TopiaContextImplementor.class); + addImport(daoHelper, TopiaDAO.class); + addImport(daoHelper, TopiaEntity.class); + addImport(daoHelper, TopiaContext.class); +// addImport(daoHelper, TopiaEntityEnum.class); + addImport(daoHelper, Array.class); +// addImport(daoHelper, Arrays.class); + if (generateOperator) { - addImport(resultClass,EntityOperator.class); - addImport(resultClass, EntityOperatorStore.class); + addImport(daoHelper,EntityOperator.class); + addImport(daoHelper, EntityOperatorStore.class); } - String entityEnumName = modelName+"EntityEnum"; - // add non public constructor ObjectModelOperation constructor = - addConstructor(resultClass, ObjectModelModifier.PROTECTED); + addConstructor(daoHelper, ObjectModelModifier.PROTECTED); setOperationBody(constructor," "); ObjectModelOperation op; - ObjectModelAttributeImpl attr; - // getModelVersion method - op = addOperation(resultClass, "getModelVersion", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getModelVersion", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - return "<%=modelVersion%>"; - }*/ - ); + /*{ + return "<%=modelVersion%>"; + }*/ + ); // getModelName method - op = addOperation(resultClass, "getModelName", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getModelName", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - return "<%=modelName%>"; - }*/ - ); + /*{ + return "<%=modelName%>"; + }*/ + ); for (ObjectModelClass clazz : classes) { @@ -128,142 +175,136 @@ String daoClazzName = clazzName + "DAO"; // specialized getXXXDao method - op = addOperation(resultClass, "get" + daoClazzName, clazz.getPackageName() + '.' + daoClazzName, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "get" + daoClazzName, clazz.getPackageName() + '.' + daoClazzName, ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, TopiaContext.class, "context"); - addImport(resultClass, clazz); + addImport(daoHelper, clazz); addException(op, TopiaException.class); setOperationBody(op, "" - /*{ - TopiaContextImplementor ci = (TopiaContextImplementor) context; - <%=daoClazzName%> result = (<%=daoClazzName%>) ci.getDAO(<%=clazzName%>.class); - return result; - }*/ + /*{ + TopiaContextImplementor ci = (TopiaContextImplementor) context; + <%=daoClazzName%> result = ci.getDAO(<%=clazzName%>.class, <%=daoClazzName%>.class); + return result; + }*/ ); } // generic getDao method - op = addOperation(resultClass, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, TopiaContext.class, "context"); addParameter(op, "Class<T>", "klass"); addException(op, TopiaException.class); setOperationBody(op, "" - /*{ - TopiaContextImplementor ci = (TopiaContextImplementor) context; - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - D dao = (D) ci.getDAO(constant.getContract()); - return dao; - }*/ - ); + /*{ + TopiaContextImplementor ci = (TopiaContextImplementor) context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + D dao = (D) ci.getDAO(constant.getContract()); + return dao; + }*/ + ); - op = addOperation(resultClass, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getDAO", "<T extends TopiaEntity, D extends TopiaDAO<? super T>> D", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, TopiaContext.class, "context"); addParameter(op, "T", "entity"); addException(op, TopiaException.class); setOperationBody(op, "" - /*{ - TopiaContextImplementor ci = (TopiaContextImplementor) context; - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(entity); - D dao = (D) ci.getDAO(constant.getContract()); - return dao; - }*/ - ); + /*{ + TopiaContextImplementor ci = (TopiaContextImplementor) context; + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(entity); + D dao = (D) ci.getDAO(constant.getContract()); + return dao; + }*/ + ); // getContractClass method - op = addOperation(resultClass, "getContractClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getContractClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" - /*{ - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - return (Class<T>) constant.getContract(); - }*/ - ); + /*{ + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getContract(); + }*/ + ); // getImplementationClass method - op = addOperation(resultClass, "getImplementationClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getImplementationClass", "<T extends TopiaEntity> Class<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, "Class<T>", "klass"); setOperationBody(op, "" - /*{ - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - return (Class<T>) constant.getImplementation(); - }*/ - ); + /*{ + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (Class<T>) constant.getImplementation(); + }*/ + ); // getContractClasses method - op = addOperation(resultClass, "getContractClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getContractClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); - Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); - for (int i = 0; i < values.length; i++) { - result[i] = values[i].getContract(); - } - return result; - }*/ - ); + /*{ + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getContract(); + } + return result; + }*/ + ); // getImplementationClasses method - op = addOperation(resultClass, "getImplementationClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getImplementationClasses", "Class<? extends TopiaEntity>[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); - Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); - for (int i = 0; i < values.length; i++) { - result[i] = values[i].getImplementation(); - } - return result; - }*/ - ); + /*{ + <%=entityEnumName%>[] values = <%=entityEnumName%>.values(); + Class<? extends TopiaEntity>[] result = (Class<? extends TopiaEntity>[]) Array.newInstance(Class.class, values.length); + for (int i = 0; i < values.length; i++) { + result[i] = values[i].getImplementation(); + } + return result; + }*/ + ); // getImplementationClassesAsString method - op = addOperation(resultClass, "getImplementationClassesAsString", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getImplementationClassesAsString", "String", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - StringBuilder buffer = new StringBuilder(); - for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { - buffer.append(',').append(aClass.getName()); - } - return buffer.substring(1); - }*/ - ); + /*{ + StringBuilder buffer = new StringBuilder(); + for (Class<? extends TopiaEntity> aClass : getImplementationClasses()) { + buffer.append(',').append(aClass.getName()); + } + return buffer.substring(1); + }*/ + ); // getContracts method - op = addOperation(resultClass, "getContracts", entityEnumName+"[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getContracts", entityEnumName+"[]", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); setOperationBody(op, "" - /*{ - return <%=entityEnumName%>.values(); - }*/ - ); + /*{ + return <%=entityEnumName%>.values(); + }*/ + ); if (generateOperator) { // getOperator method - op = addOperation(resultClass, "getOperator", "<T extends TopiaEntity> EntityOperator<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); + op = addOperation(daoHelper, "getOperator", "<T extends TopiaEntity> EntityOperator<T>", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op,"Class<T>","klass"); setOperationBody(op, "" - /*{ - <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); - return (EntityOperator<T>) EntityOperatorStore.getOperator(constant); - }*/ + /*{ + <%=entityEnumName%> constant = <%=entityEnumName%>.valueOf(klass); + return (EntityOperator<T>) EntityOperatorStore.getOperator(constant); + }*/ ); } + } - // add enum + protected void createEntityEnum(ObjectModelEnumeration entityEnum, + String daoHelperClazzName, + String entityEnumName, + boolean generateOperator, + boolean generateStandaloneEnum, + List<ObjectModelClass> classes) { - ObjectModelEnumeration entityEnum; + ObjectModelAttributeImpl attr; + ObjectModelOperation op; - if (generateStandaloneEnum) { - log.info("Will generate standalone " + entityEnumName + " in package " + packageName); - entityEnum = createEnumeration(entityEnumName, packageName); - addImport(entityEnum,TopiaEntity.class); - addImport(entityEnum,EntityOperatorStore.class); - addImport(entityEnum,Arrays.class); - - } else { - entityEnum = (ObjectModelEnumerationImpl) - addInnerClassifier(resultClass, ObjectModelType.OBJECT_MODEL_ENUMERATION, entityEnumName); - } - - addImport(resultClass, TopiaEntityEnum.class); addInterface(entityEnum, TopiaEntityEnum.class); for (ObjectModelClass clazz : classes) { @@ -293,7 +334,6 @@ } } - attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "contract", "Class<? extends TopiaEntity>"); attr.setDocumentation("the contract of the entity");

1 0

r2079 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence persistence/util
by tchemit＠users.nuiton.org July 18, 2010

July 18, 2010

Author: tchemit Date: 2010-07-18 18:51:11 +0200 (Sun, 18 Jul 2010) New Revision: 2079 Url: http://nuiton.org/repositories/revision/topia/2079 Log: Evolution #775: Add getNaturalIds method on TopiaEntityEnum and use it to obtain an entity natural id in EntityStore Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-18 15:20:33 UTC (rev 2078) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-18 16:51:11 UTC (rev 2079) @@ -25,6 +25,7 @@ package org.nuiton.topia.generator; +import org.apache.commons.lang.BooleanUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.models.object.ObjectModelType; @@ -40,9 +41,12 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.topia.persistence.util.EntityOperatorStore; +import org.nuiton.util.StringUtil; import java.lang.reflect.Array; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; import java.util.List; @@ -94,7 +98,8 @@ String entityEnumName = modelName+"EntityEnum"; // add non public constructor - ObjectModelOperation constructor = addConstructor(resultClass, ObjectModelModifier.PROTECTED); + ObjectModelOperation constructor = + addConstructor(resultClass, ObjectModelModifier.PROTECTED); setOperationBody(constructor," "); ObjectModelOperation op; @@ -260,15 +265,35 @@ addImport(resultClass, TopiaEntityEnum.class); addInterface(entityEnum, TopiaEntityEnum.class); -// addImport(entityEnum,TopiaEntityEnum.class); for (ObjectModelClass clazz : classes) { String clazzName = clazz.getName(); - addLiteral(entityEnum, clazzName + '(' + clazzName + ".class)"); + Collection<ObjectModelAttribute> attributes = clazz.getAttributes(); + + boolean withNatural = false; + StringBuilder sb = new StringBuilder(); + + for (ObjectModelAttribute attr2 : attributes) { + if (TopiaGeneratorUtil.isNaturalId(attr2)) { + withNatural = true; + // attribut metier + sb.append(", \"").append(attr2.getName()).append("\""); + } + } + + if (withNatural) { + String naturalIds = sb.substring(2); + addLiteral(entityEnum, clazzName + '(' + clazzName + ".class, " + naturalIds + ")"); + } else { + addLiteral(entityEnum, clazzName + '(' + clazzName + ".class)"); + } + if (generateStandaloneEnum) { addImport(entityEnum, clazz); } } + + attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "contract", "Class<? extends TopiaEntity>"); attr.setDocumentation("the contract of the entity"); @@ -278,102 +303,121 @@ attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "implementation", "Class<? extends TopiaEntity>"); attr.setDocumentation("the implementation class of the entity (will be lazy computed at runtime)"); + attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "naturalIds", "String[]"); + attr.setDocumentation("the array of property involved in the natural key of the entity."); + // constructor op = addConstructor(entityEnum, ObjectModelModifier.PACKAGE); addParameter(op,"Class<? extends TopiaEntity >","contract"); + addParameter(op,"String...","naturalIds"); setOperationBody(op, "" - /*{ - this.contract = contract; - this.implementationFQN = contract.getName()+"Impl"; - }*/ +/*{ + this.contract = contract; + this.naturalIds = naturalIds; + this.implementationFQN = contract.getName()+"Impl"; +}*/ ); // getContract method - op = addOperation(entityEnum, "getContract","Class<? extends TopiaEntity>",ObjectModelModifier.PUBLIC); + op = addOperation(entityEnum, "getContract", "Class<? extends TopiaEntity>", ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,"Override"); setOperationBody(op, "" - /*{ - return contract; - }*/ +/*{ + return contract; +}*/ ); + // getContract method + op = addOperation(entityEnum, "getNaturalIds", "String[]", ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,"Override"); + setOperationBody(op, "" +/*{ + return naturalIds; +}*/ + ); + // getImplementationFQN method op = addOperation(entityEnum, "getImplementationFQN","String",ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,"Override"); setOperationBody(op, "" - /*{ - return implementationFQN; - }*/ +/*{ + return implementationFQN; +}*/ ); // setImplementationFQN method op = addOperation(entityEnum, "setImplementationFQN","void",ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,"Override"); addParameter(op,"String","implementationFQN"); if (generateOperator) { setOperationBody(op, "" - /*{ - this.implementationFQN = implementationFQN; - this.implementation = null; - // on reinitialise le magasin d'operators - EntityOperatorStore.clear(); - }*/ +/*{ + this.implementationFQN = implementationFQN; + this.implementation = null; + // on reinitialise le magasin d'operators + EntityOperatorStore.clear(); +}*/ ); } else { setOperationBody(op, "" - /*{ - this.implementationFQN = implementationFQN; - this.implementation = null; - }*/ +/*{ + this.implementationFQN = implementationFQN; + this.implementation = null; +}*/ ); } // accept method op = addOperation(entityEnum, "accept","boolean",ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,"Override"); addParameter(op,"Class<? extends TopiaEntity>","klass"); setOperationBody(op, "" - /*{ - return <%=daoHelperClazzName%>.getContractClass(klass) == contract; - }*/ +/*{ + return <%=daoHelperClazzName%>.getContractClass(klass) == contract; +}*/ ); // getImplementation method op = addOperation(entityEnum, "getImplementation","Class<? extends TopiaEntity>",ObjectModelModifier.PUBLIC); + addAnnotation(entityEnum,op,"Override"); setOperationBody(op, "" - /*{ - if (implementation == null) { - try { - implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); - } catch (ClassNotFoundException e) { - throw new RuntimeException("could not find class " + implementationFQN); - } - } - return implementation; - }*/ +/*{ + if (implementation == null) { + try { + implementation = (Class<? extends TopiaEntity>) Class.forName(implementationFQN); + } catch (ClassNotFoundException e) { + throw new RuntimeException("could not find class " + implementationFQN); + } + } + return implementation; +}*/ ); // valueOf method op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelModifier.PUBLIC,ObjectModelModifier.STATIC); addParameter(op,"TopiaEntity","entity"); setOperationBody(op, "" - /*{ - return valueOf(entity.getClass()); - }*/ + /*{ + return valueOf(entity.getClass()); + }*/ ); // valueOf method op = addOperation(entityEnum, "valueOf", entityEnumName, ObjectModelModifier.PUBLIC,ObjectModelModifier.STATIC); addParameter(op,"Class<?>","klass"); setOperationBody(op, "" - /*{ - if (klass.isInterface()) { - return <%=entityEnumName%>.valueOf(klass.getSimpleName()); + /*{ + if (klass.isInterface()) { + return <%=entityEnumName%>.valueOf(klass.getSimpleName()); + } + for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { + if (entityEnum.getContract().isAssignableFrom(klass)) { + //todo check it works for inheritance + return entityEnum; } - for (<%=entityEnumName%> entityEnum : <%=entityEnumName%>.values()) { - if (entityEnum.getContract().isAssignableFrom(klass)) { - //todo check it works for inheritance - return entityEnum; - } - } - throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + Arrays.toString(<%=entityEnumName%>.values())); - }*/ + } + throw new IllegalArgumentException("no entity defined for the class " + klass + " in : " + Arrays.toString(<%=entityEnumName%>.values())); + }*/ ); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java 2010-07-18 15:20:33 UTC (rev 2078) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityEnum.java 2010-07-18 16:51:11 UTC (rev 2079) @@ -68,6 +68,13 @@ String getImplementationFQN(); /** + * + * @return the array of property names involved in the natural key + * of the entity. + */ + String[] getNaturalIds(); + + /** * Change the implementation class of the entity. * * Note : this method should reset all states of the objet Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2010-07-18 15:20:33 UTC (rev 2078) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2010-07-18 16:51:11 UTC (rev 2079) @@ -40,6 +40,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import java.util.TreeMap; + import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -77,25 +79,73 @@ */ public class EntityOperator<B extends TopiaEntity> { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** Logger */ private static Log log = LogFactory.getLog(EntityOperator.class); + + /** + * the constant of the entity + */ protected final TopiaEntityEnum contract; + + /** + * list of property names available on the entity. + */ protected List<String> properties; + + /** + * list of association names available on the entity. + */ protected List<String> associationProperties; + + /** + * cache of getter methods. + */ protected Method[] getMethods; + + /** + * cache of setter methods. + */ protected Method[] setMethods; + + /** + * cache of assocation {@code get} methods. + */ protected Method[] childGetMethods; + + /** + * cache of assocation {@code add} methods. + */ protected Method[] childAddMethods; + + /** + * cache of assocation {@code addAll} methods. + */ protected Method[] childAddAllMethods; + + /** + * cache of assocation {@code remove} methods. + */ protected Method[] childRemoveMethods; + + /** + * cache of assocation {@code size} methods. + */ protected Method[] childSizeMethods; + + /** + * cache of assocation {@code isEmpty} methods. + */ protected Method[] childIsEmptyMethods; + + /** + * cache of assocation {@code clear}methods. + */ protected Method[] childClearMethods; protected EntityOperator(TopiaEntityEnum contract) { if (contract == null) { - throw new NullPointerException("contract parameter can not be " + - "null!"); + throw new NullPointerException( + "'contract' parameter can not be null!"); } this.contract = contract; init(); @@ -131,6 +181,21 @@ } /** + * Pour obtenir un dictionnaire de la clef naturelle (clef métier) du {@code bean} + * donne. + * @param bean le bean a inspecter + * @return le dictionnaire de la clef naturel du bean + * @since 2.4.1 + */ + public Map<String,Object> getNaturalId(B bean) { + Map<String,Object> result = new TreeMap<String, Object>(); + String[] ids = contract.getNaturalIds(); + for (String id : ids) { + result.put(id,get(id, bean)); + } + return result; + } + /** * Copie une propriete de src vers dst. * * Note : cela apellera la methode <code>setXXX(value)</code>. @@ -439,7 +504,7 @@ } } - protected synchronized void init() { + protected void init() { List<Method> getters = new ArrayList<Method>(); List<Method> setters = new ArrayList<Method>(); List<Method> childGetters = new ArrayList<Method>(); @@ -564,7 +629,7 @@ } } - protected synchronized void init(Class<?> entityClass, + protected void init(Class<?> entityClass, Set<Class<?>> explored, List<String> properties, List<String> associationProperties, Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java 2010-07-18 15:20:33 UTC (rev 2078) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java 2010-07-18 16:51:11 UTC (rev 2079) @@ -61,10 +61,10 @@ EntityOperator<E> operator = (EntityOperator<E>) shared.store.get(contract); if (operator == null) { - synchronized (shared.store) { +// synchronized (shared.store) { operator = new EntityOperator<E>(contract); shared.store.put(contract, operator); - } +// } } return operator; //TODO on devrait peut-etre toujours retourner un clone ? @@ -73,9 +73,9 @@ } public static void clear() { - synchronized (shared.store) { +// synchronized (shared.store) { shared.store.clear(); - } +// } } protected EntityOperatorStore() {

1 0

r2078 - trunk
by tchemit＠users.nuiton.org July 18, 2010

July 18, 2010

Author: tchemit Date: 2010-07-18 17:20:33 +0200 (Sun, 18 Jul 2010) New Revision: 2078 Url: http://nuiton.org/repositories/revision/topia/2078 Log: Evolution #774: Use Eugene 2.1.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-07-18 11:30:15 UTC (rev 2077) +++ trunk/pom.xml 2010-07-18 15:20:33 UTC (rev 2078) @@ -230,7 +230,7 @@ <projectId>topia</projectId>  - <eugene.version>2.1</eugene.version> + <eugene.version>2.1.1-SNAPSHOT</eugene.version> <lutinutil.version>1.4</lutinutil.version> <processor.version>1.0.3</processor.version> <i18n.version>1.2.2</i18n.version>

1 0

r2077 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org July 18, 2010

July 18, 2010

Author: tchemit Date: 2010-07-18 13:30:15 +0200 (Sun, 18 Jul 2010) New Revision: 2077 Url: http://nuiton.org/repositories/revision/topia/2077 Log: Evolution #773: Can generate EntityEnum as a standalone enumeration Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-18 11:28:56 UTC (rev 2076) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-18 11:30:15 UTC (rev 2077) @@ -265,6 +265,9 @@ for (ObjectModelClass clazz : classes) { String clazzName = clazz.getName(); addLiteral(entityEnum, clazzName + '(' + clazzName + ".class)"); + if (generateStandaloneEnum) { + addImport(entityEnum, clazz); + } } attr = (ObjectModelAttributeImpl) addAttribute(entityEnum, "contract", "Class<? extends TopiaEntity>"); attr.setDocumentation("the contract of the entity");

1 0

r2076 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org July 18, 2010

July 18, 2010

Author: tchemit Date: 2010-07-18 13:28:56 +0200 (Sun, 18 Jul 2010) New Revision: 2076 Url: http://nuiton.org/repositories/revision/topia/2076 Log: Evolution #773: Can generate EntityEnum as a standalone enumeration Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-11 08:39:27 UTC (rev 2075) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2010-07-18 11:28:56 UTC (rev 2076) @@ -73,8 +73,12 @@ resultClass = createClass(daoHelperClazzName, packageName); List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); - boolean generateOperator = TopiaGeneratorUtil.shouldgenerateOperatorForDAOHelper(null, model); + boolean generateOperator = + TopiaGeneratorUtil.shouldgenerateOperatorForDAOHelper(null, model); + boolean generateStandaloneEnum = + TopiaGeneratorUtil.shouldGnerateStandaloneEnumForDAOHelper(null, model); + addImport(resultClass, TopiaContextImplementor.class); addImport(resultClass, TopiaDAO.class); addImport(resultClass, TopiaEntity.class); @@ -240,9 +244,23 @@ // add enum - ObjectModelEnumerationImpl entityEnum = (ObjectModelEnumerationImpl) addInnerClassifier(resultClass, ObjectModelType.OBJECT_MODEL_ENUMERATION, entityEnumName); - addImport(resultClass,TopiaEntityEnum.class); + ObjectModelEnumeration entityEnum; + + if (generateStandaloneEnum) { + log.info("Will generate standalone " + entityEnumName + " in package " + packageName); + entityEnum = createEnumeration(entityEnumName, packageName); + addImport(entityEnum,TopiaEntity.class); + addImport(entityEnum,EntityOperatorStore.class); + addImport(entityEnum,Arrays.class); + + } else { + entityEnum = (ObjectModelEnumerationImpl) + addInnerClassifier(resultClass, ObjectModelType.OBJECT_MODEL_ENUMERATION, entityEnumName); + } + + addImport(resultClass, TopiaEntityEnum.class); addInterface(entityEnum, TopiaEntityEnum.class); +// addImport(entityEnum,TopiaEntityEnum.class); for (ObjectModelClass clazz : classes) { String clazzName = clazz.getName(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-07-11 08:39:27 UTC (rev 2075) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-07-18 11:28:56 UTC (rev 2076) @@ -52,6 +52,7 @@ import org.nuiton.eugene.models.object.ObjectModelInterface; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; +import org.nuiton.topia.persistence.TopiaEntityEnum; /** * Classe regroupant divers méthodes utiles pour la génération des entités @@ -243,7 +244,16 @@ * Tag pour specfier si on doit générer la methode getOperator dans les daohelpers ) */ public static final String TAG_GENERATE_OPERATOR_FOR_DAO_HELPER = "generateOperatorForDAOHelper"; + /** + * Tag pour spécifier si on doit générer le {@link TopiaEntityEnum} en tant qu'inner classe + * du dao helper ou pas. + * + * <b>Note:</b> Par défaut, on génère en tant qu'inner classe. + * @since 2.4.1 + */ + public static final String TAG_GENERATE_STANDALONE_ENUM_FOR_DAO_HELPER = "generateStandaloneEnumForDAOHelper"; + /** * Tag pour spécifier le type d'une propriété dans le mapping hibernate */ public static final String TAG_TYPE= "type"; @@ -387,12 +397,13 @@ } /** - * Cherche et renvoie le prefixe i18n à utiliser sur cet element, sinon sur - * le model. + * Cherche si le tagvalue {@link #TAG_GENERATE_OPERATOR_FOR_DAO_HELPER} a été + * activé dans le model. * * @param element l'élément à tester * @param model le modele utilisé - * @return le prefix i18n ou <code>null</code> si non spécifié + * @return {@code true} si le tag value trouvé dans le modèle, {@code false} + * sinon. */ public static boolean shouldgenerateOperatorForDAOHelper( ObjectModelElement element, @@ -405,6 +416,26 @@ } /** + * Cherche si le tagvalue {@link #TAG_GENERATE_OPERATOR_FOR_DAO_HELPER} a été + * activé dans le model. + * + * @param element l'élément à tester + * @param model le modele utilisé + * @return {@code true} si le tag value trouvé dans le modèle, {@code false} + * sinon. + * @since 2.4.1 + */ + public static boolean shouldGnerateStandaloneEnumForDAOHelper( + ObjectModelElement element, + ObjectModel model) { + String tagValue = GeneratorUtil.findTagValue( + TAG_GENERATE_STANDALONE_ENUM_FOR_DAO_HELPER, element, model); + boolean generate = GeneratorUtil.notEmpty(tagValue) && + Boolean.valueOf(tagValue); + return generate; + } + + /** * Cherche et renvoie la liste des attributs constituant la clef metier * d'une classe. *

1 0

r2075 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org July 11, 2010

July 11, 2010

Author: tchemit Date: 2010-07-11 10:39:27 +0200 (Sun, 11 Jul 2010) New Revision: 2075 Url: http://nuiton.org/repositories/revision/topia/2075 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 2010-07-11 08:39:25 UTC (rev 2074) +++ trunk/pom.xml 2010-07-11 08:39:27 UTC (rev 2075) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -319,9 +319,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.4</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> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-07-11 08:39:25 UTC (rev 2074) +++ trunk/topia-persistence/pom.xml 2010-07-11 08:39:27 UTC (rev 2075) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-07-11 08:39:25 UTC (rev 2074) +++ trunk/topia-service-migration/pom.xml 2010-07-11 08:39:27 UTC (rev 2075) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-07-11 08:39:25 UTC (rev 2074) +++ trunk/topia-service-replication/pom.xml 2010-07-11 08:39:27 UTC (rev 2075) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-07-11 08:39:25 UTC (rev 2074) +++ trunk/topia-service-security/pom.xml 2010-07-11 08:39:27 UTC (rev 2075) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2074 - in tags: . topia-2.4
by tchemit＠users.nuiton.org July 11, 2010

July 11, 2010

Author: tchemit Date: 2010-07-11 10:39:25 +0200 (Sun, 11 Jul 2010) New Revision: 2074 Url: http://nuiton.org/repositories/revision/topia/2074 Log: [maven-release-plugin] copy for tag topia-2.4 Added: tags/topia-2.4/ Property changes on: tags/topia-2.4 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r2073 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org July 11, 2010

July 11, 2010

Author: tchemit Date: 2010-07-11 10:39:23 +0200 (Sun, 11 Jul 2010) New Revision: 2073 Url: http://nuiton.org/repositories/revision/topia/2073 Log: [maven-release-plugin] prepare release topia-2.4 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 2010-07-11 08:19:45 UTC (rev 2072) +++ trunk/pom.xml 2010-07-11 08:39:23 UTC (rev 2073) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <modules> <module>topia-persistence</module> @@ -319,9 +319,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.4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.4</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.4</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-07-11 08:19:45 UTC (rev 2072) +++ trunk/topia-persistence/pom.xml 2010-07-11 08:39:23 UTC (rev 2073) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-07-11 08:19:45 UTC (rev 2072) +++ trunk/topia-service-migration/pom.xml 2010-07-11 08:39:23 UTC (rev 2073) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-07-11 08:19:45 UTC (rev 2072) +++ trunk/topia-service-replication/pom.xml 2010-07-11 08:39:23 UTC (rev 2073) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-07-11 08:19:45 UTC (rev 2072) +++ trunk/topia-service-security/pom.xml 2010-07-11 08:39:23 UTC (rev 2073) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0