Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

24 changed files:

Changes:

  • client-configuration/pom.xml
    ... ... @@ -168,8 +168,8 @@
    168 168 
               <execution>
    169 169 
                 <id>scan-sources</id>
    170 170 
                 <goals>
    171 
    -              <goal>parserJava</goal>
    172 
    -              <goal>gen</goal>
    171 
    +              <goal>parse-java</goal>
    172 
    +              <goal>generate</goal>
    173 173 
                 </goals>
    174 174 
                 <configuration>
    175 175 
                   <entries>

  • client-configuration/src/main/resources/i18n/client-configuration_en_GB.properties → client-configuration/src/main/i18n/client-configuration_en_GB.properties

  • client-configuration/src/main/resources/i18n/client-configuration_es_ES.properties → client-configuration/src/main/i18n/client-configuration_es_ES.properties

  • client-configuration/src/main/resources/i18n/client-configuration_fr_FR.properties → client-configuration/src/main/i18n/client-configuration_fr_FR.properties

  • client/pom.xml
    ... ... @@ -756,13 +756,13 @@
    756 756 
               <execution>
    757 757 
                 <id>scan-sources</id>
    758 758 
                 <goals>
    759 
    -              <goal>parserJava</goal>
    760 
    -              <goal>gen</goal>
    759 
    +              <goal>parse-java</goal>
    760 
    +              <goal>generate</goal>
    761 761 
                 </goals>
    762 762 
                 <configuration>
    763 763 
                   <entries>
    764 764 
                     <entry>
    765 
    -                  <specificGoal>parserJava</specificGoal>
    765 
    +                  <specificGoal>parse-java</specificGoal>
    766 766 
                       <basedir>${project.build.directory}/generated-sources/java/</basedir>
    767 767 
                     </entry>
    768 768 
                   </entries>

  • client/src/main/resources/i18n/client_en_GB.properties → client/src/main/i18n/client_en_GB.properties

  • client/src/main/resources/i18n/client_es_ES.properties → client/src/main/i18n/client_es_ES.properties

  • client/src/main/resources/i18n/client_fr_FR.properties → client/src/main/i18n/client_fr_FR.properties

  • dto/pom.xml
    ... ... @@ -284,8 +284,8 @@
    284 284 
               <execution>
    285 285 
                 <id>scan-sources</id>
    286 286 
                 <goals>
    287 
    -              <goal>parserJava</goal>
    288 
    -              <goal>gen</goal>
    287 
    +              <goal>parse-java</goal>
    288 
    +              <goal>generate</goal>
    289 289 
                 </goals>
    290 290 
                 <configuration>
    291 291 
                   <entries>

  • dto/src/main/resources/i18n/dto_en_GB.properties → dto/src/main/i18n/dto_en_GB.properties

  • dto/src/main/resources/i18n/dto_es_ES.properties → dto/src/main/i18n/dto_es_ES.properties

  • dto/src/main/resources/i18n/dto_fr_FR.properties → dto/src/main/i18n/dto_fr_FR.properties

  • pom.xml
    ... ... @@ -156,7 +156,7 @@
    156 156 
         <eugenePluginVersion>3.0-alpha-16</eugenePluginVersion>
    157 157 
         <processorPluginVersion>1.3</processorPluginVersion>
    158 158
    159 
    -    <nuitonI18nVersion>4.0-alpha-4</nuitonI18nVersion>
    159 
    +    <nuitonI18nVersion>4.0-alpha-5-SNAPSHOT</nuitonI18nVersion>
    160 160 
         <nuitonConfigVersion>3.3</nuitonConfigVersion>
    161 161 
         <topiaVersion>3.3</topiaVersion>
    162 162 
         <nuitonValidatorVersion>3.1</nuitonValidatorVersion>

  • server-configuration/pom.xml
    ... ... @@ -160,8 +160,8 @@
    160 160 
               <execution>
    161 161 
                 <id>scan-sources</id>
    162 162 
                 <goals>
    163 
    -              <goal>parserJava</goal>
    164 
    -              <goal>gen</goal>
    163 
    +              <goal>parse-java</goal>
    164 
    +              <goal>generate</goal>
    165 165 
                 </goals>
    166 166 
                 <configuration>
    167 167 
                   <entries>

  • server-configuration/src/main/resources/i18n/server-configuration_en_GB.properties → server-configuration/src/main/i18n/server-configuration_en_GB.properties

  • server-configuration/src/main/resources/i18n/server-configuration_es_ES.properties → server-configuration/src/main/i18n/server-configuration_es_ES.properties

  • server-configuration/src/main/resources/i18n/server-configuration_fr_FR.properties → server-configuration/src/main/i18n/server-configuration_fr_FR.properties

  • services-local/src/main/resources/i18n/services-local_en_GB.properties → services-local/src/main/i18n/services-local_en_GB.properties

  • services-local/src/main/resources/i18n/services-local_es_ES.properties → services-local/src/main/i18n/services-local_es_ES.properties

  • services-local/src/main/resources/i18n/services-local_fr_FR.properties → services-local/src/main/i18n/services-local_fr_FR.properties

  • validation/pom.xml
    ... ... @@ -215,58 +215,74 @@
    215 215 
             <artifactId>i18n-maven-plugin</artifactId>
    216 216 
             <executions>
    217 217 
               <execution>
    218 
    -            <id>parse</id>
    218 
    +            <id>parse-java-default</id>
    219 219 
                 <phase>process-classes</phase>
    220 220 
                 <goals>
    221 
    -              <goal>parserJava</goal>
    222 
    -              <goal>parserValidation</goal>
    223 
    -              <goal>gen</goal>
    221 
    +              <goal>parse-java</goal>
    224 222 
                 </goals>
    225 223 
                 <configuration>
    226 
    -              <treateDefaultEntry>false</treateDefaultEntry>
    224 
    +              <treatDefaultEntry>false</treatDefaultEntry>
    225 
    +              <entries>
    226 
    +                <entry>
    227 
    +                  <basedir>${project.build.directory}/generated-sources/java/</basedir>
    228 
    +                </entry>
    229 
    +              </entries>
    230 
    +            </configuration>
    231 
    +          </execution>
    232 
    +          <execution>
    233 
    +            <id>parse-validation-default</id>
    234 
    +            <phase>process-classes</phase>
    235 
    +            <goals>
    236 
    +              <goal>parse-validation</goal>
    237 
    +            </goals>
    238 
    +            <configuration>
    239 
    +              <treatDefaultEntry>false</treatDefaultEntry>
    227 240 
                   <entries>
    228 241 
                     <entry>
    229 
    -                  <specificGoal>parserValidation</specificGoal>
    230 242 
                       <basedir>${project.basedir}/src/main/resources/</basedir>
    231 243 
                       <includes>
    232 244 
                         <param>**/**-validation.xml</param>
    233 245 
                       </includes>
    234 246 
                     </entry>
    235 
    -                <entry>
    236 
    -                  <specificGoal>parserJava</specificGoal>
    237 
    -                  <basedir>${project.build.directory}/generated-sources/java/</basedir>
    238 
    -                </entry>
    239 247 
                   </entries>
    240 248 
                 </configuration>
    241 249 
               </execution>
    242 
    -        </executions>
    243 
    -      </plugin>
    244 
    -
    245 
    -      <plugin>
    246 
    -        <artifactId>maven-antrun-plugin</artifactId>
    247 
    -        <executions>
    248 250 
               <execution>
    249 
    -            <id>copy i18n files</id>
    251 
    +            <id>generate-default</id>
    250 252 
                 <phase>process-classes</phase>
    251 
    -            <configuration>
    252 
    -              <target>
    253 
    -                <copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n">
    254 
    -                  <filterset>
    255 
    -                    <filter value="${observe.model.version}" token="observe.model.version" />
    256 
    -                  </filterset>
    257 
    -                  <fileset dir="${project.build.directory}/generated-sources/i18n">
    258 
    -                    <include name="*.properties" />
    259 
    -                  </fileset>
    260 
    -                </copy>
    261 
    -              </target>
    262 
    -            </configuration>
    263 253 
                 <goals>
    264 
    -              <goal>run</goal>
    254 
    +              <goal>generate</goal>
    265 255 
                 </goals>
    266 256 
               </execution>
    257 
    +
    267 258 
             </executions>
    268 259 
           </plugin>
    269 260
    261 
    +      <!--<plugin>-->
    262 
    +        <!--<artifactId>maven-antrun-plugin</artifactId>-->
    263 
    +        <!--<executions>-->
    264 
    +          <!--<execution>-->
    265 
    +            <!--<id>copy i18n files</id>-->
    266 
    +            <!--<phase>process-classes</phase>-->
    267 
    +            <!--<configuration>-->
    268 
    +              <!--<target>-->
    269 
    +                <!--<copy failonerror="true" overwrite="true" filtering="true" todir="${project.build.outputDirectory}/i18n">-->
    270 
    +                  <!--<filterset>-->
    271 
    +                    <!--<filter value="${observe.model.version}" token="observe.model.version" />-->
    272 
    +                  <!--</filterset>-->
    273 
    +                  <!--<fileset dir="${project.build.directory}/generated-sources/i18n">-->
    274 
    +                    <!--<include name="*.properties" />-->
    275 
    +                  <!--</fileset>-->
    276 
    +                <!--</copy>-->
    277 
    +              <!--</target>-->
    278 
    +            <!--</configuration>-->
    279 
    +            <!--<goals>-->
    280 
    +              <!--<goal>run</goal>-->
    281 
    +            <!--</goals>-->
    282 
    +          <!--</execution>-->
    283 
    +        <!--</executions>-->
    284 
    +      <!--</plugin>-->
    285 
    +
    270 286 
         </plugins>
    271 287 
       </build>
    272 288 
     </project>

  • validation/src/main/resources/i18n/validation_en_GB.properties → validation/src/main/i18n/validation_en_GB.properties

  • validation/src/main/resources/i18n/validation_es_ES.properties → validation/src/main/i18n/validation_es_ES.properties

  • validation/src/main/resources/i18n/validation_fr_FR.properties → validation/src/main/i18n/validation_fr_FR.properties

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.