This is an automated email from the git hooks/post-receive script. New commit to branch feature/1373-MAJ_documentation in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit b788d61b3e50ff9c5e7e8cfb62b4dc00d0721b8b Author: David Cossé <cosse@codelutin.com> Date: Fri Jun 16 18:01:45 2017 +0200 refs #1373 MAJ conf --- .../main/java/org/chorem/lima/business/LimaBusinessConfig.java | 6 +----- .../java/org/chorem/lima/business/LimaConfigurationHelper.java | 10 +++------- .../test/java/org/chorem/lima/business/LimaTestsConfig.java | 4 ---- lima-callao/src/main/xmi/lima-callao-model.properties | 2 -- pom.xml | 3 +-- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java index c3ecca22..db1561cf 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaBusinessConfig.java @@ -29,12 +29,10 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaTechnicalException; import org.chorem.lima.business.accountingrules.FranceAccountingRules; import org.chorem.lima.business.config.LimaConfigOptionDef; -import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.chorem.lima.entity.LimaFlywayServiceImpl; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.topia.flyway.TopiaFlywayService; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; import java.io.File; import java.util.Locale; @@ -116,13 +114,11 @@ public class LimaBusinessConfig { protected static Properties getRootContextProperties() { if (getInstance().rootContextProperties == null) { Properties result = instance.getFlatOptions(); - // add persistence classes from generated code - result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString()); + // Flyway migration service has been setup during 1.1 development (latest stable was 1.0.6) Map<String, String> toAddIfNotPresent = Maps.newLinkedHashMap(); toAddIfNotPresent.put("topia.service.migration", LimaFlywayServiceImpl.class.getName()); toAddIfNotPresent.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true"); - toAddIfNotPresent.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_INIT_SCHEMA, "true"); for (Map.Entry<String, String> entry : toAddIfNotPresent.entrySet()) { if (!result.containsKey(entry.getKey())) { diff --git a/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java b/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java index 02eacf18..f50a367b 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java +++ b/lima-business/src/main/java/org/chorem/lima/business/LimaConfigurationHelper.java @@ -34,13 +34,9 @@ import java.util.Properties; public class LimaConfigurationHelper { public static Function<Properties, LimaCallaoTopiaApplicationContext> getCreateTopiaContextFunction() { - return new Function<Properties, LimaCallaoTopiaApplicationContext>() { - @Override - public LimaCallaoTopiaApplicationContext apply(Properties input) { - LimaCallaoTopiaApplicationContext result = new LimaCallaoTopiaApplicationContext(input); - return result; - } + return input -> { + LimaCallaoTopiaApplicationContext result = new LimaCallaoTopiaApplicationContext(input); + return result; }; } - } diff --git a/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java b/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java index a7f32775..3df4421c 100644 --- a/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java +++ b/lima-business/src/test/java/org/chorem/lima/business/LimaTestsConfig.java @@ -23,11 +23,9 @@ package org.chorem.lima.business; */ import com.google.common.collect.Maps; -import org.chorem.lima.entity.LimaCallaoEntityEnum; import org.nuiton.config.ApplicationConfig; import org.nuiton.topia.flyway.TopiaFlywayService; import org.nuiton.topia.flyway.TopiaFlywayServiceImpl; -import org.nuiton.topia.persistence.TopiaConfigurationConstants; import java.util.Map; import java.util.Properties; @@ -52,12 +50,10 @@ public class LimaTestsConfig { protected void setRootContextProperties(LimaBusinessConfig instance) { Properties result = instance.getFlatOptions(); // add persistence classes from generated code - result.setProperty(TopiaConfigurationConstants.CONFIG_PERSISTENCE_CLASSES, LimaCallaoEntityEnum.getImplementationClassesAsString()); Map<String, String> toAddIfNotPresent = Maps.newLinkedHashMap(); toAddIfNotPresent.put("topia.service.migration", TopiaFlywayServiceImpl.class.getName()); toAddIfNotPresent.put("topia.service.migration." + TopiaFlywayService.USE_MODEL_VERSION, "true"); - toAddIfNotPresent.put(TopiaConfigurationConstants.CONFIG_PERSISTENCE_INIT_SCHEMA, "true"); for (Map.Entry<String, String> entry : toAddIfNotPresent.entrySet()) { if (!result.containsKey(entry.getKey())) { diff --git a/lima-callao/src/main/xmi/lima-callao-model.properties b/lima-callao/src/main/xmi/lima-callao-model.properties index 88531f18..7f53bae5 100644 --- a/lima-callao/src/main/xmi/lima-callao-model.properties +++ b/lima-callao/src/main/xmi/lima-callao-model.properties @@ -20,12 +20,10 @@ # #L% ### # Precise l'entete de l'ensemble des fichiers generes -model.tagvalue.copyright=/*\n Copyright (C) 2009-2012 Lima Callao\n */ model.tagvalue.version=0.8.6.0 model.tagvalue.constantPrefix=PROPERTY_ model.tagValue.notGenerateToString=true model.tagValue.hibernateAttributeType.String=text -model.tagValue.doNotGenerateBooleanGetMethods=false # natural id org.chorem.lima.entity.Account.class.tagvalue.naturalIdMutable=false diff --git a/pom.xml b/pom.xml index d02ef98e..eb578652 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>10.4</version> + <version>10.5</version> </parent> <groupId>org.chorem</groupId> @@ -672,6 +672,5 @@ </properties> </profile> - </profiles> </project> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.