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

r3064 - in trunk: topia-it/src/main/xmi topia-templates/src/main/java/org/nuiton/topia/templates
by bleny＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: bleny Date: 2014-04-15 15:21:50 +0200 (Tue, 15 Apr 2014) New Revision: 3064 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3064 Log: fixes #3148 Modified: trunk/topia-it/src/main/xmi/topia-it-mapping.zargo trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java Modified: trunk/topia-it/src/main/xmi/topia-it-mapping.zargo =================================================================== (Binary files differ) Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java 2014-04-15 09:34:41 UTC (rev 3063) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/DTOTransformer.java 2014-04-15 13:21:50 UTC (rev 3064) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; @@ -134,7 +135,7 @@ } else { if (!attr.hasAssociationClass()) { String nMultType; - if (attr.isOrdered()) { + if (JavaGeneratorUtil.isOrdered(attr)) { nMultType = List.class.getName() + "<"; } else { nMultType = Collection.class.getName() + "<"; @@ -151,7 +152,7 @@ String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); String nMultType; - if (attr.isOrdered()) { + if (JavaGeneratorUtil.isOrdered(attr)) { nMultType = List.class.getName() + "<"; } else { nMultType = Collection.class.getName() + "<"; @@ -297,7 +298,7 @@ if (!attr.hasAssociationClass()) { //Méthodes remplacées par des accesseurs sur les classes d'assoc String nMultType; - if (attr.isOrdered()) { + if (JavaGeneratorUtil.isOrdered(attr)) { nMultType = List.class.getName() + "<" + attrTypeDTO + ">"; } else { nMultType = Collection.class.getName() + "<" + attrTypeDTO + ">"; @@ -358,7 +359,7 @@ String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); String nMultType; - if (attr.isOrdered()) { + if (JavaGeneratorUtil.isOrdered(attr)) { nMultType = List.class.getName() + "<" + assocClassFQN + "DTO>"; } else { nMultType = Collection.class.getName() + "<" + assocClassFQN + "DTO>"; @@ -378,7 +379,7 @@ } if (!attr.hasAssociationClass()) { String nMultType; - if (attr.isOrdered()) { + if (JavaGeneratorUtil.isOrdered(attr)) { nMultType = List.class.getName() + "<" + attrTypeDTO + ">"; } else { nMultType = Collection.class.getName() + "<" + attrTypeDTO + ">"; @@ -393,7 +394,7 @@ String assocAttrName = TopiaGeneratorUtil.getAssocAttrName(attr); String assocClassFQN = attr.getAssociationClass().getQualifiedName(); String nMultType; - if (attr.isOrdered()) { + if (JavaGeneratorUtil.isOrdered(attr)) { nMultType = List.class.getName() + "<" + assocClassFQN + "DTO>"; } else { nMultType = Collection.class.getName() + "<" + assocClassFQN + "DTO>"; Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java 2014-04-15 09:34:41 UTC (rev 3063) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityHibernateMappingGenerator.java 2014-04-15 13:21:50 UTC (rev 3064) @@ -28,6 +28,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; @@ -422,7 +423,7 @@ // optionalAttributes += "schema=\"" + schema + "\" "; } - if (TopiaGeneratorUtil.hasIndexedStereotype(attr)) { + if (JavaGeneratorUtil.isOrdered(attr)) { String indexName = tableName + "_idx"; optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_INDEX, indexName); // optionalAttributes += "index=\"" + indexName + "\" "; @@ -436,7 +437,7 @@ }*/ } else { String optionalAttributes = ""; - if (TopiaGeneratorUtil.hasIndexedStereotype(attr)) { + if (JavaGeneratorUtil.isOrdered(attr)) { String indexName = tableName + "_idx"; optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_INDEX, indexName); // optionalAttributes += "index=\"" + indexName + "\""; @@ -571,7 +572,7 @@ protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { - boolean needsIndex = TopiaGeneratorUtil.hasIndexedStereotype(attr); + boolean needsIndex = JavaGeneratorUtil.isOrdered(attr); boolean isInverse = attr.getReverseAttribute().isNavigable(); isInverse |= hasUnidirectionalRelationOnAbstractType(attr, model); @@ -639,7 +640,7 @@ protected void generateHibernateMany(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { - boolean needsIndex = TopiaGeneratorUtil.hasIndexedStereotype(attr); + boolean needsIndex = JavaGeneratorUtil.isOrdered(attr); String attrName = getName(attr); String attrType = getType(attr); String collType = TopiaGeneratorUtil.getNMultiplicityHibernateType(attr); @@ -742,7 +743,7 @@ isInverse &= TopiaGeneratorUtil.isFirstAttribute(attr); } - boolean needsIndex = TopiaGeneratorUtil.hasIndexedStereotype(attr); + boolean needsIndex = JavaGeneratorUtil.isOrdered(attr); String cascade = ""; if (attr.isComposite() || attr.hasAssociationClass()) { cascade = " cascade=\"delete,delete-orphan\""; Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-04-15 09:34:41 UTC (rev 3063) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityTransformer.java 2014-04-15 13:21:50 UTC (rev 3064) @@ -29,6 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; +import org.nuiton.eugene.java.JavaGeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelAssociationClass; import org.nuiton.eugene.models.object.ObjectModelAttribute; @@ -39,7 +40,6 @@ import org.nuiton.eugene.models.object.ObjectModelModifier; import org.nuiton.eugene.models.object.ObjectModelOperation; import org.nuiton.eugene.models.object.ObjectModelParameter; -import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.TopiaEntityVisitor; import org.nuiton.topia.persistence.internal.AbstractTopiaEntity; import org.nuiton.topia.persistence.TopiaDaoSupplier; @@ -48,7 +48,6 @@ import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import java.util.ArrayList; import java.util.Collection; import java.util.LinkedList; import java.util.List; @@ -700,9 +699,9 @@ // List, Set or Collection ? String collectionInterface = - TopiaGeneratorUtil.getNMultiplicityInterfaceType(attribute); + JavaGeneratorUtil.getCollectionType(attribute).getName(); String collectionImpl = - TopiaGeneratorUtil.getNMultiplicityObjectType(attribute); + JavaGeneratorUtil.getCollectionInstanceType(attribute).getName(); addImport(outputInterface, collectionInterface); addImport(outputAbstract, collectionInterface); @@ -1456,7 +1455,7 @@ protected String getCollectionType(ObjectModelAttribute attribute) { String result = null; if (!associationClass && TopiaGeneratorUtil.isNMultiplicity(attribute)) { - result = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attribute); + result = JavaGeneratorUtil.getCollectionType(attribute).getName(); } return result; } Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-04-15 09:34:41 UTC (rev 3063) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-04-15 13:21:50 UTC (rev 3064) @@ -55,7 +55,6 @@ import java.util.Iterator; import java.util.LinkedHashMap; import java.util.LinkedHashSet; -import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Set; @@ -727,46 +726,11 @@ * @param attr l'attribut a traiter * @return String */ - public static String getNMultiplicityInterfaceType( - ObjectModelAttribute attr) { - if (hasUniqueStereotype(attr)) { - return Set.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { - return List.class.getName(); - } - return Collection.class.getName(); - } - - /** - * Renvoie le type d'objet (instance) à utiliser en fonction de l'attribut - * - * @param attr l'attribut a traiter - * @return String - */ - public static String getNMultiplicityObjectType(ObjectModelAttribute attr) { - if (hasUniqueStereotype(attr)) { - return HashSet.class.getName(); - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr) || attr.isOrdered()) { - //On considère qu'on ne sait pas traiter vraiment l'attribut "ordered" - // puisqu'on va conserver l'ordre d'insertion, et non un ordre en - // fonction d'un élément donné. Donc on renvoi une ArrayList - return ArrayList.class.getName(); - } - LinkedList.class.getName(); - return ArrayList.class.getName(); - } - - /** - * Renvoie le type d'interface à utiliser en fonction de l'attribut - * - * @param attr l'attribut a traiter - * @return String - */ public static String getNMultiplicityHibernateType( ObjectModelAttribute attr) { if (hasUniqueStereotype(attr)) { return "set"; - } else if (JavaGeneratorUtil.hasIndexedStereotype(attr)) { + } else if (JavaGeneratorUtil.isOrdered(attr)) { return "list"; } //attr.isOrdered() - On génère le ordered en bag @@ -908,9 +872,9 @@ for (ObjectModelAttribute attr : aClass.getAttributes()) { fqns.add(attr.getType()); if (isNMultiplicity(attr)) { - String collectionType = getNMultiplicityInterfaceType(attr); + String collectionType = getCollectionType(attr).getName(); fqns.add(collectionType); - String collectionObject = getNMultiplicityObjectType(attr); + String collectionObject = getCollectionInstanceType(attr).getName(); fqns.add(collectionObject); } } @@ -928,9 +892,9 @@ } fqns.add(attr.getType()); if (isNMultiplicity(attr)) { - String collectionType = getNMultiplicityInterfaceType(attr); + String collectionType = getCollectionType(attr).getName(); fqns.add(collectionType); - String collectionObject = getNMultiplicityObjectType(attr); + String collectionObject = getCollectionInstanceType(attr).getName(); fqns.add(collectionObject); } } Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java 2014-04-15 09:34:41 UTC (rev 3063) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaStereoTypes.java 2014-04-15 13:21:50 UTC (rev 3064) @@ -69,15 +69,6 @@ String STEREOTYPE_DAO = "dao"; /** - * Stéréotype pour les collections avec unicité. - * - * @see TopiaGeneratorUtil#hasUniqueStereotype(ObjectModelAttribute) - */ - @StereotypeDefinition(target = ObjectModelAttribute.class, - documentation = "To specify that an attribute is unique (Hibernate mapping)") - String STEREOTYPE_UNIQUE = "unique"; - - /** * Stéréotype pour les attributs étant des clés primaires. * * @see TopiaGeneratorUtil#hasPrimaryKeyStereotype(ObjectModelAttribute)

1 0

r3063 - trunk
by athimel＠users.nuiton.org 15 Apr '14

15 Apr '14

Author: athimel Date: 2014-04-15 11:34:41 +0200 (Tue, 15 Apr 2014) New Revision: 3063 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3063 Log: Use Eugene 2.8-SNAPSHOT Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-11 16:08:01 UTC (rev 3062) +++ trunk/pom.xml 2014-04-15 09:34:41 UTC (rev 3063) @@ -237,7 +237,7 @@ <relativizeDecorationLinks>false</relativizeDecorationLinks>  - <eugeneVersion>2.7.4</eugeneVersion> + <eugeneVersion>2.8-SNAPSHOT</eugeneVersion> <nuitonUtilsVersion>3.0-rc-2</nuitonUtilsVersion> <nuitonCsvVersion>3.0-alpha-3</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion>

1 0

r3062 - branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration
by athimel＠users.nuiton.org 11 Apr '14

11 Apr '14

Author: athimel Date: 2014-04-11 18:08:01 +0200 (Fri, 11 Apr 2014) New Revision: 3062 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3062 Log: Remove usages of deprecated '_' method Modified: branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java Modified: branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-04-11 16:06:18 UTC (rev 3061) +++ branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-04-11 16:08:01 UTC (rev 3062) @@ -278,9 +278,9 @@ boolean complete = migrateSchema(); if (!complete) { if (log.isErrorEnabled()) { - log.error(_("topia.migration.migration.incomplete")); + log.error(t("topia.migration.migration.incomplete")); } - throw new TopiaRuntimeException(_("topia.migration.migration.incomplete")); + throw new TopiaRuntimeException(t("topia.migration.migration.incomplete")); } } @@ -297,7 +297,7 @@ Version version = callback.getApplicationVersion(); - log.info(_("topia.migration.start.migration", + log.info(t("topia.migration.start.migration", version.getVersion(), dbVersion.getVersion()) ); @@ -317,7 +317,7 @@ if (versionTableExist && dbVersion.equals(version)) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info(t("topia.migration.skip.migration.db.is.up.to.date")); } // la base est a jour return true; @@ -325,7 +325,7 @@ // Aucune version existante, la base de données est vierge if (versionTableExist && dbNotVersioned && migrateOnInit) { - log.info(_("topia.migration.skip.migration.db.is.empty")); + log.info(t("topia.migration.skip.migration.db.is.empty")); // la base est vierge, aucune migration nécessaire // mise à jour de la table tmsversion saveApplicationVersion(); @@ -337,7 +337,7 @@ // on a trouvee une table depreciee tmsVersion avec la bonne version de base // il suffit donc d'enregister la version dans la nouvelle table if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.db.is.up.to.date")); + log.info(t("topia.migration.skip.migration.db.is.up.to.date")); } // la base est a jour mais il faut migrer la table saveApplicationVersion(); @@ -348,7 +348,7 @@ new TreeSet<Version>(new VersionComparator()); allVersions.addAll(Arrays.asList(callback.getAvailableVersions())); if (log.isInfoEnabled()) { - log.info(_("topia.migration.available.versions", allVersions)); + log.info(t("topia.migration.available.versions", allVersions)); } // tell if migration is needed @@ -367,11 +367,11 @@ if (versionsToApply.isEmpty()) { if (log.isInfoEnabled()) { - log.info(_("topia.migration.skip.migration.no.version.to.apply")); + log.info(t("topia.migration.skip.migration.no.version.to.apply")); } } else { if (log.isInfoEnabled()) { - log.info(_("topia.migration.migrate.versions", versionsToApply)); + log.info(t("topia.migration.migrate.versions", versionsToApply)); } // perform the migration @@ -459,7 +459,7 @@ TMSVersionDAO.deleteAll(tx); if (log.isInfoEnabled()) { - log.info(_("topia.migration.saving.db.version", version)); + log.info(t("topia.migration.saving.db.version", version)); } // create new version and store it in table @@ -577,7 +577,7 @@ if (v != null) { if (log.isDebugEnabled()) { - log.debug("Legacy : " + _("topia.migration.detected.db.version", v)); + log.debug("Legacy : " + t("topia.migration.detected.db.version", v)); } } } @@ -590,9 +590,9 @@ // etre detenu en local v = Version.VZERO; dbNotVersioned = true; - log.info(_("topia.migration.db.not.versionned")); + log.info(t("topia.migration.db.not.versionned")); } else { - log.info(_("topia.migration.detected.db.version", v)); + log.info(t("topia.migration.detected.db.version", v)); } dbVersion = v; versionDetected = true;

1 0

r3061 - in branches/topia-2.9.x: topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-service-migration/src/main/java/org/nuiton/topia/migration topia-service-replication/src/main/java/org/nuiton/topia/replication topia-service-replication/src/main/java/org/nuiton/topia/replication/operation topia-service-replication/src/test/java/org/nuiton/topia/replication/operation
by athimel＠users.nuiton.org 11 Apr '14

11 Apr '14

Author: athimel Date: 2014-04-11 18:06:18 +0200 (Fri, 11 Apr 2014) New Revision: 3061 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3061 Log: Remove usages of deprecated '_' method Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -24,7 +24,7 @@ package org.nuiton.topia.framework; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; import java.beans.PropertyChangeListener; import java.io.BufferedInputStream; @@ -236,15 +236,15 @@ TopiaService service = (TopiaService) newInstance; if (key.equals("topia.service." + service.getServiceName())) { result.put(service.getServiceName(), service); - log.info(_("topia.persistence.service.loaded", + log.info(t("topia.persistence.service.loaded", key, classService)); } else { - log.warn(_("topia.persistence.warn.service.not.loaded", + log.warn(t("topia.persistence.warn.service.not.loaded", key, service.getServiceName())); } } catch (Throwable eee) { String message = - _("topia.persistence.error.service.unknown", + t("topia.persistence.error.service.unknown", key, classService); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -260,7 +260,7 @@ protected void preInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.preInit(this)) { - log.warn(_("topia.persistence.warn.service.not.preInit", + log.warn(t("topia.persistence.warn.service.not.preInit", service.getServiceName())); } } @@ -269,7 +269,7 @@ protected void postInitServices(Map<String, TopiaService> services) { for (TopiaService service : services.values()) { if (!service.postInit(this)) { - log.warn(_("topia.persistence.warn.service.not.postInit", + log.warn(t("topia.persistence.warn.service.not.postInit", service.getServiceName())); } } @@ -334,13 +334,13 @@ result = (E) getService(name); } catch (Exception eee) { throw new TopiaNotFoundException( - _("topia.persistence.error.service.not.retreaved", + t("topia.persistence.error.service.not.retreaved", interfaceService, getProperExceptionMessage(eee)), eee); } if (result == null) { throw new TopiaNotFoundException( - _("topia.persistence.error.service.not.found", + t("topia.persistence.error.service.not.found", interfaceService)); } return result; @@ -354,7 +354,7 @@ String name = getServiceName(interfaceService); result = serviceEnabled(name); } catch (Exception eee) { - String message = _("topia.persistence.warn.service.not.found", + String message = t("topia.persistence.warn.service.not.found", interfaceService, getProperExceptionMessage(eee)); if (log.isDebugEnabled()) { log.debug(message, eee); @@ -455,7 +455,7 @@ getFiresSupport().firePostCreateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.create.schema", + t("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -467,7 +467,7 @@ execute(true, false, false, true); } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.create.schema", + t("topia.persistence.error.create.schema", eee.getMessage()), eee); } } @@ -485,7 +485,7 @@ getFiresSupport().firePostUpdateSchema(this); } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.update.schema", + t("topia.persistence.error.update.schema", eee.getMessage()), eee); } } @@ -494,7 +494,7 @@ public Session getHibernate() throws TopiaException { if (hibernate == null) { throw new TopiaException( - _("topia.persistence.error.no.hibernate.session")); + t("topia.persistence.error.no.hibernate.session")); } return hibernate; } @@ -592,7 +592,7 @@ log.debug("Class " + classname + " not found"); } throw new TopiaNotFoundException( - _("topia.persistence.error.class.not.found", + t("topia.persistence.error.class.not.found", classname)); } persistenceClasses.add(clazz); @@ -645,12 +645,12 @@ throws TopiaException { if (entityClass == null) { throw new IllegalArgumentException( - _("topia.persistence.error.null.param", + t("topia.persistence.error.null.param", "entityClass", "getDAO")); } if (equals(getRootContext())) { throw new TopiaException( - _("topia.persistence.error.rootContext.access")); + t("topia.persistence.error.rootContext.access")); } if (getHibernateFactory().getClassMetadata(entityClass) == null && getHibernateFactory().getClassMetadata( @@ -658,10 +658,10 @@ getHibernateFactory().getClassMetadata( entityClass.getName() + "Abstract") == null) { - log.info(_("topia.persistence.supported.classes.for.context", + log.info(t("topia.persistence.supported.classes.for.context", getHibernateFactory().getAllClassMetadata().keySet())); throw new TopiaException( - _("topia.persistence.error.unsupported.class", + t("topia.persistence.error.unsupported.class", entityClass.getName())); } @@ -698,7 +698,7 @@ @Override public TopiaContext beginTransaction() throws TopiaException { - checkClosed(_("topia.persistence.error.context.is.closed")); + checkClosed(t("topia.persistence.error.context.is.closed")); TopiaContextImpl result = new TopiaContextImpl(this); SessionFactory factory = getHibernateFactory(); @@ -732,7 +732,7 @@ } throw new TopiaException( - _("topia.persistence.error.open.transaction.failed", + t("topia.persistence.error.open.transaction.failed", eee.getMessage()), eee); } @@ -748,10 +748,10 @@ @Override public void commitTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(_("topia.persistence.error.unsupported.operation.on.root.context", + throw new TopiaException(t("topia.persistence.error.unsupported.operation.on.root.context", "commit")); } - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "commit")); try { @@ -778,7 +778,7 @@ // hibernate = getHibernateFactory().openSession(); // hibernate.setFlushMode(FlushMode.NEVER); } catch (Exception eee) { - throw new TopiaException(_("topia.persistence.error.on.commit", + throw new TopiaException(t("topia.persistence.error.on.commit", eee.getMessage()), eee); } } @@ -786,10 +786,10 @@ @Override public void rollbackTransaction() throws TopiaException { if (equals(getRootContext())) { - throw new TopiaException(_("topia.persistence.error.unsupported.operation.on.root.context", + throw new TopiaException(t("topia.persistence.error.unsupported.operation.on.root.context", "rollback")); } - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "rollback")); try { // for (TopiaDAO<? extends TopiaEntity> dao : daoCache.values()) { @@ -816,7 +816,7 @@ } catch (HibernateException eee) { throw new TopiaException( - _("topia.persistence.error.on.rollback", + t("topia.persistence.error.on.rollback", eee.getMessage()), eee); } } @@ -824,7 +824,7 @@ @Override public void closeContext() throws TopiaException { // Throw exception if context is already closed - checkClosed(_("topia.persistence.error.context.already.closed")); + checkClosed(t("topia.persistence.error.context.already.closed")); // FD-20100421 : Ano #546 : no need to copy childContext, the // {@link #getChildContext()} provides a thread-safe copy to iterate @@ -909,7 +909,7 @@ @SuppressWarnings({"unchecked"}) @Override public TopiaEntity findByTopiaId(String id) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "findById")); Class<TopiaEntity> entityClass = TopiaId.getClassName(id); @@ -931,7 +931,7 @@ @Override public List<?> findAll(String hql, Object... args) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "findAll")); try { @@ -955,7 +955,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.query", + throw new TopiaException(t("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -963,7 +963,7 @@ @Override public List<?> find(String hql, int startIndex, int endIndex, Object... args) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "find")); try { @@ -989,7 +989,7 @@ result = firesSupport.fireEntitiesLoad(this, result); return result; } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.query", + throw new TopiaException(t("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @@ -997,7 +997,7 @@ @Override public Object findUnique(String hql, Object... paramNamesAndValues) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "findUnique")); List<?> results = find(hql, 0, 1, paramNamesAndValues); @@ -1027,7 +1027,7 @@ */ @Override public int execute(String hql, Object... args) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "find")); try { @@ -1038,14 +1038,14 @@ int result = query.executeUpdate(); return result; } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.query", + throw new TopiaException(t("topia.persistence.error.on.query", hql, eee.getMessage()), eee); } } @Override public void add(TopiaEntity e) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "add")); String id = e.getTopiaId(); @@ -1057,17 +1057,17 @@ @Override public void replicate(TopiaContext dstCtxt, Object... entityAndCondition) throws TopiaException, IllegalArgumentException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; dstContextImpl.checkClosed( - _("topia.persistence.error.unsupported.operation.on.closed.context", + t("topia.persistence.error.unsupported.operation.on.closed.context", "replicate")); if (getRootContext().equals(dstContextImpl.getRootContext())) { throw new IllegalArgumentException( - _("topia.persistence.error.replicate.on.same.context")); + t("topia.persistence.error.replicate.on.same.context")); } String[] queries = buildQueries(entityAndCondition); @@ -1085,7 +1085,7 @@ } } } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.replicate", + throw new TopiaException(t("topia.persistence.error.on.replicate", eee.getMessage()), eee); } } @@ -1094,15 +1094,15 @@ public <T extends TopiaEntity> void replicateEntity(TopiaContext dstCtxt, T entity) throws TopiaException, IllegalArgumentException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + dstContextImpl.checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(_( + throw new IllegalArgumentException(t( "topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entity); @@ -1112,15 +1112,15 @@ public <T extends TopiaEntity> void replicateEntities(TopiaContext dstCtxt, List<T> entities) throws TopiaException, IllegalArgumentException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); TopiaContextImpl dstContextImpl = (TopiaContextImpl) dstCtxt; - dstContextImpl.checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + dstContextImpl.checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntities")); if (getRootContext().equals(dstContextImpl.getRootContext())) { - throw new IllegalArgumentException(_("topia.persistence.error.replicate.on.same.context")); + throw new IllegalArgumentException(t("topia.persistence.error.replicate.on.same.context")); } replicate0(dstContextImpl, entities.toArray()); } @@ -1141,7 +1141,7 @@ */ @Override public void backup(File file, boolean compress) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "backup")); try { String options = ""; @@ -1154,7 +1154,7 @@ query.list(); } catch (Exception eee) { - throw new TopiaException(_( + throw new TopiaException(t( "topia.persistence.error.on.backup", eee.getMessage()), eee); } @@ -1171,7 +1171,7 @@ public void restore(File file) throws TopiaException { // send event getFiresSupport().firePreRestoreSchema(this); - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "restore")); String sql = null; @@ -1204,7 +1204,7 @@ // send event AFTER restore getFiresSupport().firePostRestoreSchema(this); } catch (Exception eee) { - throw new TopiaException(_( + throw new TopiaException(t( "topia.persistence.error.on.restore", sql, eee.getMessage()), eee); } @@ -1237,7 +1237,7 @@ // root.finalize(); } catch (Throwable eee) { throw new TopiaException( - _("topia.persistence.error.on.clear", eee.getMessage()), eee); + t("topia.persistence.error.on.clear", eee.getMessage()), eee); } } @@ -1259,7 +1259,7 @@ @Override public boolean isSchemaExist(Class<?> clazz) throws TopiaException { - checkClosed(_("topia.persistence.error.unsupported.operation.on.closed.context", + checkClosed(t("topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); boolean result = TopiaUtil.isSchemaExist(this, clazz.getName()); return result; @@ -1452,7 +1452,7 @@ } } catch (HibernateException eee) { - throw new TopiaException(_("topia.persistence.error.on.replicate", + throw new TopiaException(t("topia.persistence.error.on.replicate", eee.getMessage()), eee); } } Modified: branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java =================================================================== --- branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityHelper.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -24,7 +24,6 @@ package org.nuiton.topia.persistence.util; -import com.google.common.base.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; @@ -56,7 +55,7 @@ import java.util.SortedMap; import java.util.TreeMap; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Une classe avec des méthodes utiles sur les entités. @@ -1146,7 +1145,7 @@ Object value) { if (value == null) { throw new NullPointerException( - _("topia.persistence.error.null.param", + t("topia.persistence.error.null.param", methodName, parameterName)); } } @@ -1162,7 +1161,7 @@ public static void checkSize(int size, Object[] params) { if (params.length != size) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.size", size, params.length)); + t("topia.persistence.error.invalid.size", size, params.length)); } } @@ -1173,13 +1172,13 @@ Object value = params[index]; if (value == null) { throw new IllegalArgumentException( - _("topia.persistence.error.null.param.in.array", index)); + t("topia.persistence.error.null.param.in.array", index)); } Class<?> foundType = value.getClass(); if (!requiredType.isAssignableFrom(foundType)) { throw new IllegalArgumentException( - _("topia.persistence.error.invalid.type.in.array", + t("topia.persistence.error.invalid.type.in.array", index, requiredType, foundType)); } } Modified: branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java =================================================================== --- branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/AbstractTopiaMigrationCallback.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -37,7 +37,7 @@ import java.sql.SQLException; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Abstract migration callback. @@ -114,7 +114,7 @@ try { - log.info(_("topia.migration.start.migrate", v)); + log.info(t("topia.migration.start.migrate", v)); migrateForVersion(v, tx, showSql, showProgression); @@ -167,7 +167,7 @@ if (log.isInfoEnabled()) { - log.info(_("topia.migration.start.sqls", sqls.length)); + log.info(t("topia.migration.start.sqls", sqls.length)); } if (showSql) { StringBuilder buffer = new StringBuilder(); @@ -195,7 +195,7 @@ String message = ""; if (showProgression) { - message = _("topia.migration.start.sql", index, max); + message = t("topia.migration.start.sql", index, max); } if (showSql) { message += "\n" + sql; @@ -213,7 +213,7 @@ } if (log.isDebugEnabled()) { String message; - message = _("topia.migration.end.sql", index, max, StringUtil.convertTime(System.nanoTime() - t0)); + message = t("topia.migration.end.sql", index, max, StringUtil.convertTime(System.nanoTime() - t0)); log.debug(message); } } Modified: branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -51,7 +51,7 @@ import java.util.SortedSet; import java.util.TreeSet; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Le moteur de migration proposé par topia. Il est basé sur un {@link AbstractTopiaMigrationCallback} Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/TopiaReplicationModelBuilder.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -37,7 +37,7 @@ import java.util.Arrays; import java.util.Set; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Builder of {@link ReplicationModel}. @@ -127,7 +127,7 @@ if (operation == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.operation", + t("topia.replication.error.unkown.operation", operationClass.getSimpleName(), Arrays.toString(getOperationProvider().getOperations())) ); @@ -136,7 +136,7 @@ ReplicationNode node = model.getNode(type); if (node == null) { throw new IllegalArgumentException( - _("topia.replication.error.unkown.owner.node", + t("topia.replication.error.unkown.owner.node", type, operationClass.getSimpleName(), model.getNodes()) Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachAssociation.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -42,7 +42,7 @@ import java.util.Collections; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Pour attacher une association. @@ -153,7 +153,7 @@ if (ownerIds == null || ownerIds.isEmpty()) { // pas de donnees a traiter - log.info(_("topia.replication.attachAssociation.nothing.to.do", + log.info(t("topia.replication.attachAssociation.nothing.to.do", ownerOperator)); return; } Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/AttachLink.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -43,7 +43,7 @@ import java.util.Collections; import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Pour attacher une association. @@ -131,7 +131,7 @@ if (ownerIds == null || ownerIds.isEmpty()) { // pas de donnees a traiter - log.info(_("topia.replication.attachAssociation.nothing.to.do", + log.info(t("topia.replication.attachAssociation.nothing.to.do", ownerOperator)); return; } Modified: branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/LoadLink.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -40,7 +40,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * Pour charger une association sur le noeud de l'operation. @@ -83,7 +83,7 @@ if (!ownerNode.equals(operationDef.getNode())) { throw new IllegalStateException( - _("topia.replication.error.operation.loadLink.illegalSource", + t("topia.replication.error.operation.loadLink.illegalSource", operationDef.getNode(), ownerNode)); } Modified: branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java =================================================================== --- branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java 2014-04-11 14:51:41 UTC (rev 3060) +++ branches/topia-2.9.x/topia-service-replication/src/test/java/org/nuiton/topia/replication/operation/UncreatableOperation.java 2014-04-11 16:06:18 UTC (rev 3061) @@ -36,7 +36,7 @@ import java.util.List; -import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.t; /** * @author tchemit <chemit(a)codelutin.com> @@ -51,7 +51,7 @@ Object... parameters) { throw new UnsupportedOperationException( - _("topia.replication.error.operation.uncreatable", getClass())); + t("topia.replication.error.operation.uncreatable", getClass())); } @Override

1 0

r3060 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/persistence/internal topia-templates/src/main/java/org/nuiton/topia/templates
by bleny＠users.nuiton.org 11 Apr '14

11 Apr '14

Author: bleny Date: 2014-04-11 16:51:41 +0200 (Fri, 11 Apr 2014) New Revision: 3060 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3060 Log: fixes #3134 introduce AbstractProjectTopiaDao Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-04-09 15:46:51 UTC (rev 3059) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/AbstractTopiaDao.java 2014-04-11 14:51:41 UTC (rev 3060) @@ -533,7 +533,7 @@ return result; } - public <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { + protected <K> List<K> find(String hql, Map<String, Object> hqlParameters, TopiaPagerBean pager) { Preconditions.checkNotNull(hql); Preconditions.checkNotNull(hqlParameters); Preconditions.checkNotNull(pager); Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-04-09 15:46:51 UTC (rev 3059) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-04-11 14:51:41 UTC (rev 3060) @@ -115,6 +115,8 @@ usages = TopiaGeneratorUtil.searchDirectUsages(model); + generateParentDao(); + // keep all classifiers on the model which are entities List<ObjectModelClass> allEntities = TopiaGeneratorUtil.getEntityClasses(model, true); @@ -347,6 +349,26 @@ } + protected void generateParentDao() { + + String parentDaoFqn = TopiaGeneratorUtil.getParentDaoFqn(this, model); + + if ( ! isInClassPath(parentDaoFqn)) { + + ObjectModelClass parentDao = + createAbstractClass( + TopiaGeneratorUtil.getParentDaoName(model) + "<E extends " + TopiaEntity.class.getSimpleName() + ">", + TopiaGeneratorUtil.getDaoPackage(this, model) + ); + addImport(parentDao, TopiaEntity.class); + + // super class + setSuperClass(parentDao, AbstractTopiaDao.class.getName() + "<E>"); + + } + + } + protected void generateGeneratedDao(ObjectModelClass clazz, String clazzName, String clazzFQN) { @@ -366,7 +388,8 @@ if (superClassName == null) { superClassName = TopiaGeneratorUtil.getDaoSuperClassTagValue(clazz, model); if (superClassName == null) { - superClassName = AbstractTopiaDao.class.getName(); + superClassName = TopiaGeneratorUtil.getParentDaoFqn(this, model); + addImport(daoAbstractClass, superClassName); } superClassName += "<E>"; } Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-04-09 15:46:51 UTC (rev 3059) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-04-11 14:51:41 UTC (rev 3060) @@ -133,27 +133,27 @@ public static String getApplicationContextPackage(ObjectModelTransformerToJava transformer, ObjectModel model) { - String result = transformer.getDefaultPackageName(); - return result; } public static String getPersistenceContextPackage(ObjectModelTransformerToJava transformer, ObjectModel model) { + String result = transformer.getDefaultPackageName(); + return result; + } + public static String getDaoPackage(ObjectModelTransformerToJava transformer, ObjectModel model) { String result = transformer.getDefaultPackageName(); - return result; } - public static String getDaoPackage(ObjectModelTransformerToJava transformer, - ObjectModel model, - ObjectModelClassifier input) { + public static String getParentDaoName(ObjectModel model) { + return "Abstract" + model.getName() + "TopiaDao"; + } - Preconditions.checkState(isEntity(input), "Cant' find dao package name for a none entity " + input); - String result = input.getPackageName(); - return result; + public static String getParentDaoFqn(ObjectModelTransformerToJava transformer, ObjectModel model) { + return getDaoPackage(transformer, model) + "." + getParentDaoName(model); } public static String getApplicationContextInterfaceName(ObjectModel model) {

1 0

Build failed in Jenkins: topia-nightly #13
by admin+ci-nuiton.org＠codelutin.com 09 Apr '14

09 Apr '14

See <http://ci.nuiton.org/jenkins/job/topia-nightly/13/changes> Changes: [athimel] fixes #3142 Make sure the HqlAndParametersBuilder always use a suffix for each HQL parameter's name ------------------------------------------ [...truncated 2900 lines...] [INFO] [INFO] Using the builder org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder with a thread count of 1 [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building ToPIA :: Templates 3.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] [INFO] --- maven-surefire-plugin:2.17:test (default-cli) @ topia-templates --- [INFO] Surefire report directory: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> ------------------------------------------------------- T E S T S ------------------------------------------------------- Running org.nuiton.topia.templates.TopiaGeneratorUtilTest Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.132 sec - in org.nuiton.topia.templates.TopiaGeneratorUtilTest Running org.nuiton.topia.templates.TopiaModelPropertiesProviderTest Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.114 sec - in org.nuiton.topia.templates.TopiaModelPropertiesProviderTest Results : Tests run: 4, Failures: 0, Errors: 0, Skipped: 0 [INFO] ------------------------------------------------------------------------ [INFO] BUILD SUCCESS [INFO] ------------------------------------------------------------------------ [INFO] Total time: 42.371 s [INFO] Finished at: 2014-04-09T00:48:12+01:00 [INFO] Final Memory: 84M/840M [INFO] ------------------------------------------------------------------------ [INFO] [00:48:13.152] Execute org.apache.maven.plugins:maven-surefire-plugin:2.17:test done: 873 ms [INFO] [00:48:13.152] Index files [INFO] [00:48:13.170] 19 files indexed [INFO] [00:48:13.170] Execute maven plugin maven-surefire-plugin done: 891 ms [INFO] [00:48:13.170] Initializer JacocoMavenInitializer... [INFO] [00:48:13.170] Initializer JacocoMavenInitializer done: 0 ms [INFO] [00:48:13.170] Index files [INFO] [00:48:13.185] 19 files indexed [INFO] [00:48:13.185] Base dir: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates> [INFO] [00:48:13.185] Working dir: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:13.185] Source dirs: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/src…> [INFO] [00:48:13.185] Test dirs: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/src…> [INFO] [00:48:13.185] Binary dirs: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:13.185] Source encoding: UTF-8, default locale: en_GB [INFO] [00:48:13.189] Sensor JavaSourceImporter... [INFO] [00:48:13.247] Sensor JavaSourceImporter done: 58 ms [INFO] [00:48:13.247] Sensor JavaSquidSensor... [INFO] [00:48:13.252] Java AST scan... [INFO] [00:48:13.252] 17 source files to be analyzed [INFO] [00:48:13.714] 17/17 source files analyzed [INFO] [00:48:13.715] Java AST scan done: 463 ms [INFO] [00:48:13.716] Java bytecode scan... [INFO] [00:48:13.755] Java bytecode scan done: 39 ms [INFO] [00:48:13.758] Package design analysis... [INFO] [00:48:13.759] Package design analysis done: 1 ms [INFO] [00:48:13.825] Sensor JavaSquidSensor done: 578 ms [INFO] [00:48:13.825] Sensor FindbugsSensor... [INFO] [00:48:13.825] Execute Findbugs 2.0.2... [INFO] [00:48:13.857] Findbugs output report: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:16.757] Execute Findbugs 2.0.2 done: 2932 ms [INFO] [00:48:16.760] Sensor FindbugsSensor done: 2935 ms [INFO] [00:48:16.760] Sensor SurefireSensor... [INFO] [00:48:16.760] parsing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:16.764] Sensor SurefireSensor done: 4 ms [INFO] [00:48:16.764] Sensor CpdSensor... [INFO] [00:48:16.764] SonarEngine is used [INFO] [00:48:16.765] Cross-project analysis disabled [INFO] [00:48:16.835] Sensor CpdSensor done: 71 ms [INFO] [00:48:16.835] Sensor CheckstyleSensor... [INFO] [00:48:16.835] Execute Checkstyle 5.6... [INFO] [00:48:16.836] Checkstyle configuration: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:17.429] Execute Checkstyle 5.6 done: 594 ms [INFO] [00:48:17.429] Sensor CheckstyleSensor done: 594 ms [INFO] [00:48:17.429] Sensor PmdSensor... [INFO] [00:48:17.429] Execute PMD 4.3... [INFO] [00:48:17.429] Java version: 1.5 [INFO] [00:48:17.434] PMD configuration: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:21.185] PMD configuration: <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:21.186] Execute PMD 4.3 done: 3757 ms [INFO] [00:48:21.217] Sensor PmdSensor done: 3788 ms [INFO] [00:48:21.217] Sensor InitialOpenIssuesSensor... [INFO] [00:48:21.299] Sensor InitialOpenIssuesSensor done: 82 ms [INFO] [00:48:21.299] Sensor ProfileSensor... [INFO] [00:48:21.529] Sensor ProfileSensor done: 230 ms [INFO] [00:48:21.529] Sensor ProfileEventsSensor... [INFO] [00:48:21.532] Sensor ProfileEventsSensor done: 3 ms [INFO] [00:48:21.532] Sensor ProjectLinksSensor... [INFO] [00:48:21.537] Sensor ProjectLinksSensor done: 5 ms [INFO] [00:48:21.537] Sensor VersionEventsSensor... [INFO] [00:48:21.539] Sensor VersionEventsSensor done: 2 ms [INFO] [00:48:21.539] Sensor FileHashSensor... [INFO] [00:48:21.540] Sensor FileHashSensor done: 1 ms [INFO] [00:48:21.540] Sensor Maven dependencies... [INFO] [00:48:21.673] Sensor Maven dependencies done: 133 ms [INFO] [00:48:21.673] Sensor JaCoCoSensor... [INFO] [00:48:21.673] Analysing <http://ci.nuiton.org/jenkins/job/topia-nightly/ws/trunk/topia-templates/tar…> [INFO] [00:48:21.746] No information about coverage per test. [INFO] [00:48:21.746] Sensor JaCoCoSensor done: 73 ms [INFO] [00:48:21.828] Execute decorators... [INFO] [00:48:22.468] ------------- Scan ToPIA :: IT [INFO] [00:48:22.469] Load module settings [ERROR] Unable to request: /batch_bootstrap/properties?project=org.nuiton.topia:topia-it&dryRun=false [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] ToPIA ............................................. FAILURE [01:10 min] [INFO] ToPIA :: Persistence .............................. SUCCESS [ 0.967 s] [INFO] ToPIA :: JUnit .................................... SKIPPED [INFO] ToPIA :: Templates ................................ SUCCESS [ 0.640 s] [INFO] ToPIA :: IT ....................................... SKIPPED [INFO] ToPIA :: Service Replication ...................... SKIPPED [INFO] ToPIA :: Service Migration ........................ SKIPPED [INFO] ToPIA :: Service Csv .............................. SKIPPED [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 01:12 min [INFO] Finished at: 2014-04-09T00:48:42+01:00 [INFO] Final Memory: 42M/754M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.codehaus.mojo:sonar-maven-plugin:2.2:sonar (default-cli) on project topia: Can not execute SonarQube analysis: Unable to request: /batch_bootstrap/properties?project=org.nuiton.topia:topia-it&dryRun=false: Read timed out -> [Help 1] org.apache.maven.lifecycle.LifecycleExecutionException: Failed to execute goal org.codehaus.mojo:sonar-maven-plugin:2.2:sonar (default-cli) on project topia: Can not execute SonarQube analysis at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:216) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:153) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:145) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:108) at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:76) at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:51) at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:116) at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:361) at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:155) at org.apache.maven.cli.MavenCli.execute(MavenCli.java:584) at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:213) at org.apache.maven.cli.MavenCli.main(MavenCli.java:157) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:289) at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:229) at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:415) at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:356) Caused by: org.apache.maven.plugin.MojoExecutionException: Can not execute SonarQube analysis at org.codehaus.mojo.sonar.Bootstraper.executeMojo(Bootstraper.java:109) at org.codehaus.mojo.sonar.Bootstraper.start(Bootstraper.java:67) at org.codehaus.mojo.sonar.SonarMojo.execute(SonarMojo.java:109) at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:133) at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:208) ... 19 more Caused by: org.apache.maven.plugin.MojoExecutionException: Unable to request: /batch_bootstrap/properties?project=org.nuiton.topia:topia-it&dryRun=false at org.sonar.maven.ExceptionHandling.handle(ExceptionHandling.java:37) at org.sonar.maven.SonarMojo.execute(SonarMojo.java:175) at org.codehaus.mojo.sonar.Bootstraper.executeMojo(Bootstraper.java:104) ... 23 more Caused by: org.sonar.api.utils.SonarException: Unable to request: /batch_bootstrap/properties?project=org.nuiton.topia:topia-it&dryRun=false at org.sonar.batch.bootstrap.ServerClient.request(ServerClient.java:92) at org.sonar.batch.bootstrap.ServerClient.request(ServerClient.java:82) at org.sonar.batch.bootstrap.ServerClient.request(ServerClient.java:78) at org.sonar.batch.scan.ModuleSettings.downloadSettings(ModuleSettings.java:82) at org.sonar.batch.scan.ModuleSettings.addProjectProperties(ModuleSettings.java:77) at org.sonar.batch.scan.ModuleSettings.init(ModuleSettings.java:63) at org.sonar.batch.scan.ModuleSettings.<init>(ModuleSettings.java:59) at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:526) at org.picocontainer.injectors.AbstractInjector.newInstance(AbstractInjector.java:145) at org.picocontainer.injectors.ConstructorInjector$1.run(ConstructorInjector.java:342) at org.picocontainer.injectors.AbstractInjector$ThreadLocalCyclicDependencyGuard.observe(AbstractInjector.java:270) at org.picocontainer.injectors.ConstructorInjector.getComponentInstance(ConstructorInjector.java:364) at org.picocontainer.injectors.AbstractInjectionFactory$LifecycleAdapter.getComponentInstance(AbstractInjectionFactory.java:56) at org.picocontainer.behaviors.AbstractBehavior.getComponentInstance(AbstractBehavior.java:64) at org.picocontainer.behaviors.Stored.getComponentInstance(Stored.java:91) at org.picocontainer.DefaultPicoContainer.getInstance(DefaultPicoContainer.java:698) at org.picocontainer.DefaultPicoContainer.getComponent(DefaultPicoContainer.java:646) at org.picocontainer.DefaultPicoContainer.getComponent(DefaultPicoContainer.java:677) at org.sonar.api.platform.ComponentContainer.getComponentByType(ComponentContainer.java:187) at org.sonar.batch.scan.ModuleScanContainer.addCoreComponents(ModuleScanContainer.java:76) at org.sonar.batch.scan.ModuleScanContainer.doBeforeStart(ModuleScanContainer.java:63) at org.sonar.api.platform.ComponentContainer.startComponents(ComponentContainer.java:90) at org.sonar.api.platform.ComponentContainer.execute(ComponentContainer.java:77) at org.sonar.batch.scan.ProjectScanContainer.scan(ProjectScanContainer.java:211) at org.sonar.batch.scan.ProjectScanContainer.scanRecursively(ProjectScanContainer.java:206) at org.sonar.batch.scan.ProjectScanContainer.scanRecursively(ProjectScanContainer.java:204) at org.sonar.batch.scan.ProjectScanContainer.doAfterStart(ProjectScanContainer.java:199) at org.sonar.api.platform.ComponentContainer.startComponents(ComponentContainer.java:92) at org.sonar.api.platform.ComponentContainer.execute(ComponentContainer.java:77) at org.sonar.batch.scan.ScanTask.scan(ScanTask.java:58) at org.sonar.batch.scan.ScanTask.execute(ScanTask.java:45) at org.sonar.batch.bootstrap.TaskContainer.doAfterStart(TaskContainer.java:82) at org.sonar.api.platform.ComponentContainer.startComponents(ComponentContainer.java:92) at org.sonar.api.platform.ComponentContainer.execute(ComponentContainer.java:77) at org.sonar.batch.bootstrap.BootstrapContainer.executeTask(BootstrapContainer.java:144) at org.sonar.batch.bootstrap.BootstrapContainer.doAfterStart(BootstrapContainer.java:132) at org.sonar.api.platform.ComponentContainer.startComponents(ComponentContainer.java:92) at org.sonar.api.platform.ComponentContainer.execute(ComponentContainer.java:77) at org.sonar.batch.bootstrapper.Batch.startBatch(Batch.java:92) at org.sonar.batch.bootstrapper.Batch.execute(Batch.java:74) at org.sonar.runner.batch.IsolatedLauncher.execute(IsolatedLauncher.java:45) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43) at java.lang.reflect.Method.invoke(Method.java:606) at org.sonar.runner.impl.BatchLauncher$1.delegateExecution(BatchLauncher.java:87) at org.sonar.runner.impl.BatchLauncher$1.run(BatchLauncher.java:75) at java.security.AccessController.doPrivileged(Native Method) at org.sonar.runner.impl.BatchLauncher.doExecute(BatchLauncher.java:69) at org.sonar.runner.impl.BatchLauncher.execute(BatchLauncher.java:50) at org.sonar.runner.api.EmbeddedRunner.doExecute(EmbeddedRunner.java:102) at org.sonar.runner.api.Runner.execute(Runner.java:90) at org.sonar.maven.SonarMojo.execute(SonarMojo.java:173) ... 24 more Caused by: java.net.SocketTimeoutException: Read timed out at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method) at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:57) at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45) at java.lang.reflect.Constructor.newInstance(Constructor.java:526) at sun.net.www.protocol.http.HttpURLConnection$6.run(HttpURLConnection.java:1675) at sun.net.www.protocol.http.HttpURLConnection$6.run(HttpURLConnection.java:1673) at java.security.AccessController.doPrivileged(Native Method) at sun.net.www.protocol.http.HttpURLConnection.getChainedException(HttpURLConnection.java:1671) at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1244) at java.net.HttpURLConnection.getResponseCode(HttpURLConnection.java:468) at org.sonar.api.utils.HttpDownloader$BaseHttpDownloader$HttpInputSupplier.getInput(HttpDownloader.java:274) at org.sonar.api.utils.HttpDownloader$BaseHttpDownloader$HttpInputSupplier.getInput(HttpDownloader.java:235) at org.sonar.batch.bootstrap.ServerClient.request(ServerClient.java:88) ... 79 more Caused by: java.net.SocketTimeoutException: Read timed out at java.net.SocketInputStream.socketRead0(Native Method) at java.net.SocketInputStream.read(SocketInputStream.java:152) at java.net.SocketInputStream.read(SocketInputStream.java:122) at java.io.BufferedInputStream.fill(BufferedInputStream.java:235) at java.io.BufferedInputStream.read1(BufferedInputStream.java:275) at java.io.BufferedInputStream.read(BufferedInputStream.java:334) at sun.net.www.http.HttpClient.parseHTTPHeader(HttpClient.java:687) at sun.net.www.http.HttpClient.parseHTTP(HttpClient.java:633) at sun.net.www.protocol.http.HttpURLConnection.getInputStream(HttpURLConnection.java:1323) at sun.net.www.protocol.http.HttpURLConnection.getHeaderField(HttpURLConnection.java:2678) at java.net.URLConnection.getContentEncoding(URLConnection.java:533) at org.sonar.api.utils.HttpDownloader$BaseHttpDownloader$HttpInputSupplier.getInput(HttpDownloader.java:272) ... 81 more [ERROR] [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException Sonar analysis completed: FAILURE Build step 'Sonar' changed build result to FAILURE Build step 'Sonar' marked build as failure Failed to send e-mail to athimel because no e-mail address is known, and no default e-mail domain is configured

1 1

[ANN] - ToPIA 3.0-beta-2 released
by nuiton.org Release Notification 09 Apr '14

09 Apr '14

The ToPIA team is pleased to announce the topia-3.0-beta-2 release! Tools for Portable and Independent Architecture : Framework de persistance et de distribution d'application. Documentation of the project can be found here: https://doc.nuiton.org/topia Changes ------- Changes in this version include: Fixed Bugs: o HqlAndParameterBuilder.addWhereClause fails because of parameters collision Issue: 3143. Thanks to Tony Chemit. Resolved by tchemit. o Some queries fails because of unexpected HQL parameter names Issue: 3142. Thanks to Arnaud Thimel. Resolved by athimel. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in Maven Central Repository http://repo1.maven.org/maven2/ Find us at * http://search.maven.org/#artifactdetails|org.nuiton|topia|3.0-beta-2|jar Have fun! -ToPIA team

1 0

r3059 - in trunk: . topia-it topia-junit topia-persistence topia-service-csv topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 09 Apr '14

09 Apr '14

Author: maven-release Date: 2014-04-09 17:46:51 +0200 (Wed, 09 Apr 2014) New Revision: 3059 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3059 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-csv/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-templates/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -211,12 +211,12 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-2</connection> + <connection>scm:svn:https://svn.nuiton.org/topia/trunk</connection> <developerConnection> - scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-2 + scm:svn:https://svn.nuiton.org/topia/trunk </developerConnection> <url> - https://forge.nuiton.org/projects/topia/repository/show/tags/topia-3.0-beta… + https://forge.nuiton.org/projects/topia/repository/show/trunk </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/topia-it/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/topia-junit/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/topia-persistence/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-csv/pom.xml =================================================================== --- trunk/topia-service-csv/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/topia-service-csv/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/topia-service-migration/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/topia-service-replication/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2014-04-09 15:46:30 UTC (rev 3058) +++ trunk/topia-templates/pom.xml 2014-04-09 15:46:51 UTC (rev 3059) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-beta-2</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r3058 - in tags: . topia-3.0-beta-2
by maven-release＠users.nuiton.org 09 Apr '14

09 Apr '14

Author: maven-release Date: 2014-04-09 17:46:30 +0200 (Wed, 09 Apr 2014) New Revision: 3058 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3058 Log: [maven-release-plugin] copy for tag topia-3.0-beta-2 Added: tags/topia-3.0-beta-2/ Property changes on: tags/topia-3.0-beta-2 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings .idea atlassian-ide-plugin.xml Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r3057 - in trunk: . topia-it topia-junit topia-persistence topia-service-csv topia-service-migration topia-service-replication topia-templates
by maven-release＠users.nuiton.org 09 Apr '14

09 Apr '14

Author: maven-release Date: 2014-04-09 17:46:11 +0200 (Wed, 09 Apr 2014) New Revision: 3057 Url: http://forge.nuiton.org/projects/topia/repository/revisions/3057 Log: [maven-release-plugin] prepare release topia-3.0-beta-2 Modified: trunk/pom.xml trunk/topia-it/pom.xml trunk/topia-junit/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-csv/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-templates/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -33,7 +33,7 @@ </parent> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> <packaging>pom</packaging> <name>ToPIA</name> @@ -211,12 +211,12 @@ </modules> <scm> - <connection>scm:svn:https://svn.nuiton.org/topia/trunk</connection> + <connection>scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-2</connection> <developerConnection> - scm:svn:https://svn.nuiton.org/topia/trunk + scm:svn:https://svn.nuiton.org/topia/tags/topia-3.0-beta-2 </developerConnection> <url> - https://forge.nuiton.org/projects/topia/repository/show/trunk + https://forge.nuiton.org/projects/topia/repository/show/tags/topia-3.0-beta… </url> </scm> <distributionManagement> Modified: trunk/topia-it/pom.xml =================================================================== --- trunk/topia-it/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/topia-it/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-junit/pom.xml =================================================================== --- trunk/topia-junit/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/topia-junit/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/topia-persistence/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-csv/pom.xml =================================================================== --- trunk/topia-service-csv/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/topia-service-csv/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/topia-service-migration/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/topia-service-replication/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2014-04-09 13:47:26 UTC (rev 3056) +++ trunk/topia-templates/pom.xml 2014-04-09 15:46:11 UTC (rev 3057) @@ -30,7 +30,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>3.0-SNAPSHOT</version> + <version>3.0-beta-2</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0