Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 34418a81 by Tony Chemit at 2024-07-03T12:27:37+02:00 Un utilisateur Windows a toujours un souci avec les chemins lors du démarrage en 9.3.5 - Closes #2915 - - - - - a656bf4b by Tony Chemit at 2024-07-03T12:38:32+02:00 update pom - - - - - 3 changed files: - client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java - pom.xml - server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java Changes: ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/ClientConfig.java ===================================== @@ -542,6 +542,8 @@ public class ClientConfig extends GeneratedClientConfig implements TripMapConfig public void initConfig(String... args) throws ArgumentsParserException { ApplicationConfig applicationConfig = get(); applicationConfig.parse(args); + applicationConfig.fixFileOptionsForWindows(options()); + File userConfigFile = applicationConfig.getUserConfigFile(); if (userConfigFile.exists() && (Files.notExists(getServerDataSourceConfigurationsFile().toPath()) || Files.notExists(getRemoteDataSourceConfigurationsFile().toPath()))) { Properties old = new Properties(); ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2024.26</version> + <version>2024.28</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> ===================================== server/configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java ===================================== @@ -162,10 +162,6 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar log.info(String.format("Generate empty log4j configuration file to: %s", log4jConfigurationFile)); } - public boolean isWindows() { - return get().getOsName().toLowerCase().contains("windows"); - } - public void init(boolean strict) { log.info("Starts to init ObServe server configuration..."); @@ -196,7 +192,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar if (strict && !commonSecurityConfigurationFile.exists()) { throw new IllegalStateException(String.format("Can not start application. Could not find security.yml file.\n\nPlease add it to one of this places:\n\t%s\n\t%s", commonSecurityConfigurationFile, securityConfigurationFile)); } - boolean generated = ServerResources.SECURITY_CONFIGURATION.setStrict(strict).setForWindows(isWindows()).copyResource(commonSecurityConfigurationFile.toPath(), securityConfigurationFile); + boolean generated = ServerResources.SECURITY_CONFIGURATION.setStrict(strict).setForWindows(get().isWindowsOs()).copyResource(commonSecurityConfigurationFile.toPath(), securityConfigurationFile); if (generated) { log.info("Generate default security.yml"); } else { @@ -227,6 +223,7 @@ public class ServerConfig extends GeneratedServerConfig implements CleanTemporar private void parse() { try { get().parse(); + get().fixFileOptionsForWindows(options()); } catch (ArgumentsParserException e) { throw new ObserveWebApplicationConfigInitException("could not parse configuration", e); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cab949ebbf594066bc98e67b... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/9cab949ebbf594066bc98e67b... You're receiving this email because of your account on gitlab.com.