Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 03ca7425 by Tony CHEMIT at 2017-07-10T16:48:14+02:00 Mise à jour des librairies (Closes #790) (retour sur yamlbeans qui ne fonctionne toujours pas en version audessus de la 1.08... - - - - - 4e0f3a1e by Tony CHEMIT at 2017-07-10T16:49:04+02:00 Utilisation des templates dans le répertoires des ressources (Closes #791) - - - - - e6fbec99 by Tony CHEMIT at 2017-07-10T19:38:48+02:00 Régression dur l'écran de configuration (See #789) - - - - - 5 changed files: - application-swing-configuration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java - pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -91,7 +91,7 @@ <artifactId>nuiton-config</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -77,7 +77,7 @@ <artifactId>nuiton-decorator</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -357,63 +357,63 @@ <!-- jaxx dependencies --> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-application</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-session</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-wizard</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-hidor</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> </dependency> @@ -623,7 +623,7 @@ <plugins> <plugin> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <executions> <execution> ===================================== application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java ===================================== --- a/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java +++ b/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java @@ -23,29 +23,30 @@ package fr.ird.observe.application.swing.ui.content.impl.longline; */ import com.google.common.collect.Iterables; +import fr.ird.observe.application.swing.ObserveResourceManager; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.services.dto.longline.BasketDto; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SectionDto; -import org.nuiton.jaxx.validator.swing.SwingValidator; -import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Locale; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.nuiton.config.ArgumentsParserException; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.ClassPathI18nInitializer; +import org.nuiton.jaxx.validator.swing.SwingValidator; +import org.nuiton.jaxx.validator.swing.SwingValidatorMessage; import org.nuiton.validator.NuitonValidatorScope; import org.nuiton.validator.bean.simple.SimpleBeanValidatorMessage; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Locale; - /** * Created on 3/18/15. * @@ -60,14 +61,18 @@ public class LonglineDetailCompositionValidatorServiceTest { protected LonglineDetailCompositionValidatorService service; @Before - public void setUp() throws IOException { + public void setUp() throws IOException, ArgumentsParserException { if (ObserveSwingApplicationContext.isInit()) { ObserveSwingApplicationContext.get().close(); } - ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(new ObserveSwingApplicationConfig()); + ObserveSwingApplicationConfig config = new ObserveSwingApplicationConfig(); + + config.initConfig(new ObserveResourceManager().getResource(ObserveResourceManager.Resource.application)); + + ObserveSwingApplicationContext applicationContext = new ObserveSwingApplicationContext(config); SwingValidator<SectionDto> sectionValidator = new SwingValidator<>(SectionDto.class, "ui-update-table", NuitonValidatorScope.values()); SwingValidator<BasketDto> basketValidator = new SwingValidator<>(BasketDto.class, "ui-update-table", NuitonValidatorScope.values()); ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -173,8 +173,8 @@ <eugenePluginVersion>3.0-alpha-11</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <jaxxVersion>3.0-alpha-6</jaxxVersion> - <nuitonI18nVersion>4.0-alpha-1-SNAPSHOT</nuitonI18nVersion> + <jaxxVersion>3.0-alpha-7</jaxxVersion> + <nuitonI18nVersion>4.0-alpha-1</nuitonI18nVersion> <nuitonConfigVersion>3.2</nuitonConfigVersion> <topiaVersion>3.2.1</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -389,11 +389,21 @@ <artifactId>i18n-editor</artifactId> <version>${nuitonI18nVersion}</version> <scope>compile</scope> + <exclusions> + <exclusion> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-runtime</artifactId> + </exclusion> + <exclusion> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-file</artifactId> + </exclusion> + </exclusions> </dependency> <!-- Jaxx --> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -405,19 +415,19 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-application</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-session</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-runtime-swing-wizard</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -429,7 +439,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-validator</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -441,7 +451,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-error</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -453,7 +463,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-hidor</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -465,7 +475,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -477,7 +487,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-datetime</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -489,7 +499,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-select</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -501,7 +511,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-about</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -513,7 +523,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-number</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -525,7 +535,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-file</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -537,7 +547,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-status</artifactId> <version>${jaxxVersion}</version> <exclusions> @@ -548,7 +558,7 @@ </exclusions> </dependency> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-config</artifactId> <version>${jaxxVersion}</version> <scope>compile</scope> @@ -705,7 +715,8 @@ <dependency> <groupId>com.esotericsoftware.yamlbeans</groupId> <artifactId>yamlbeans</artifactId> - <version>1.12</version> + <!--up to version 13 it does not work :(--> + <version>1.08</version> </dependency> <!-- ne pas mettre à jour cette version est pour tomcat 7--> @@ -883,7 +894,7 @@ <artifactId>maven-site-plugin</artifactId> <dependencies> <dependency> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-widgets-gis</artifactId> <version>${jaxxVersion}</version> </dependency> @@ -949,7 +960,7 @@ </plugin> <plugin> - <groupId>org.nuiton.jaxx</groupId> + <groupId>io.ultreia.java4all.jaxx</groupId> <artifactId>jaxx-maven-plugin</artifactId> <version>${jaxxVersion}</version> </plugin> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/55d1f1279e4e9c8cda8a5d5e0a8... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/55d1f1279e4e9c8cda8a5d5e0a8... You're receiving this email because of your account on gitlab.com.