Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe
Commits:
-
f9b772d9
by tchemit at 2019-01-16T15:51:24Z
21 changed files:
- dto/pom.xml
- dto/src/main/i18n/getters/java.getter
- services/pom.xml
- services/src/main/i18n/getters/java.getter
- dto/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java → services/src/main/java/fr/ird/observe/validation/SeineBycatchObservedSystemConfig.java
- dto/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/AbstractSpeciesFieldDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivityFinDeVeilleExistsDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySeineObservedSystemValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySimpleSpeedDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ActivitySpeedDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java → services/src/main/java/fr/ird/observe/validation/validators/NonTargetCatchObservedSystemValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/ObserveLengthFormulaCollectionUniqueKeyDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java → services/src/main/java/fr/ird/observe/validation/validators/OpenableDtoFieldValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueHomeIdDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineLogbookUniqueNumberDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueHomeIdDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SetLonglineObsUniqueNumberDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesLengthFieldDtoValidator.java
- dto/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java → services/src/main/java/fr/ird/observe/validation/validators/SpeciesWeightFieldDtoValidator.java
- validation/src/main/i18n/getters/validation-messages.getter
Changes:
| ... | ... | @@ -64,10 +64,6 @@ |
| 64 | 64 |
<groupId>org.nuiton</groupId>
|
| 65 | 65 |
<artifactId>nuiton-decorator</artifactId>
|
| 66 | 66 |
</dependency>
|
| 67 |
- <dependency>
|
|
| 68 |
- <groupId>org.nuiton</groupId>
|
|
| 69 |
- <artifactId>nuiton-validator</artifactId>
|
|
| 70 |
- </dependency>
|
|
| 71 | 67 |
|
| 72 | 68 |
<dependency>
|
| 73 | 69 |
<groupId>io.ultreia.java4all.http</groupId>
|
| ... | ... | @@ -83,12 +79,6 @@ |
| 83 | 79 |
<artifactId>java-bean</artifactId>
|
| 84 | 80 |
</dependency>
|
| 85 | 81 |
|
| 86 |
- <!-- XWork -->
|
|
| 87 |
- <dependency>
|
|
| 88 |
- <groupId>org.apache.struts.xwork</groupId>
|
|
| 89 |
- <artifactId>xwork-core</artifactId>
|
|
| 90 |
- </dependency>
|
|
| 91 |
- |
|
| 92 | 82 |
<!-- commons dependencies -->
|
| 93 | 83 |
<dependency>
|
| 94 | 84 |
<groupId>org.apache.logging.log4j</groupId>
|
| ... | ... | @@ -48,5 +48,3 @@ observe.common.nocode |
| 48 | 48 |
observe.common.none
|
| 49 | 49 |
observe.common.program
|
| 50 | 50 |
observe.common.settingIdentifier
|
| 51 |
-observe.validation.activity.speed.bound
|
|
| 52 |
-observe.validation.activity.speed.bound.inter
|
| ... | ... | @@ -68,6 +68,11 @@ |
| 68 | 68 |
</dependency>
|
| 69 | 69 |
|
| 70 | 70 |
<!-- nuiton dependencies -->
|
| 71 |
+ <dependency>
|
|
| 72 |
+ <groupId>org.nuiton</groupId>
|
|
| 73 |
+ <artifactId>nuiton-decorator</artifactId>
|
|
| 74 |
+ </dependency>
|
|
| 75 |
+ |
|
| 71 | 76 |
<dependency>
|
| 72 | 77 |
<groupId>org.nuiton</groupId>
|
| 73 | 78 |
<artifactId>nuiton-version</artifactId>
|
| ... | ... | @@ -4,4 +4,6 @@ observe.common.ActivityLonglinePairingResultItemDto.computedTime |
| 4 | 4 |
observe.common.ActivityLonglinePairingResultItemDto.computedTimeValue
|
| 5 | 5 |
observe.common.ActivityLonglinePairingResultItemDto.observationActivity
|
| 6 | 6 |
observe.common.ActivityLonglinePairingResultItemDto.type
|
| 7 |
+observe.validation.activity.speed.bound
|
|
| 8 |
+observe.validation.activity.speed.bound.inter
|
|
| 7 | 9 |
observe.validation.trip.vessel.overlap
|
| ... | ... | @@ -21,7 +21,6 @@ observe.validation.lengthWeightParameter.invalid.weightLengthFormula |
| 21 | 21 |
observe.validation.nonTargetCatch.missing.observedSystem
|
| 22 | 22 |
observe.validation.nonTargetCatch.required.weightOrNombreEstime
|
| 23 | 23 |
observe.validation.nonTargetCatch.required.weightOrTailleMoyen
|
| 24 |
-observe.validation.nonTargetCatch.uniqueKey
|
|
| 25 | 24 |
observe.validation.nonTargetSample.required.weight.or.taille
|
| 26 | 25 |
observe.validation.objectMaterial.invalid.validation
|
| 27 | 26 |
observe.validation.objectObservedSpecies.positive.count
|