[Observe-commits] 06/07: Use nuiton-validator 3.0.1 + remove no more used validation-shared module

27 Jul 2016

This is an automated email from the git hooks/post-receive script.

New commit to branch develop in repository observe.

See https://gitlab.nuiton.org/codelutin/observe.git

commit 2d591600fef75f03be39036321e1a2b5fc38690b
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Jul 27 10:21:54 2016 +0200

    Use nuiton-validator 3.0.1 + remove no more used validation-shared module
---
 observe-application-swing-validation/pom.xml       |   5 -
 .../CollectionUniqueKeyDtoValidator.java           |  12 +-
 .../ObserveCollectionUniqueKeyDtoValidator.java    |  15 +-
 .../CountryDto-n1-create-error-validation.xml      |   8 +-
 .../CountryDto-n1-update-error-validation.xml      |   8 +-
 .../FpaZoneDto-n1-create-error-validation.xml      |   4 +-
 .../FpaZoneDto-n1-update-error-validation.xml      |   4 +-
 ...CaracteristicDto-n1-create-error-validation.xml |   4 +-
 ...CaracteristicDto-n1-update-error-validation.xml |   4 +-
 ...cteristicTypeDto-n1-create-error-validation.xml |   4 +-
 ...cteristicTypeDto-n1-update-error-validation.xml |   4 +-
 .../GearDto-n1-create-error-validation.xml         |   4 +-
 .../GearDto-n1-update-error-validation.xml         |   4 +-
 .../HarbourDto-n1-create-error-validation.xml      |   4 +-
 .../HarbourDto-n1-update-error-validation.xml      |   4 +-
 ...ightParameterDto-n1-create-error-validation.xml |  10 +-
 ...ightParameterDto-n1-update-error-validation.xml |  10 +-
 .../OceanDto-n1-create-error-validation.xml        |   4 +-
 .../OceanDto-n1-update-error-validation.xml        |   4 +-
 .../OrganismDto-n1-create-error-validation.xml     |   4 +-
 .../OrganismDto-n1-update-error-validation.xml     |   4 +-
 .../PersonDto-n1-create-error-validation.xml       |   4 +-
 .../PersonDto-n1-update-error-validation.xml       |   4 +-
 .../ProgramDto-n1-create-error-validation.xml      |   4 +-
 .../ProgramDto-n1-update-error-validation.xml      |   4 +-
 .../SexDto-n1-create-error-validation.xml          |   4 +-
 .../SexDto-n1-update-error-validation.xml          |   4 +-
 .../SpeciesDto-n1-create-error-validation.xml      |  12 +-
 .../SpeciesDto-n1-update-error-validation.xml      |  12 +-
 .../SpeciesGroupDto-n1-create-error-validation.xml |   4 +-
 .../SpeciesGroupDto-n1-update-error-validation.xml |   4 +-
 .../SpeciesListDto-n1-create-error-validation.xml  |   4 +-
 .../SpeciesListDto-n1-update-error-validation.xml  |   4 +-
 .../VesselDto-n1-create-error-validation.xml       |   4 +-
 .../VesselDto-n1-update-error-validation.xml       |   4 +-
 ...lSizeCategoryDto-n1-create-error-validation.xml |   4 +-
 ...lSizeCategoryDto-n1-update-error-validation.xml |   4 +-
 .../VesselTypeDto-n1-create-error-validation.xml   |   4 +-
 .../VesselTypeDto-n1-update-error-validation.xml   |   4 +-
 ...HaulingStatusDto-n1-create-error-validation.xml |   4 +-
 ...HaulingStatusDto-n1-update-error-validation.xml |   4 +-
 ...SettingStatusDto-n1-create-error-validation.xml |   4 +-
 ...SettingStatusDto-n1-update-error-validation.xml |   4 +-
 .../BaitTypeDto-n1-create-error-validation.xml     |   4 +-
 .../BaitTypeDto-n1-update-error-validation.xml     |   4 +-
 ...hFateLonglineDto-n1-create-error-validation.xml |   4 +-
 ...hFateLonglineDto-n1-update-error-validation.xml |   4 +-
 ...EncounterTypeDto-n1-create-error-validation.xml |   4 +-
 ...EncounterTypeDto-n1-update-error-validation.xml |   4 +-
 .../HealthnessDto-n1-create-error-validation.xml   |   4 +-
 .../HealthnessDto-n1-update-error-validation.xml   |   4 +-
 .../HookPositionDto-n1-create-error-validation.xml |   4 +-
 .../HookPositionDto-n1-update-error-validation.xml |   4 +-
 .../HookSizeDto-n1-create-error-validation.xml     |   4 +-
 .../HookSizeDto-n1-update-error-validation.xml     |   4 +-
 .../HookTypeDto-n1-create-error-validation.xml     |   4 +-
 .../HookTypeDto-n1-update-error-validation.xml     |   4 +-
 ...ontalPositionDto-n1-create-error-validation.xml |   4 +-
 ...ontalPositionDto-n1-update-error-validation.xml |   4 +-
 ...ticalPositionDto-n1-create-error-validation.xml |   4 +-
 ...ticalPositionDto-n1-update-error-validation.xml |   4 +-
 ...htsticksColorDto-n1-create-error-validation.xml |   4 +-
 ...htsticksColorDto-n1-update-error-validation.xml |   4 +-
 ...ghtsticksTypeDto-n1-create-error-validation.xml |   4 +-
 ...ghtsticksTypeDto-n1-update-error-validation.xml |   4 +-
 .../LineTypeDto-n1-create-error-validation.xml     |   4 +-
 .../LineTypeDto-n1-update-error-validation.xml     |   4 +-
 ...aturityStatusDto-n1-create-error-validation.xml |   4 +-
 ...aturityStatusDto-n1-update-error-validation.xml |   4 +-
 ...itigationTypeDto-n1-create-error-validation.xml |   4 +-
 ...itigationTypeDto-n1-update-error-validation.xml |   4 +-
 .../SensorBrandDto-n1-create-error-validation.xml  |   4 +-
 .../SensorBrandDto-n1-update-error-validation.xml  |   4 +-
 ...sorDataFormatDto-n1-create-error-validation.xml |   4 +-
 ...sorDataFormatDto-n1-update-error-validation.xml |   4 +-
 .../SensorTypeDto-n1-create-error-validation.xml   |   4 +-
 .../SensorTypeDto-n1-update-error-validation.xml   |   4 +-
 .../SettingShapeDto-n1-create-error-validation.xml |   4 +-
 .../SettingShapeDto-n1-update-error-validation.xml |   4 +-
 ...zeMeasureTypeDto-n1-create-error-validation.xml |   4 +-
 ...zeMeasureTypeDto-n1-update-error-validation.xml |   4 +-
 ...tomacFullnessDto-n1-create-error-validation.xml |   4 +-
 ...tomacFullnessDto-n1-update-error-validation.xml |   4 +-
 .../TripTypeDto-n1-create-error-validation.xml     |   4 +-
 .../TripTypeDto-n1-update-error-validation.xml     |   4 +-
 ...ivityLonglineDto-n1-create-error-validation.xml |   4 +-
 ...ivityLonglineDto-n1-update-error-validation.xml |   4 +-
 ...htMeasureTypeDto-n1-create-error-validation.xml |   4 +-
 ...htMeasureTypeDto-n1-update-error-validation.xml |   4 +-
 ...DetectionModeDto-n1-create-error-validation.xml |   4 +-
 ...DetectionModeDto-n1-update-error-validation.xml |   4 +-
 .../ObjectFateDto-n1-create-error-validation.xml   |   4 +-
 .../ObjectFateDto-n1-update-error-validation.xml   |   4 +-
 ...jectOperationDto-n1-create-error-validation.xml |   4 +-
 ...jectOperationDto-n1-update-error-validation.xml |   4 +-
 .../ObjectTypeDto-n1-create-error-validation.xml   |   4 +-
 .../ObjectTypeDto-n1-update-error-validation.xml   |   4 +-
 ...bservedSystemDto-n1-create-error-validation.xml |   4 +-
 ...bservedSystemDto-n1-update-error-validation.xml |   4 +-
 ...sonForDiscardDto-n1-create-error-validation.xml |   4 +-
 ...sonForDiscardDto-n1-update-error-validation.xml |   4 +-
 ...nForNoFishingDto-n1-create-error-validation.xml |   4 +-
 ...nForNoFishingDto-n1-update-error-validation.xml |   4 +-
 ...sonForNullSetDto-n1-create-error-validation.xml |   4 +-
 ...sonForNullSetDto-n1-update-error-validation.xml |   4 +-
 .../SpeciesFateDto-n1-create-error-validation.xml  |   4 +-
 .../SpeciesFateDto-n1-update-error-validation.xml  |   4 +-
 ...SpeciesStatusDto-n1-create-error-validation.xml |   4 +-
 ...SpeciesStatusDto-n1-update-error-validation.xml |   4 +-
 ...ndingActivityDto-n1-create-error-validation.xml |   4 +-
 ...ndingActivityDto-n1-update-error-validation.xml |   4 +-
 ...BuoyOperationDto-n1-create-error-validation.xml |   4 +-
 ...BuoyOperationDto-n1-update-error-validation.xml |   4 +-
 ...ttingBuoyTypeDto-n1-create-error-validation.xml |   4 +-
 ...ttingBuoyTypeDto-n1-update-error-validation.xml |   4 +-
 ...ActivitySeineDto-n1-create-error-validation.xml |   4 +-
 ...ActivitySeineDto-n1-update-error-validation.xml |   4 +-
 ...eightCategoryDto-n1-create-error-validation.xml |   4 +-
 ...eightCategoryDto-n1-update-error-validation.xml |   4 +-
 .../seine/WindDto-n1-create-error-validation.xml   |   4 +-
 .../seine/WindDto-n1-update-error-validation.xml   |   4 +-
 .../src/test/resources/validators.xml              |   8 +-
 .../src/main/resources/validators.xml              |  10 +-
 .../src/main/resources/validators.xml              |  11 +-
 observe-entities/pom.xml                           |   5 -
 .../entities}/CollectionUniqueKeyValidator2.java   |   2 +-
 .../ObserveCollectionUniqueKeyValidator.java       |   2 +-
 observe-entities/src/test/resources/validators.xml |  11 +-
 .../src/test/resources/validators.xml              |  11 +-
 observe-validation-shared/LICENSE.txt              | 674 ---------------------
 observe-validation-shared/README.md                |   0
 observe-validation-shared/pom.xml                  | 293 ---------
 .../src/license/THIRD-PARTY.properties             |  33 -
 .../CollectionFieldExpressionValidator2.java       | 127 ----
 pom.xml                                            |   3 +-
 135 files changed, 287 insertions(+), 1443 deletions(-)

diff --git a/observe-application-swing-validation/pom.xml b/observe-application-swing-validation/pom.xml
index 86ee048..fb95364 100644
--- a/observe-application-swing-validation/pom.xml
+++ b/observe-application-swing-validation/pom.xml
@@ -48,11 +48,6 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>observe-validation-shared</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>observe-application-swing-decoration</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java
similarity index 80%
copy from observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java
copy to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java
index ae1d60f..24f8630 100644
--- a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java
+++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/CollectionUniqueKeyDtoValidator.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.validation.shared.validators;
+package fr.ird.observe.application.swing.validation.validators;
 
 /*
  * #%L
@@ -23,7 +23,7 @@ package fr.ird.observe.validation.shared.validators;
  */
 
 import com.opensymphony.xwork2.validator.ValidationException;
-import org.nuiton.topia.persistence.TopiaEntity;
+import fr.ird.observe.services.dto.IdDto;
 import org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator;
 
 /**
@@ -32,12 +32,12 @@ import org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator;
  * @author Tony Chemit - chemit@codelutin.com
  * @since XXX
  */
-public class CollectionUniqueKeyValidator2 extends CollectionUniqueKeyValidator {
+public class CollectionUniqueKeyDtoValidator extends CollectionUniqueKeyValidator {
 
     @Override
     protected Integer getUniqueKeyHashCode(Object o) throws ValidationException {
-        if (o instanceof TopiaEntity) {
-            o = ((TopiaEntity) o).getTopiaId();
+        if (o instanceof IdDto) {
+            o = ((IdDto) o).getId();
         }
         Integer uniqueKeyHashCode = super.getUniqueKeyHashCode(o);
         return uniqueKeyHashCode;
@@ -45,7 +45,7 @@ public class CollectionUniqueKeyValidator2 extends CollectionUniqueKeyValidator
 
     @Override
     public String getValidatorType() {
-        return "collectionUniqueKey";
+        return "collectionUniqueKeyDto";
     }
 
 }
diff --git a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java
similarity index 93%
copy from observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java
copy to observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java
index 29edc3b..0ce9d9f 100644
--- a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java
+++ b/observe-application-swing-validation/src/main/java/fr/ird/observe/application/swing/validation/validators/ObserveCollectionUniqueKeyDtoValidator.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.validation.shared.validators;
+package fr.ird.observe.application.swing.validation.validators;
 
 /*
  * #%L
@@ -24,7 +24,7 @@ package fr.ird.observe.validation.shared.validators;
 
 import com.google.common.base.Objects;
 import com.opensymphony.xwork2.validator.ValidationException;
-import org.nuiton.topia.persistence.TopiaEntity;
+import fr.ird.observe.services.dto.IdDto;
 import org.nuiton.validator.xwork2.field.NuitonFieldValidatorSupport;
 
 import java.util.Collection;
@@ -40,7 +40,7 @@ import java.util.TreeSet;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 4.0.1
  */
-public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSupport {
+public class ObserveCollectionUniqueKeyDtoValidator extends NuitonFieldValidatorSupport {
 
     /**
      * pour indiquer la propriété qui contient la liste à valider.
@@ -78,7 +78,6 @@ public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSup
      *
      * @param keys keys of the unique key comma separated
      */
-    @SuppressWarnings("MethodCanBeVariableArityMethod")
     public void setKeys(String[] keys) {
         if (keys != null && keys.length == 1 && keys[0].contains(",")) {
             this.keys = keys[0].split(",");
@@ -114,14 +113,14 @@ public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSup
 
         hashCodes.add(object);
 
-        String topiaIdToExclude = ((TopiaEntity) object).getTopiaId();
+        String idToExclude = ((IdDto) object).getId();
         int index = -1;
         for (Object o : col) {
 
             index++;
 
-            String topiaId = ((TopiaEntity) o).getTopiaId();
-            if (Objects.equal(topiaIdToExclude, topiaId)) {
+            String id = ((IdDto) o).getId();
+            if (Objects.equal(idToExclude, id)) {
 
                 // Do not treate against object
                 continue;
@@ -150,7 +149,7 @@ public class ObserveCollectionUniqueKeyValidator extends NuitonFieldValidatorSup
 
     @Override
     public String getValidatorType() {
-        return "observeCollectionUniqueKey";
+        return "observeCollectionUniqueKeyDto";
     }
 
     Comparator<?> comparator;
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml
index 6aad3b1..5890a36 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
@@ -58,7 +58,7 @@
     </field-validator>
 
     <!-- clef unique sur le iso2Code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">iso2Code</param>
       <param name="againstMe">true</param>
@@ -75,7 +75,7 @@
     </field-validator>
 
     <!-- clef unique sur le iso3Code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">iso3Code</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml
index 6aad3b1..5890a36 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/CountryDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
@@ -58,7 +58,7 @@
     </field-validator>
 
     <!-- clef unique sur le iso2Code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">iso2Code</param>
       <param name="againstMe">true</param>
@@ -75,7 +75,7 @@
     </field-validator>
 
     <!-- clef unique sur le iso3Code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">iso3Code</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml
index b323f8c..ec4da12 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-create-error-validation.xml
@@ -27,7 +27,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -40,7 +40,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml
index b323f8c..ec4da12 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/FpaZoneDto-n1-update-error-validation.xml
@@ -27,7 +27,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -40,7 +40,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml
index cdd92c8..9780f1a 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml
index cdd92c8..9780f1a 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml
index 9ac1e38..4f6c9a5 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml
index 9ac1e38..4f6c9a5 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearCaracteristicTypeDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml
index 39b9df0..cdd8742 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntityEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml
index 9ac1e38..4f6c9a5 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/GearDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml
index b9958a9..40e8cc5 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml
index 0d8f609..a879ac4 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/HarbourDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml
index f6311ae..8cf2345 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -46,7 +46,7 @@
     </field-validator>
 
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
@@ -56,7 +56,7 @@
 
   <field name="ocean">
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
@@ -66,7 +66,7 @@
 
   <field name="sex">
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
@@ -76,7 +76,7 @@
 
   <field name="startDate">
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml
index eeb730b..2a8d794 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/LengthWeightParameterDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -46,7 +46,7 @@
     </field-validator>
 
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
@@ -56,7 +56,7 @@
 
   <field name="ocean">
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
@@ -66,7 +66,7 @@
 
   <field name="sex">
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
@@ -76,7 +76,7 @@
 
   <field name="startDate">
     <!-- clef unique species - gender - ocean - startDate -->
-    <field-validator type="observeCollectionUniqueKey" short-circuit="true">
+    <field-validator type="observeCollectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">species,sex,ocean,startDate</param>
       <!--<param name="againstMe">true</param>-->
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OceanDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml
index 01a4ba4..1036204 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml
index 2692af5..97f57d6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/OrganismDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml
index fdb057d..4b76b99 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri-->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml
index 194ce1a..2b41808 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/PersonDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri-->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml
index 88973da..1be724e 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml
index 3b021dc..4511af2 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/ProgramDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml
index b323f8c..ec4da12 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-create-error-validation.xml
@@ -27,7 +27,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -40,7 +40,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml
index b323f8c..ec4da12 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SexDto-n1-update-error-validation.xml
@@ -27,7 +27,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -40,7 +40,7 @@
   <field name="uri">
 
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml
index e981a11..f5f581e 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
@@ -52,7 +52,7 @@
 
   <field name="homeId">
     <!-- clef unique sur le homeId -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">homeId</param>
       <param name="againstMe">true</param>
@@ -63,7 +63,7 @@
 
   <field name="faoCode">
     <!-- clef unique sur le faoCode -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">faoCode</param>
       <param name="againstMe">true</param>
@@ -74,7 +74,7 @@
 
   <field name="wormsId">
     <!-- clef unique sur le wormsId -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">wormsId</param>
       <param name="againstMe">true</param>
@@ -105,7 +105,7 @@
     </field-validator>
 
     <!-- clef unique sur le scientificLabel -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">scientificLabel</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml
index f357281..5a9ebd2 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
@@ -52,7 +52,7 @@
 
   <field name="homeId">
     <!-- clef unique sur le homeId -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">homeId</param>
       <param name="againstMe">true</param>
@@ -63,7 +63,7 @@
 
   <field name="faoCode">
     <!-- clef unique sur le faoCode -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">faoCode</param>
       <param name="againstMe">true</param>
@@ -74,7 +74,7 @@
 
   <field name="wormsId">
     <!-- clef unique sur le wormsId -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">wormsId</param>
       <param name="againstMe">true</param>
@@ -104,7 +104,7 @@
     </field-validator>
 
     <!-- clef unique sur le scientificLabel -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">scientificLabel</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesGroupDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/SpeciesListDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml
index a108075..b81b03b 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml
index ebed934..4e63a64 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml
index 827ebd4..cf16688 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml
index d9e00c4..a3861f5 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselSizeCategoryDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/VesselTypeDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitHaulingStatusDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitSettingStatusDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/BaitTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/CatchFateLonglineDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/EncounterTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HealthnessDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookPositionDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookSizeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/HookTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemHorizontalPositionDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/ItemVerticalPositionDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksColorDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LightsticksTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/LineTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MaturityStatusDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/MitigationTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml
index 1869733..bfb24e2 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml
index 1869733..bfb24e2 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorBrandDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorDataFormatDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SensorTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SettingShapeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/SizeMeasureTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/StomacFullnessDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/TripTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/VesselActivityLonglineDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-create-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml
index 1967477..25e6cf6 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/longline/WeightMeasureTypeDto-n1-update-error-validation.xml
@@ -30,7 +30,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -42,7 +42,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/DetectionModeDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectFateDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectOperationDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObjectTypeDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ObservedSystemDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForDiscardDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNoFishingDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/ReasonForNullSetDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesFateDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SpeciesStatusDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/SurroundingActivityDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyOperationDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/TransmittingBuoyTypeDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml
index 2a90a31..50ec1f7 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml
index 139ecae..3279414 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/VesselActivitySeineDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml
index 043a266..830a5ba 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml
index 82a637d..384f8b8 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WeightCategoryDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml
index a44070e..bc6ef19 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-create-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml
index a44070e..bc6ef19 100644
--- a/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml
+++ b/observe-application-swing-validation/src/main/resources/fr/ird/observe/services/dto/referential/seine/WindDto-n1-update-error-validation.xml
@@ -29,7 +29,7 @@
   <field name="code">
 
     <!-- clef unique sur le code -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">code</param>
       <param name="againstMe">true</param>
@@ -41,7 +41,7 @@
 
   <field name="uri">
     <!-- clef unique sur l'uri -->
-    <field-validator type="collectionUniqueKey" short-circuit="true">
+    <field-validator type="collectionUniqueKeyDto" short-circuit="true">
       <param name="collectionFieldName">editingReferentielListEntity</param>
       <param name="keys">uri</param>
       <param name="againstMe">true</param>
diff --git a/observe-application-swing-validation/src/test/resources/validators.xml b/observe-application-swing-validation/src/test/resources/validators.xml
index f462849..e8460f6 100644
--- a/observe-application-swing-validation/src/test/resources/validators.xml
+++ b/observe-application-swing-validation/src/test/resources/validators.xml
@@ -43,6 +43,7 @@
     <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
 
     <!-- les validateurs fournis par Nuiton-validator -->
+    <validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/>
     <validator name="requiredFile" class="org.nuiton.validator.xwork2.field.RequiredFileFieldValidator"/>
     <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/>
     <validator name="notExistingFile" class="org.nuiton.validator.xwork2.field.NotExistingFileFieldValidator"/>
@@ -50,12 +51,9 @@
     <validator name="notExistingDirectory" class="org.nuiton.validator.xwork2.field.NotExistingDirectoryFieldValidator"/>
     <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/>
 
-    <!-- les validateurs spécifiques à ObServe -->
-    <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/>
-    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/>
-    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/>
-
     <!-- Les validateurs spécifique aux Dto dans observe -->
+    <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.CollectionUniqueKeyDtoValidator"/>
+    <validator name="observeCollectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.ObserveCollectionUniqueKeyDtoValidator"/>
     <validator name="openableDto" class="fr.ird.observe.application.swing.validation.validators.OpenableDtoFieldValidator"/>
     <validator name="species_lengthDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesLengthFieldDtoValidator"/>
     <validator name="species_weightDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesWeightFieldDtoValidator"/>
diff --git a/observe-application-swing/src/main/resources/validators.xml b/observe-application-swing/src/main/resources/validators.xml
index f446e2b..3fb279b 100644
--- a/observe-application-swing/src/main/resources/validators.xml
+++ b/observe-application-swing/src/main/resources/validators.xml
@@ -43,6 +43,7 @@
     <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
 
     <!-- les validateurs fournis par Nuiton-validator -->
+    <validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/>
     <validator name="requiredFile" class="org.nuiton.validator.xwork2.field.RequiredFileFieldValidator"/>
     <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/>
     <validator name="notExistingFile" class="org.nuiton.validator.xwork2.field.NotExistingFileFieldValidator"/>
@@ -50,12 +51,9 @@
     <validator name="notExistingDirectory" class="org.nuiton.validator.xwork2.field.NotExistingDirectoryFieldValidator"/>
     <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/>
 
-    <!-- les validateurs spécifiques à ObServe -->
-    <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/>
-    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/>
-    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/>
-
     <!-- Les validateurs spécifique aux entitées dans observe -->
+    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.entities.CollectionUniqueKeyValidator2"/>
+    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.entities.ObserveCollectionUniqueKeyValidator"/>
     <validator name="species_length" class="fr.ird.observe.validation.validator.entities.SpeciesLengthFieldValidator"/>
     <validator name="species_weight" class="fr.ird.observe.validation.validator.entities.SpeciesWeightFieldValidator"/>
     <validator name="activitySpeed" class="fr.ird.observe.validation.validator.entities.ActivitySpeedValidator"/>
@@ -65,6 +63,8 @@
     <validator name="setLonglineUniqueNumber" class="fr.ird.observe.validation.validator.entities.SetLonglineUniqueNumberValidator"/>
 
     <!-- Les validateurs spécifique aux Dto dans observe -->
+    <validator name="collectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.CollectionUniqueKeyDtoValidator"/>
+    <validator name="observeCollectionUniqueKeyDto" class="fr.ird.observe.application.swing.validation.validators.ObserveCollectionUniqueKeyDtoValidator"/>
     <validator name="openableDto" class="fr.ird.observe.application.swing.validation.validators.OpenableDtoFieldValidator"/>
     <validator name="species_lengthDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesLengthFieldDtoValidator"/>
     <validator name="species_weightDto" class="fr.ird.observe.application.swing.validation.validators.SpeciesWeightFieldDtoValidator"/>
diff --git a/observe-application-web/src/main/resources/validators.xml b/observe-application-web/src/main/resources/validators.xml
index 44415e9..7094f80 100644
--- a/observe-application-web/src/main/resources/validators.xml
+++ b/observe-application-web/src/main/resources/validators.xml
@@ -43,8 +43,7 @@
     <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
 
     <!-- les validateurs fournis par Nuiton-validator -->
-    <!--validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/-->
-    <!--validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/-->
+    <validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/>
     <validator name="requiredFile" class="org.nuiton.validator.xwork2.field.RequiredFileFieldValidator"/>
     <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/>
     <validator name="notExistingFile" class="org.nuiton.validator.xwork2.field.NotExistingFileFieldValidator"/>
@@ -52,13 +51,9 @@
     <validator name="notExistingDirectory" class="org.nuiton.validator.xwork2.field.NotExistingDirectoryFieldValidator"/>
     <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/>
 
-    <!-- les validateurs spécifiques à ObServe -->
-    <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/>
-    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/>
-    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/>
-
     <!-- Les validateurs spécifique aux entitées dans observe -->
-    <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>-->
+    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.entities.CollectionUniqueKeyValidator2"/>
+    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.entities.ObserveCollectionUniqueKeyValidator"/>
     <validator name="species_length" class="fr.ird.observe.validation.validator.entities.SpeciesLengthFieldValidator"/>
     <validator name="species_weight" class="fr.ird.observe.validation.validator.entities.SpeciesWeightFieldValidator"/>
     <validator name="activitySpeed" class="fr.ird.observe.validation.validator.entities.ActivitySpeedValidator"/>
diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml
index 26410c1..86ff797 100644
--- a/observe-entities/pom.xml
+++ b/observe-entities/pom.xml
@@ -49,11 +49,6 @@
       <artifactId>observe-topia-extension</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>observe-validation-shared</artifactId>
-      <version>${project.version}</version>
-    </dependency>
 
     <!-- Nuiton -->
     <dependency>
diff --git a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/CollectionUniqueKeyValidator2.java
similarity index 96%
rename from observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java
rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/CollectionUniqueKeyValidator2.java
index ae1d60f..e1be1b7 100644
--- a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionUniqueKeyValidator2.java
+++ b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/CollectionUniqueKeyValidator2.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.validation.shared.validators;
+package fr.ird.observe.validation.validator.entities;
 
 /*
  * #%L
diff --git a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ObserveCollectionUniqueKeyValidator.java
similarity index 99%
rename from observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java
rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ObserveCollectionUniqueKeyValidator.java
index 29edc3b..0cdedab 100644
--- a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/ObserveCollectionUniqueKeyValidator.java
+++ b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ObserveCollectionUniqueKeyValidator.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.validation.shared.validators;
+package fr.ird.observe.validation.validator.entities;
 
 /*
  * #%L
diff --git a/observe-entities/src/test/resources/validators.xml b/observe-entities/src/test/resources/validators.xml
index 44415e9..3778495 100644
--- a/observe-entities/src/test/resources/validators.xml
+++ b/observe-entities/src/test/resources/validators.xml
@@ -43,8 +43,7 @@
     <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
 
     <!-- les validateurs fournis par Nuiton-validator -->
-    <!--validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/-->
-    <!--validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/-->
+    <validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/>
     <validator name="requiredFile" class="org.nuiton.validator.xwork2.field.RequiredFileFieldValidator"/>
     <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/>
     <validator name="notExistingFile" class="org.nuiton.validator.xwork2.field.NotExistingFileFieldValidator"/>
@@ -52,13 +51,9 @@
     <validator name="notExistingDirectory" class="org.nuiton.validator.xwork2.field.NotExistingDirectoryFieldValidator"/>
     <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/>
 
-    <!-- les validateurs spécifiques à ObServe -->
-    <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/>
-    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/>
-    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/>
-
     <!-- Les validateurs spécifique aux entitées dans observe -->
-    <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>-->
+    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.entities.ObserveCollectionUniqueKeyValidator"/>
+    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.entities.CollectionUniqueKeyValidator2"/>
     <validator name="species_length" class="fr.ird.observe.validation.validator.entities.SpeciesLengthFieldValidator"/>
     <validator name="species_weight" class="fr.ird.observe.validation.validator.entities.SpeciesWeightFieldValidator"/>
     <validator name="activitySpeed" class="fr.ird.observe.validation.validator.entities.ActivitySpeedValidator"/>
diff --git a/observe-services-topia/src/test/resources/validators.xml b/observe-services-topia/src/test/resources/validators.xml
index 44415e9..3778495 100644
--- a/observe-services-topia/src/test/resources/validators.xml
+++ b/observe-services-topia/src/test/resources/validators.xml
@@ -43,8 +43,7 @@
     <validator name="conditionalvisitor" class="com.opensymphony.xwork2.validator.validators.ConditionalVisitorFieldValidator"/>
 
     <!-- les validateurs fournis par Nuiton-validator -->
-    <!--validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/-->
-    <!--validator name="collectionUniqueKey" class="org.nuiton.validator.xwork2.field.CollectionUniqueKeyValidator"/-->
+    <validator name="collectionFieldExpression" class="org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator"/>
     <validator name="requiredFile" class="org.nuiton.validator.xwork2.field.RequiredFileFieldValidator"/>
     <validator name="existingFile" class="org.nuiton.validator.xwork2.field.ExistingFileFieldValidator"/>
     <validator name="notExistingFile" class="org.nuiton.validator.xwork2.field.NotExistingFileFieldValidator"/>
@@ -52,13 +51,9 @@
     <validator name="notExistingDirectory" class="org.nuiton.validator.xwork2.field.NotExistingDirectoryFieldValidator"/>
     <validator name="fieldexpressionwithparams" class="org.nuiton.validator.xwork2.field.FieldExpressionWithParamsValidator"/>
 
-    <!-- les validateurs spécifiques à ObServe -->
-    <validator name="collectionFieldExpression" class="fr.ird.observe.validation.shared.validators.CollectionFieldExpressionValidator2"/>
-    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.shared.validators.CollectionUniqueKeyValidator2"/>
-    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.shared.validators.ObserveCollectionUniqueKeyValidator"/>
-
     <!-- Les validateurs spécifique aux entitées dans observe -->
-    <!--<validator name="openableEntity" class="fr.ird.observe.business.validation.field.OpenableFieldValidator"/>-->
+    <validator name="observeCollectionUniqueKey" class="fr.ird.observe.validation.validator.entities.ObserveCollectionUniqueKeyValidator"/>
+    <validator name="collectionUniqueKey" class="fr.ird.observe.validation.validator.entities.CollectionUniqueKeyValidator2"/>
     <validator name="species_length" class="fr.ird.observe.validation.validator.entities.SpeciesLengthFieldValidator"/>
     <validator name="species_weight" class="fr.ird.observe.validation.validator.entities.SpeciesWeightFieldValidator"/>
     <validator name="activitySpeed" class="fr.ird.observe.validation.validator.entities.ActivitySpeedValidator"/>
diff --git a/observe-validation-shared/LICENSE.txt b/observe-validation-shared/LICENSE.txt
deleted file mode 100644
index 94a9ed0..0000000
--- a/observe-validation-shared/LICENSE.txt
+++ /dev/null
@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
diff --git a/observe-validation-shared/README.md b/observe-validation-shared/README.md
deleted file mode 100644
index e69de29..0000000
diff --git a/observe-validation-shared/pom.xml b/observe-validation-shared/pom.xml
deleted file mode 100644
index 9147149..0000000
--- a/observe-validation-shared/pom.xml
+++ /dev/null
@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  #%L
-  ObServe :: Business
-
-  $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-business/pom.xml $
-  %%
-  Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit
-  %%
-  This program is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as
-  published by the Free Software Foundation, either version 3 of the
-  License, or (at your option) any later version.
-
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Lesser Public License for more details.
-
-  You should have received a copy of the GNU General Lesser Public
-  License along with this program.  If not, see
-  <http://www.gnu.org/licenses/lgpl-3.0.html>.
-  #L%
-  -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>fr.ird.observe</groupId>
-    <artifactId>observe</artifactId>
-    <version>5.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>observe-validation-shared</artifactId>
-
-  <name>ObServe :: Validation shared</name>
-  <description>ObServe validation shared module</description>
-
-  <dependencies>
-
-
-    <!-- Nuiton -->
-    <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-version</artifactId>
-    </dependency>
-
-    <!-- commons -->
-    <dependency>
-      <groupId> org.apache.commons</groupId>
-      <artifactId>commons-lang3</artifactId>
-    </dependency>
-    <dependency>
-      <groupId> org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-io</groupId>
-      <artifactId>commons-io</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.swinglabs.swingx</groupId>
-      <artifactId>swingx-common</artifactId>
-    </dependency>
-
-    <!-- ToPIA -->
-
-    <dependency>
-      <groupId>org.nuiton.topia</groupId>
-      <artifactId>topia-persistence</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.nuiton.topia</groupId>
-      <artifactId>topia-service-migration</artifactId>
-    </dependency>
-    <!--dependency>
-      <groupId>org.nuiton.topia</groupId>
-      <artifactId>topia-service-sql-batch</artifactId>
-      <scope>compile</scope>
-    </dependency-->
-
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-validator</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.struts.xwork</groupId>
-      <artifactId>xwork-core</artifactId>
-    </dependency>
-
-    <!-- test  -->
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-jcl</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>log4j</groupId>
-      <artifactId>log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>com.h2database</groupId>
-      <artifactId>h2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.postgresql</groupId>
-      <artifactId>postgresql</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-validator</artifactId>
-      <scope>test</scope>
-      <classifier>tests</classifier>
-    </dependency>
-
-  </dependencies>
-
-  <build>
-    <resources>
-      <resource>
-        <directory>${project.build.directory}/generated-sources/resources/</directory>
-        <includes>
-          <include>objectmodel/*.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/filters</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>*.properties</include>
-        </includes>
-      </resource>
-      <resource>
-        <directory>src/main/xmi</directory>
-        <filtering>true</filtering>
-        <includes>
-          <include>*.properties</include>
-        </includes>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>src/test/resources</directory>
-        <includes>
-          <include>**/*</include>
-        </includes>
-      </testResource>
-    </testResources>
-    <plugins>
-
-      <plugin>
-
-        <artifactId>maven-antrun-plugin</artifactId>
-        <inherited>false</inherited>
-        <executions>
-
-          <!-- on recopie le les fichiers de modèle pour appliquer les filtres -->
-          <execution>
-            <id>copy model properties</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <tasks>
-                <copy verbose="true" failonerror="false" overwrite="true" filtering="true"
-                      todir="${project.build.directory}/xmi">
-                  <filterset>
-                    <filter value="${observe.model.version}" token="observe.model.version" />
-                  </filterset>
-                  <fileset dir="${basedir}/src/main/xmi">
-                    <include name="*.properties"/>
-                  </fileset>
-                </copy>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-          <execution>
-            <id>copy model zargo</id>
-            <phase>generate-sources</phase>
-            <configuration>
-              <tasks>
-                <copy verbose="true" failonerror="false" overwrite="true"
-                      todir="${project.build.directory}/xmi">
-                  <fileset dir="${basedir}/src/main/xmi">
-                    <include name="*.zargo"/>
-                  </fileset>
-                </copy>
-              </tasks>
-            </configuration>
-            <goals>
-              <goal>run</goal>
-            </goals>
-          </execution>
-
-        </executions>
-      </plugin>
-
-      <plugin>
-        <groupId>org.nuiton.eugene</groupId>
-        <artifactId>eugene-maven-plugin</artifactId>
-        <configuration>
-          <defaultPackage>fr.ird.observe</defaultPackage>
-          <fullPackagePath>fr.ird.observe</fullPackagePath>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <id>generate-persistence</id>
-            <configuration>
-              <inputs>
-                <input>zargo:target/xmi:observe-common.zargo</input>
-                <input>zargo:target/xmi:observe-seine.zargo</input>
-                <input>zargo:target/xmi:observe-longline.zargo</input>
-              </inputs>
-              <!--org.nuiton.eugene.java.JavaInterfaceTransformer,-->
-              <templates>
-                org.nuiton.topia.templates.TopiaMetaTransformer,
-                org.nuiton.topia.templates.BinderHelperTransformer,
-                org.nuiton.topia.templates.TopiaMetadataModelGenerator
-              </templates>
-            </configuration>
-            <goals>
-              <goal>generate</goal>
-            </goals>
-          </execution>
-        </executions>
-        <dependencies>
-          <dependency>
-            <groupId>org.nuiton.topia</groupId>
-            <artifactId>topia-templates</artifactId>
-            <version>${topiaVersion}</version>
-            <scope>compile</scope>
-          </dependency>
-          <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>observe-topia-templates-extension</artifactId>
-            <version>${project.version}</version>
-            <scope>compile</scope>
-          </dependency>
-        </dependencies>
-      </plugin>
-
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-test</id>
-            <goals>
-              <goal>test-jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-
-    </plugins>
-  </build>
-
-</project>
diff --git a/observe-validation-shared/src/license/THIRD-PARTY.properties b/observe-validation-shared/src/license/THIRD-PARTY.properties
deleted file mode 100644
index e7f6efe..0000000
--- a/observe-validation-shared/src/license/THIRD-PARTY.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
-#-------------------------------------------------------------------------------
-# Already used licenses in project :
-# - AL 2.0
-# - Apache License 2.0
-# - Apache License, version 2.0
-# - Apache Software License, version 1.1
-# - BSD License
-# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0
-# - Common Development and Distribution License
-# - Common Public License Version 1.0
-# - Eclipse Distribution License (EDL), Version 1.0
-# - Eclipse Public License (EPL), Version 1.0
-# - GNU General Public License, Version 2 with the Classpath Exception
-# - GNU Library or Lesser General Public License
-# - Indiana University Extreme! Lab Software License, vesion 1.1.1
-# - Lesser General Public License (LGPL)
-# - Lesser General Public License (LGPL) v 3.0
-# - Lesser General Public License (LPGL)
-# - Lesser General Public License (LPGL) v 2.1
-# - MIT License
-# - MPL 1.1
-# - New BSD License
-# - Public Domain
-# - The Apache Software License, Version 2.0
-# - The H2 License, Version 1.0
-#-------------------------------------------------------------------------------
-# Please fill the missing licenses for dependencies :
-#
-#
-#Tue Aug 26 01:19:49 CEST 2014
-commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0
-dom4j--dom4j--1.6.1=BSD License
diff --git a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionFieldExpressionValidator2.java b/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionFieldExpressionValidator2.java
deleted file mode 100644
index b9ff7a8..0000000
--- a/observe-validation-shared/src/main/java/fr/ird/observe/validation/shared/validators/CollectionFieldExpressionValidator2.java
+++ /dev/null
@@ -1,127 +0,0 @@
-package fr.ird.observe.validation.shared.validators;
-
-/*
- * #%L
- * ObServe :: Validation
- * %%
- * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public
- * License along with this program.  If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import com.google.common.base.Objects;
-import com.opensymphony.xwork2.validator.ValidationException;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Set;
-import java.util.TreeSet;
-
-/**
- * Created on 1/23/15.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 3.14
- */
-public class CollectionFieldExpressionValidator2 extends CollectionFieldExpressionValidator {
-
-    /** Logger. */
-    private static final Log log = LogFactory.getLog(CollectionFieldExpressionValidator2.class);
-
-    @Override
-    public String getValidatorType() {
-        return "collectionFieldExpression2";
-    }
-
-    @Override
-    protected Boolean validateUniqueKey(Collection<?> col) throws ValidationException {
-        boolean answer = true;
-
-        Comparator comparator1 = getComparator();
-        Set<Object> hashCodes = new TreeSet<>(comparator1);
-        int index = -1;
-        for (Object entry : col) {
-            index++;
-            boolean wasAdded = hashCodes.add(entry);
-            if (!wasAdded) {
-                answer = false;
-                if (log.isDebugEnabled()) {
-                    log.debug("duplicated unique entry at " + index);
-                }
-                break;
-            }
-        }
-        return answer;
-    }
-
-    Comparator<?> comparator;
-
-    private  Comparator<?> getComparator() {
-        if (comparator == null) {
-            comparator = new MyComparator<>(keys);
-        }
-        return comparator;
-    }
-
-    private class MyComparator<O> implements Comparator<O>, Serializable {
-
-        private static final long serialVersionUID = 1L;
-
-        private final String[] keys;
-
-        public MyComparator(String... keys) {
-
-            this.keys = keys;
-        }
-
-        @Override
-        public int compare(O o1, O o2) {
-
-            boolean equals = true;
-
-            for (String key : keys) {
-
-                Object property1 = getPropertyValue(key, o1);
-                Object property2 = getPropertyValue(key, o2);
-
-                equals = Objects.equal(property1, property2);
-
-                if (!equals) {
-                    break;
-                }
-            }
-
-            return equals ? 0 : -1;
-        }
-    }
-
-    protected Object getPropertyValue(String key, Object o) {
-
-        try {
-            return getFieldValue(key, o);
-
-        } catch (ValidationException e) {
-            if (log.isErrorEnabled()) {
-                log.error("Can't get property '" + key + "'value on oject: " + o);
-            }
-            return null;
-        }
-    }
-}
diff --git a/pom.xml b/pom.xml
index 36e3524..fa5f4f6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -90,7 +90,6 @@
     <module>observe-services-model</module>
     <module>observe-services-api</module>
     <module>observe-test-data</module>
-    <module>observe-validation-shared</module>
     <module>observe-entities</module>
     <module>observe-services-topia</module>
     <module>observe-services-rest</module>
@@ -128,7 +127,7 @@
     <topiaVersion>3.1.2-SNAPSHOT</topiaVersion>
     <jaxxVersion>2.29</jaxxVersion>
     <nuitonI18nVersion>3.5</nuitonI18nVersion>
-    <nuitonValidatorVersion>3.0</nuitonValidatorVersion>
+    <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion>
 
     <xworkVersion>2.3.29</xworkVersion>
     <hibernateVersion>4.3.11.Final</hibernateVersion>

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

    

[Observe-commits] 06/07: Use nuiton-validator 3.0.1 + remove no more used validation-shared module

codelutin.com scm