Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
3c2de76e
by Tony CHEMIT at 2017-11-01T09:49:08+01:00
-
200e6bfc
by Tony CHEMIT at 2017-11-01T17:39:01+01:00
8 changed files:
- client-configuration/pom.xml
- client/pom.xml
- client/src/main/assembly/i18n.xml
- client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx
- client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx
- dto/pom.xml
- pom.xml
- validation/pom.xml
Changes:
| ... | ... | @@ -130,9 +130,10 @@ |
| 130 | 130 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 131 | 131 |
<executions>
|
| 132 | 132 |
<execution>
|
| 133 |
- <id>generateI18nEnumHelper</id>
|
|
| 134 | 133 |
<goals>
|
| 135 |
- <goal>generateI18nEnumHelper</goal>
|
|
| 134 |
+ <goal>parse-java-enumerations</goal>
|
|
| 135 |
+ <goal>parse-java</goal>
|
|
| 136 |
+ <goal>generate</goal>
|
|
| 136 | 137 |
</goals>
|
| 137 | 138 |
<configuration>
|
| 138 | 139 |
<enumerationSets>
|
| ... | ... | @@ -163,15 +164,6 @@ |
| 163 | 164 |
</enums>
|
| 164 | 165 |
</enumerationSet>
|
| 165 | 166 |
</enumerationSets>
|
| 166 |
- </configuration>
|
|
| 167 |
- </execution>
|
|
| 168 |
- <execution>
|
|
| 169 |
- <id>scan-sources</id>
|
|
| 170 |
- <goals>
|
|
| 171 |
- <goal>parse-java</goal>
|
|
| 172 |
- <goal>generate</goal>
|
|
| 173 |
- </goals>
|
|
| 174 |
- <configuration>
|
|
| 175 | 167 |
<entries>
|
| 176 | 168 |
<entry>
|
| 177 | 169 |
<basedir>${project.build.directory}/generated-sources/java</basedir>
|
| ... | ... | @@ -718,9 +718,9 @@ |
| 718 | 718 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 719 | 719 |
<executions>
|
| 720 | 720 |
<execution>
|
| 721 |
- <id>generateI18nEnumHelper</id>
|
|
| 721 |
+ <id>default-parse-java-enumerations</id>
|
|
| 722 | 722 |
<goals>
|
| 723 |
- <goal>generateI18nEnumHelper</goal>
|
|
| 723 |
+ <goal>parse-java-enumerations</goal>
|
|
| 724 | 724 |
</goals>
|
| 725 | 725 |
<configuration>
|
| 726 | 726 |
<enumerationSets>
|
| ... | ... | @@ -748,7 +748,7 @@ |
| 748 | 748 |
</configuration>
|
| 749 | 749 |
</execution>
|
| 750 | 750 |
<execution>
|
| 751 |
- <id>check-convergence</id>
|
|
| 751 |
+ <id>default-check-i18n-artifacts</id>
|
|
| 752 | 752 |
<goals>
|
| 753 | 753 |
<goal>check-i18n-artifacts</goal>
|
| 754 | 754 |
</goals>
|
| ... | ... | @@ -760,16 +760,16 @@ |
| 760 | 760 |
<goal>generate</goal>
|
| 761 | 761 |
</goals>
|
| 762 | 762 |
<configuration>
|
| 763 |
+ <copyToClasses>false</copyToClasses>
|
|
| 763 | 764 |
<entries>
|
| 764 | 765 |
<entry>
|
| 765 |
- <specificGoal>parse-java</specificGoal>
|
|
| 766 | 766 |
<basedir>${project.build.directory}/generated-sources/java/</basedir>
|
| 767 | 767 |
</entry>
|
| 768 | 768 |
</entries>
|
| 769 | 769 |
</configuration>
|
| 770 | 770 |
</execution>
|
| 771 | 771 |
<execution>
|
| 772 |
- <id>make-bundle</id>
|
|
| 772 |
+ <id>default-bundle</id>
|
|
| 773 | 773 |
<goals>
|
| 774 | 774 |
<goal>bundle</goal>
|
| 775 | 775 |
</goals>
|
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 |
</fileSet>
|
| 38 | 38 |
|
| 39 | 39 |
<fileSet>
|
| 40 |
- <directory>target/generated-sources/resources/META-INF</directory>
|
|
| 40 |
+ <directory>target/classes/META-INF</directory>
|
|
| 41 | 41 |
<outputDirectory/>
|
| 42 | 42 |
<includes>
|
| 43 | 43 |
<include>observe-i18n*</include>
|
| ... | ... | @@ -39,6 +39,7 @@ |
| 39 | 39 |
javax.swing.JComboBox
|
| 40 | 40 |
|
| 41 | 41 |
static fr.ird.observe.client.util.UIHelper.getStringValue
|
| 42 |
+ static org.nuiton.i18n.I18n.t
|
|
| 42 | 43 |
</import>
|
| 43 | 44 |
|
| 44 | 45 |
<ReferentialSynchroUIHandler id='handler' initializer='getContextValue(ReferentialSynchroUIHandler.class)'/>
|
| ... | ... | @@ -30,6 +30,8 @@ |
| 30 | 30 |
fr.ird.observe.client.ui.storage.tabs.SecurityModel
|
| 31 | 31 |
fr.ird.observe.client.ui.storage.StorageStep
|
| 32 | 32 |
fr.ird.observe.client.ui.storage.StorageUIModel
|
| 33 |
+ |
|
| 34 |
+ static org.nuiton.i18n.I18n.t
|
|
| 33 | 35 |
</import>
|
| 34 | 36 |
|
| 35 | 37 |
<StorageStep id='step' initializer='StorageStep.ROLES'/>
|
| ... | ... | @@ -249,9 +249,10 @@ |
| 249 | 249 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 250 | 250 |
<executions>
|
| 251 | 251 |
<execution>
|
| 252 |
- <id>generateI18nEnumHelper</id>
|
|
| 253 | 252 |
<goals>
|
| 254 |
- <goal>generateI18nEnumHelper</goal>
|
|
| 253 |
+ <goal>parse-java-enumerations</goal>
|
|
| 254 |
+ <goal>parse-java</goal>
|
|
| 255 |
+ <goal>generate</goal>
|
|
| 255 | 256 |
</goals>
|
| 256 | 257 |
<configuration>
|
| 257 | 258 |
<enumerationSets>
|
| ... | ... | @@ -278,16 +279,6 @@ |
| 278 | 279 |
</enums>
|
| 279 | 280 |
</enumerationSet>
|
| 280 | 281 |
</enumerationSets>
|
| 281 |
- </configuration>
|
|
| 282 |
- </execution>
|
|
| 283 |
- |
|
| 284 |
- <execution>
|
|
| 285 |
- <id>scan-sources</id>
|
|
| 286 |
- <goals>
|
|
| 287 |
- <goal>parse-java</goal>
|
|
| 288 |
- <goal>generate</goal>
|
|
| 289 |
- </goals>
|
|
| 290 |
- <configuration>
|
|
| 291 | 282 |
<entries>
|
| 292 | 283 |
<entry>
|
| 293 | 284 |
<basedir>${project.build.directory}/generated-sources/java</basedir>
|
| ... | ... | @@ -26,7 +26,7 @@ |
| 26 | 26 |
<parent>
|
| 27 | 27 |
<groupId>io.ultreia.maven</groupId>
|
| 28 | 28 |
<artifactId>pom</artifactId>
|
| 29 |
- <version>2017.34</version>
|
|
| 29 |
+ <version>2017.36</version>
|
|
| 30 | 30 |
</parent>
|
| 31 | 31 |
|
| 32 | 32 |
<groupId>fr.ird.observe</groupId>
|
| ... | ... | @@ -132,7 +132,7 @@ |
| 132 | 132 |
<distributionManagement>
|
| 133 | 133 |
<site>
|
| 134 | 134 |
<id>gitlab.com</id>
|
| 135 |
- <url>scm:git:http://git@gitlab.com/${projectPath}.git</url>
|
|
| 135 |
+ <url>scm:git:https://git@gitlab.com/${projectPath}.git</url>
|
|
| 136 | 136 |
</site>
|
| 137 | 137 |
</distributionManagement>
|
| 138 | 138 |
|
| ... | ... | @@ -156,7 +156,8 @@ |
| 156 | 156 |
<eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
|
| 157 | 157 |
<processorPluginVersion>1.3</processorPluginVersion>
|
| 158 | 158 |
|
| 159 |
- <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion>
|
|
| 159 |
+ <jaxx.version>3.0-alpha-17-SNAPSHOT</jaxx.version>
|
|
| 160 |
+ <i18n.version>4.0-alpha-6</i18n.version>
|
|
| 160 | 161 |
<nuitonConfigVersion>3.3</nuitonConfigVersion>
|
| 161 | 162 |
<topiaVersion>3.3</topiaVersion>
|
| 162 | 163 |
<nuitonValidatorVersion>3.1</nuitonValidatorVersion>
|
| ... | ... | @@ -423,7 +424,7 @@ |
| 423 | 424 |
<dependency>
|
| 424 | 425 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 425 | 426 |
<artifactId>i18n-api</artifactId>
|
| 426 |
- <version>${nuitonI18nVersion}</version>
|
|
| 427 |
+ <version>${i18n.version}</version>
|
|
| 427 | 428 |
<scope>compile</scope>
|
| 428 | 429 |
<exclusions>
|
| 429 | 430 |
<exclusion>
|
| ... | ... | @@ -435,7 +436,7 @@ |
| 435 | 436 |
<dependency>
|
| 436 | 437 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 437 | 438 |
<artifactId>i18n-editor</artifactId>
|
| 438 |
- <version>${nuitonI18nVersion}</version>
|
|
| 439 |
+ <version>${i18n.version}</version>
|
|
| 439 | 440 |
<scope>compile</scope>
|
| 440 | 441 |
</dependency>
|
| 441 | 442 |
|
| ... | ... | @@ -835,7 +836,7 @@ |
| 835 | 836 |
<plugin>
|
| 836 | 837 |
<groupId>io.ultreia.java4all.i18n</groupId>
|
| 837 | 838 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 838 |
- <version>${nuitonI18nVersion}</version>
|
|
| 839 |
+ <version>${i18n.version}</version>
|
|
| 839 | 840 |
</plugin>
|
| 840 | 841 |
|
| 841 | 842 |
<plugin>
|
| ... | ... | @@ -43,11 +43,6 @@ |
| 43 | 43 |
<artifactId>dto</artifactId>
|
| 44 | 44 |
<version>${project.version}</version>
|
| 45 | 45 |
</dependency>
|
| 46 |
- <!--dependency>
|
|
| 47 |
- <groupId>${project.groupId}</groupId>
|
|
| 48 |
- <artifactId>services</artifactId>
|
|
| 49 |
- <version>${project.version}</version>
|
|
| 50 |
- </dependency-->
|
|
| 51 | 46 |
<dependency>
|
| 52 | 47 |
<groupId>${project.groupId}</groupId>
|
| 53 | 48 |
<artifactId>test</artifactId>
|
| ... | ... | @@ -156,6 +151,7 @@ |
| 156 | 151 |
|
| 157 | 152 |
<plugins>
|
| 158 | 153 |
|
| 154 |
+ |
|
| 159 | 155 |
<plugin>
|
| 160 | 156 |
<groupId>fr.ird.observe.toolkit</groupId>
|
| 161 | 157 |
<artifactId>toolbox-maven-plugin</artifactId>
|
| ... | ... | @@ -165,27 +161,6 @@ |
| 165 | 161 |
</configuration>
|
| 166 | 162 |
<executions>
|
| 167 | 163 |
<execution>
|
| 168 |
- <id>generate-i18n-validator-fields</id>
|
|
| 169 |
- <goals>
|
|
| 170 |
- <goal>generate-i18n-validator-fields</goal>
|
|
| 171 |
- </goals>
|
|
| 172 |
- <configuration>
|
|
| 173 |
- <className>ClientI18nValidatorHelper</className>
|
|
| 174 |
- <prefix>observe.common.</prefix>
|
|
| 175 |
- <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile>
|
|
| 176 |
- <sourceRoot>../validation/src/main/resources</sourceRoot>
|
|
| 177 |
- <inheritanceMapping>
|
|
| 178 |
- <fr.ird.observe.dto.referential.I18nReferentialDto>
|
|
| 179 |
- label1,label2,label3,label4,label5,label6,label7,label8
|
|
| 180 |
- </fr.ird.observe.dto.referential.I18nReferentialDto>
|
|
| 181 |
- <fr.ird.observe.dto.referential.ReferentialDto>
|
|
| 182 |
- code,status,uri,needComment
|
|
| 183 |
- </fr.ird.observe.dto.referential.ReferentialDto>
|
|
| 184 |
- </inheritanceMapping>
|
|
| 185 |
- </configuration>
|
|
| 186 |
- </execution>
|
|
| 187 |
- <execution>
|
|
| 188 |
- <id>generate-validators-descriptor</id>
|
|
| 189 | 164 |
<goals>
|
| 190 | 165 |
<goal>generate-validators-descriptor</goal>
|
| 191 | 166 |
</goals>
|
| ... | ... | @@ -215,17 +190,32 @@ |
| 215 | 190 |
<artifactId>i18n-maven-plugin</artifactId>
|
| 216 | 191 |
<executions>
|
| 217 | 192 |
<execution>
|
| 218 |
- <phase>process-classes</phase>
|
|
| 219 | 193 |
<goals>
|
| 220 | 194 |
<goal>parse-java</goal>
|
| 221 |
- <goal>parse-validation</goal>
|
|
| 195 |
+ <goal>parse-validation-fields</goal>
|
|
| 196 |
+ <goal>parse-validation-messages</goal>
|
|
| 222 | 197 |
<goal>generate</goal>
|
| 223 | 198 |
</goals>
|
| 224 | 199 |
<configuration>
|
| 225 |
- <force>true</force>
|
|
| 200 |
+ <validationFieldPrefix>observe.common.</validationFieldPrefix>
|
|
| 201 |
+ <inheritanceMapping>
|
|
| 202 |
+ <fr.ird.observe.dto.referential.I18nReferentialDto>
|
|
| 203 |
+ label1,label2,label3,label4,label5,label6,label7,label8
|
|
| 204 |
+ </fr.ird.observe.dto.referential.I18nReferentialDto>
|
|
| 205 |
+ <fr.ird.observe.dto.referential.ReferentialDto>
|
|
| 206 |
+ code,status,uri,needComment
|
|
| 207 |
+ </fr.ird.observe.dto.referential.ReferentialDto>
|
|
| 208 |
+ </inheritanceMapping>
|
|
| 226 | 209 |
</configuration>
|
| 227 | 210 |
</execution>
|
| 228 | 211 |
</executions>
|
| 212 |
+ <dependencies>
|
|
| 213 |
+ <dependency>
|
|
| 214 |
+ <groupId>${project.groupId}</groupId>
|
|
| 215 |
+ <artifactId>dto</artifactId>
|
|
| 216 |
+ <version>${project.version}</version>
|
|
| 217 |
+ </dependency>
|
|
| 218 |
+ </dependencies>
|
|
| 229 | 219 |
</plugin>
|
| 230 | 220 |
|
| 231 | 221 |
</plugins>
|