branch feature/8170 updated (f168873 -> da6bb29)
This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from f168873 Fix H2 dialect and fix also test databases new 6349f59 Fix abstract dao ? new 4097786 Reformat code new 0991c68 Use ToPIA persistence context close new da6bb29 Utilisation nuitonWeb 1.17 pour être compatible avec ToPIA 3 The 4 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 da6bb2954157198d8c39746c2c507d63ded96255 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 08:46:24 2016 +0200 Utilisation nuitonWeb 1.17 pour être compatible avec ToPIA 3 commit 0991c68c82e68099f386554307bda6c309c73628 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 11 11:58:54 2016 +0200 Use ToPIA persistence context close commit 4097786b817aa85e71300ce6ed3d018dd57afd41 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 11 11:58:32 2016 +0200 Reformat code commit 6349f590c339d324a6b6b3446665114314aacc7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 11 11:58:16 2016 +0200 Fix abstract dao ? Summary of changes: .../fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java | 6 +++--- .../fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java | 10 ---------- .../fr/ifremer/echobase/ui/EchoBaseApplicationContext.java | 6 ++---- pom.xml | 2 +- 4 files changed, 6 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 6349f590c339d324a6b6b3446665114314aacc7b Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 11 11:58:16 2016 +0200 Fix abstract dao ? --- .../java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java index a6b91c7..340949d 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseUserTopiaDao.java @@ -20,12 +20,12 @@ */ package fr.ifremer.echobase.entities; -import java.util.List; - import org.nuiton.topia.persistence.TopiaException; import org.nuiton.util.pagination.PaginationParameter; -public abstract class EchoBaseUserTopiaDao extends GeneratedEchoBaseUserTopiaDao<EchoBaseUser> { +import java.util.List; + +public class EchoBaseUserTopiaDao extends GeneratedEchoBaseUserTopiaDao<EchoBaseUser> { public List<EchoBaseUser> findAll(PaginationParameter pager) throws TopiaException { List<EchoBaseUser> users; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 4097786b817aa85e71300ce6ed3d018dd57afd41 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 11 11:58:32 2016 +0200 Reformat code --- .../java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java index 700a489..d58201c 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/EchoBaseApplicationContext.java @@ -345,8 +345,7 @@ public class EchoBaseApplicationContext { // no users in database create the admin user if (log.isInfoEnabled()) { - log.info("No user in database, will create default " + - "users."); + log.info("No user in database, will create default users."); } service.createDefaultUsers(); @@ -355,8 +354,7 @@ public class EchoBaseApplicationContext { if (configuration.isEmbedded()) { if (log.isInfoEnabled()) { - log.info("Will try to create default working db " + - "configuration for internal db."); + log.info("Will try to create default working db configuration for internal db."); } // try to create a default embedded working db configuration serviceContext.newService(WorkingDbConfigurationService.class). -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit 0991c68c82e68099f386554307bda6c309c73628 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Apr 11 11:58:54 2016 +0200 Use ToPIA persistence context close --- .../fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java index 2283607..deac3ba 100644 --- a/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java +++ b/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBaseEntityHelper.java @@ -5,7 +5,6 @@ import fr.ifremer.echobase.entities.DriverType; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.hibernate.Transaction; import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; @@ -127,15 +126,6 @@ public class EchoBaseEntityHelper { if (log.isDebugEnabled()) { log.debug("closing transaction " + transaction); } - - - Transaction tx = transaction.getHibernateSupport().getHibernateSession().getTransaction(); - if (!tx.wasCommitted() && !tx.wasRolledBack()) { - if (log.isDebugEnabled()) { - log.debug("rollback transaction!"); - } - tx.rollback(); - } transaction.close(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit da6bb2954157198d8c39746c2c507d63ded96255 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Apr 12 08:46:24 2016 +0200 Utilisation nuitonWeb 1.17 pour être compatible avec ToPIA 3 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3c90b2a..0b0b1a2 100644 --- a/pom.xml +++ b/pom.xml @@ -131,7 +131,7 @@ <topiaVersion>3.1-SNAPSHOT</topiaVersion> <nuitonUtilsVersion>3.0-rc-11</nuitonUtilsVersion> <nuitonI18nVersion>3.4.1</nuitonI18nVersion> - <nuitonWebVersion>1.16</nuitonWebVersion> + <nuitonWebVersion>1.17</nuitonWebVersion> <!--<struts2Version>2.3.20</struts2Version>--> <struts2Version>2.3.15.3</struts2Version> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm