branch develop updated (d45f83e -> 62b9501)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository topia. See http://git.nuiton.org/topia.git from d45f83e Hide JDBC connection password from toString new 9ac5771 Update parent pom new 532d9e6 Update java 7 compilation level just because of eugene dependency new 62b9501 Fix javadoc The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 62b950181d62e990c31f2e5c3b32ac234fc166d9 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 11 12:04:13 2016 +0100 Fix javadoc commit 532d9e6350a48425c3ed785d7ec899abcf4b457c Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 11 12:00:33 2016 +0100 Update java 7 compilation level just because of eugene dependency commit 9ac577135e8bc416e5d7a58793d95a2fd086da0a Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 11 11:52:33 2016 +0100 Update parent pom Summary of changes: topia-service-replication/README.txt => README.md | 0 pom.xml | 8 ++- topia-templates/README.txt => topia-it/README.md | 0 .../README.txt => topia-junit/README.md | 0 .../README.txt => topia-persistence/README.md | 0 topia-persistence/changelog.txt | 67 ---------------------- .../topia/persistence/event/EntityState.java | 24 ++++---- .../internal/TopiaConnectionProvider.java | 2 +- .../persistence/legacy/EntityListUpdator.java | 2 +- .../topia/persistence/legacy/ListUpdator.java | 2 +- .../nuiton/topia/persistence/legacy/Loador.java | 2 +- .../persistence/util/EntityOperatorStore.java | 2 +- topia-service-csv/{README.txt => README.md} | 0 topia-service-csv/changelog.txt | 63 -------------------- .../topia/service/csv/in/AbstractImportModel.java | 2 +- topia-service-flyway/{README.txt => README.md} | 0 .../README.md | 0 .../README.md | 0 README.txt => topia-service-replication/README.md | 0 topia-service-replication/changelog.txt | 2 - topia-it/README.txt => topia-templates/README.md | 0 21 files changed, 24 insertions(+), 152 deletions(-) rename topia-service-replication/README.txt => README.md (100%) rename topia-templates/README.txt => topia-it/README.md (100%) rename topia-service-liquibase/README.txt => topia-junit/README.md (100%) rename topia-service-migration/README.txt => topia-persistence/README.md (100%) delete mode 100644 topia-persistence/changelog.txt rename topia-service-csv/{README.txt => README.md} (100%) delete mode 100644 topia-service-csv/changelog.txt rename topia-service-flyway/{README.txt => README.md} (100%) rename topia-junit/README.txt => topia-service-liquibase/README.md (100%) rename topia-persistence/README.txt => topia-service-migration/README.md (100%) rename README.txt => topia-service-replication/README.md (100%) delete mode 100644 topia-service-replication/changelog.txt rename topia-it/README.txt => topia-templates/README.md (100%) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 9ac577135e8bc416e5d7a58793d95a2fd086da0a Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 11 11:52:33 2016 +0100 Update parent pom --- topia-service-replication/README.txt => README.md | 0 pom.xml | 8 ++- topia-templates/README.txt => topia-it/README.md | 0 .../README.txt => topia-junit/README.md | 0 .../README.txt => topia-persistence/README.md | 0 topia-persistence/changelog.txt | 67 ---------------------- topia-service-csv/{README.txt => README.md} | 0 topia-service-csv/changelog.txt | 63 -------------------- topia-service-flyway/{README.txt => README.md} | 0 .../README.md | 0 .../README.md | 0 README.txt => topia-service-replication/README.md | 0 topia-service-replication/changelog.txt | 2 - topia-it/README.txt => topia-templates/README.md | 0 14 files changed, 6 insertions(+), 134 deletions(-) diff --git a/topia-service-replication/README.txt b/README.md similarity index 100% rename from topia-service-replication/README.txt rename to README.md diff --git a/pom.xml b/pom.xml index 0ae5a9b..7295f4c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ $Id$ $HeadURL$ %% - Copyright (C) 2004 - 2013 CodeLutin, Chatellier Eric + Copyright (C) 2004 - 2016 CodeLutin, Chatellier Eric %% This program is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -29,7 +29,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>5</version> + <version>9</version> </parent> <artifactId>topia</artifactId> @@ -258,6 +258,10 @@ <siteSourcesType>rst</siteSourcesType> + <ciViewId>ToPIA</ciViewId> + <javaVersion>1.6</javaVersion> + <signatureArtifactId>java16</signatureArtifactId> + <signatureVersion>1.1</signatureVersion> </properties> <dependencyManagement> diff --git a/topia-templates/README.txt b/topia-it/README.md similarity index 100% rename from topia-templates/README.txt rename to topia-it/README.md diff --git a/topia-service-liquibase/README.txt b/topia-junit/README.md similarity index 100% rename from topia-service-liquibase/README.txt rename to topia-junit/README.md diff --git a/topia-service-migration/README.txt b/topia-persistence/README.md similarity index 100% rename from topia-service-migration/README.txt rename to topia-persistence/README.md diff --git a/topia-persistence/changelog.txt b/topia-persistence/changelog.txt deleted file mode 100644 index 2506b97..0000000 --- a/topia-persistence/changelog.txt +++ /dev/null @@ -1,67 +0,0 @@ -2.2.0 -* add a EntityOperatorStore to share operators -* migrate to nuiton (relocate coordinates) -* introduce TopiaEntityOperator api -* refactor EntityEnumContract to TopiaEntityEnum -* introduce Collector api (and gives some implementations in TopiaEntityHelper) -* add generateOperatorForDAOHelper tagValue on model to enable operator feature in dao helper -* add algorithm to build diff between two list of entities (DiffState) -* improve TopiaDAO and TopiaDAOImpl code, and add findAllIds method - -* 20090605 [desbois] - add DAO developper implementation support (<<dao>> stereotype on entity operation) -* 20090604 [desbois] - suppress Flatfile support - - suppress TopiaDAODelegator, packages persitence.flatfile and persistence.hibernate - - merge TopiaDAOAbstract and TopiaDAOHibernate - - modify generated DAO which inherits of TopiaDAOAbstract by default (instead of TopiaDAODelegator) - - modify in TopiaContextImpl (no configuration can be used to define DAO implementation) -* 20090604 [desbois] - resolve issue of NMultiplicity relation between two entities with inheritance (DAOAbsractGenerator delete method generation) -* 20090528 [desbois] - resolve issue of NMultiplicity on attribute with primitive type (like String) -* 20090520 [desbois] - add DTO generation with BeanGenerator - -2.1.5 - -* 20090504 [chemit] - suppress deprecated class TopiaEntityEnumEntry - - improve TopiaEntityAbstract (fix javadoc, add @Override) - -2.1.4 xxxx 200903xx -* 20090418 [chemit] - suppress deprecated generators - - add a BeanGenerator - - add methods isXXXEmpty on association in generated entities -* 20090317 [chatellier] Change tagValue from "orderBy" to "order-by" - -2.1.3 chemit 20090220 -* 20090210 [chatellier] - add first letter capitalize on model name use -* 20090129 [chemit] - add methods in TopiaGeneratorUtil class to optimize imports -* 20090129 [thimel] - Refactor generators (part1 : remove any methods calls in <%=...%>) -* 20090129 [thimel] - Renamed GeneratorUtil to TopiaGeneratorUtil -* 20090128 [bpoussin] - introduce Visitor design pattern on generated TopiaEntityAbstract -* 20090126 [chemit] - refactor poms (all dependencies in parent-pom dependencyManagment) -* 20090126 [chemit] - add somes junit tests to check none-regression when modify ToPIA's templates. - - fix generation bug (notNull could ne null (line 226 EntityHibernateMappingGenerator) -* 20090116 [chemit] - fix a NPE of TopiaDAOFlatFile when do a putAll on a map with some null values on entries. - - ajout des methodes replicate et replicateEntities sur TopiaContext car les methodes existantes - importXML et exportXML ne peuvent pas prendre en compte tous les cas possibles (et on a peut-être - pas envie de passer par du xml...) -2.1.2 chemit 20090115 -* 20090115 [chemit] - pour le moment pas d'embed-xml sur les association multiples -* 20090114 [chemit] - improve exportXML (prepare queries then executes then when parameters are known to be fine) -* 20090106 [chemit] - amélioration du générateur de mapping hibernate : - - génération des clefs metier dans le mapping hibernate via la tag value naturalId - - mise en constantes des tagValues utiliser dans le génératuer du mapping hibernate - - ajout du tagValue notNull pour le mapping hibernate - - changement du tagValue order-by en orderBy car sinon on récupère order au lieu de order-by - - ajout de la méthode obtainProgperties sur la classe Loador pour recuperer la map des propriétés à binder - (car pour les clef métiers on doit les ajouter à la création sinon hibernate pleure...) -* 20090104 [chemit] - utilisation foreach dans les générateurs - - ajout de méthode getXXXByTopiaId pour les attributs à multiplicité dans les entités (interface et abstract) - - fix generic dans les méthodes générées - - ajout d'un tagValue i18n pour générer dans les entités abstraites les chaines i18n - - ajout d'un paquetage org.codelutin.topia.persistence.util avec du code utile :) (javadoc a faire...) - -2.1.1 chemit 20081215 -* 20081215 [chemit] - new release for isis-fish :) -* 20081212 [chemit] - add a InterfaceGenerator to generate simple with no stereotype interfaces. - -2.1.0 chemit 20081210 -* 20081205 [chemit] - improve poms, use lutinproject 3.2 - - add some usefull methods in TopiaUtil to help with regex on topiaId expression diff --git a/topia-service-csv/README.txt b/topia-service-csv/README.md similarity index 100% rename from topia-service-csv/README.txt rename to topia-service-csv/README.md diff --git a/topia-service-csv/changelog.txt b/topia-service-csv/changelog.txt deleted file mode 100644 index d152780..0000000 --- a/topia-service-csv/changelog.txt +++ /dev/null @@ -1,63 +0,0 @@ -2.2.1 chemit 20090903 - - * [FIX #38] manual migration service does not work on windows OS - * [FEATURE #40] clean manual migration service - * [FEATURE #42] add i18n in migration service - --- chemit -- Thu, 03 Sep 2009 18:51:54 +0200 - -2.2.0 - * integrate in ToPIA project as org.nuiton.topia:topia-service-migration - * introduce a simpler migration service ManualMigrationEngine - - do only manual sql migration (using ToPIA persistence api) - - use only one callback handler of type ManualMigrationCallback - - use a ToPIA TMSVersion entity in package org.nuiton.migration - -1.1.0 - * migrate to nuiton - -1.0.3 chemit 20090511 - * bump versions (lutinproject, lutinutil, topia, maven-license-switcher-plugin) - * use doxia-modules-jrst instead of maven-jrst-plugin - * improve download section on site - -1.0.2 chemit 20090220 -* 20090220 [chemit] - use lutinproject 3.4 - -1.0.1 chemit 20081215 -* 20081215 [chemit] - new release for isis-fish :) follow release of topia - -1.0 chemit 20081210 - * 20081205 [chemit] - improve poms, use lutinproject 3.2, migrate tests to JUnit4 - -0.9.1 - * [chatellier] Correction d'un bug de recherche de mapping sous windows (\) - -0.9 - * <chemit> use lutinproject 3.0 + clean pom + use topia 2.0.27 - * <poussin> modif dans service de migration pour permettre a l'app de - faire la migration via le callback - -0.8 - - * 20071120 [chatellier] update topia-service site - * 20071115 [chatellier] apply hibernate code style to open/close session and - transaction - * 20071115 [chatellier] refractoring separate specifique topia service - and real migration code - * 20071115 [chatellier] add schema existance detection support - and dont migrate if there is no table - * 20071111 [chatellier] add support for callback handler - * 20071111 [chatellier] use cascade to calculate dependencies order - * 20071109 [chatellier] change schema creation process to - correct duplicate foreign key creation - * 20071109 [chatellier] add inherit support to calculate dependancies - -0.6 ??? ??? - - * 20070426 [chatellier] use lutinutil.Resources.getUrls() to get mappings - * 20070426 [chatellier] change finder migration to use Class.forName() - * 20070420 [chatellier] remove the 'V' letter in old mapping directories name - * 20070420 [chatellier] add support to look for hibernate mapping in a tree - structure of directories - * 20070418 [chatellier] add migration service \ No newline at end of file diff --git a/topia-service-flyway/README.txt b/topia-service-flyway/README.md similarity index 100% rename from topia-service-flyway/README.txt rename to topia-service-flyway/README.md diff --git a/topia-junit/README.txt b/topia-service-liquibase/README.md similarity index 100% rename from topia-junit/README.txt rename to topia-service-liquibase/README.md diff --git a/topia-persistence/README.txt b/topia-service-migration/README.md similarity index 100% rename from topia-persistence/README.txt rename to topia-service-migration/README.md diff --git a/README.txt b/topia-service-replication/README.md similarity index 100% rename from README.txt rename to topia-service-replication/README.md diff --git a/topia-service-replication/changelog.txt b/topia-service-replication/changelog.txt deleted file mode 100644 index ab64e83..0000000 --- a/topia-service-replication/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -2.2.0 - * initial version \ No newline at end of file diff --git a/topia-it/README.txt b/topia-templates/README.md similarity index 100% rename from topia-it/README.txt rename to topia-templates/README.md -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 532d9e6350a48425c3ed785d7ec899abcf4b457c Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 11 12:00:33 2016 +0100 Update java 7 compilation level just because of eugene dependency --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 7295f4c..ff7acb2 100644 --- a/pom.xml +++ b/pom.xml @@ -259,9 +259,9 @@ <siteSourcesType>rst</siteSourcesType> <ciViewId>ToPIA</ciViewId> - <javaVersion>1.6</javaVersion> - <signatureArtifactId>java16</signatureArtifactId> - <signatureVersion>1.1</signatureVersion> + <javaVersion>1.7</javaVersion> + <signatureArtifactId>java17</signatureArtifactId> + <signatureVersion>1.0</signatureVersion> </properties> <dependencyManagement> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository topia. See http://git.nuiton.org/topia.git commit 62b950181d62e990c31f2e5c3b32ac234fc166d9 Author: Eric Chatellier <chatellier@codelutin.com> Date: Fri Mar 11 12:04:13 2016 +0100 Fix javadoc --- .../topia/persistence/event/EntityState.java | 24 +++++++++++----------- .../internal/TopiaConnectionProvider.java | 2 +- .../persistence/legacy/EntityListUpdator.java | 2 +- .../topia/persistence/legacy/ListUpdator.java | 2 +- .../nuiton/topia/persistence/legacy/Loador.java | 2 +- .../persistence/util/EntityOperatorStore.java | 2 +- .../topia/service/csv/in/AbstractImportModel.java | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java index ce00e4a..f445e1d 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/event/EntityState.java @@ -106,54 +106,54 @@ public class EntityState implements Comparable<EntityState> { } /** - * Tells if the {@link #LOADED} state is on. + * Tells if the {@code #LOADED} state is on. * - * @return {@code true} if {@link #LOADED} state is on, {@code false} otherwise. + * @return {@code true} if {@code #LOADED} state is on, {@code false} otherwise. */ public boolean isLoaded() { return (state & LOADED) == LOADED; } /** - * Tells if the {@link #READ} state is on. + * Tells if the {@code #READ} state is on. * - * @return {@code true} if {@link #READ} state is on, {@code false} otherwise. + * @return {@code true} if {@code #READ} state is on, {@code false} otherwise. */ public boolean isRead() { return (state & READ) == READ; } /** - * Tells if the {@link #CREATED} state is on. + * Tells if the {@code #CREATED} state is on. * - * @return {@code true} if {@link #CREATED} state is on, {@code false} otherwise. + * @return {@code true} if {@code #CREATED} state is on, {@code false} otherwise. */ public boolean isCreated() { return (state & CREATED) == CREATED; } /** - * Tells if the {@link #WRITTEN} state is on. + * Tells if the {@code #WRITTEN} state is on. * - * @return {@code true} if {@link #WRITTEN} state is on, {@code false} otherwise. + * @return {@code true} if {@code #WRITTEN} state is on, {@code false} otherwise. */ public boolean isWritten() { return (state & WRITTEN) == WRITTEN; } /** - * Tells if the {@link #UPDATED} state is on. + * Tells if the {@code #UPDATED} state is on. * - * @return {@code true} if {@link #UPDATED} state is on, {@code false} otherwise. + * @return {@code true} if {@code #UPDATED} state is on, {@code false} otherwise. */ public boolean isUpdated() { return (state & UPDATED) == UPDATED; } /** - * Tells if the {@link #DELETED} state is on. + * Tells if the {@code #DELETED} state is on. * - * @return {@code true} if {@link #DELETED} state is on, {@code false} otherwise. + * @return {@code true} if {@code #DELETED} state is on, {@code false} otherwise. */ public boolean isDeleted() { return (state & DELETED) == DELETED; diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java index e19b8f3..7a29d09 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/internal/TopiaConnectionProvider.java @@ -86,7 +86,7 @@ public class TopiaConnectionProvider implements ConnectionProvider, Configurable /** * Sql isolation level to use in connection. * - * Can be configured by hibernate property {@link Environment#ISOLATION_LEVELS}. + * Can be configured by hibernate property {@link Environment#ISOLATION}. * * @see Connection#getTransactionIsolation() */ diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java index a316028..b55bd50 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/EntityListUpdator.java @@ -42,7 +42,7 @@ import java.util.Collection; * * @author Tony Chemit - chemit@codelutin.com * @param <P> type of parent of childs - * @param <E>type of child + * @param <E> type of child */ public class EntityListUpdator<P extends TopiaEntity, E extends TopiaEntity> implements ListUpdator<P, E> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java index 6e4047a..24bc1a7 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/ListUpdator.java @@ -36,7 +36,7 @@ import java.util.Collection; * * @author Tony Chemit - chemit@codelutin.com * @param <P> the type of the entity which contains the collection to update. - * @param <E>the type of entities in the collection. + * @param <E> the type of entities in the collection. */ public interface ListUpdator<P, E> { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java index 378b67c..49a7d77 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/legacy/Loador.java @@ -31,7 +31,7 @@ import java.util.Map; * A simple contract to load an object from another one. * * @author Tony Chemit - chemit@codelutin.com - * @param <E>type of bean to load + * @param <E> type of bean to load */ public interface Loador<E> extends Serializable { diff --git a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java index 7d72350..1d45c4f 100644 --- a/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java +++ b/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperatorStore.java @@ -48,7 +48,7 @@ public class EntityOperatorStore { /** * - * @param <E>le type de l'entite + * @param <E> le type de l'entite * @param contract le contrat de l'entite * @return l'operator associe au contrat * @see EntityOperator diff --git a/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/AbstractImportModel.java b/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/AbstractImportModel.java index 1a2246b..0b35e11 100644 --- a/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/AbstractImportModel.java +++ b/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/in/AbstractImportModel.java @@ -33,7 +33,7 @@ import java.util.Map; /** * Abstract import model which add the useful methdo about importing foreign keys. * - * @param <E>type of entity to import + * @param <E> type of entity to import * @author Tony Chemit - chemit@codelutin.com * @since 2.6.12 */ -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm