Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3c2de76e by Tony CHEMIT at 2017-11-01T09:49:08+01:00 use new i18n mojos - - - - - 200e6bfc by Tony CHEMIT at 2017-11-01T17:39:01+01:00 use new i18n mojo - - - - - 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: ===================================== client-configuration/pom.xml ===================================== --- a/client-configuration/pom.xml +++ b/client-configuration/pom.xml @@ -130,9 +130,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -163,15 +164,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== client/pom.xml ===================================== --- a/client/pom.xml +++ b/client/pom.xml @@ -718,9 +718,9 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> + <id>default-parse-java-enumerations</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> </goals> <configuration> <enumerationSets> @@ -748,7 +748,7 @@ </configuration> </execution> <execution> - <id>check-convergence</id> + <id>default-check-i18n-artifacts</id> <goals> <goal>check-i18n-artifacts</goal> </goals> @@ -760,16 +760,16 @@ <goal>generate</goal> </goals> <configuration> + <copyToClasses>false</copyToClasses> <entries> <entry> - <specificGoal>parse-java</specificGoal> <basedir>${project.build.directory}/generated-sources/java/</basedir> </entry> </entries> </configuration> </execution> <execution> - <id>make-bundle</id> + <id>default-bundle</id> <goals> <goal>bundle</goal> </goals> ===================================== client/src/main/assembly/i18n.xml ===================================== --- a/client/src/main/assembly/i18n.xml +++ b/client/src/main/assembly/i18n.xml @@ -37,7 +37,7 @@ </fileSet> <fileSet> - <directory>target/generated-sources/resources/META-INF</directory> + <directory>target/classes/META-INF</directory> <outputDirectory/> <includes> <include>observe-i18n*</include> ===================================== client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/admin/synchronize/referential/ng/ReferentialSynchroConfigUI.jaxx @@ -39,6 +39,7 @@ javax.swing.JComboBox static fr.ird.observe.client.util.UIHelper.getStringValue + static org.nuiton.i18n.I18n.t </import> <ReferentialSynchroUIHandler id='handler' initializer='getContextValue(ReferentialSynchroUIHandler.class)'/> ===================================== client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx ===================================== --- a/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx +++ b/client/src/main/java/fr/ird/observe/client/ui/storage/tabs/RolesUI.jaxx @@ -30,6 +30,8 @@ fr.ird.observe.client.ui.storage.tabs.SecurityModel fr.ird.observe.client.ui.storage.StorageStep fr.ird.observe.client.ui.storage.StorageUIModel + + static org.nuiton.i18n.I18n.t </import> <StorageStep id='step' initializer='StorageStep.ROLES'/> ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -249,9 +249,10 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <id>generateI18nEnumHelper</id> <goals> - <goal>generateI18nEnumHelper</goal> + <goal>parse-java-enumerations</goal> + <goal>parse-java</goal> + <goal>generate</goal> </goals> <configuration> <enumerationSets> @@ -278,16 +279,6 @@ </enums> </enumerationSet> </enumerationSets> - </configuration> - </execution> - - <execution> - <id>scan-sources</id> - <goals> - <goal>parse-java</goal> - <goal>generate</goal> - </goals> - <configuration> <entries> <entry> <basedir>${project.build.directory}/generated-sources/java</basedir> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2017.34</version> + <version>2017.36</version> </parent> <groupId>fr.ird.observe</groupId> @@ -132,7 +132,7 @@ <distributionManagement> <site> <id>gitlab.com</id> - <url>scm:git:http://git@gitlab.com/${projectPath}.git</url> + <url>scm:git:https://git@gitlab.com/${projectPath}.git</url> </site> </distributionManagement> @@ -156,7 +156,8 @@ <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion> + <jaxx.version>3.0-alpha-17-SNAPSHOT</jaxx.version> + <i18n.version>4.0-alpha-6</i18n.version> <nuitonConfigVersion>3.3</nuitonConfigVersion> <topiaVersion>3.3</topiaVersion> <nuitonValidatorVersion>3.1</nuitonValidatorVersion> @@ -423,7 +424,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-api</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> <exclusions> <exclusion> @@ -435,7 +436,7 @@ <dependency> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-editor</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> <scope>compile</scope> </dependency> @@ -835,7 +836,7 @@ <plugin> <groupId>io.ultreia.java4all.i18n</groupId> <artifactId>i18n-maven-plugin</artifactId> - <version>${nuitonI18nVersion}</version> + <version>${i18n.version}</version> </plugin> <plugin> ===================================== validation/pom.xml ===================================== --- a/validation/pom.xml +++ b/validation/pom.xml @@ -43,11 +43,6 @@ <artifactId>dto</artifactId> <version>${project.version}</version> </dependency> - <!--dependency> - <groupId>${project.groupId}</groupId> - <artifactId>services</artifactId> - <version>${project.version}</version> - </dependency--> <dependency> <groupId>${project.groupId}</groupId> <artifactId>test</artifactId> @@ -156,6 +151,7 @@ <plugins> + <plugin> <groupId>fr.ird.observe.toolkit</groupId> <artifactId>toolbox-maven-plugin</artifactId> @@ -165,27 +161,6 @@ </configuration> <executions> <execution> - <id>generate-i18n-validator-fields</id> - <goals> - <goal>generate-i18n-validator-fields</goal> - </goals> - <configuration> - <className>ClientI18nValidatorHelper</className> - <prefix>observe.common.</prefix> - <validatorsFile>${project.basedir}/main/resources/validators.xml</validatorsFile> - <sourceRoot>../validation/src/main/resources</sourceRoot> - <inheritanceMapping> - <fr.ird.observe.dto.referential.I18nReferentialDto> - label1,label2,label3,label4,label5,label6,label7,label8 - </fr.ird.observe.dto.referential.I18nReferentialDto> - <fr.ird.observe.dto.referential.ReferentialDto> - code,status,uri,needComment - </fr.ird.observe.dto.referential.ReferentialDto> - </inheritanceMapping> - </configuration> - </execution> - <execution> - <id>generate-validators-descriptor</id> <goals> <goal>generate-validators-descriptor</goal> </goals> @@ -215,17 +190,32 @@ <artifactId>i18n-maven-plugin</artifactId> <executions> <execution> - <phase>process-classes</phase> <goals> <goal>parse-java</goal> - <goal>parse-validation</goal> + <goal>parse-validation-fields</goal> + <goal>parse-validation-messages</goal> <goal>generate</goal> </goals> <configuration> - <force>true</force> + <validationFieldPrefix>observe.common.</validationFieldPrefix> + <inheritanceMapping> + <fr.ird.observe.dto.referential.I18nReferentialDto> + label1,label2,label3,label4,label5,label6,label7,label8 + </fr.ird.observe.dto.referential.I18nReferentialDto> + <fr.ird.observe.dto.referential.ReferentialDto> + code,status,uri,needComment + </fr.ird.observe.dto.referential.ReferentialDto> + </inheritanceMapping> </configuration> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>dto</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> </plugins> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f63e34a61a1d87299b4bfeefe5d... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/f63e34a61a1d87299b4bfeefe5d... You're receiving this email because of your account on gitlab.com.