branch feature/hibernate_5 created (now 117aaa2)
This is an automated email from the git hooks/post-receive script. New change to branch feature/hibernate_5 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git at 117aaa2 optimize thid parties This branch includes the following new commits: new 7739c36 POC new e1385a6 Fix test isolation new 117aaa2 optimize thid parties 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 117aaa2c6d612b5e2ee7b1eae40969ee5da35c61 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 23 11:33:19 2016 +0200 optimize thid parties commit e1385a6a721ffefb5a5d01018a0356efc4e6cb32 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 23 11:14:48 2016 +0200 Fix test isolation commit 7739c36c58fc2a69366b4788524f1153e8958d4b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 19 11:21:24 2016 +0200 POC -- 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/hibernate_5 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 7739c36c58fc2a69366b4788524f1153e8958d4b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 19 11:21:24 2016 +0200 POC --- .../fr/ird/observe/ObserveTopiaApplicationContext.java | 6 +++--- .../entities/migration/ObserveMigrationEngine.java | 4 ++-- pom.xml | 4 +++- .../service/sql/batch/actions/CreateSchemaAction.java | 16 ++++------------ .../service/sql/batch/actions/DropSchemaAction.java | 15 ++++----------- 5 files changed, 16 insertions(+), 29 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 3c87e9d..4a324b1 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -29,8 +29,8 @@ import fr.ird.observe.entities.migration.ObserveMigrationEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; -import org.hibernate.cfg.Configuration; import org.hibernate.tool.hbm2ddl.SchemaExport; +import org.hibernate.tool.schema.TargetType; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.internal.support.TopiaMetadataModelSupportImpl; import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; @@ -46,6 +46,7 @@ import org.nuiton.util.StringUtil; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; +import java.util.EnumSet; import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; @@ -132,8 +133,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat topiaPersistenceContext.commit(); } - Configuration hibernateConfiguration = getHibernateProvider().getHibernateConfiguration(); - new SchemaExport(hibernateConfiguration).execute(showSchema, true, false, true); + new SchemaExport().execute(EnumSet.of(TargetType.DATABASE), SchemaExport.Action.CREATE, getHibernateProvider().getMetaData()); topiaFiresSupport.firePostCreateSchema(this); } catch (HibernateException eee) { diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java index d5ffe91..51ec92d 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java @@ -34,8 +34,8 @@ import org.nuiton.topia.persistence.util.TopiaUtil; public class ObserveMigrationEngine extends TopiaMigrationEngine { public void createSchemaIfNotExist() { - if (TopiaUtil.isSchemaEmpty(versionConfiguration)) { - TMSVersionHibernateDao.createTMSSchema(versionConfiguration); + if (TopiaUtil.isSchemaEmpty(versionConfiguration, metaData)) { + TMSVersionHibernateDao.createTMSSchema(metaData); } } diff --git a/pom.xml b/pom.xml index 4508a6b..58fdb40 100644 --- a/pom.xml +++ b/pom.xml @@ -161,14 +161,16 @@ <eugenePluginVersion>3.0-alpha-9</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> + <hibernateVersion>4.3.11.Final</hibernateVersion> + <hibernateVersion>5.2.3.Final</hibernateVersion> <topiaVersion>3.1.3.2</topiaVersion> + <topiaVersion>3.2-SNAPSHOT</topiaVersion> <jaxxVersion>2.33.1</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> <nuitonUtilsVersion>3.0-rc-15</nuitonUtilsVersion> <nuitonConfigVersion>3.1</nuitonConfigVersion> <xworkVersion>2.3.30</xworkVersion> - <hibernateVersion>4.3.11.Final</hibernateVersion> <sl4jVersion>1.7.21</sl4jVersion> <swingXVersion>1.6.5-1</swingXVersion> <reflectionsVersion>0.9.10</reflectionsVersion> diff --git a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java index f5173ac..26aedf1 100644 --- a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java +++ b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/CreateSchemaAction.java @@ -24,17 +24,15 @@ package org.nuiton.topia.service.sql.batch.actions; import com.google.common.collect.ImmutableSet; import org.hibernate.HibernateException; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.tool.hbm2ddl.SchemaExport; -import org.hibernate.tool.hbm2ddl.Target; +import org.hibernate.tool.schema.TargetType; import org.nuiton.topia.persistence.TopiaException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Properties; +import java.util.EnumSet; /** * Created on 01/01/16. @@ -56,16 +54,10 @@ public class CreateSchemaAction extends AbstractSchemaAction<CreateSchemaRequest Path sqlScriptFile = temporaryDirectory.resolve("replicateSchema_" + System.nanoTime() + ".sql"); - Configuration hibernateConfiguration = getSourcePersistenceContext().getHibernateSupport().getHibernateConfiguration(); - - Properties properties = new Properties(); - - properties.put(Environment.DIALECT, dialectType.getName()); - - new SchemaExport(hibernateConfiguration, properties) + new SchemaExport() .setOutputFile(sqlScriptFile.toFile().getAbsolutePath()) .setDelimiter(";") - .execute(Target.NONE, SchemaExport.Type.CREATE); + .execute(EnumSet.of(TargetType.SCRIPT), SchemaExport.Action.CREATE, getSourcePersistenceContext().getHibernateSupport().getHibernateMetadata()); String sqlStatements = ""; if (request.isAddSchema()) { diff --git a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java index d04582e..ff98578 100644 --- a/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java +++ b/topia-extension/src/main/java/org/nuiton/topia/service/sql/batch/actions/DropSchemaAction.java @@ -25,16 +25,15 @@ package org.nuiton.topia.service.sql.batch.actions; import com.google.common.collect.ImmutableSet; import org.apache.commons.io.output.WriterOutputStream; import org.hibernate.HibernateException; -import org.hibernate.cfg.Configuration; -import org.hibernate.cfg.Environment; import org.hibernate.dialect.Dialect; import org.hibernate.tool.hbm2ddl.SchemaExport; +import org.hibernate.tool.schema.TargetType; import org.nuiton.topia.persistence.TopiaException; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Properties; +import java.util.EnumSet; /** * Created on 01/01/16. @@ -57,16 +56,10 @@ public class DropSchemaAction extends AbstractSchemaAction<DropSchemaRequest> { Path sqlScriptFile = temporaryDirectory.resolve("replicateSchema_" + System.nanoTime() + ".sql"); - Configuration hibernateConfiguration = getSourcePersistenceContext().getHibernateSupport().getHibernateConfiguration(); - - Properties properties = new Properties(); - - properties.put(Environment.DIALECT, dialectType.getName()); - - new SchemaExport(hibernateConfiguration, properties) + new SchemaExport() .setOutputFile(sqlScriptFile.toFile().getAbsolutePath()) .setDelimiter(";") - .drop(false, false); + .drop(EnumSet.of(TargetType.SCRIPT), getSourcePersistenceContext().getHibernateSupport().getHibernateMetadata()); WriterOutputStream out = new WriterOutputStream(writer); Files.copy(sqlScriptFile, out); -- 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/hibernate_5 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e1385a6a721ffefb5a5d01018a0356efc4e6cb32 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 23 11:14:48 2016 +0200 Fix test isolation --- .../application/web/configuration/db/ObserveWebDatabasesHelperTest.java | 1 + .../application/web/configuration/user/ObserveWebUsersHelperTest.java | 1 + 2 files changed, 2 insertions(+) diff --git a/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java index e30a7f8..da9608e 100644 --- a/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java +++ b/application-web/src/test/java/fr/ird/observe/application/web/configuration/db/ObserveWebDatabasesHelperTest.java @@ -90,6 +90,7 @@ public class ObserveWebDatabasesHelperTest { @Before public void setUp() { configuration = new ObserveWebApplicationConfig("observeweb-test.conf"); + configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); observeWebDatabasesHelper = new ObserveWebDatabasesHelper(); databasesConfigurationFile = configuration.getDatabasesConfigurationFile(); diff --git a/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java b/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java index f9476e8..c6cc285 100644 --- a/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java +++ b/application-web/src/test/java/fr/ird/observe/application/web/configuration/user/ObserveWebUsersHelperTest.java @@ -75,6 +75,7 @@ public class ObserveWebUsersHelperTest { @Before public void setUp() throws Exception { configuration = new ObserveWebApplicationConfig("observeweb-test.conf"); + configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); observeWebUsersHelper = new ObserveWebUsersHelper(); usersConfigurationFile = configuration.getUsersConfigurationFile(); -- 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/hibernate_5 in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 117aaa2c6d612b5e2ee7b1eae40969ee5da35c61 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Oct 23 11:33:19 2016 +0200 optimize thid parties --- application-swing/src/license/THIRD-PARTY.properties | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/application-swing/src/license/THIRD-PARTY.properties b/application-swing/src/license/THIRD-PARTY.properties index 9abfc8f..4b36a46 100644 --- a/application-swing/src/license/THIRD-PARTY.properties +++ b/application-swing/src/license/THIRD-PARTY.properties @@ -1,23 +1,19 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 # - Apache 2.0 # - Apache License 2.0 # - Apache License, version 2.0 # - BSD License # - BSD License for HSQL -# - Common Development and Distribution License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - EPSG database distribution license # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 # - Eclipse Public License, Version 1.0 -# - GNU General Public License - Version 2 with the class path exception -# - GNU General Public License, Version 2 with the Classpath Exception # - GNU Lesser General Public License # - GNU Lesser General Public License, Version 2.1 -# - GNU Lesser Public License # - General Public License (GPL) # - HSQLDB License, a BSD open source license # - JDL (Java Distribution License) @@ -28,7 +24,6 @@ # - MPL 1.1 # - New BSD License # - OGC copyright -# - Public Domain # - Similar to Apache License but with the acknowledgment clause removed # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 @@ -36,11 +31,13 @@ # - The New BSD License # - The PostgreSQL License # - WTFPL +# - lgpl #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Sep 01 13:13:00 CEST 2016 +#Sun Oct 23 11:24:13 CEST 2016 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License +javax.el--el-api--2.2=JDL (Java Distribution License) javax.media--jai_core--1.1.3=JDL (Java Distribution License) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm