March 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 219df83f by Tony CHEMIT at 2017-03-30T16:12:24+02:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-3-SNAPSHOT development - - - - - 20 changed files: - application-swing-configuration/pom.xml - application-swing-decoration/pom.xml - application-swing-validation/pom.xml - application-swing/pom.xml - application-web-configuration/pom.xml - application-web/pom.xml - common/pom.xml - observe/pom.xml - persistence/pom.xml - pom.xml - services-binder/pom.xml - services-rest/pom.xml - services-runner/pom.xml - services-topia/pom.xml - services-validation/pom.xml - services/pom.xml - test/pom.xml - toolbox-maven-plugin/pom.xml - topia-extension/pom.xml - topia-templates-extension/pom.xml Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> ===================================== application-swing-decoration/pom.xml ===================================== --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> ===================================== common/pom.xml ===================================== --- a/common/pom.xml +++ b/common/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>common</artifactId> ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>observe</artifactId> ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>persistence</artifactId> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -31,7 +31,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> ===================================== services-binder/pom.xml ===================================== --- a/services-binder/pom.xml +++ b/services-binder/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-binder</artifactId> ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services-validation</artifactId> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>services</artifactId> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>test</artifactId> ===================================== toolbox-maven-plugin/pom.xml ===================================== --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> ===================================== topia-extension/pom.xml ===================================== --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> ===================================== topia-templates-extension/pom.xml ===================================== --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>pom</artifactId> - <version>6.0-RC-2-SNAPSHOT</version> + <version>6.0-RC-3-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/219df83f00259469fa2f1ed4f69…

1 0

[Git][ultreiaio/ird-observe] Pushed new branch release/6.0-RC-2
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed new branch release/6.0-RC-2 at ultreiaio / ird-observe

1 0

[Git][ultreiaio/ird-observe][develop] Possibilité d'insérer un capteur alors que son type n'a pas été renseigné (See #762)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3166590c by Tony CHEMIT at 2017-03-30T14:28:22+02:00 Possibilité d'insérer un capteur alors que son type n'a pas été renseigné (See #762) - - - - - 1 changed file: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java @@ -44,6 +44,9 @@ public class NewTableEntryUIAction extends AbstractContentUIAction { @Override protected void actionPerformed(ContentUI<?, ?> ui) { ContentTableUI<?, ?, ?> contentUI = (ContentTableUI<?, ?, ?>) ui; + // pour forcer le rechargement du binding + contentUI.getModel().setCanSaveRow(true); + contentUI.getModel().setCanSaveRow(false); contentUI.getTableModel().addNewEntry(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/3166590c7521d8c49350f67c4ff…

1 0

[Git][ultreiaio/ird-observe][develop] Dans certaisn référentiels, les doubles listes ne prennent pas toute la place di…
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a9837e41 by Tony CHEMIT at 2017-03-30T14:10:59+02:00 Dans certaisn référentiels, les doubles listes ne prennent pas toute la place disponible à cet effet (See #763) - - - - - 5 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx - application-swing/src/main/resources/i18n/application-swing_en_GB.properties - application-swing/src/main/resources/i18n/application-swing_es_ES.properties - application-swing/src/main/resources/i18n/application-swing_fr_FR.properties Changes: ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx @@ -49,7 +49,7 @@ <Table id="editView" insets="0" fill="both"> <row> - <cell anchor="north" weightx="1"> + <cell anchor="north" weightx="1" weighty="1"> <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> @@ -173,11 +173,6 @@ </JTabbedPane> </cell> </row> - <row> - <cell columns="2" weighty="1"> - <JLabel/> - </cell> - </row> </Table> </fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI> ===================================== application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx ===================================== --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/SpeciesListUI.jaxx @@ -56,7 +56,7 @@ <Table id="editView" insets="0" fill="both"> <row> - <cell anchor="north" weightx="1"> + <cell anchor="north" weightx="1" weighty="1"> <JTabbedPane id='mainTabbedPane'> <tab id='generalTab'> <Table fill="both"> @@ -167,7 +167,7 @@ <Table fill="both" weightx="1">  <row> - <cell weightx="1" weighty="1"> + <cell weighty="1"> <JScrollPane id='speciesPane' layout='{new GridLayout(1,1)}'> <FilterableDoubleList id='species' genericType='ReferentialReference<SpeciesDto>' _entityClass='SpeciesDto.class'/> @@ -179,11 +179,6 @@ </JTabbedPane> </cell> </row> - <row> - <cell columns="2" weighty="1"> - <JLabel/> - </cell> - </row> </Table> </fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUI> ===================================== application-swing/src/main/resources/i18n/application-swing_en_GB.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -1375,16 +1375,16 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.descri observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bi directionnal observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=From left to right observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=From right to left -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=observed -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=non observed -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value3=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value4=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value5=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value6=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value7=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value8=value not defined -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value9=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value0=observed +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value1=non observed +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value2=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value3=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value4=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value5=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value6=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value7=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value8=value not defined +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value9=value not defined observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.GROUPED=Batch observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.INDIVIDUAL=Individual observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum.ld1=LD1 ===================================== application-swing/src/main/resources/i18n/application-swing_es_ES.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -1377,16 +1377,16 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.descri observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bidireccional observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De izquierda a derecha observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De derecha a izquierda -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=no observado -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=observado -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=valor 2 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value3=valor 3 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value4=valor 4 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value5=valor 5 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value6=valor 6 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value7=valor 7 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value8=valor 8 no definido -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value9=valor 9 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value0=no observado +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value1=observado +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value2=valor 2 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value3=valor 3 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value4=valor 4 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value5=valor 5 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value6=valor 6 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value7=valor 7 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value8=valor 8 no definido +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value9=valor 9 no definido observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.GROUPED=Agroupado observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.INDIVIDUAL=Por individuo observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum.ld1=LD1 ===================================== application-swing/src/main/resources/i18n/application-swing_fr_FR.properties ===================================== --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -1382,16 +1382,16 @@ observe.enum.fr.ird.observe.application.swing.ui.admin.AdminStep.VALIDATE.descri observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.BOTH=Bidirectionnel observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_LEFT_TO_RIGHT=De la gauche vers la droite observe.enum.fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode.FROM_RIGHT_TO_LEFT=De la droite vers la gauche -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value0=non observé -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value1=observé -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value2=valeur 2 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value3=valeur 3 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value4=valeur 4 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value5=valeur 5 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value6=valeur 6 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value7=valeur 7 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value8=valeur 8 non définie -observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum.value9=valeur 9 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value0=non observé +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value1=observé +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value2=valeur 2 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value3=valeur 3 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value4=valeur 4 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value5=valeur 5 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value6=valeur 6 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value7=valeur 7 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value8=valeur 8 non définie +observe.enum.fr.ird.observe.application.swing.ui.content.ref.impl.common.ProgramObservationEnum.value9=valeur 9 non définie observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.GROUPED=Groupé observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.longline.CatchAcquisitionModeEnum.INDIVIDUAL=Par individu observe.enum.fr.ird.observe.application.swing.ui.content.table.impl.seine.CodeMesureEnum.ld1=LD1 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a9837e417c64c57041a37e0150b…

1 0

[Git][ultreiaio/ird-observe][develop] Meilleure packaging des refs commons + début de correction de #763 (pour l'écran espèce)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 4371d8ee by Tony CHEMIT at 2017-03-30T13:58:51+02:00 Meilleure packaging des refs commons + début de correction de #763 (pour l'écran espèce) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/CountryUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/FpaZoneUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicTypeUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearCaracteristicUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/GearUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/HarbourUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUI.jcss - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUIHandler.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIModel.java → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthLengthParameterUIModel.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthWeightParameterUI.jaxx - application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jcss → application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/common/LengthWeightParameterUI.jcss The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/4371d8ee46b240e3a270c65ba91…

1 0

[Git][ultreiaio/ird-observe][develop] Sur les doubles listes les boutons du mileu n'ont plus d'icones (See #761)
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fa0332bd by Tony CHEMIT at 2017-03-30T13:34:06+02:00 Sur les doubles listes les boutons du mileu n'ont plus d'icones (See #761) - - - - - 1 changed file: - application-swing/src/main/resources/observe-ui.properties Changes: ===================================== application-swing/src/main/resources/observe-ui.properties ===================================== --- a/application-swing/src/main/resources/observe-ui.properties +++ b/application-swing/src/main/resources/observe-ui.properties @@ -81,6 +81,13 @@ icon.action.add=action-add.png icon.action.bean-sort=action-bean-sort.png icon.action.bean-sort-up=action-bean-sort-up.png icon.action.bean-sort-down=action-bean-sort-down.png +icon.action.doublelist-sort=action-doublelist-sort.png +icon.action.doublelist-up=action-doublelist-up.png +icon.action.doublelist-down=action-doublelist-down.png +icon.action.doublelist-sort-up=action-doublelist-sort-up.png +icon.action.doublelist-sort-down=action-doublelist-sort-down.png +icon.action.doublelist-unselect=action-doublelist-unselect.png +icon.action.doublelist-select=action-doublelist-select.png icon.action.config-quit=action-config-quit.png icon.action.config-save=action-config-save.png icon.action.config-reset=action-config-reset.png View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fa0332bd156979a9f15ffa5be7c…

1 0

[Git][ultreiaio/ird-observe][develop] Revue des raccourcis claviers (on supprime les raccourcis qui font doublon avec…
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d85bab86 by Tony CHEMIT at 2017-03-30T13:13:51+02:00 Revue des raccourcis claviers (on supprime les raccourcis qui font doublon avec les globaux) (See #760) - - - - - 30 changed files: - application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractObserveAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AbstractContentUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivityLonglineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineFloatingObjectUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/AddActivitySeineSetUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/BackToReferentialListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseAndCreateUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CloseOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateNewReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/CreateOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteDataUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteReferenceUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/DeleteTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialFromListUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/EditReferentialUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoToTabUIActionSupport.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivityLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveActivitySeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveRoutesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/NewTableEntryUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ReOpenUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/ResetEditUIAction.java - application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/SaveEditUIAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d85bab860de249cc68cd02dc942…

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: Squash services-configuration modules
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: f0d6ecb3 by Tony CHEMIT at 2017-03-30T11:14:28+02:00 Squash services-configuration modules - - - - - 91d9cc3b by Tony CHEMIT at 2017-03-30T11:15:46+02:00 update license headers - - - - - 30 changed files: - application-swing-configuration/src/main/resources/log4j.properties - application-swing-validation/src/main/java/validators/AbstractSpeciesFieldDtoValidator.java - application-swing-validation/src/main/java/validators/ActivityFinDeVeilleExistsDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySimpleSpeedDtoValidator.java - application-swing-validation/src/main/java/validators/ActivitySpeedDtoValidator.java - application-swing-validation/src/main/java/validators/CollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/CoordinateLatitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/CoordinateLongitudeDtoFieldValidator.java - application-swing-validation/src/main/java/validators/ObserveCollectionUniqueKeyDtoValidator.java - application-swing-validation/src/main/java/validators/OpenableDtoFieldValidator.java - application-swing-validation/src/main/java/validators/QuadrantFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueHomeIdDtoValidator.java - application-swing-validation/src/main/java/validators/SetLonglineUniqueNumberDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesLengthFieldDtoValidator.java - application-swing-validation/src/main/java/validators/SpeciesWeightFieldDtoValidator.java - application-swing/pom.xml - application-swing/src/main/resources/ftl/initStorage_en.ftl - application-swing/src/main/resources/ftl/initStorage_es.ftl - application-swing/src/main/resources/ftl/initStorage_fr.ftl - application-web/pom.xml - pom.xml - services-binder/src/test/resources/log4j.properties - − services-configuration-rest/LICENSE.txt - − services-configuration-rest/README.md - − services-configuration-rest/pom.xml - − services-configuration-topia/LICENSE.txt - − services-configuration-topia/README.md - − services-configuration-topia/pom.xml - − services-configuration/LICENSE.txt - − services-configuration/README.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/fdd698f79b9a0108c59f2c2fd1…

1 0

[Git][ultreiaio/ird-observe][develop] Squash validators and validation modules
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: fdd698f7 by Tony CHEMIT at 2017-03-30T10:55:51+02:00 Squash validators and validation modules - - - - - 8 changed files: - application-swing-configuration/pom.xml - application-swing-validation/pom.xml - application-web-configuration/pom.xml - services-runner/pom.xml - services-validation/pom.xml - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java Changes: ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -48,13 +48,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> + <artifactId>services-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> + <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -126,6 +126,24 @@ <plugins> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compile-generated-sources</id> + <goals> + <goal>compile</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <includes> + <include>**/I18nValidatorHelper.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> <groupId>${project.groupId}</groupId> <artifactId>toolbox-maven-plugin</artifactId> <version>${project.version}</version> @@ -144,7 +162,6 @@ </execution> <execution> <id>generate-validators-descriptor</id> - <phase>generate-sources</phase> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -156,11 +173,6 @@ <artifactId>services</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </plugin> @@ -173,6 +185,7 @@ <goals> <goal>parserJava</goal> </goals> + <phase>process-classes</phase> <configuration> <entries> <entry> @@ -187,6 +200,7 @@ <goals> <goal>parserValidation</goal> </goals> + <phase>process-classes</phase> <configuration> <entries> <entry> @@ -203,6 +217,7 @@ <goals> <goal>gen</goal> </goals> + <phase>process-classes</phase> </execution> </executions> </plugin> ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -44,13 +44,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> + <artifactId>services-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> + <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>provided</scope> </dependency> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -78,22 +78,10 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>application-swing-validation</artifactId> <version>${project.version}</version> <scope>runtime</scope> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>application-swing-validators</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency>  ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -132,7 +132,6 @@ <executions> <execution> <id>generate-i18n-validator-fields</id> - <phase>generate-sources</phase> <goals> <goal>generate-i18n-validator-fields</goal> </goals> @@ -142,7 +141,6 @@ </execution> <execution> <id>generate-validators-descriptor</id> - <phase>generate-sources</phase> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -154,20 +152,33 @@ <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services-validators</artifactId> - <version>${project.version}</version> - </dependency> </dependencies> </plugin> <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <executions> + <execution> + <id>compile-generated-sources</id> + <goals> + <goal>compile</goal> + </goals> + <phase>process-classes</phase> + <configuration> + <includes> + <include>**/I18nValidatorHelper.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> <id>parse-java</id> + <phase>process-classes</phase> <goals> <goal>parserJava</goal> </goals> @@ -182,6 +193,7 @@ </execution> <execution> <id>parse-validation</id> + <phase>process-classes</phase> <goals> <goal>parserValidation</goal> </goals> @@ -198,6 +210,7 @@ </execution> <execution> <id>gen</id> + <phase>process-classes</phase> <goals> <goal>gen</goal> </goals> ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateI18nValidatorFieldsMojo.java @@ -44,7 +44,7 @@ import java.util.TreeSet; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) +@Mojo(name = "generate-i18n-validator-fields", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE) class GenerateI18nValidatorFieldsMojo extends GenerateValidatorMojoSupport { /** ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorMojoSupport.java @@ -84,7 +84,7 @@ public abstract class GenerateValidatorMojoSupport extends ToolboxMojoSupport im @Override public URLClassLoader getUrlClassLoader() throws MalformedURLException { - return initClassLoader(getProject(), validatorsFile.getParentFile(), true, false, true, true, false); + return initClassLoader(getProject(), validatorsFile.getParentFile(), false, true, true, true, true); } } ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java @@ -48,7 +48,7 @@ import java.util.TreeSet; * @author Tony Chemit - dev(a)tchemit.fr * @since 5.0 */ -@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.GENERATE_RESOURCES, requiresDependencyResolution = ResolutionScope.COMPILE) +@Mojo(name = "generate-validators-descriptor", defaultPhase = LifecyclePhase.PROCESS_CLASSES, requiresDependencyResolution = ResolutionScope.COMPILE) class GenerateValidatorsDescriptorMojo extends GenerateValidatorMojoSupport { /** View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/fdd698f79b9a0108c59f2c2fd1f…

1 0

[Git][ultreiaio/ird-observe][develop] try to make builds work again
by Tony CHEMIT 30 Mar '17

30 Mar '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 8237b901 by Tony CHEMIT at 2017-03-30T09:21:22+02:00 try to make builds work again - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,6 @@ stages: - Production .before_script_default: &before_script_default - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) @@ -27,9 +24,6 @@ stages: - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/8237b9019df07af5d9901034371…

1 0