[Observe-commits] 02/04: Introduction module common

22 Dec 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 7cf5dc0f1aaacd0e65d3f711abaf1e02cd2462e7
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Thu Dec 22 16:23:31 2016 +0100

    Introduction module common
---
 application-swing-decoration/pom.xml               |   5 +
 .../swing/decoration/DecoratorService.java         |   2 +-
 .../decoration/ObserveI18nDecoratorHelper.java     |   2 +-
 application-swing-validators/pom.xml               |   5 +
 .../ActivitySimpleSpeedDtoValidator.java           |  30 +++-
 .../validators/ActivitySpeedDtoValidator.java      |   8 +-
 application-swing/pom.xml                          |  19 ++-
 .../observe/application/swing/ObserveRunner.java   |   2 +-
 .../actions/content/MoveTripLonglinesUIAction.java |   3 +-
 .../ui/actions/content/MoveTripSeinesUIAction.java |   3 +-
 .../ui/actions/content/MoveTripsUIAction.java      |   2 +-
 .../FloatingObjectTransmittingBuoyOperationUI.jaxx |   4 +-
 ...ngObjectTransmittingBuoyOperationUIHandler.java |   4 +-
 .../ui/content/impl/seine/SetSeineUIHandler.java   |   2 +-
 .../ui/content/ref/ContentReferenceUIHandler.java  |   2 +-
 .../swing/ui/content/ref/impl/CountryUI.jaxx       |   2 +-
 .../swing/ui/content/ref/impl/FpaZoneUI.jaxx       |   2 +-
 .../content/ref/impl/GearCaracteristicTypeUI.jaxx  |   2 +-
 .../ui/content/ref/impl/GearCaracteristicUI.jaxx   |   2 +-
 .../swing/ui/content/ref/impl/GearUI.jaxx          |   2 +-
 .../swing/ui/content/ref/impl/HarbourUI.jaxx       |   2 +-
 .../content/ref/impl/LengthLengthParameterUI.jaxx  |   2 +-
 .../content/ref/impl/LengthWeightParameterUI.jaxx  |   2 +-
 .../swing/ui/content/ref/impl/OceanUI.jaxx         |   4 +-
 .../swing/ui/content/ref/impl/OrganismUI.jaxx      |   4 +-
 .../swing/ui/content/ref/impl/PersonUI.jaxx        |   4 +-
 .../swing/ui/content/ref/impl/ProgramUI.jaxx       |   6 +-
 .../swing/ui/content/ref/impl/SexUI.jaxx           |   2 +-
 .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx     |   2 +-
 .../ui/content/ref/impl/SizeMeasureTypeUI.jaxx     |   2 +-
 .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx  |   2 +-
 .../swing/ui/content/ref/impl/SpeciesListUI.jaxx   |   2 +-
 .../swing/ui/content/ref/impl/SpeciesUI.jaxx       |   2 +-
 .../ui/content/ref/impl/VesselSizeCategoryUI.jaxx  |   2 +-
 .../swing/ui/content/ref/impl/VesselTypeUI.jaxx    |   2 +-
 .../swing/ui/content/ref/impl/VesselUI.jaxx        |   2 +-
 .../ui/content/ref/impl/WeightMeasureTypeUI.jaxx   |   2 +-
 .../ref/impl/longline/BaitHaulingStatusUI.jaxx     |   2 +-
 .../ref/impl/longline/BaitSettingStatusUI.jaxx     |   2 +-
 .../ui/content/ref/impl/longline/BaitTypeUI.jaxx   |   2 +-
 .../ref/impl/longline/CatchFateLonglineUI.jaxx     |   2 +-
 .../content/ref/impl/longline/EncounterTypeUI.jaxx |   2 +-
 .../ui/content/ref/impl/longline/HealthnessUI.jaxx |   2 +-
 .../content/ref/impl/longline/HookPositionUI.jaxx  |   2 +-
 .../ui/content/ref/impl/longline/HookSizeUI.jaxx   |   2 +-
 .../ui/content/ref/impl/longline/HookTypeUI.jaxx   |   2 +-
 .../impl/longline/ItemHorizontalPositionUI.jaxx    |   2 +-
 .../ref/impl/longline/ItemVerticalPositionUI.jaxx  |   2 +-
 .../ref/impl/longline/LightsticksColorUI.jaxx      |   2 +-
 .../ref/impl/longline/LightsticksTypeUI.jaxx       |   2 +-
 .../ui/content/ref/impl/longline/LineTypeUI.jaxx   |   2 +-
 .../ref/impl/longline/MaturityStatusUI.jaxx        |   2 +-
 .../ref/impl/longline/MitigationTypeUI.jaxx        |   2 +-
 .../content/ref/impl/longline/SensorBrandUI.jaxx   |   2 +-
 .../ref/impl/longline/SensorDataFormatUI.jaxx      |   2 +-
 .../ui/content/ref/impl/longline/SensorTypeUI.jaxx |   2 +-
 .../content/ref/impl/longline/SettingShapeUI.jaxx  |   2 +-
 .../ref/impl/longline/StomacFullnessUI.jaxx        |   2 +-
 .../ui/content/ref/impl/longline/TripTypeUI.jaxx   |   2 +-
 .../impl/longline/VesselActivityLonglineUI.jaxx    |   2 +-
 .../ui/content/ref/impl/seine/DetectionModeUI.jaxx |   2 +-
 .../ui/content/ref/impl/seine/ObjectFateUI.jaxx    |   2 +-
 .../content/ref/impl/seine/ObjectOperationUI.jaxx  |   2 +-
 .../ui/content/ref/impl/seine/ObjectTypeUI.jaxx    |   2 +-
 .../content/ref/impl/seine/ObservedSystemUI.jaxx   |   4 +-
 .../content/ref/impl/seine/ReasonForDiscardUI.jaxx |   2 +-
 .../ref/impl/seine/ReasonForNoFishingUI.jaxx       |   2 +-
 .../content/ref/impl/seine/ReasonForNullSetUI.jaxx |   2 +-
 .../ui/content/ref/impl/seine/SpeciesFateUI.jaxx   |   2 +-
 .../ui/content/ref/impl/seine/SpeciesStatusUI.jaxx |   2 +-
 .../ref/impl/seine/SurroundingActivityUI.jaxx      |   2 +-
 .../impl/seine/TransmittingBuoyOperationUI.jaxx    |   2 +-
 .../ref/impl/seine/TransmittingBuoyTypeUI.jaxx     |   2 +-
 .../ref/impl/seine/VesselActivitySeineUI.jaxx      |   2 +-
 .../content/ref/impl/seine/WeightCategoryUI.jaxx   |   2 +-
 .../swing/ui/content/ref/impl/seine/WindUI.jaxx    |   2 +-
 .../table/impl/seine/NonTargetCatchUIHandler.java  |   2 +-
 .../ui/util/tripMap/TripMapContentBuilder.java     |  20 +--
 .../swing/ui/util/tripMap/TripMapUIHandler.java    |   6 +-
 .../i18n/application-swing_en_GB.properties        |  68 ++++-----
 .../i18n/application-swing_es_ES.properties        |  68 ++++-----
 .../i18n/application-swing_fr_FR.properties        |  68 ++++-----
 application-web-configuration/pom.xml              |   2 +-
 .../configuration/ObserveWebApplicationConfig.java |   2 +-
 common/pom.xml                                     |  36 +++--
 .../fr/ird/observe/common}/CoordinateHelper.java   |   5 +-
 .../java/fr/ird/observe/common}/FormulaHelper.java |  50 +++----
 .../main/java/fr/ird/observe/common}/GPSPoint.java |  41 +-----
 .../java/fr/ird/observe/common}/ObserveUtil.java   |   2 +-
 .../java/fr/ird/observe/common}/TripMapPoint.java  |  10 +-
 .../java/fr/ird/observe/common/WithFormula.java    |  19 +++
 .../fr/ird/observe/common}/constants/GearType.java |   2 +-
 .../observe/common}/constants/ReferenceStatus.java |   2 +-
 .../common}/constants/TripMapPointType.java        |   2 +-
 .../seine/NonTargetCatchComputedValueSource.java   |   2 +-
 .../observe/common}/constants/seine/Ownership.java |   2 +-
 .../common}/constants/seine/SchoolType.java        |   2 +-
 .../seine/TypeTransmittingBuoyOperation.java       |   2 +-
 .../fr/ird/observe/common}/FormulaHelperTest.java  |  27 +++-
 .../fr/ird/observe/common}/RelationRegexTest.java  |   2 +-
 .../java/fr/ird/observe/common}/ScriptTest.java    |   2 +-
 common/src/test/resources/log4j.properties         |  31 ++++
 persistence/pom.xml                                |   4 +-
 .../entities/constants/GearTypePersist.java        |  59 --------
 .../entities/constants/ReferenceStatusPersist.java |  39 ------
 .../constants/TripMapPointTypePersist.java         |  48 -------
 .../NonTargetCatchComputedValueSourcePersist.java  |  52 -------
 .../entities/constants/seine/OwnershipPersist.java |  40 ------
 .../constants/seine/SchoolTypePersist.java         |  41 ------
 .../TypeTransmittingBuoyOperationPersist.java      |  37 -----
 .../entities/longline/ActivityLonglineImpl.java    |   2 +-
 .../observe/entities/longline/SetLonglineImpl.java |   2 +-
 .../entities/longline/TripLonglineTopiaDao.java    |  24 ++--
 .../entities/referentiel/FormulaSupportImpl.java   |   4 +-
 .../observe/entities/referentiel/HarbourImpl.java  |   2 +-
 .../referentiel/LengthLengthParameterImpl.java     |   5 +-
 .../referentiel/LengthWeightParameterImpl.java     |   2 +
 .../referentiel/LengthWeightParameters.java        |   1 +
 .../referentiel/ObserveReferentialEntities.java    | 113 ---------------
 .../referentiel/ObserveReferentialEntityImpl.java  |   6 +-
 .../observe/entities/seine/ActivitySeineImpl.java  |   8 +-
 .../ird/observe/entities/seine/ActivitySeines.java |  10 +-
 .../observe/entities/seine/FloatingObjectImpl.java |  18 +--
 .../observe/entities/seine/NonTargetCatchImpl.java |   6 +-
 .../ird/observe/entities/seine/SetSeineImpl.java   |  12 +-
 .../observe/entities/seine/TripSeineTopiaDao.java  |  22 +--
 persistence/src/main/xmi/observe-common.zargo      | Bin 45811 -> 45825 bytes
 persistence/src/main/xmi/observe-seine.zargo       | Bin 87287 -> 87233 bytes
 persistence/src/main/xmi/observe.ini               |   3 +
 services-dto-reference/pom.xml                     |   5 +
 .../ReferentialReferenceSetDefinitions.java        |   2 +-
 services-dto/pom.xml                               |   8 +-
 .../services/dto/referential/FormulaHelper.java    | 156 ---------------------
 .../dto/referential/LengthLengthParameterDto.java  |   9 +-
 .../dto/referential/LengthWeightParameterDto.java  |  25 ++--
 .../services/dto/referential/ProgramHelper.java    |   2 +-
 .../services/dto/referential/ReferentialDto.java   |  16 +--
 .../dto/referential/ReferentialReference.java      |  16 +--
 .../seine/FloatingObjectTransmittingBuoyDto.java   |   2 +-
 .../src/main/xmi/observe-services-dto-common.zargo | Bin 51095 -> 51083 bytes
 .../src/main/xmi/observe-services-dto-seine.zargo  | Bin 60919 -> 60907 bytes
 services-dto/src/main/xmi/observe-services-dto.ini |   3 +
 .../topia/binder/BinderEngineInitializer.java      | 105 +++++++-------
 .../services/topia/binder/BinderSupport.java       |  55 +-------
 .../binder/data/seine/NonTargetCatchBinder.java    |  16 +--
 .../topia/binder/data/seine/SetSeineBinder.java    |   4 +-
 .../binder/data/seine/TransmittingBuoyBinder.java  |   4 +-
 .../referential/ReferentialBinderSupport.java      |   6 +-
 .../binder/referential/common/ProgramBinder.java   |   6 +-
 .../referential/seine/ObservedSystemBinder.java    |   4 +-
 services-topia-validators/pom.xml                  |   2 +-
 .../validators/ActivitySimpleSpeedValidator.java   |   2 +-
 .../topia/validators/ActivitySpeedValidator.java   |   2 +-
 services-topia/pom.xml                             |   5 +
 .../ConsolidateActivitySeineDataResultBuilder.java |   5 +-
 .../consolidate/ConsolidateDataServiceTopia.java   |  34 ++---
 .../ReferentialSynchronizeDiffServiceTopia.java    |  16 +--
 .../topia/service/data/TripMapDtoFactory.java      |  19 +--
 .../data/longline/TripLonglineServiceTopia.java    |   2 +-
 .../service/data/seine/SetSeineServiceTopia.java   |  10 +-
 .../service/data/seine/TripSeineServiceTopia.java  |   2 +-
 .../referential/ReferentialServiceTopia.java       |   9 +-
 .../topia/entity/LengthWeightParemetersTest.java   |   8 +-
 services/pom.xml                                   |   5 +
 .../ConsolidateActivitySeineDataResult.java        |   2 +-
 165 files changed, 637 insertions(+), 1192 deletions(-)

diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml
index 01767d5..73173fc 100644
--- a/application-swing-decoration/pom.xml
+++ b/application-swing-decoration/pom.xml
@@ -39,6 +39,11 @@
     <!-- sibling dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>services-dto</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java
index 0815119..00346dc 100644
--- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java
+++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/DecoratorService.java
@@ -137,7 +137,7 @@ import fr.ird.observe.services.dto.seine.TargetSampleDto;
 import fr.ird.observe.services.dto.seine.TransmittingBuoyDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.dto.seine.TripSeineGearUseDto;
-import fr.ird.observe.util.GPSPoint;
+import fr.ird.observe.common.GPSPoint;
 import org.nuiton.decorator.Decorator;
 import org.nuiton.decorator.DecoratorProvider;
 
diff --git a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java
index 9928c84..bbc7999 100644
--- a/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java
+++ b/application-swing-decoration/src/main/java/fr/ird/observe/application/swing/decoration/ObserveI18nDecoratorHelper.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.decoration;
 
 import com.google.common.cache.AbstractLoadingCache;
 import fr.ird.observe.services.dto.ObserveDto;
-import fr.ird.observe.util.ObserveUtil;
+import fr.ird.observe.common.ObserveUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.atteo.evo.inflector.English;
 
diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml
index 5403888..e2f4602 100644
--- a/application-swing-validators/pom.xml
+++ b/application-swing-validators/pom.xml
@@ -43,6 +43,11 @@
     <!-- sibling dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>services-dto</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java
index 521755b..80873ea 100644
--- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java
+++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySimpleSpeedDtoValidator.java
@@ -25,10 +25,10 @@ package fr.ird.observe.application.swing.validators;
 import com.opensymphony.xwork2.validator.ValidationException;
 import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.common.GPSPoint;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.ActivitySeineStubDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
-import fr.ird.observe.util.GPSPoint;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -163,8 +163,8 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport {
             return;
         }
 
-        GPSPoint currentPoint = GPSPoint.newPoint(route, activity);
-        GPSPoint previousPoint = GPSPoint.newPoint(route, previousActivity);
+        GPSPoint currentPoint = newPoint(route, activity);
+        GPSPoint previousPoint = newPoint(route, previousActivity);
 
         float computedSpeed = previousPoint.getSpeed(currentPoint);
 
@@ -202,4 +202,28 @@ public class ActivitySimpleSpeedDtoValidator extends FieldValidatorSupport {
         return decoratorService.getDecoratorByType(GPSPoint.class).toString(currentPoint);
     }
 
+    /**
+     * Construit un point à partir de l'entité donnée.
+     *
+     * @param route    la route qui contient le jour
+     * @param activity l'activite qui contient l'heure et la position géographique
+     * @return le nouveau point instancié
+     * @since 3.8
+     */
+    public static GPSPoint newPoint(RouteDto route, ActivitySeineDto activity) {
+        return GPSPoint.newPoint(route.getDate(), activity.getTime(), activity.getLatitude(), activity.getLongitude());
+    }
+
+    /**
+     * Construit un point à partir de l'entité donnée.
+     *
+     * @param route    la route qui contient le jour
+     * @param activity l'activite qui contient l'heure et la position géographique
+     * @return le nouveau point instancié
+     * @since 3.8
+     */
+    public static GPSPoint newPoint(RouteDto route, ActivitySeineStubDto activity) {
+        return GPSPoint.newPoint(route.getDate(), activity.getTime(), activity.getLatitude(), activity.getLongitude());
+    }
+
 }
diff --git a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java
index df05d95..67f85a8 100644
--- a/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java
+++ b/application-swing-validators/src/main/java/fr/ird/observe/application/swing/validators/ActivitySpeedDtoValidator.java
@@ -25,13 +25,15 @@ package fr.ird.observe.application.swing.validators;
 import com.opensymphony.xwork2.validator.ValidationException;
 import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
 import fr.ird.observe.application.swing.decoration.DecoratorService;
+import fr.ird.observe.common.GPSPoint;
 import fr.ird.observe.services.dto.seine.ActivitySeineStubDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
-import fr.ird.observe.util.GPSPoint;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator;
 
+import static fr.ird.observe.application.swing.validators.ActivitySimpleSpeedDtoValidator.newPoint;
+
 /**
  * <!-- START SNIPPET: javadoc --> ActivityspeedValidator vérifie que
  * la cohérence de vitesses entre toutes les activités d'une route. <!-- END SNIPPET: javadoc
@@ -146,8 +148,8 @@ public class ActivitySpeedDtoValidator extends FieldValidatorSupport {
                         return true;
                     }
 
-                    GPSPoint previousPoint = GPSPoint.newPoint(route, previousActivity);
-                    GPSPoint currentPoint = GPSPoint.newPoint(route, currentActivity);
+                    GPSPoint previousPoint = newPoint(route, previousActivity);
+                    GPSPoint currentPoint = newPoint(route, currentActivity);
 
                     float computedSpeed = previousPoint.getSpeed(currentPoint);
 
diff --git a/application-swing/pom.xml b/application-swing/pom.xml
index 81c5211..25e060a 100644
--- a/application-swing/pom.xml
+++ b/application-swing/pom.xml
@@ -88,6 +88,11 @@
     <!-- sibling dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>services-dto</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -433,13 +438,13 @@
                   <name>label</name>
                   <pattern>observe.enum.@CLASS_NAME@.@NAME@</pattern>
                   <enums>
-                    <enum>fr.ird.observe.services.dto.constants.GearType</enum>
-                    <enum>fr.ird.observe.services.dto.constants.ReferenceStatus</enum>
-                    <enum>fr.ird.observe.services.dto.constants.TripMapPointType</enum>
-                    <enum>fr.ird.observe.services.dto.constants.seine.SchoolType</enum>
-                    <enum>fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation</enum>
-                    <enum>fr.ird.observe.services.dto.constants.seine.Ownership</enum>
-                    <enum>fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource</enum>
+                    <enum>fr.ird.observe.common.constants.GearType</enum>
+                    <enum>fr.ird.observe.common.constants.ReferenceStatus</enum>
+                    <enum>fr.ird.observe.common.constants.TripMapPointType</enum>
+                    <enum>fr.ird.observe.common.constants.seine.SchoolType</enum>
+                    <enum>fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation</enum>
+                    <enum>fr.ird.observe.common.constants.seine.Ownership</enum>
+                    <enum>fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource</enum>
                     <enum>fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum</enum>
                     <enum>fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode
                     </enum>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
index b56adbc..a4e583f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
@@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.actions.menu.storage.StartServerModeAction;
 import fr.ird.observe.application.swing.ui.util.FloatConverter;
 import fr.ird.observe.application.swing.validation.ObserveSwingValidator;
-import fr.ird.observe.util.ObserveUtil;
+import fr.ird.observe.common.ObserveUtil;
 import jaxx.runtime.swing.application.ApplicationRunner;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.Converter;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java
index 8aabffd..71fd15f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripLonglinesUIAction.java
@@ -24,12 +24,11 @@ package fr.ird.observe.application.swing.ui.actions.content;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
-import fr.ird.observe.application.swing.ui.actions.content.MoveTripsUIAction;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUI;
 import fr.ird.observe.application.swing.ui.content.list.impl.longline.TripLonglinesUIModel;
 import fr.ird.observe.services.dto.DataReference;
-import fr.ird.observe.services.dto.constants.GearType;
+import fr.ird.observe.common.constants.GearType;
 import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.service.data.longline.TripLonglineService;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java
index bca7be6..8403837 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripSeinesUIAction.java
@@ -24,12 +24,11 @@ package fr.ird.observe.application.swing.ui.actions.content;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
-import fr.ird.observe.application.swing.ui.actions.content.MoveTripsUIAction;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUI;
 import fr.ird.observe.application.swing.ui.content.list.impl.seine.TripSeinesUIModel;
 import fr.ird.observe.services.dto.DataReference;
-import fr.ird.observe.services.dto.constants.GearType;
+import fr.ird.observe.common.constants.GearType;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.service.data.seine.TripSeineService;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java
index e81796f..a6dffa6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/MoveTripsUIAction.java
@@ -34,7 +34,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.RootNavigationT
 import fr.ird.observe.application.swing.ui.util.DecoratedNodeEntity;
 import fr.ird.observe.services.dto.DataDto;
 import fr.ird.observe.services.dto.DataReference;
-import fr.ird.observe.services.dto.constants.GearType;
+import fr.ird.observe.common.constants.GearType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx
index cfd0393..969c018 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUI.jaxx
@@ -27,8 +27,8 @@
   <import>
     fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyDto
     fr.ird.observe.services.dto.seine.TransmittingBuoyDto
-    fr.ird.observe.services.dto.constants.seine.Ownership
-    fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation
+    fr.ird.observe.common.constants.seine.Ownership
+    fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation
     fr.ird.observe.services.dto.referential.CountryDto
     fr.ird.observe.services.dto.referential.ReferentialReference
     fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
index 4bd19b7..affe64e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectTransmittingBuoyOperationUIHandler.java
@@ -30,8 +30,8 @@ import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.content.ContentMode;
 import fr.ird.observe.application.swing.ui.content.ContentUIHandler;
 import fr.ird.observe.services.dto.Form;
-import fr.ird.observe.services.dto.constants.seine.Ownership;
-import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation;
+import fr.ird.observe.common.constants.seine.Ownership;
+import fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto;
 import fr.ird.observe.services.dto.result.SaveResultDto;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java
index a741118..fd07327 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUIHandler.java
@@ -33,7 +33,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree;
 import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.Form;
-import fr.ird.observe.services.dto.constants.seine.SchoolType;
+import fr.ird.observe.common.constants.seine.SchoolType;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java
index 57bc138..8953ba3 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUIHandler.java
@@ -35,9 +35,9 @@ import fr.ird.observe.application.swing.ui.content.ref.usage.UsageForDesactivate
 import fr.ird.observe.application.swing.ui.content.ref.usage.UsageForDisplayUI;
 import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree;
 import fr.ird.observe.application.swing.validation.ValidationContext;
+import fr.ird.observe.common.constants.ReferenceStatus;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.ReferenceMap;
-import fr.ird.observe.services.dto.constants.ReferenceStatus;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
 import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions;
 import fr.ird.observe.services.dto.referential.I18nReferentialDto;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx
index 903ef68..bbd7f0a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.CountryDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx
index 8b95242..110c6dc 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUI.jaxx
@@ -30,7 +30,7 @@
     org.jdesktop.swingx.JXDatePicker
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx
index 9acd2f8..1804291 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx
index d305db1..450beef 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUI.jaxx
@@ -33,7 +33,7 @@
     jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx
index 6c0f6b4..97ca09d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUI.jaxx
@@ -33,7 +33,7 @@
 
     java.util.Collection
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
     static org.nuiton.i18n.I18n.t
   </import>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx
index 62f97ac..22649e7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUI.jaxx
@@ -34,7 +34,7 @@
     org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx
index dcf4342..57e4391 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUI.jaxx
@@ -40,7 +40,7 @@
     javax.swing.table.TableCellRenderer
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx
index 0a411bd..5fe9b53 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUI.jaxx
@@ -45,7 +45,7 @@
     javax.swing.table.TableCellRenderer
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx
index b3003b2..f8fa439 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUI.jaxx
@@ -25,11 +25,11 @@
   <style source="ReferenceEntity.jcss"/>
 
   <import>
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
     fr.ird.observe.services.dto.referential.OceanDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx
index 8567d3c..9264ca9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUI.jaxx
@@ -25,7 +25,7 @@
   <style source="ReferenceEntity.jcss"/>
 
   <import>
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
     fr.ird.observe.services.dto.referential.ReferentialReference
     fr.ird.observe.services.dto.referential.OrganismDto
     fr.ird.observe.services.dto.referential.CountryDto
@@ -33,7 +33,7 @@
     jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx
index 2049d8a..855fb2d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUI.jaxx
@@ -25,7 +25,7 @@
   <style source="ReferenceEntity.jcss"/>
 
   <import>
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
     fr.ird.observe.services.dto.referential.ReferentialReference
     fr.ird.observe.services.dto.referential.PersonDto
     fr.ird.observe.services.dto.referential.CountryDto
@@ -38,7 +38,7 @@
     jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx
index 21cb1d2..5743611 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUI.jaxx
@@ -26,8 +26,8 @@
   <style source="../ContentI18nReferenceUI.jcss"/>
 
   <import>
-    fr.ird.observe.services.dto.constants.ReferenceStatus
-    fr.ird.observe.services.dto.constants.GearType
+    fr.ird.observe.common.constants.ReferenceStatus
+    fr.ird.observe.common.constants.GearType
     fr.ird.observe.services.dto.referential.ReferentialReference
     fr.ird.observe.services.dto.referential.ProgramDto
     fr.ird.observe.services.dto.referential.ReferentialDto
@@ -43,7 +43,7 @@
     java.awt.Dimension
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx
index 3472ad9..dc59114 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.SexDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx
index c91483c..c7b735a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUI.jaxx
@@ -30,7 +30,7 @@
     jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx
index f562efc..f04723a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.SizeMeasureTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx
index 7c01ba2..67f5633 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUI.jaxx
@@ -31,7 +31,7 @@
     jaxx.runtime.swing.editor.NumberEditor
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx
index c50f00a..e640e44 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUI.jaxx
@@ -40,7 +40,7 @@
     java.util.Collection
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
     static org.nuiton.i18n.I18n.t
   </import>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx
index 2fd3d98..13847ca 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUI.jaxx
@@ -40,7 +40,7 @@
     java.util.Collection
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx
index 0330029..e35a28b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.VesselSizeCategoryDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx
index 0c3165e..ac30b4c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.VesselTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx
index 2120e74..dd13fbd 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUI.jaxx
@@ -40,7 +40,7 @@
     org.jdesktop.swingx.JXDatePicker
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx
index 352e2a3..c172ac2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.WeightMeasureTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx
index 5b93b37..012331b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUI.jaxx
@@ -26,7 +26,7 @@
     fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx
index c35e623..d693981 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx
index 4e83e19..1a88c45 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.BaitTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx
index c4d1b2b..4af0c95 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx
index fdf4041..91b6e55 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.EncounterTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx
index ac4f47c..2e700a4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.HealthnessDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx
index c0e51c0..1e0a830 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.HookPositionDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx
index fb2648e..9bc6bed 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.HookSizeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx
index c519935..3551a1d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.HookTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx
index 5b3efdd..529d0bb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx
index c34a985..5322d6e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx
index 1cc48c8..39ea104 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.LightsticksColorDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx
index a4971ff..9bb91a6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx
index e0e8e43..08dd27d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.LineTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx
index be1097c..56213bd 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.MaturityStatusDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx
index 9b0b9f8..22390a7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.MitigationTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx
index 7c20e75..e5f8ae4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.SensorBrandDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx
index 98828b6..f97151d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx
index 8e37ace..f2e087a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.SensorTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx
index 4099a4e..c1ea6b1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.SettingShapeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx
index 3dc3de7..11bc587 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.StomacFullnessDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx
index 348592e..2b6000c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUI.jaxx
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.longline.TripTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx
index da330b3..1c0d766 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx
index 618a994..5ca4c4b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.DetectionModeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx
index b476184..8ef0b32 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.seine.ObjectFateDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx
index 2a04baf..721e26c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.ObjectOperationDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx
index f9e23bb..793cb8e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.seine.ObjectTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx
index 3ddebf7..c7c4cf1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUI.jaxx
@@ -26,11 +26,11 @@
   <style source="../ReferenceEntity.jcss"/>
 
   <import>
-    fr.ird.observe.services.dto.constants.seine.SchoolType
+    fr.ird.observe.common.constants.seine.SchoolType
     fr.ird.observe.services.dto.referential.seine.ObservedSystemDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx
index bc33d13..48c5ee2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx
index 79dd524..096885b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx
index cfe527c..a95c98e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx
index 4c86f0b..e64bbcb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUI.jaxx
@@ -30,7 +30,7 @@
     fr.ird.observe.application.swing.ui.util.BooleanEditor
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx
index 294a880..f591d5d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx
index 3f23e90..ec623db 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx
index c9d6e42..1ab723f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx
index 2789783..0ae1a50 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx
index ec6cb22..bd5aeb8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx
index b45567c..f422767 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUI.jaxx
@@ -38,7 +38,7 @@
     javax.swing.table.TableCellRenderer
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx
index e57d337..5f13ff1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUI.jaxx
@@ -28,7 +28,7 @@
     fr.ird.observe.services.dto.referential.seine.WindDto
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
-    fr.ird.observe.services.dto.constants.ReferenceStatus
+    fr.ird.observe.common.constants.ReferenceStatus
   </import>
 
   <!-- validator -->
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java
index f386b2c..2ec213e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUIHandler.java
@@ -31,7 +31,7 @@ import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.content.table.ContentTableModel;
 import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler;
 import fr.ird.observe.services.dto.Form;
-import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource;
+import fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ReferentialReferences;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java
index c702d83..be55fa1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapContentBuilder.java
@@ -30,10 +30,10 @@ import com.vividsolutions.jts.geom.GeometryFactory;
 import com.vividsolutions.jts.geom.LineString;
 import com.vividsolutions.jts.geom.Point;
 import com.vividsolutions.jts.geom.Polygon;
-import fr.ird.observe.application.swing.ObserveSwingTechnicalException;
 import fr.ird.observe.application.swing.I18nEnumHelper;
-import fr.ird.observe.services.dto.TripMapPointDto;
-import fr.ird.observe.services.dto.constants.TripMapPointType;
+import fr.ird.observe.application.swing.ObserveSwingTechnicalException;
+import fr.ird.observe.common.TripMapPoint;
+import fr.ird.observe.common.constants.TripMapPointType;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.geotools.data.FileDataStore;
@@ -130,7 +130,7 @@ public class TripMapContentBuilder {
         mapContent.addLayer(layer);
     }
 
-    public void addTripLine(List<TripMapPointDto> tripMapPoints) throws FactoryException {
+    public void addTripLine(List<TripMapPoint> tripMapPoints) throws FactoryException {
 
         GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();
 
@@ -148,9 +148,9 @@ public class TripMapContentBuilder {
 
         List<Coordinate> coordinatesByDay = null;
 
-        TripMapPointDto previousPoint = null;
+        TripMapPoint previousPoint = null;
 
-        for (TripMapPointDto point : tripMapPoints) {
+        for (TripMapPoint point : tripMapPoints) {
             if (previousPoint == null) {
                 coordinatesByDay = Lists.newLinkedList();
             } else if (!DateUtils.isSameDay(previousPoint.getTime(), point.getTime())) {
@@ -224,7 +224,7 @@ public class TripMapContentBuilder {
 
     }
 
-    public void addLonglineFishingZone(List<TripMapPointDto> tripMapPoints) throws FactoryException {
+    public void addLonglineFishingZone(List<TripMapPoint> tripMapPoints) throws FactoryException {
         GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();
 
         SimpleFeatureTypeBuilder polygonFeatureTypeBuilder = new SimpleFeatureTypeBuilder();
@@ -272,7 +272,7 @@ public class TripMapContentBuilder {
         }
     }
 
-    public void addLonglineLine(List<TripMapPointDto> tripMapPoints) throws FactoryException {
+    public void addLonglineLine(List<TripMapPoint> tripMapPoints) throws FactoryException {
         GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();
 
         SimpleFeatureTypeBuilder lineFeatureTypeBuilder = new SimpleFeatureTypeBuilder();
@@ -363,7 +363,7 @@ public class TripMapContentBuilder {
     }
 
 
-    public void addPoints(List<TripMapPointDto> tripMapPoints) throws FactoryException {
+    public void addPoints(List<TripMapPoint> tripMapPoints) throws FactoryException {
 
         GeometryFactory geometryFactory = JTSFactoryFinder.getGeometryFactory();
 
@@ -383,7 +383,7 @@ public class TripMapContentBuilder {
 
         Set<TripMapPointType> pointTypeInLegend = Sets.newHashSet();
 
-        for (TripMapPointDto tripMapPoint : tripMapPoints) {
+        for (TripMapPoint tripMapPoint : tripMapPoints) {
             Coordinate coordinate = new Coordinate(tripMapPoint.getLongitude(), tripMapPoint.getLatitude());
 
             TripMapPointType type = tripMapPoint.getType();
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java
index 0629ef2..d288d48 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java
@@ -27,9 +27,9 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ObserveSwingTechnicalException;
 import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig;
 import fr.ird.observe.application.swing.ui.UIHelper;
+import fr.ird.observe.common.TripMapPoint;
 import fr.ird.observe.services.dto.IdHelper;
 import fr.ird.observe.services.dto.TripMapDto;
-import fr.ird.observe.services.dto.TripMapPointDto;
 import jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -96,7 +96,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> {
                 mapPane.getMapContent().dispose();
             }
 
-            List<TripMapPointDto> tripMapPoints = Lists.newArrayList(tripMapDto.getPoints());
+            List<TripMapPoint> tripMapPoints = Lists.newArrayList(tripMapDto.getPoints());
 
 
             TripMapContentBuilder mapContentBuilder = new TripMapContentBuilder();
@@ -121,7 +121,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> {
 
             // set zoom
             tripArea = new ReferencedEnvelope();
-            for (TripMapPointDto point : tripMapPoints) {
+            for (TripMapPoint point : tripMapPoints) {
                 tripArea.expandToInclude(new DirectPosition2D(point.getLongitude(), point.getLatitude()));
             }
             tripArea.expandBy(1.1);
diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties
index 70985db..1a95f5d 100644
--- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties
+++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties
@@ -1416,6 +1416,40 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DAT
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DATA.description=Only data
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL=Only referentials
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Only referentials
+observe.enum.fr.ird.observe.common.constants.GearType.longline=Longline gear type
+observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne gear type
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Disabled
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Enabled
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Activity
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encounter
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Harbour landing
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Activity
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=In harbour
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Free School type
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Object School type
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Harbour departure
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Harbour landing
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Computed from data
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Computed from referential
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Computed from samples
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Other vessel
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=This vessel
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Unknown
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Free school type
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Object school type
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Undefined school type
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Posing
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visit
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.EMPTY.tip=Display programs with no trip
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Longline
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL.tip=Display Palangre's programs
@@ -1423,40 +1457,6 @@ observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Seine
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS.tip=Display Seine's programs
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Referential
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF.tip=Display referential
-observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline gear type
-observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne gear type
-observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Disabled
-observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.enabled=Enabled
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivity=Activity
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityInHarbour=Au Harbour
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingEnd=Hauling end
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingStart=Hauling start
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithInteraction=Encounter
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingEnd=Setting end
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingStart=Setting start
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithStation=Station
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineDepartureHarbour=Harbour departure
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineLandingHarbour=Harbour landing
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivity=Activity
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityInHarbour=In harbour
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithFreeSchoolType=Free School type
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithObjectSchoolType=Object School type
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineDepartureHarbour=Harbour departure
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineLandingHarbour=Harbour landing
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromData=Computed from data
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Computed from referential
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromSample=Computed from samples
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.autreVessel=Other vessel
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.ceVessel=This vessel
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.unknown=Unknown
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.libre=Free school type
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.objet=Object school type
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.undefined=Undefined school type
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=No Beacon
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pose=Posing
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Grab
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Grab and change
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Visit
 observe.error.can.not.create.directory=Can't create directory %&$s\!
 observe.error.no.activity.6=Activity of type 6 was not found.
 observe.error.storage.could.not.backup.unsane.local.db=Can not save an borken database
diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties
index 2e77128..b46d168 100644
--- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties
+++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties
@@ -1416,6 +1416,40 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DAT
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DATA.description=Datos del observador
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL=Referencial
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Todos los referenciales
+observe.enum.fr.ird.observe.common.constants.GearType.longline=Palangre
+observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Desactivado
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Activo
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=Actividad
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=En el puerto
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de arrastre
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Inicio de arrastre
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Encuentro
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de calada
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Inicio de calada
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Puerto de salida
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Puerto de llegada
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=Actividad
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=En el puerto
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Puerto de salida
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Puerto de llegada
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del referencial
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Barco ajeno
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Este barco o un barco del mismo armador
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Desconocido
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banco libre
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banco a objeto
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banco indeterminado
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.EMPTY.tip=Voir les programmes sans marée \#TODO
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL.tip=Voir les programmes Palangre \#TODO
@@ -1423,40 +1457,6 @@ observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS.tip=Voir les programmes Senne \#TODO
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Referencial
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF.tip=Voir le référentiel \#TODO
-observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Palangre
-observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne
-observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Desactivado
-observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.enabled=Activo
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivity=Actividad
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityInHarbour=En el puerto
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de arrastre
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingStart=Inicio de arrastre
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithInteraction=Encuentro
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de calada
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingStart=Inicio de calada
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithStation=Station
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineDepartureHarbour=Puerto de salida
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineLandingHarbour=Puerto de llegada
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivity=Actividad
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityInHarbour=En el puerto
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banco libre
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banco a objeto
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineDepartureHarbour=Puerto de salida
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineLandingHarbour=Puerto de llegada
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromData=Calculado a partir de otros datos
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=Calculado a partir del referencial
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromSample=Calculado a partir de las muestras
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.autreVessel=Barco ajeno
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.ceVessel=Este barco o un barco del mismo armador
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.unknown=Desconocido
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.libre=Banco libre
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.objet=Banco a objeto
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.undefined=Banco indeterminado
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=DCP sin baliza
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pose=Colocación de nueva baliza
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Recogida de baliza sin regreso al agua
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Recuperación y colocación de una nueva baliza
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Visita a la baliza
 observe.error.can.not.create.directory=¡Imposible crear el directorio %1$s\!
 observe.error.no.activity.6=La actividad con código 6 no se ha encontrado en la base de datos.
 observe.error.storage.could.not.backup.unsane.local.db=Impossible grabar una base dañada
diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
index c17e06e..af90535 100644
--- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
+++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties
@@ -1415,6 +1415,40 @@ observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DAT
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.DATA.description=Données observées
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL=Référentiel
 observe.enum.fr.ird.observe.application.swing.validation.ValidationModelMode.REFERENTIEL.description=Tous les référentiels
+observe.enum.fr.ird.observe.common.constants.GearType.longline=Longline
+observe.enum.fr.ird.observe.common.constants.GearType.seine=Senne
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.disabled=Désactivé
+observe.enum.fr.ird.observe.common.constants.ReferenceStatus.enabled=Actif
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivity=point d'activité
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityInHarbour=Au port
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de virage
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithHaulingStart=Début de virage
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithInteraction=Rencontre
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de filage
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithSettingStart=Début de filage
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineActivityWithStation=Station océanographique
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineDepartureHarbour=Port de départ
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.longlineLandingHarbour=Port d'arrivée
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivity=point d'activité
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityInHarbour=Au port
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineDepartureHarbour=Port de départ
+observe.enum.fr.ird.observe.common.constants.TripMapPointType.seineLandingHarbour=Port d'arrivée
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromData=calculé à partir des autres données
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel
+observe.enum.fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.autreVessel=Navire d'un autre armement
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.ceVessel=Ce navire ou cet armement
+observe.enum.fr.ird.observe.common.constants.seine.Ownership.unknown=Inconnue
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.libre=Banc libre
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.objet=Banc objet
+observe.enum.fr.ird.observe.common.constants.seine.SchoolType.undefined=Banc indéterminé
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise
+observe.enum.fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.EMPTY.tip=Voir les programmes sans marée
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL=Palangre
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.LL.tip=Voir les programmes Palangre
@@ -1422,40 +1456,6 @@ observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS=Senne
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.PS.tip=Voir les programmes Seine
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF=Référentiel
 observe.enum.fr.ird.observe.services.dto.ObserveModelType.REF.tip=Voir le référentiel
-observe.enum.fr.ird.observe.services.dto.constants.GearType.longline=Longline
-observe.enum.fr.ird.observe.services.dto.constants.GearType.seine=Senne
-observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.disabled=Désactivé
-observe.enum.fr.ird.observe.services.dto.constants.ReferenceStatus.enabled=Actif
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivity=point d'activité
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityInHarbour=Au port
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingEnd=Fin de virage
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithHaulingStart=Début de virage
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithInteraction=Rencontre
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingEnd=Fin de filage
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithSettingStart=Début de filage
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineActivityWithStation=Station océanographique
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineDepartureHarbour=Port de départ
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.longlineLandingHarbour=Port d'arrivée
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivity=point d'activité
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityInHarbour=Au port
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithFreeSchoolType=Banc libre
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineActivityWithObjectSchoolType=Banc objet
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineDepartureHarbour=Port de départ
-observe.enum.fr.ird.observe.services.dto.constants.TripMapPointType.seineLandingHarbour=Port d'arrivée
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromData=calculé à partir des autres données
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromReferentiel=calculé à partir du référentiel
-observe.enum.fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource.fromSample=calculé à partir des échantillons
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.autreVessel=Navire d'un autre armement
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.ceVessel=Ce navire ou cet armement
-observe.enum.fr.ird.observe.services.dto.constants.seine.Ownership.unknown=Inconnue
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.libre=Banc libre
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.objet=Banc objet
-observe.enum.fr.ird.observe.services.dto.constants.seine.SchoolType.undefined=Banc indéterminé
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pasDeBalise=Pas de balise liée au DCP
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperation=Récupération d'une balise sans remise à l'eau
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.recuperationEtRemplacement=Récupération et pose d'une nouvelle balise
-observe.enum.fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation.visite=Simple visite de la balise
 observe.error.can.not.create.directory=Création du répertoire %1$s impossible\!
 observe.error.no.activity.6=L'activité de type 6 n'a pas été trouvée en base.
 observe.error.storage.could.not.backup.unsane.local.db=Impossible d'enregistrer une base non endommagée
diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml
index d1b4701..6737903 100644
--- a/application-web-configuration/pom.xml
+++ b/application-web-configuration/pom.xml
@@ -39,7 +39,7 @@
     <!-- sibling dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>services-dto</artifactId>
+      <artifactId>common</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java
index cb00323..2d5fc2f 100644
--- a/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java
+++ b/application-web-configuration/src/main/java/fr/ird/observe/application/web/configuration/ObserveWebApplicationConfig.java
@@ -25,7 +25,7 @@ package fr.ird.observe.application.web.configuration;
 import com.google.common.base.Charsets;
 import com.google.common.io.CharSource;
 import com.google.common.io.Resources;
-import fr.ird.observe.util.ObserveUtil;
+import fr.ird.observe.common.ObserveUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.log4j.LogManager;
diff --git a/common/pom.xml b/common/pom.xml
index 207a721..079a872 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
@@ -11,26 +12,22 @@
   <artifactId>common</artifactId>
 
   <name>ObServe :: Common</name>
-  <description>ObServe common module</description>
+  <description>ObServe Common module</description>
 
   <dependencies>
 
     <!-- nuiton dependencies -->
-    <!--dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-version</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.nuiton</groupId>
       <artifactId>nuiton-utils</artifactId>
     </dependency>
     <dependency>
       <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-validator</artifactId>
-    </dependency-->
+      <artifactId>nuiton-config</artifactId>
+    </dependency>
 
     <!-- commons dependencies -->
-    <!--dependency>
+    <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
     </dependency>
@@ -39,14 +36,25 @@
       <artifactId>commons-lang3</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.apache.commons</groupId>
-      <artifactId>commons-collections4</artifactId>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
     </dependency>
 
+    <!-- test  -->
     <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </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>
 
   </dependencies>
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java b/common/src/main/java/fr/ird/observe/common/CoordinateHelper.java
similarity index 94%
rename from persistence/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java
rename to common/src/main/java/fr/ird/observe/common/CoordinateHelper.java
index 52f8016..ae7bb41 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java
+++ b/common/src/main/java/fr/ird/observe/common/CoordinateHelper.java
@@ -19,7 +19,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-package fr.ird.observe.entities.gps;
+package fr.ird.observe.common;
 
 /**
  * Helper to deal with coordinates.
@@ -34,8 +34,7 @@ public class CoordinateHelper {
      *
      * @param longitude la longitude décimale
      * @param latitude  la latitude décimale
-     * @return la valeur du quadrant ou {@code null} si l'une des deux
-     *         coordonnées est {@code null}.
+     * @return la valeur du quadrant ou {@code null} si l'une des deux coordonnées est {@code null}.
      * @since 1.2
      */
     public static Integer getQuadrant(Float longitude, Float latitude) {
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java b/common/src/main/java/fr/ird/observe/common/FormulaHelper.java
similarity index 84%
rename from persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java
rename to common/src/main/java/fr/ird/observe/common/FormulaHelper.java
index 10e1e91..4487f7f 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java
+++ b/common/src/main/java/fr/ird/observe/common/FormulaHelper.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.entities.referentiel;
+package fr.ird.observe.common;
 
 /*-
  * #%L
@@ -60,9 +60,9 @@ public class FormulaHelper {
 
     public static final String VARIABLE_OUTPUT = "O";
 
-    public  static final String COEFFICIENT_A = "a";
+    public static final String COEFFICIENT_A = "a";
 
-    public  static final String COEFFICIENT_B = "b";
+    public static final String COEFFICIENT_B = "b";
 
     /** moteur d'évaluation d'expression */
     protected static ScriptEngine scriptEngine;
@@ -77,7 +77,7 @@ public class FormulaHelper {
         return scriptEngine;
     }
 
-    public static Map<String, Double> getCoefficientValues(FormulaSupport parametrage) {
+    public static Map<String, Double> getCoefficientValues(WithFormula parametrage) {
 
         Map<String, Double> result = new TreeMap<>();
         String coefficients = parametrage.getCoefficients();
@@ -109,7 +109,7 @@ public class FormulaHelper {
         return result;
     }
 
-    protected static boolean validateRelation(FormulaSupport parametrage, String relation, String variable) {
+    public static boolean validateRelation(WithFormula parametrage, String relation, String variable) {
         boolean result = false;
         if (!StringUtils.isEmpty(relation)) {
 
@@ -117,16 +117,7 @@ public class FormulaHelper {
 
             ScriptEngine engine = getScriptEngine();
             Bindings bindings = engine.createBindings();
-            for (Map.Entry<String, Double> entry : coeffs.entrySet()) {
-                String key = entry.getKey();
-                Double value = entry.getValue();
-                bindings.put(key, value);
-
-                if (log.isDebugEnabled()) {
-                    log.debug("add constant " + key + '=' + value);
-                }
-            }
-            bindings.put(variable, 1);
+            addBindings(coeffs, bindings, variable, 1);
 
             try {
                 engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE);
@@ -144,8 +135,8 @@ public class FormulaHelper {
         return result;
     }
 
-    public static Float computeValue(FormulaSupport parametrage, String formula, String coefficientName, String variableName, float data) {
-        if (coefficientName!=null) {
+    public static Float computeValue(WithFormula parametrage, String formula, String coefficientName, String variableName, float data) {
+        if (coefficientName != null) {
             Double b = parametrage.getCoefficientValue(coefficientName);
             if (b == 0) {
 
@@ -161,20 +152,12 @@ public class FormulaHelper {
         return o;
     }
 
-    private static Float computeValue(FormulaSupport parametrage, String relation, String variable, float taille) {
+    private static Float computeValue(WithFormula parametrage, String relation, String variable, float taille) {
         Map<String, Double> coeffs = parametrage.getCoefficientValues();
         ScriptEngine engine = getScriptEngine();
         Bindings bindings = engine.createBindings();
-        for (Map.Entry<String, Double> entry : coeffs.entrySet()) {
-            String key = entry.getKey();
-            Double value = entry.getValue();
-            bindings.put(key, value);
+        addBindings(coeffs, bindings, variable, taille);
 
-            if (log.isDebugEnabled()) {
-                log.debug("add constant " + key + '=' + value);
-            }
-        }
-        bindings.put(variable, taille);
         engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE);
         Double o = null;
         try {
@@ -187,5 +170,18 @@ public class FormulaHelper {
         return o == null ? null : o.floatValue();
     }
 
+    private static void addBindings(Map<String, Double> coeffs, Bindings bindings, String variable, float taille) {
+        for (Map.Entry<String, Double> entry : coeffs.entrySet()) {
+            String key = entry.getKey();
+            Double value = entry.getValue();
+            bindings.put(key, value);
+
+            if (log.isDebugEnabled()) {
+                log.debug("add constant " + key + '=' + value);
+            }
+        }
+        bindings.put(variable, taille);
+    }
+
 
 }
diff --git a/services-dto/src/main/java/fr/ird/observe/util/GPSPoint.java b/common/src/main/java/fr/ird/observe/common/GPSPoint.java
similarity index 80%
rename from services-dto/src/main/java/fr/ird/observe/util/GPSPoint.java
rename to common/src/main/java/fr/ird/observe/common/GPSPoint.java
index 5b3da1f..69da1a4 100644
--- a/services-dto/src/main/java/fr/ird/observe/util/GPSPoint.java
+++ b/common/src/main/java/fr/ird/observe/common/GPSPoint.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.util;
+package fr.ird.observe.common;
 
 /*
  * #%L
@@ -22,9 +22,6 @@ package fr.ird.observe.util;
  * #L%
  */
 
-import fr.ird.observe.services.dto.seine.ActivitySeineDto;
-import fr.ird.observe.services.dto.seine.ActivitySeineStubDto;
-import fr.ird.observe.services.dto.seine.RouteDto;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
@@ -67,42 +64,8 @@ public class GPSPoint implements Serializable {
 
     }
 
-    /**
-     * Construit un point à partir de l'entité donnée.
-     *
-     * @param route    la route qui contient le jour
-     * @param activity l'activite qui contient l'heure et la position géographique
-     * @return le nouveau point instancié
-     * @since 3.8
-     */
-    public static GPSPoint newPoint(RouteDto route, ActivitySeineDto activity) {
-        return newPoint(route.getDate(), activity.getTime(), activity.getLatitude(), activity.getLongitude());
-    }
-
-    /**
-     * Construit un point à partir de l'entité donnée.
-     *
-     * @param route    la route qui contient le jour
-     * @param activity l'activite qui contient l'heure et la position géographique
-     * @return le nouveau point instancié
-     * @since 3.8
-     */
-    public static GPSPoint newPoint(RouteDto route, ActivitySeineStubDto activity) {
-        return newPoint(route.getDate(), activity.getTime(), activity.getLatitude(), activity.getLongitude());
-    }
-
     public Integer getQuadrant() {
-        if (longitude == null || latitude == null) {
-            return null;
-        }
-        int result;
-
-        if (latitude > 0) {
-            result = longitude > 0 ? 1 : 4;
-        } else {
-            result = longitude > 0 ? 2 : 3;
-        }
-        return result;
+        return CoordinateHelper.getQuadrant(longitude, latitude);
     }
 
     public boolean isSameLocation(GPSPoint point) {
diff --git a/services-dto/src/main/java/fr/ird/observe/util/ObserveUtil.java b/common/src/main/java/fr/ird/observe/common/ObserveUtil.java
similarity index 98%
rename from services-dto/src/main/java/fr/ird/observe/util/ObserveUtil.java
rename to common/src/main/java/fr/ird/observe/common/ObserveUtil.java
index ce41394..660f393 100644
--- a/services-dto/src/main/java/fr/ird/observe/util/ObserveUtil.java
+++ b/common/src/main/java/fr/ird/observe/common/ObserveUtil.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.util;
+package fr.ird.observe.common;
 
 /*-
  * #%L
diff --git a/persistence/src/main/java/fr/ird/observe/entities/TripMapPoint.java b/common/src/main/java/fr/ird/observe/common/TripMapPoint.java
similarity index 87%
rename from persistence/src/main/java/fr/ird/observe/entities/TripMapPoint.java
rename to common/src/main/java/fr/ird/observe/common/TripMapPoint.java
index 63ba8db..c36c1db 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/TripMapPoint.java
+++ b/common/src/main/java/fr/ird/observe/common/TripMapPoint.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.entities;
+package fr.ird.observe.common;
 
 /*-
  * #%L
@@ -22,7 +22,7 @@ package fr.ird.observe.entities;
  * #L%
  */
 
-import fr.ird.observe.entities.constants.TripMapPointTypePersist;
+import fr.ird.observe.common.constants.TripMapPointType;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -45,7 +45,7 @@ public class TripMapPoint implements Serializable {
 
     protected float longitude;
 
-    protected TripMapPointTypePersist type;
+    protected TripMapPointType type;
 
     public Date getTime() {
         return time;
@@ -71,11 +71,11 @@ public class TripMapPoint implements Serializable {
         this.longitude = longitude;
     }
 
-    public TripMapPointTypePersist getType() {
+    public TripMapPointType getType() {
         return type;
     }
 
-    public void setType(TripMapPointTypePersist type) {
+    public void setType(TripMapPointType type) {
         this.type = type;
     }
 }
diff --git a/common/src/main/java/fr/ird/observe/common/WithFormula.java b/common/src/main/java/fr/ird/observe/common/WithFormula.java
new file mode 100644
index 0000000..22239cd
--- /dev/null
+++ b/common/src/main/java/fr/ird/observe/common/WithFormula.java
@@ -0,0 +1,19 @@
+package fr.ird.observe.common;
+
+import java.util.Map;
+
+/**
+ * Created on 22/12/16.
+ *
+ * @author Tony Chemit - chemit@codelutin.com
+ * @since 6.0
+ */
+public interface WithFormula {
+
+    String getCoefficients();
+
+    Double getCoefficientValue(String coefficientName);
+
+    Map<String, Double> getCoefficientValues();
+
+}
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/GearType.java b/common/src/main/java/fr/ird/observe/common/constants/GearType.java
similarity index 96%
rename from services-dto/src/main/java/fr/ird/observe/services/dto/constants/GearType.java
rename to common/src/main/java/fr/ird/observe/common/constants/GearType.java
index e96a7f6..cdec814 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/GearType.java
+++ b/common/src/main/java/fr/ird/observe/common/constants/GearType.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.dto.constants;
+package fr.ird.observe.common.constants;
 
 /*
  * #%L
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java b/common/src/main/java/fr/ird/observe/common/constants/ReferenceStatus.java
similarity index 95%
rename from services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java
rename to common/src/main/java/fr/ird/observe/common/constants/ReferenceStatus.java
index a3ad978..5329f9d 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/ReferenceStatus.java
+++ b/common/src/main/java/fr/ird/observe/common/constants/ReferenceStatus.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.dto.constants;
+package fr.ird.observe.common.constants;
 
 /*
  * #%L
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java b/common/src/main/java/fr/ird/observe/common/constants/TripMapPointType.java
similarity index 97%
rename from services-dto/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java
rename to common/src/main/java/fr/ird/observe/common/constants/TripMapPointType.java
index 6a49ce3..bab7fae 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/TripMapPointType.java
+++ b/common/src/main/java/fr/ird/observe/common/constants/TripMapPointType.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.dto.constants;
+package fr.ird.observe.common.constants;
 
 /*
  * #%L
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java b/common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchComputedValueSource.java
similarity index 96%
rename from services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java
rename to common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchComputedValueSource.java
index 2479319..33b9a1e 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/NonTargetCatchComputedValueSource.java
+++ b/common/src/main/java/fr/ird/observe/common/constants/seine/NonTargetCatchComputedValueSource.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.services.dto.constants.seine;
+package fr.ird.observe.common.constants.seine;
 
 /*
  * #%L
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java b/common/src/main/java/fr/ird/observe/common/constants/seine/Ownership.java
similarity index 96%
rename from services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java
rename to common/src/main/java/fr/ird/observe/common/constants/seine/Ownership.java
index 33c81bc..c80f572 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/Ownership.java
+++ b/common/src/main/java/fr/ird/observe/common/constants/seine/Ownership.java
@@ -19,7 +19,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-package fr.ird.observe.services.dto.constants.seine;
+package fr.ird.observe.common.constants.seine;
 
 /**
  * An enum to define the ownership of a DCP.
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java b/common/src/main/java/fr/ird/observe/common/constants/seine/SchoolType.java
similarity index 95%
rename from services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java
rename to common/src/main/java/fr/ird/observe/common/constants/seine/SchoolType.java
index a9af112..f990d05 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/SchoolType.java
+++ b/common/src/main/java/fr/ird/observe/common/constants/seine/SchoolType.java
@@ -19,7 +19,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-package fr.ird.observe.services.dto.constants.seine;
+package fr.ird.observe.common.constants.seine;
 
 /**
  * Une énumération pour caractériser les valeurs d'un type de banc d'une calée.
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java b/common/src/main/java/fr/ird/observe/common/constants/seine/TypeTransmittingBuoyOperation.java
similarity index 97%
rename from services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java
rename to common/src/main/java/fr/ird/observe/common/constants/seine/TypeTransmittingBuoyOperation.java
index 90aae95..a8f160f 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/constants/seine/TypeTransmittingBuoyOperation.java
+++ b/common/src/main/java/fr/ird/observe/common/constants/seine/TypeTransmittingBuoyOperation.java
@@ -19,7 +19,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-package fr.ird.observe.services.dto.constants.seine;
+package fr.ird.observe.common.constants.seine;
 
 /** @author Tony Chemit - chemit@codelutin.com */
 public enum TypeTransmittingBuoyOperation {
diff --git a/persistence/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java b/common/src/test/java/fr/ird/observe/common/FormulaHelperTest.java
similarity index 66%
rename from persistence/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java
rename to common/src/test/java/fr/ird/observe/common/FormulaHelperTest.java
index d1d1571..a7f3d4e 100644
--- a/persistence/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java
+++ b/common/src/test/java/fr/ird/observe/common/FormulaHelperTest.java
@@ -1,4 +1,4 @@
-package fr.ird.observe.entities.referentiel;
+package fr.ird.observe.common;
 
 /*-
  * #%L
@@ -22,9 +22,12 @@ package fr.ird.observe.entities.referentiel;
  * #L%
  */
 
+import com.google.common.collect.ImmutableMap;
 import org.junit.Assert;
 import org.junit.Test;
 
+import java.util.Map;
+
 /**
  * Created on 05/11/16.
  *
@@ -36,10 +39,24 @@ public class FormulaHelperTest {
     @Test
     public void testComputeValue() {
 
-        LengthWeightParameterImpl parametrage = new LengthWeightParameterImpl();
-        parametrage.setCoefficients("a=3.8e-5:b=2.78 ");
-        parametrage.setLengthWeightFormula("a * Math.pow(L, b)");
-        Assert.assertTrue(parametrage.isFormulaOneValid());
+        WithFormula parametrage = new WithFormula() {
+
+            @Override
+            public String getCoefficients() {
+                return "a=3.8e-5:b=2.78 ";
+            }
+
+            @Override
+            public Double getCoefficientValue(String coefficientName) {
+                return getCoefficientValues().get(coefficientName);
+            }
+
+            @Override
+            public Map<String, Double> getCoefficientValues() {
+                return ImmutableMap.of("a", 3.8e-5, "b", 2.78);
+            }
+        };
+
         Float weight = FormulaHelper.computeValue(parametrage, "a * Math.pow(L, b)", null, "L", 84.0f);
         Assert.assertNotNull(weight);
 
diff --git a/persistence/src/test/java/fr/ird/observe/RelationRegexTest.java b/common/src/test/java/fr/ird/observe/common/RelationRegexTest.java
similarity index 98%
rename from persistence/src/test/java/fr/ird/observe/RelationRegexTest.java
rename to common/src/test/java/fr/ird/observe/common/RelationRegexTest.java
index 7be72d5..cb43c37 100644
--- a/persistence/src/test/java/fr/ird/observe/RelationRegexTest.java
+++ b/common/src/test/java/fr/ird/observe/common/RelationRegexTest.java
@@ -20,7 +20,7 @@
  * #L%
  */
 
-package fr.ird.observe;
+package fr.ird.observe.common;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/persistence/src/test/java/fr/ird/observe/ScriptTest.java b/common/src/test/java/fr/ird/observe/common/ScriptTest.java
similarity index 99%
rename from persistence/src/test/java/fr/ird/observe/ScriptTest.java
rename to common/src/test/java/fr/ird/observe/common/ScriptTest.java
index 5d5c62b..df6fe2a 100644
--- a/persistence/src/test/java/fr/ird/observe/ScriptTest.java
+++ b/common/src/test/java/fr/ird/observe/common/ScriptTest.java
@@ -19,7 +19,7 @@
  * <http://www.gnu.org/licenses/gpl-3.0.html>.
  * #L%
  */
-package fr.ird.observe;
+package fr.ird.observe.common;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/common/src/test/resources/log4j.properties b/common/src/test/resources/log4j.properties
new file mode 100644
index 0000000..cc584f6
--- /dev/null
+++ b/common/src/test/resources/log4j.properties
@@ -0,0 +1,31 @@
+###
+# #%L
+# ObServe :: Entities
+# %%
+# Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
+###
+
+# Global logging configuration
+log4j.rootLogger=ERROR, stdout
+# Console output...
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n
+
+# package level
+log4j.logger.fr.ird.observe=INFO
diff --git a/persistence/pom.xml b/persistence/pom.xml
index a69543a..c8c3665 100644
--- a/persistence/pom.xml
+++ b/persistence/pom.xml
@@ -44,11 +44,11 @@
       <artifactId>topia-extension</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!--dependency>
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>common</artifactId>
       <version>${project.version}</version>
-    </dependency-->
+    </dependency>
 
     <!-- Nuiton -->
     <dependency>
diff --git a/persistence/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java
deleted file mode 100644
index 07c2675..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package fr.ird.observe.entities.constants;
-
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
- */
-
-/**
- * Created on 8/5/14.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 3.6
- */
-public enum GearTypePersist {
-
-    /** Seine */
-    seine("PS"),
-
-    /** Longline */
-    longline("LL");
-
-    private final String prefix;
-
-    GearTypePersist(String prefix) {
-        this.prefix = prefix;
-    }
-
-    public static GearTypePersist fromOrdinal(int ordinal) {
-
-        GearTypePersist result = null;
-        for (GearTypePersist gearType : values()) {
-            if (ordinal == gearType.ordinal()) {
-                result = gearType;
-            }
-        }
-        return result;
-    }
-
-    public String getPrefix() {
-        return prefix;
-    }
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java
deleted file mode 100644
index 3444533..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
- */
-package fr.ird.observe.entities.constants;
-
-/**
- * Une énumération pour caractériser les valeurs des status d'une entité du
- * référentiel
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 1.2
- */
-public enum ReferenceStatusPersist {
-
-    /** status desactive */
-    disabled,
-
-    /** status active */
-    enabled
-
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java
deleted file mode 100644
index 88617cd..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package fr.ird.observe.entities.constants;
-
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
- */
-
-/**
- * @author Sylvain Bavencoff - bavencoff@codelutin.com
- */
-public enum TripMapPointTypePersist {
-
-    seineDepartureHarbour,
-    seineLandingHarbour,
-    seineActivity,
-    seineActivityInHarbour,
-    seineActivityWithFreeSchoolType,
-    seineActivityWithObjectSchoolType,
-
-    longlineActivity,
-    longlineDepartureHarbour,
-    longlineLandingHarbour,
-    longlineActivityInHarbour,
-    longlineActivityWithSettingStart,
-    longlineActivityWithSettingEnd,
-    longlineActivityWithHaulingStart,
-    longlineActivityWithHaulingEnd,
-    longlineActivityWithInteraction,
-    longlineActivityWithStation
-
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java
deleted file mode 100644
index d47c336..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package fr.ird.observe.entities.constants.seine;
-
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
- */
-
-/**
- * Pour définir comment a été calculé une donnée d'une discarded faune.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 3.0
- */
-public enum NonTargetCatchComputedValueSourcePersist {
-
-    /**
-     * Donnée directement calculée à partir d'autre données de la capture.
-     *
-     * @since 3.0
-     */
-    fromData,
-    /**
-     * Donnée calculée à partir de l'échantillon pour la même espèce et la même calée.
-     *
-     * @since 3.0
-     */
-    fromSample,
-    /**
-     * Donnée calculée à partir du référentiel.
-     *
-     * @since 3.0
-     */
-    fromReferentiel
-
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java
deleted file mode 100644
index 8bfbcc5..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
- */
-package fr.ird.observe.entities.constants.seine;
-
-/**
- * An enum to define the ownership of a DCP.
- *
- * @author Tony Chemit - chemit@codelutin.com
- */
-public enum OwnershipPersist implements Comparable<OwnershipPersist> {
-
-    /** inconnue */
-    unknown,
-
-    /** appartient a ce vessel */
-    ceVessel,
-
-    /** appartien a un autre vessel */
-    autreVessel
-
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java
deleted file mode 100644
index cfef3a6..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
- */
-package fr.ird.observe.entities.constants.seine;
-
-/**
- * Une énumération pour caractériser les valeurs d'un type de banc d'une calée.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 1.5
- */
-public enum SchoolTypePersist {
-
-    /** banc indéterminé (valeur par défaut) // was 3 before version 4.0 */
-    undefined,
-
-    /** banc objet // was 1 before version 4.0 */
-    objet,
-
-    /** banc libre // was 2 before version 4.0 */
-    libre
-
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java
deleted file mode 100644
index 1a734b8..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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%
- */
-package fr.ird.observe.entities.constants.seine;
-
-/** @author Tony Chemit - chemit@codelutin.com */
-public enum TypeTransmittingBuoyOperationPersist {
-    // pas de balise lue
-    pasDeBalise,
-
-    // une balise lue
-    visite,
-    recuperation,
-    pose,
-
-    // deux balises lues
-    recuperationEtRemplacement
-
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java
index 294a6eb..7899e06 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java
@@ -24,7 +24,7 @@ package fr.ird.observe.entities.longline;
 
 import com.google.common.base.MoreObjects;
 import fr.ird.observe.persistence.Entities;
-import fr.ird.observe.entities.gps.CoordinateHelper;
+import fr.ird.observe.common.CoordinateHelper;
 import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline;
 import org.nuiton.util.DateUtil;
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java
index ce4f4d5..7b274fb 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java
@@ -24,7 +24,7 @@ package fr.ird.observe.entities.longline;
 
 import com.google.common.base.MoreObjects;
 import fr.ird.observe.persistence.Entities;
-import fr.ird.observe.entities.gps.CoordinateHelper;
+import fr.ird.observe.common.CoordinateHelper;
 import org.nuiton.util.DateUtil;
 
 import java.util.Date;
diff --git a/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java
index 7002ed4..0e41082 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java
@@ -23,8 +23,8 @@ package fr.ird.observe.entities.longline;
  */
 
 import com.google.common.collect.Lists;
-import fr.ird.observe.entities.TripMapPoint;
-import fr.ird.observe.entities.constants.TripMapPointTypePersist;
+import fr.ird.observe.common.TripMapPoint;
+import fr.ird.observe.common.constants.TripMapPointType;
 import fr.ird.observe.entities.referentiel.Harbour;
 import fr.ird.observe.entities.referentiel.Program;
 import org.nuiton.topia.persistence.support.TopiaSqlQuery;
@@ -76,7 +76,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
             departurePoint.setTime(tripLongline.getStartDate());
             departurePoint.setLatitude(departureHarbour.getLatitude());
             departurePoint.setLongitude(departureHarbour.getLongitude());
-            departurePoint.setType(TripMapPointTypePersist.longlineDepartureHarbour);
+            departurePoint.setType(TripMapPointType.longlineDepartureHarbour);
             tripMapPoints.add(departurePoint);
         }
 
@@ -96,7 +96,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
             landingPoint.setTime(tripLongline.getEndDate());
             landingPoint.setLatitude(landingHarbour.getLatitude());
             landingPoint.setLongitude(landingHarbour.getLongitude());
-            landingPoint.setType(TripMapPointTypePersist.longlineLandingHarbour);
+            landingPoint.setType(TripMapPointType.longlineLandingHarbour);
             tripMapPoints.add(landingPoint);
         }
 
@@ -156,13 +156,13 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
 
                 String vesselActivityId = resultSet.getString(4);
                 if (vesselActivityId == null) {
-                    activity.setType(TripMapPointTypePersist.longlineActivity);
+                    activity.setType(TripMapPointType.longlineActivity);
                 } else if (ACTIVITY_INTERACTION_ID.equals(vesselActivityId)) {
-                    activity.setType(TripMapPointTypePersist.longlineActivityWithInteraction);
+                    activity.setType(TripMapPointType.longlineActivityWithInteraction);
                 } else if (ACTIVITY_STATION_ID.equals(vesselActivityId)) {
-                    activity.setType(TripMapPointTypePersist.longlineActivityWithStation);
+                    activity.setType(TripMapPointType.longlineActivityWithStation);
                 } else {
-                    activity.setType(TripMapPointTypePersist.longlineActivity);
+                    activity.setType(TripMapPointType.longlineActivity);
                 }
 
                 result.add(activity);
@@ -174,7 +174,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
                 settingStart.setTime(resultSet.getDate(5));
                 settingStart.setLatitude(resultSet.getFloat(6));
                 settingStart.setLongitude(resultSet.getFloat(7));
-                settingStart.setType(TripMapPointTypePersist.longlineActivityWithSettingStart);
+                settingStart.setType(TripMapPointType.longlineActivityWithSettingStart);
                 result.add(settingStart);
             }
 
@@ -184,7 +184,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
                 settingEnd.setTime(resultSet.getDate(8));
                 settingEnd.setLatitude(resultSet.getFloat(9));
                 settingEnd.setLongitude(resultSet.getFloat(10));
-                settingEnd.setType(TripMapPointTypePersist.longlineActivityWithSettingEnd);
+                settingEnd.setType(TripMapPointType.longlineActivityWithSettingEnd);
                 result.add(settingEnd);
             }
 
@@ -194,7 +194,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
                 haulingStart.setTime(resultSet.getDate(11));
                 haulingStart.setLatitude(resultSet.getFloat(12));
                 haulingStart.setLongitude(resultSet.getFloat(13));
-                haulingStart.setType(TripMapPointTypePersist.longlineActivityWithHaulingStart);
+                haulingStart.setType(TripMapPointType.longlineActivityWithHaulingStart);
                 result.add(haulingStart);
             }
 
@@ -204,7 +204,7 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl
                 haulingEnd.setTime(resultSet.getDate(14));
                 haulingEnd.setLatitude(resultSet.getFloat(15));
                 haulingEnd.setLongitude(resultSet.getFloat(16));
-                haulingEnd.setType(TripMapPointTypePersist.longlineActivityWithHaulingEnd);
+                haulingEnd.setType(TripMapPointType.longlineActivityWithHaulingEnd);
                 result.add(haulingEnd);
             }
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java
index 0c4fa18..3efe892 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java
@@ -22,6 +22,8 @@ package fr.ird.observe.entities.referentiel;
  * #L%
  */
 
+import fr.ird.observe.common.FormulaHelper;
+import fr.ird.observe.common.WithFormula;
 import org.apache.commons.lang3.BooleanUtils;
 
 import java.util.Map;
@@ -33,7 +35,7 @@ import java.util.Set;
  * @author Tony Chemit - chemit@codelutin.com
  * @since 6.0
  */
-public abstract class FormulaSupportImpl extends FormulaSupportAbstract {
+public abstract class FormulaSupportImpl extends FormulaSupportAbstract implements WithFormula {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java
index ce461a4..2868637 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java
@@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel;
  * #L%
  */
 
-import fr.ird.observe.entities.gps.CoordinateHelper;
+import fr.ird.observe.common.CoordinateHelper;
 
 public class HarbourImpl extends HarbourAbstract {
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java
index 3b16f67..d6e248c 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java
@@ -22,13 +22,16 @@ package fr.ird.observe.entities.referentiel;
  * #L%
  */
 
+import fr.ird.observe.common.FormulaHelper;
+import fr.ird.observe.common.WithFormula;
+
 /**
  * Created on 05/11/16.
  *
  * @author Tony Chemit - chemit@codelutin.com
  * @since 6.0
  */
-public class LengthLengthParameterImpl extends LengthLengthParameterAbstract {
+public class LengthLengthParameterImpl extends LengthLengthParameterAbstract implements WithFormula {
 
     @Override
     public void setInputOutputFormula(String inputOutputFormula) {
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java
index 8b1c687..4385690 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java
@@ -21,6 +21,8 @@
  */
 package fr.ird.observe.entities.referentiel;
 
+import fr.ird.observe.common.FormulaHelper;
+
 public class LengthWeightParameterImpl extends LengthWeightParameterAbstract {
 
     @Override
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java
index db81dd6..cacd021 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java
@@ -22,6 +22,7 @@ package fr.ird.observe.entities.referentiel;
  * #L%
  */
 
+import fr.ird.observe.common.FormulaHelper;
 import fr.ird.observe.persistence.ObserveTopiaDaoSupplier;
 import org.apache.commons.collections4.CollectionUtils;
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java
deleted file mode 100644
index 4826d00..0000000
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package fr.ird.observe.entities.referentiel;
-
-/*
- * #%L
- * ObServe :: Entities
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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 fr.ird.observe.persistence.ObserveEntityEnum;
-import fr.ird.observe.persistence.Entities;
-import fr.ird.observe.entities.constants.ReferenceStatusPersist;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.nuiton.topia.persistence.TopiaEntity;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Predicate;
-
-/**
- * Helper class around {@link ObserveReferentialEntity}.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 3.0
- */
-public class ObserveReferentialEntities {
-
-    public static final Predicate<? extends ObserveReferentialEntity> IS_ACTIF_PREDICATE = input -> ReferenceStatusPersist.disabled != input.getStatus();
-
-    /** Logger. */
-    private static final Log log = LogFactory.getLog(ObserveReferentialEntities.class);
-
-    /**
-     * Filter une liste d'entités d'un référentiel en supprimmant toutes les
-     * entités qui ne sont pas actives {@link ObserveReferentialEntity#getStatus()}
-     *
-     * @param list la liste des entitées à filtrer
-     * @param <E>  le type des entites du référentiel
-     */
-    public static <E extends ObserveReferentialEntity> void filterReferentielListByStatus(List<E> list) {
-        filterReferentielList(list, (Predicate)ObserveReferentialEntities.IS_ACTIF_PREDICATE);
-    }
-
-    /**
-     * Filter une liste d'entités d'un référentiel en supprimant toutes les
-     * entités qui ne rspeciesnt pas le précidat donné.
-     *
-     * @param list      la liste des entitées à filtrer
-     * @param predicate le prédicate à appliquer pour conserver les valeurs
-     * @param <E>       le type des entites du référentiel
-     */
-    public static <E extends ObserveReferentialEntity> void filterReferentielList(List<E> list, Predicate<E> predicate) {
-        Iterator<E> itr = list.iterator();
-        while (itr.hasNext()) {
-            E e = itr.next();
-            if (!predicate.test(e)) {
-
-                // l'entite n'est pas retenue, on ne l'affiche pas
-
-                if (log.isDebugEnabled()) {
-                    log.debug("remove disabled entity " + e.getTopiaId());
-                }
-
-                itr.remove();
-            }
-        }
-    }
-
-    public static void walk(ReferentielWalker walker) throws Exception {
-        for (ObserveEntityEnum constant : Entities.REFERENCE_ENTITIES) {
-            Class<? extends TopiaEntity> contractClass = constant.getContract();
-            walker.walk(contractClass);
-        }
-    }
-
-    public static void walkSafe(ReferentielWalker walker) {
-        for (ObserveEntityEnum constant : Entities.REFERENCE_ENTITIES) {
-            try {
-                Class<? extends TopiaEntity> contractClass =
-                        constant.getContract();
-                walker.walk(contractClass);
-            } catch (Exception ex) {
-                throw new RuntimeException(ex);
-            }
-        }
-    }
-
-    protected ObserveReferentialEntities() {
-        // avoid instance
-    }
-
-    public interface ReferentielWalker {
-
-        <E extends TopiaEntity> void walk(Class<E> beanClass);
-    }
-
-}
diff --git a/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java
index 3869f8e..ebc188d 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java
@@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel;
  * #L%
  */
 
-import fr.ird.observe.entities.constants.ReferenceStatusPersist;
+import fr.ird.observe.common.constants.ReferenceStatus;
 
 public abstract class ObserveReferentialEntityImpl extends ObserveReferentialEntityAbstract {
 
@@ -30,12 +30,12 @@ public abstract class ObserveReferentialEntityImpl extends ObserveReferentialEnt
 
     @Override
     public boolean isEnabled() {
-        return ReferenceStatusPersist.enabled == getStatus();
+        return ReferenceStatus.enabled == getStatus();
     }
 
     @Override
     public boolean isDisabled() {
-        return ReferenceStatusPersist.disabled == getStatus();
+        return ReferenceStatus.disabled == getStatus();
     }
 
 }
diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java
index 9398bbf..99f3590 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java
@@ -22,10 +22,10 @@
 package fr.ird.observe.entities.seine;
 
 import com.google.common.base.MoreObjects;
-import fr.ird.observe.persistence.Entities;
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
-import fr.ird.observe.entities.gps.CoordinateHelper;
+import fr.ird.observe.common.constants.seine.SchoolType;
+import fr.ird.observe.common.CoordinateHelper;
 import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine;
+import fr.ird.observe.persistence.Entities;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.NumberUtil;
@@ -114,7 +114,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract {
 //    }
 
     @Override
-    public SchoolTypePersist getSchoolType() {
+    public SchoolType getSchoolType() {
         return ActivitySeines.getSchoolType(this);
     }
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java
index fff4493..31b4cbd 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java
@@ -23,7 +23,7 @@ package fr.ird.observe.entities.seine;
  */
 
 import com.google.common.collect.Lists;
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
+import fr.ird.observe.common.constants.seine.SchoolType;
 import fr.ird.observe.entities.referentiel.I18nReferenceEntities;
 import fr.ird.observe.entities.referentiel.seine.ObservedSystem;
 import org.apache.commons.logging.Log;
@@ -121,14 +121,14 @@ public class ActivitySeines {
      * @return le type de banc a appliquer
      * @since 1.5
      */
-    public static SchoolTypePersist getSchoolType(ActivitySeine a) {
+    public static SchoolType getSchoolType(ActivitySeine a) {
 
         // par defaut, on suppose que la set est sur BL
-        SchoolTypePersist type = SchoolTypePersist.libre;
+        SchoolType type = SchoolType.libre;
 
         if (!a.isObservedSystemEmpty()) {
 
-            SchoolTypePersist boCode = SchoolTypePersist.objet;
+            SchoolType boCode = SchoolType.objet;
 
             // des systèmes observés sont connus, si un des système est sur
             // banc objet, alors la set est considérée sur BO
@@ -136,7 +136,7 @@ public class ActivitySeines {
                 if (boCode == s.getSchoolType()) {
 
                     // set sur BO
-                    type = SchoolTypePersist.objet;
+                    type = SchoolType.objet;
                     break;
                 }
             }
diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java
index f0eebbf..2a0b85a 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java
@@ -22,7 +22,7 @@
 package fr.ird.observe.entities.seine;
 
 import com.google.common.collect.Iterables;
-import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist;
+import fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation;
 import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation;
 
 /** Implantation des objectOperations pour l'entité FloatingObject. */
@@ -33,15 +33,15 @@ public class FloatingObjectImpl extends FloatingObjectAbstract {
     /**
      * Récupère le type d'objectOperation effectué sur les balises du DCP.
      *
-     * @return l'ordinal de l'énumeration {@link TypeTransmittingBuoyOperationPersist}
-     * @see TypeTransmittingBuoyOperationPersist
+     * @return l'ordinal de l'énumeration {@link TypeTransmittingBuoyOperation}
+     * @see TypeTransmittingBuoyOperation
      */
     @Override
-    public TypeTransmittingBuoyOperationPersist getTypeTransmittingBuoyOperation() {
+    public TypeTransmittingBuoyOperation getTypeTransmittingBuoyOperation() {
         if (isTransmittingBuoyEmpty()) {
 
             // pas de balise lié au dcp.
-            return TypeTransmittingBuoyOperationPersist.pasDeBalise;
+            return TypeTransmittingBuoyOperation.pasDeBalise;
         }
         if (transmittingBuoy.size() == 1) {
 
@@ -55,15 +55,15 @@ public class FloatingObjectImpl extends FloatingObjectAbstract {
                 case 1:
 
                     // visite
-                    return TypeTransmittingBuoyOperationPersist.visite;
+                    return TypeTransmittingBuoyOperation.visite;
                 case 2:
 
                     // recuperation
-                    return TypeTransmittingBuoyOperationPersist.recuperation;
+                    return TypeTransmittingBuoyOperation.recuperation;
                 case 3:
 
                     // mise a l'eau d'une nouvelle balise
-                    return TypeTransmittingBuoyOperationPersist.pose;
+                    return TypeTransmittingBuoyOperation.pose;
                 default:
                     throw new IllegalStateException("objectOperation must be between 1 to 3, but was " + objectOperation.getCode());
             }
@@ -72,7 +72,7 @@ public class FloatingObjectImpl extends FloatingObjectAbstract {
 
             // deux balises lues pour le DCP, on peut avoir un seul cas :
             // - récupération et remplacement
-            return TypeTransmittingBuoyOperationPersist.recuperationEtRemplacement;
+            return TypeTransmittingBuoyOperation.recuperationEtRemplacement;
         }
         throw new IllegalStateException("on a dcp, can only have 0, 1 or 2 balise lues");
 
diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java
index 8901543..950a489 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java
@@ -21,7 +21,7 @@
  */
 package fr.ird.observe.entities.seine;
 
-import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSourcePersist;
+import fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource;
 import fr.ird.observe.entities.referentiel.LengthWeightParameter;
 import fr.ird.observe.entities.referentiel.SizeMeasureType;
 import org.apache.commons.logging.Log;
@@ -65,7 +65,7 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract {
 
     @Override
     public void setIsLengthComputed(boolean lengthSource) {
-        setMeanLengthComputedSource(NonTargetCatchComputedValueSourcePersist.fromData);
+        setMeanLengthComputedSource(NonTargetCatchComputedValueSource.fromData);
     }
 
     @Override
@@ -85,7 +85,7 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract {
 
     @Override
     public void setIsWeightComputed(boolean weightSource) {
-        setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.fromData);
+        setMeanWeightComputedSource(NonTargetCatchComputedValueSource.fromData);
     }
 
     @Override
diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java
index 789aec0..15464f7 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java
@@ -21,7 +21,7 @@
  */
 package fr.ird.observe.entities.seine;
 
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
+import fr.ird.observe.common.constants.seine.SchoolType;
 import org.nuiton.util.DateUtil;
 import org.nuiton.util.NumberUtil;
 
@@ -71,8 +71,8 @@ public class SetSeineImpl extends SetSeineAbstract {
             if (discarded) {
 
                 if (c.isDiscarded() &&
-                    c.getBroughtOnDeck() != null &&
-                    c.getBroughtOnDeck()) {
+                        c.getBroughtOnDeck() != null &&
+                        c.getBroughtOnDeck()) {
 
                     // on a trouvé au moins un rejet monté sur le pont
                     return true;
@@ -129,17 +129,17 @@ public class SetSeineImpl extends SetSeineAbstract {
 
     @Override
     public boolean isFreeSchoolType() {
-        return schoolType != null && SchoolTypePersist.libre == schoolType;
+        return schoolType != null && SchoolType.libre == schoolType;
     }
 
     @Override
     public boolean isSchoolObjectType() {
-        return schoolType != null && SchoolTypePersist.objet == schoolType;
+        return schoolType != null && SchoolType.objet == schoolType;
     }
 
     @Override
     public boolean isUnknownSchoolType() {
-        return schoolType != null && SchoolTypePersist.undefined == schoolType;
+        return schoolType != null && SchoolType.undefined == schoolType;
     }
 
     @Override
diff --git a/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java
index cfae063..5580fed 100644
--- a/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java
+++ b/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java
@@ -21,9 +21,9 @@
  */
 package fr.ird.observe.entities.seine;
 
-import fr.ird.observe.entities.TripMapPoint;
-import fr.ird.observe.entities.constants.TripMapPointTypePersist;
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
+import fr.ird.observe.common.TripMapPoint;
+import fr.ird.observe.common.constants.TripMapPointType;
+import fr.ird.observe.common.constants.seine.SchoolType;
 import fr.ird.observe.entities.referentiel.Harbour;
 import fr.ird.observe.entities.referentiel.Program;
 import org.nuiton.topia.persistence.support.TopiaSqlQuery;
@@ -76,7 +76,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
             departurePoint.setTime(tripSeine.getStartDate());
             departurePoint.setLatitude(departureHarbour.getLatitude());
             departurePoint.setLongitude(departureHarbour.getLongitude());
-            departurePoint.setType(TripMapPointTypePersist.seineDepartureHarbour);
+            departurePoint.setType(TripMapPointType.seineDepartureHarbour);
             tripMapPoints.add(departurePoint);
         }
 
@@ -91,7 +91,7 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
             landingPoint.setTime(tripSeine.getEndDate());
             landingPoint.setLatitude(landingHarbour.getLatitude());
             landingPoint.setLongitude(landingHarbour.getLongitude());
-            landingPoint.setType(TripMapPointTypePersist.seineLandingHarbour);
+            landingPoint.setType(TripMapPointType.seineLandingHarbour);
             tripMapPoints.add(landingPoint);
         }
 
@@ -137,20 +137,20 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> {
             point.setLatitude(resultSet.getFloat(3));
             point.setLongitude(resultSet.getFloat(4));
             if (ACTIVITY_HARBOUR_ID.equals(resultSet.getString(5))) {
-                point.setType(TripMapPointTypePersist.seineActivityInHarbour);
+                point.setType(TripMapPointType.seineActivityInHarbour);
             } else if (resultSet.getString(6) == null) {
-                point.setType(TripMapPointTypePersist.seineActivity);
+                point.setType(TripMapPointType.seineActivity);
             } else {
-                SchoolTypePersist schoolType = SchoolTypePersist.values()[resultSet.getInt(6)];
+                SchoolType schoolType = SchoolType.values()[resultSet.getInt(6)];
                 switch (schoolType) {
                     case libre:
-                        point.setType(TripMapPointTypePersist.seineActivityWithFreeSchoolType);
+                        point.setType(TripMapPointType.seineActivityWithFreeSchoolType);
                         break;
                     case objet:
-                        point.setType(TripMapPointTypePersist.seineActivityWithObjectSchoolType);
+                        point.setType(TripMapPointType.seineActivityWithObjectSchoolType);
                         break;
                     default:
-                        point.setType(TripMapPointTypePersist.seineActivity);
+                        point.setType(TripMapPointType.seineActivity);
                 }
 
             }
diff --git a/persistence/src/main/xmi/observe-common.zargo b/persistence/src/main/xmi/observe-common.zargo
index c552da6..df241d3 100644
Binary files a/persistence/src/main/xmi/observe-common.zargo and b/persistence/src/main/xmi/observe-common.zargo differ
diff --git a/persistence/src/main/xmi/observe-seine.zargo b/persistence/src/main/xmi/observe-seine.zargo
index 8c5bf2a..0ded7d6 100644
Binary files a/persistence/src/main/xmi/observe-seine.zargo and b/persistence/src/main/xmi/observe-seine.zargo differ
diff --git a/persistence/src/main/xmi/observe.ini b/persistence/src/main/xmi/observe.ini
index 65ffdcc..9222a85 100644
--- a/persistence/src/main/xmi/observe.ini
+++ b/persistence/src/main/xmi/observe.ini
@@ -12,6 +12,9 @@ notGenerateToString = true
 useEnumerationName = false
 version = @observe.model.version@
 
+[package fr.ird.observe.common]
+skip = true
+
 [package fr.ird.observe.entities]
 dbSchema = OBSERVE_COMMON
 
diff --git a/services-dto-reference/pom.xml b/services-dto-reference/pom.xml
index ea928fb..cc9d1a7 100644
--- a/services-dto-reference/pom.xml
+++ b/services-dto-reference/pom.xml
@@ -44,6 +44,11 @@
       <artifactId>services-dto</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
 
     <dependency>
       <groupId>org.reflections</groupId>
diff --git a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java
index 7baf5fe..9d3e615 100644
--- a/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java
+++ b/services-dto-reference/src/main/java/fr/ird/observe/services/dto/reference/ReferentialReferenceSetDefinitions.java
@@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.reference;
  * #L%
  */
 
-import fr.ird.observe.services.dto.constants.GearType;
+import fr.ird.observe.common.constants.GearType;
 import fr.ird.observe.services.dto.referential.CountryDto;
 import fr.ird.observe.services.dto.referential.FpaZoneDto;
 import fr.ird.observe.services.dto.referential.GearCaracteristicDto;
diff --git a/services-dto/pom.xml b/services-dto/pom.xml
index dfe69cd..cf6b20b 100644
--- a/services-dto/pom.xml
+++ b/services-dto/pom.xml
@@ -44,11 +44,11 @@
       <artifactId>services-configuration</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <!--dependency>
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>common</artifactId>
       <version>${project.version}</version>
-    </dependency-->
+    </dependency>
 
     <!-- Nuiton -->
     <dependency>
@@ -59,10 +59,6 @@
       <groupId>org.nuiton.i18n</groupId>
       <artifactId>nuiton-i18n</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.nuiton</groupId>
-      <artifactId>nuiton-config</artifactId>
-    </dependency>
 
     <!-- JAXX -->
     <dependency>
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/FormulaHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/FormulaHelper.java
deleted file mode 100644
index 0aefb89..0000000
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/FormulaHelper.java
+++ /dev/null
@@ -1,156 +0,0 @@
-package fr.ird.observe.services.dto.referential;
-
-/*-
- * #%L
- * ObServe :: Services DTO
- * %%
- * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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 org.apache.commons.lang3.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-
-import javax.script.Bindings;
-import javax.script.ScriptContext;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * Created on 05/11/16.
- *
- * @author Tony Chemit - chemit@codelutin.com
- * @since 6.0
- */
-public class FormulaHelper {
-
-    public interface FormulaSupport {
-
-        String getCoefficients();
-
-        Map<String, Double> getCoefficientValues();
-
-    } //FormulaSupport
-
-
-    /** Logger */
-    private static final Log log = LogFactory.getLog(FormulaHelper.class);
-
-    private static final Pattern COEFFICIENTS_PATTERN = Pattern.compile("(.+)=(.+)");
-
-    /** variable weight à utiliser dans la relation taille */
-    public static final String VARIABLE_WEIGHT = "P";
-
-    /** variable taille à utiliser dans la relation weight */
-    public static final String VARIABLE_LENGTH = "L";
-
-    public static final String VARIABLE_INPUT = "I";
-
-    public static final String VARIABLE_OUTPUT = "O";
-
-    public static final String COEFFICIENT_A = "a";
-
-    public static final String COEFFICIENT_B = "b";
-
-    /** moteur d'évaluation d'expression */
-    protected static ScriptEngine scriptEngine;
-
-
-    protected static ScriptEngine getScriptEngine() {
-        if (scriptEngine == null) {
-            ScriptEngineManager factory = new ScriptEngineManager();
-
-            scriptEngine = factory.getEngineByExtension("js");
-        }
-        return scriptEngine;
-    }
-
-    public static Map<String, Double> getCoefficientValues(FormulaSupport parametrage) {
-
-        Map<String, Double> result = new TreeMap<>();
-        String coefficients = parametrage.getCoefficients();
-        if (coefficients != null) {
-            for (String coefficientDef : coefficients.split(":")) {
-                Matcher matcher = COEFFICIENTS_PATTERN.matcher(coefficientDef.trim());
-                if (log.isDebugEnabled()) {
-                    log.debug("constant to test = " + coefficientDef);
-                }
-                if (matcher.matches()) {
-
-                    String key = matcher.group(1);
-                    String val = matcher.group(2);
-                    try {
-                        Double d = Double.valueOf(val);
-                        result.put(key, d);
-                        if (log.isDebugEnabled()) {
-                            log.debug("detects coefficient " + key + '=' + val);
-                        }
-                    } catch (NumberFormatException e) {
-                        // pas pu recupere le count...
-                        if (log.isWarnEnabled()) {
-                            log.warn("could not parse double " + val + " for coefficient " + key);
-                        }
-                    }
-                }
-            }
-        }
-        return result;
-    }
-
-    protected static boolean validateRelation(FormulaSupport parametrage, String relation, String variable) {
-        boolean result = false;
-        if (!StringUtils.isEmpty(relation)) {
-
-            Map<String, Double> coeffs = parametrage.getCoefficientValues();
-
-            ScriptEngine engine = getScriptEngine();
-            Bindings bindings = engine.createBindings();
-            for (Map.Entry<String, Double> entry : coeffs.entrySet()) {
-                String key = entry.getKey();
-                Double value = entry.getValue();
-                bindings.put(key, value);
-
-                if (log.isDebugEnabled()) {
-                    log.debug("add constant " + key + '=' + value);
-                }
-            }
-            bindings.put(variable, 1);
-
-            try {
-                engine.setBindings(bindings, ScriptContext.ENGINE_SCOPE);
-                Double o = (Double) engine.eval("parseFloat(" + relation + ")");
-                if (log.isDebugEnabled()) {
-                    log.debug("evaluation ok : " + relation + " (" + variable + "=1) = " + o);
-                }
-                result = true;
-            } catch (Exception e) {
-                if (log.isDebugEnabled()) {
-                    log.debug("evalution ko : " + relation + ", reason : " + e.getMessage());
-                }
-            }
-        }
-        return result;
-    }
-
-
-}
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java
index ddfe885..0c981cd 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthLengthParameterDto.java
@@ -22,11 +22,13 @@ package fr.ird.observe.services.dto.referential;
  * #L%
  */
 
+import fr.ird.observe.common.FormulaHelper;
+import fr.ird.observe.common.WithFormula;
 import fr.ird.observe.services.dto.WithComment;
 
 import java.util.Map;
 
-public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto implements FormulaHelper.FormulaSupport {
+public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto implements WithFormula {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +65,11 @@ public class LengthLengthParameterDto extends GeneratedLengthLengthParameterDto
         revalidateFormulaTwo();
     }
 
+    @Override
+    public Double getCoefficientValue(String coefficientName) {
+        return getCoefficientValues().get(coefficientName);
+    }
+
     public void revalidateFormulaOne() {
         boolean result = FormulaHelper.validateRelation(this, inputOutputFormula, FormulaHelper.VARIABLE_INPUT);
         setInputOutputFormulaValid(result);
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java
index 41eb564..af0d528 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/LengthWeightParameterDto.java
@@ -22,11 +22,13 @@ package fr.ird.observe.services.dto.referential;
  * #L%
  */
 
+import fr.ird.observe.common.FormulaHelper;
+import fr.ird.observe.common.WithFormula;
 import fr.ird.observe.services.dto.WithComment;
 
 import java.util.Map;
 
-public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto implements FormulaHelper.FormulaSupport {
+public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto implements WithFormula {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,14 +65,9 @@ public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto
         revalidateFormulaTwo();
     }
 
-    public void revalidateFormulaOne() {
-        boolean result = FormulaHelper.validateRelation(this, lengthWeightFormula, FormulaHelper.VARIABLE_LENGTH);
-        setLengthWeightFormulaValid(result);
-    }
-
-    public void revalidateFormulaTwo() {
-        boolean result = FormulaHelper.validateRelation(this, weightLengthFormula, FormulaHelper.VARIABLE_WEIGHT);
-        setWeightLengthFormulaValid(result);
+    @Override
+    public Double getCoefficientValue(String coefficientName) {
+        return getCoefficientValues().get(coefficientName);
     }
 
     @Override
@@ -80,4 +77,14 @@ public class LengthWeightParameterDto extends GeneratedLengthWeightParameterDto
         }
         return coefficientsValues;
     }
+
+    public void revalidateFormulaOne() {
+        boolean result = FormulaHelper.validateRelation(this, lengthWeightFormula, FormulaHelper.VARIABLE_LENGTH);
+        setLengthWeightFormulaValid(result);
+    }
+
+    public void revalidateFormulaTwo() {
+        boolean result = FormulaHelper.validateRelation(this, weightLengthFormula, FormulaHelper.VARIABLE_WEIGHT);
+        setWeightLengthFormulaValid(result);
+    }
 }
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java
index 242b775..cc0a1f1 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ProgramHelper.java
@@ -22,7 +22,7 @@ package fr.ird.observe.services.dto.referential;
  * #L%
  */
 
-import fr.ird.observe.services.dto.constants.GearType;
+import fr.ird.observe.common.constants.GearType;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java
index 4239d27..d4fded7 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialDto.java
@@ -23,7 +23,7 @@ package fr.ird.observe.services.dto.referential;
  */
 
 import com.google.common.base.MoreObjects;
-import fr.ird.observe.services.dto.constants.ReferenceStatus;
+import fr.ird.observe.common.constants.ReferenceStatus;
 
 import static fr.ird.observe.services.dto.referential.ReferentialReference.PROPERTY_ENABLED;
 
@@ -38,13 +38,13 @@ public abstract class ReferentialDto extends GeneratedReferentialDto {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
-                .add(PROPERTY_ID, id)
-                .add(PROPERTY_ENABLED, isEnabled())
-                .add(PROPERTY_NEED_COMMENT, needComment)
-                .add(PROPERTY_CREATE_DATE, createDate)
-                .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate)
-                .add(PROPERTY_VERSION, version)
-                .toString();
+                          .add(PROPERTY_ID, id)
+                          .add(PROPERTY_ENABLED, isEnabled())
+                          .add(PROPERTY_NEED_COMMENT, needComment)
+                          .add(PROPERTY_CREATE_DATE, createDate)
+                          .add(PROPERTY_LAST_UPDATE_DATE, lastUpdateDate)
+                          .add(PROPERTY_VERSION, version)
+                          .toString();
     }
 
 }
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java
index 792b697..694d040 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java
@@ -23,7 +23,6 @@ package fr.ird.observe.services.dto.referential;
  */
 
 import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.services.dto.AbstractReference;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -43,17 +42,6 @@ public class ReferentialReference<D extends ReferentialDto> extends AbstractRefe
 
     public static final String PROPERTY_LABEL = "label";
 
-    public static final ImmutableSet<String> I18N_PROPERTY_NAMES = ImmutableSet.of(
-            I18nReferentialDto.PROPERTY_LABEL1,
-            I18nReferentialDto.PROPERTY_LABEL2,
-            I18nReferentialDto.PROPERTY_LABEL3,
-            I18nReferentialDto.PROPERTY_LABEL4,
-            I18nReferentialDto.PROPERTY_LABEL5,
-            I18nReferentialDto.PROPERTY_LABEL6,
-            I18nReferentialDto.PROPERTY_LABEL7,
-            I18nReferentialDto.PROPERTY_LABEL8
-    );
-
     private static final long serialVersionUID = 1L;
 
     /** Logger. */
@@ -86,8 +74,8 @@ public class ReferentialReference<D extends ReferentialDto> extends AbstractRefe
     @Override
     public String toString() {
         MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this)
-                .add(PROPERTY_TYPE, type.getSimpleName())
-                .add(PROPERTY_ID, id);
+                                                               .add(PROPERTY_TYPE, type.getSimpleName())
+                                                               .add(PROPERTY_ID, id);
 
         if (log.isDebugEnabled()) {
             toStringHelper
diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java
index 51f5a08..08f336b 100644
--- a/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java
+++ b/services-dto/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java
@@ -23,7 +23,7 @@ package fr.ird.observe.services.dto.seine;
  */
 
 import com.google.common.collect.Iterables;
-import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation;
+import fr.ird.observe.common.constants.seine.TypeTransmittingBuoyOperation;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
 import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto;
 
diff --git a/services-dto/src/main/xmi/observe-services-dto-common.zargo b/services-dto/src/main/xmi/observe-services-dto-common.zargo
index 9a28eff..1310fe4 100644
Binary files a/services-dto/src/main/xmi/observe-services-dto-common.zargo and b/services-dto/src/main/xmi/observe-services-dto-common.zargo differ
diff --git a/services-dto/src/main/xmi/observe-services-dto-seine.zargo b/services-dto/src/main/xmi/observe-services-dto-seine.zargo
index 1530f0d..b514077 100644
Binary files a/services-dto/src/main/xmi/observe-services-dto-seine.zargo and b/services-dto/src/main/xmi/observe-services-dto-seine.zargo differ
diff --git a/services-dto/src/main/xmi/observe-services-dto.ini b/services-dto/src/main/xmi/observe-services-dto.ini
index 716637e..c4a7da3 100644
--- a/services-dto/src/main/xmi/observe-services-dto.ini
+++ b/services-dto/src/main/xmi/observe-services-dto.ini
@@ -4,6 +4,9 @@ classNameSuffix = Dto
 superClass = fr.ird.observe.services.dto.AbstractObserveDto
 version = @observe.model.version@
 
+[package fr.ird.observe.common]
+skip= true
+
 [package fr.ird.observe.services.dto]
 bean = true
 
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java
index 8f87bda..4582370 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java
@@ -23,7 +23,6 @@ package fr.ird.observe.services.topia.binder;
  */
 
 import com.google.common.collect.ImmutableMap;
-import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.entities.ObserveDataEntity;
 import fr.ird.observe.entities.longline.ActivityLongline;
 import fr.ird.observe.entities.longline.BaitsComposition;
@@ -122,6 +121,7 @@ import fr.ird.observe.entities.seine.TargetLength;
 import fr.ird.observe.entities.seine.TargetSample;
 import fr.ird.observe.entities.seine.TransmittingBuoy;
 import fr.ird.observe.entities.seine.TripSeine;
+import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.services.dto.DataDto;
 import fr.ird.observe.services.dto.ObserveModelInitializer;
 import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
@@ -246,24 +246,38 @@ import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineBinder
 import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineEncouterDtoBinder;
 import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineSensorUsedDtoBinder;
 import fr.ird.observe.services.topia.binder.data.longline.ActivityLonglineStubDtoBinder;
-import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineBinder;
-import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineStubDtoBinder;
 import fr.ird.observe.services.topia.binder.data.longline.BaitsCompositionBinder;
 import fr.ird.observe.services.topia.binder.data.longline.BasketBinder;
 import fr.ird.observe.services.topia.binder.data.longline.BranchlineBinder;
 import fr.ird.observe.services.topia.binder.data.longline.BranchlinesCompositionBinder;
 import fr.ird.observe.services.topia.binder.data.longline.CatchLonglineBinder;
 import fr.ird.observe.services.topia.binder.data.longline.EncounterBinder;
+import fr.ird.observe.services.topia.binder.data.longline.FloatlinesCompositionBinder;
+import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesLonglineBinder;
+import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesMeasurementLonglineBinder;
+import fr.ird.observe.services.topia.binder.data.longline.HooksCompositionBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SectionBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SensorUsedBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SetLonglineBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SetLonglineCatchDtoBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SetLonglineDetailCompositionDtoBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SetLonglineGlobalCompositionDtoBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SetLonglineStubDtoBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SetLonglineTdrDtoBinder;
+import fr.ird.observe.services.topia.binder.data.longline.SizeMeasureBinder;
+import fr.ird.observe.services.topia.binder.data.longline.TdrBinder;
+import fr.ird.observe.services.topia.binder.data.longline.TripLonglineActivityDtoBinder;
+import fr.ird.observe.services.topia.binder.data.longline.TripLonglineBinder;
+import fr.ird.observe.services.topia.binder.data.longline.TripLonglineGearUseDtoBinder;
+import fr.ird.observe.services.topia.binder.data.longline.WeightMeasureBinder;
+import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineBinder;
+import fr.ird.observe.services.topia.binder.data.seine.ActivitySeineStubDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectBinder;
 import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectObservedSpeciesDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectSchoolEstimateDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.FloatingObjectTransmittingBuoyDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.FloatlinesCompositionBinder;
-import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesLonglineBinder;
-import fr.ird.observe.services.topia.binder.data.longline.GearUseFeaturesMeasurementLonglineBinder;
 import fr.ird.observe.services.topia.binder.data.seine.GearUseFeaturesMeasurementSeineBinder;
 import fr.ird.observe.services.topia.binder.data.seine.GearUseFeaturesSeineBinder;
-import fr.ird.observe.services.topia.binder.data.longline.HooksCompositionBinder;
 import fr.ird.observe.services.topia.binder.data.seine.NonTargetCatchBinder;
 import fr.ird.observe.services.topia.binder.data.seine.NonTargetLengthBinder;
 import fr.ird.observe.services.topia.binder.data.seine.NonTargetSampleBinder;
@@ -272,90 +286,76 @@ import fr.ird.observe.services.topia.binder.data.seine.ObjectSchoolEstimateBinde
 import fr.ird.observe.services.topia.binder.data.seine.RouteBinder;
 import fr.ird.observe.services.topia.binder.data.seine.RouteStubDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.SchoolEstimateBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SectionBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SensorUsedBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SetLonglineBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SetLonglineCatchDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SetLonglineDetailCompositionDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SetLonglineGlobalCompositionDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SetLonglineStubDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SetLonglineTdrDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.SetSeineBinder;
 import fr.ird.observe.services.topia.binder.data.seine.SetSeineNonTargetCatchDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.SetSeineSchoolEstimateDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.SetSeineTargetCatchDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.SizeMeasureBinder;
 import fr.ird.observe.services.topia.binder.data.seine.TargetCatchBinder;
 import fr.ird.observe.services.topia.binder.data.seine.TargetLengthBinder;
 import fr.ird.observe.services.topia.binder.data.seine.TargetSampleBinder;
-import fr.ird.observe.services.topia.binder.data.longline.TdrBinder;
 import fr.ird.observe.services.topia.binder.data.seine.TransmittingBuoyBinder;
-import fr.ird.observe.services.topia.binder.data.longline.TripLonglineActivityDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.TripLonglineBinder;
-import fr.ird.observe.services.topia.binder.data.longline.TripLonglineGearUseDtoBinder;
 import fr.ird.observe.services.topia.binder.data.seine.TripSeineBinder;
 import fr.ird.observe.services.topia.binder.data.seine.TripSeineGearUseDtoBinder;
-import fr.ird.observe.services.topia.binder.data.longline.WeightMeasureBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.BaitHaulingStatusBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.BaitSettingStatusBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.BaitTypeBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.CatchFateLonglineBinder;
 import fr.ird.observe.services.topia.binder.referential.common.CountryBinder;
-import fr.ird.observe.services.topia.binder.referential.seine.DetectionModeBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.EncounterTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.common.FpaZoneBinder;
 import fr.ird.observe.services.topia.binder.referential.common.GearBinder;
 import fr.ird.observe.services.topia.binder.referential.common.GearCaracteristicBinder;
 import fr.ird.observe.services.topia.binder.referential.common.GearCaracteristicTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.common.HarbourBinder;
+import fr.ird.observe.services.topia.binder.referential.common.LengthLengthParameterBinder;
+import fr.ird.observe.services.topia.binder.referential.common.LengthWeightParameterBinder;
+import fr.ird.observe.services.topia.binder.referential.common.OceanBinder;
+import fr.ird.observe.services.topia.binder.referential.common.OrganismBinder;
+import fr.ird.observe.services.topia.binder.referential.common.PersonBinder;
+import fr.ird.observe.services.topia.binder.referential.common.ProgramBinder;
+import fr.ird.observe.services.topia.binder.referential.common.SexBinder;
+import fr.ird.observe.services.topia.binder.referential.common.ShipOwnerBinder;
+import fr.ird.observe.services.topia.binder.referential.common.SizeMeasureTypeBinder;
+import fr.ird.observe.services.topia.binder.referential.common.SpeciesBinder;
+import fr.ird.observe.services.topia.binder.referential.common.SpeciesGroupBinder;
+import fr.ird.observe.services.topia.binder.referential.common.SpeciesListBinder;
+import fr.ird.observe.services.topia.binder.referential.common.VesselBinder;
+import fr.ird.observe.services.topia.binder.referential.common.VesselSizeCategoryBinder;
+import fr.ird.observe.services.topia.binder.referential.common.VesselTypeBinder;
+import fr.ird.observe.services.topia.binder.referential.common.WeightMeasureTypeBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.BaitHaulingStatusBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.BaitSettingStatusBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.BaitTypeBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.CatchFateLonglineBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.EncounterTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.HealthnessBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.HookPositionBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.HookSizeBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.HookTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.ItemHorizontalPositionBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.ItemVerticalPositionBinder;
-import fr.ird.observe.services.topia.binder.referential.common.LengthLengthParameterBinder;
-import fr.ird.observe.services.topia.binder.referential.common.LengthWeightParameterBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.LightsticksColorBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.LightsticksTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.LineTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.MaturityStatusBinder;
 import fr.ird.observe.services.topia.binder.referential.longline.MitigationTypeBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.SensorBrandBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.SensorDataFormatBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.SensorTypeBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.SettingShapeBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.StomacFullnessBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.TripTypeBinder;
+import fr.ird.observe.services.topia.binder.referential.longline.VesselActivityLonglineBinder;
+import fr.ird.observe.services.topia.binder.referential.seine.DetectionModeBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.ObjectFateBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.ObjectOperationBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.ObjectTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.ObservedSystemBinder;
-import fr.ird.observe.services.topia.binder.referential.common.OceanBinder;
-import fr.ird.observe.services.topia.binder.referential.common.OrganismBinder;
-import fr.ird.observe.services.topia.binder.referential.common.PersonBinder;
-import fr.ird.observe.services.topia.binder.referential.common.ProgramBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.ReasonForDiscardBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.ReasonForNoFishingBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.ReasonForNullSetBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.SensorBrandBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.SensorDataFormatBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.SensorTypeBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.SettingShapeBinder;
-import fr.ird.observe.services.topia.binder.referential.common.SexBinder;
-import fr.ird.observe.services.topia.binder.referential.common.ShipOwnerBinder;
-import fr.ird.observe.services.topia.binder.referential.common.SizeMeasureTypeBinder;
-import fr.ird.observe.services.topia.binder.referential.common.SpeciesBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.SpeciesFateBinder;
-import fr.ird.observe.services.topia.binder.referential.common.SpeciesGroupBinder;
-import fr.ird.observe.services.topia.binder.referential.common.SpeciesListBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.SpeciesStatusBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.StomacFullnessBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.SurroundingActivityBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.TransmittingBuoyOperationBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.TransmittingBuoyTypeBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.TripTypeBinder;
-import fr.ird.observe.services.topia.binder.referential.longline.VesselActivityLonglineBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.VesselActivitySeineBinder;
-import fr.ird.observe.services.topia.binder.referential.common.VesselBinder;
-import fr.ird.observe.services.topia.binder.referential.common.VesselSizeCategoryBinder;
-import fr.ird.observe.services.topia.binder.referential.common.VesselTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.WeightCategoryBinder;
-import fr.ird.observe.services.topia.binder.referential.common.WeightMeasureTypeBinder;
 import fr.ird.observe.services.topia.binder.referential.seine.WindBinder;
 
 import java.util.Map;
@@ -471,11 +471,6 @@ class BinderEngineInitializer implements ObserveModelInitializer {
     }
 
     @Override
-    public void initTripMapPointDto() {
-
-    }
-
-    @Override
     public void initReferentialDto() {
 
     }
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java
index 8368dfc..9dbaa2c 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java
@@ -23,33 +23,19 @@ package fr.ird.observe.services.topia.binder;
  */
 
 import com.google.common.collect.Iterables;
-import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.entities.ObserveEntity;
-import fr.ird.observe.entities.constants.GearTypePersist;
-import fr.ird.observe.entities.constants.ReferenceStatusPersist;
-import fr.ird.observe.entities.constants.TripMapPointTypePersist;
-import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSourcePersist;
-import fr.ird.observe.entities.constants.seine.OwnershipPersist;
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
-import fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist;
 import fr.ird.observe.entities.referentiel.I18nReferenceEntities;
 import fr.ird.observe.entities.referentiel.I18nReferentialEntity;
 import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
+import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.services.dto.AbstractReference;
-import fr.ird.observe.services.dto.referential.I18nReferentialHelper;
-import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport;
 import fr.ird.observe.services.dto.IdDto;
-import fr.ird.observe.services.dto.constants.GearType;
-import fr.ird.observe.services.dto.constants.ReferenceStatus;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
-import fr.ird.observe.services.dto.constants.TripMapPointType;
-import fr.ird.observe.services.dto.constants.seine.NonTargetCatchComputedValueSource;
-import fr.ird.observe.services.dto.constants.seine.Ownership;
-import fr.ird.observe.services.dto.constants.seine.SchoolType;
-import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation;
 import fr.ird.observe.services.dto.referential.I18nReferentialDto;
+import fr.ird.observe.services.dto.referential.I18nReferentialHelper;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
+import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport;
 import org.apache.commons.collections4.CollectionUtils;
 import org.nuiton.topia.persistence.TopiaEntity;
 
@@ -57,7 +43,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.List;
-import java.util.function.Function;
 
 /**
  * Created on 24/11/15.
@@ -66,40 +51,6 @@ import java.util.function.Function;
  */
 public abstract class BinderSupport<E extends TopiaEntity, D extends IdDto> {
 
-    protected static final Function<TripMapPointType, TripMapPointTypePersist> TRIP_MAP_POINT_TO_ENTITY = input -> TripMapPointTypePersist.valueOf(input.name());
-
-    protected static final Function<GearType, GearTypePersist> GEAR_TYPE_TO_ENTITY = input -> GearTypePersist.valueOf(input.name());
-
-    protected static final Function<ReferenceStatus, ReferenceStatusPersist> REFERENCE_STATUS_TO_ENTITY = input -> ReferenceStatusPersist.valueOf(input.name());
-
-    protected static final Function<Ownership, OwnershipPersist> OWNERSHIP_TO_ENTITY = input -> input == null ? null : OwnershipPersist.valueOf(input.name());
-
-    protected static final Function<SchoolType, SchoolTypePersist> SCHOOL_TYPE_TO_ENTITY = input -> input == null ? null : SchoolTypePersist.valueOf(input.name());
-
-    protected static final Function<TypeTransmittingBuoyOperation, TypeTransmittingBuoyOperationPersist> TYPE_TRANSMITTING_BUOY_OPERATION_TO_ENTITY = input -> input == null ? null : TypeTransmittingBuoyOperationPersist.valueOf(input.name());
-
-    protected static final Function<NonTargetCatchComputedValueSource, NonTargetCatchComputedValueSourcePersist> NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_ENTITY = input -> input == null ? null : NonTargetCatchComputedValueSourcePersist.valueOf(input.name());
-
-    protected static final Function<TripMapPointTypePersist, TripMapPointType> TRIP_MAP_POINT_TO_DTO = input -> TripMapPointType.valueOf(input.name());
-
-    protected static final Function<GearTypePersist, GearType> GEAR_TYPE_TO_DTO = input -> input == null ? null : GearType.valueOf(input.name());
-
-    protected static final Function<ReferenceStatusPersist, ReferenceStatus> REFERENCE_STATUS_TO_DTO = input -> input == null ? null : ReferenceStatus.valueOf(input.name());
-
-    protected static final Function<OwnershipPersist, Ownership> OWNERSHIP_TO_DTO = input -> input == null ? null : Ownership.valueOf(input.name());
-
-    protected static final Function<SchoolTypePersist, SchoolType> SCHOOL_TYPE_TO_DTO = input -> input == null ? null : SchoolType.valueOf(input.name());
-
-//    protected static final Function<fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist, fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist> TRANSMITTING_BUOY_OPERATION_TO_DTO = new Function<fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist, fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist>() {
-//
-//        @Override
-//        public fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist apply(fr.ird.observe.entities.constants.seine.TypeTransmittingBuoyOperationPersist input) {
-//            return input == null ? null : fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperationPersist.valueOf(input.name());
-//        }
-//    };
-
-    protected static final Function<NonTargetCatchComputedValueSourcePersist, NonTargetCatchComputedValueSource> NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_DTO = input -> input == null ? null : NonTargetCatchComputedValueSource.valueOf(input.name());
-
     protected final Class<E> entityType;
 
     protected final Class<D> dtoType;
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java
index bc1b6f9..2f304de 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/NonTargetCatchBinder.java
@@ -54,10 +54,10 @@ public class NonTargetCatchBinder extends DataBinderSupport<NonTargetCatch, NonT
         entity.setMeanWeight(dto.getMeanWeight());
         entity.setMeanLength(dto.getMeanLength());
         entity.setTotalCount(dto.getTotalCount());
-        entity.setCatchWeightComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_ENTITY.apply(dto.getCatchWeightComputedSource()));
-        entity.setMeanWeightComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_ENTITY.apply(dto.getMeanWeightComputedSource()));
-        entity.setMeanLengthComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_ENTITY.apply(dto.getMeanLengthComputedSource()));
-        entity.setTotalCountComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_ENTITY.apply(dto.getTotalCountComputedSource()));
+        entity.setCatchWeightComputedSource(dto.getCatchWeightComputedSource());
+        entity.setMeanWeightComputedSource(dto.getMeanWeightComputedSource());
+        entity.setMeanLengthComputedSource(dto.getMeanLengthComputedSource());
+        entity.setTotalCountComputedSource(dto.getTotalCountComputedSource());
         entity.setSpeciesFate(toEntity(dto.getSpeciesFate(), SpeciesFate.class));
         entity.setSpecies(toEntity(dto.getSpecies(), Species.class));
         entity.setReasonForDiscard(toEntity(dto.getReasonForDiscard(), ReasonForDiscard.class));
@@ -75,10 +75,10 @@ public class NonTargetCatchBinder extends DataBinderSupport<NonTargetCatch, NonT
         dto.setMeanWeight(entity.getMeanWeight());
         dto.setMeanLength(entity.getMeanLength());
         dto.setTotalCount(entity.getTotalCount());
-        dto.setCatchWeightComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_DTO.apply(entity.getCatchWeightComputedSource()));
-        dto.setMeanWeightComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_DTO.apply(entity.getMeanWeightComputedSource()));
-        dto.setMeanLengthComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_DTO.apply(entity.getMeanLengthComputedSource()));
-        dto.setTotalCountComputedSource(NON_TARGET_CATCH_COMPUTED_VALUE_SOURCE_TO_DTO.apply(entity.getTotalCountComputedSource()));
+        dto.setCatchWeightComputedSource(entity.getCatchWeightComputedSource());
+        dto.setMeanWeightComputedSource(entity.getMeanWeightComputedSource());
+        dto.setMeanLengthComputedSource(entity.getMeanLengthComputedSource());
+        dto.setTotalCountComputedSource(entity.getTotalCountComputedSource());
 
         dto.setSpeciesFate(toReferentialReference(referentialLocale, entity.getSpeciesFate(), SpeciesFateDto.class));
         dto.setSpecies(toReferentialReference(referentialLocale, entity.getSpecies(), SpeciesDto.class));
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java
index da1981a..96c6a70 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/SetSeineBinder.java
@@ -62,7 +62,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> {
         entity.setLastUpdateDate(dto.getLastUpdateDate());
         entity.setTargetCatchCompositionEstimatedByObserver(dto.isTargetCatchCompositionEstimatedByObserver());
         entity.setTargetDiscardCatchCompositionEstimatedByObserver(dto.isTargetDiscardCatchCompositionEstimatedByObserver());
-        entity.setSchoolType(SCHOOL_TYPE_TO_ENTITY.apply(dto.getSchoolType()));
+        entity.setSchoolType(dto.getSchoolType());
         entity.setReasonForNullSet(toEntity(dto.getReasonForNullSet(), ReasonForNullSet.class));
 
     }
@@ -89,7 +89,7 @@ public class SetSeineBinder extends DataBinderSupport<SetSeine, SetSeineDto> {
         dto.setTargetCatchCompositionEstimatedByObserver(entity.isTargetCatchCompositionEstimatedByObserver());
         dto.setTargetDiscardCatchCompositionEstimatedByObserver(entity.isTargetDiscardCatchCompositionEstimatedByObserver());
 
-        dto.setSchoolType(SCHOOL_TYPE_TO_DTO.apply(entity.getSchoolType()));
+        dto.setSchoolType(entity.getSchoolType());
         dto.setReasonForNullSet(toReferentialReference(referentialLocale, entity.getReasonForNullSet(), ReasonForNullSetDto.class));
 
     }
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java
index 0e1bf94..4f9cc7a 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/seine/TransmittingBuoyBinder.java
@@ -52,7 +52,7 @@ public class TransmittingBuoyBinder extends DataBinderSupport<TransmittingBuoy,
 
         entity.setCode(dto.getCode());
         entity.setBrand(dto.getBrand());
-        entity.setOwnership(OWNERSHIP_TO_ENTITY.apply(dto.getOwnership()));
+        entity.setOwnership(dto.getOwnership());
         entity.setTransmittingBuoyOperation(toEntity(dto.getTransmittingBuoyOperation(), TransmittingBuoyOperation.class));
         entity.setTransmittingBuoyType(toEntity(dto.getTransmittingBuoyType(), TransmittingBuoyType.class));
         entity.setCountry(toEntity(dto.getCountry(), Country.class));
@@ -66,7 +66,7 @@ public class TransmittingBuoyBinder extends DataBinderSupport<TransmittingBuoy,
 
         dto.setCode(entity.getCode());
         dto.setBrand(entity.getBrand());
-        dto.setOwnership(OWNERSHIP_TO_DTO.apply(entity.getOwnership()));
+        dto.setOwnership(entity.getOwnership());
         dto.setTransmittingBuoyOperation(toReferentialReference(referentialLocale, entity.getTransmittingBuoyOperation(), TransmittingBuoyOperationDto.class));
         dto.setTransmittingBuoyType(toReferentialReference(referentialLocale, entity.getTransmittingBuoyType(), TransmittingBuoyTypeDto.class));
         dto.setCountry(toReferentialReference(referentialLocale, entity.getCountry(), CountryDto.class));
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java
index 4bb03c4..4ef3393 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/ReferentialBinderSupport.java
@@ -24,13 +24,13 @@ package fr.ird.observe.services.topia.binder.referential;
 
 import fr.ird.observe.entities.referentiel.I18nReferentialEntity;
 import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
-import fr.ird.observe.services.topia.binder.BinderSupport;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
 import fr.ird.observe.services.dto.reference.ReferenceSetDefinition;
 import fr.ird.observe.services.dto.reference.ReferentialReferenceSetDefinitions;
 import fr.ird.observe.services.dto.referential.I18nReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.ReferentialReference;
+import fr.ird.observe.services.topia.binder.BinderSupport;
 
 import java.io.Serializable;
 
@@ -132,7 +132,7 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit
     protected void copyDtoReferentialFieldsToEntity(ReferentialDto dto, ObserveReferentialEntity entity) {
 
         entity.setTopiaId(dto.getId());
-        entity.setStatus(REFERENCE_STATUS_TO_ENTITY.apply(dto.getStatus()));
+        entity.setStatus(dto.getStatus());
         entity.setNeedComment(dto.isNeedComment());
         entity.setLastUpdateDate(dto.getLastUpdateDate());
         entity.setTopiaVersion(dto.getVersion());
@@ -145,7 +145,7 @@ public abstract class ReferentialBinderSupport<E extends ObserveReferentialEntit
     protected void copyEntityReferentialFieldsToDto(ObserveReferentialEntity entity, ReferentialDto dto) {
 
         dto.setId(entity.getTopiaId());
-        dto.setStatus(REFERENCE_STATUS_TO_DTO.apply(entity.getStatus()));
+        dto.setStatus(entity.getStatus());
         dto.setNeedComment(entity.isNeedComment());
         dto.setLastUpdateDate(entity.getLastUpdateDate());
         dto.setVersion(entity.getTopiaVersion());
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java
index a066813..6ac794f 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/common/ProgramBinder.java
@@ -50,7 +50,7 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto>
         entity.setOrganism(toEntity(dto.getOrganism(), Organism.class));
 
         entity.setEndDate(dto.getEndDate());
-        entity.setGearType(GEAR_TYPE_TO_ENTITY.apply(dto.getGearType()));
+        entity.setGearType(dto.getGearType());
         entity.setNonTargetObservation(dto.getNonTargetObservation());
         entity.setTargetDiscardsObservation(dto.getTargetDiscardsObservation());
         entity.setSamplesObservation(dto.getSamplesObservation());
@@ -74,7 +74,7 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto>
 
         dto.setOrganism(toReferentialReference(referentialLocale, entity.getOrganism(), OrganismDto.class));
 
-        dto.setGearType(GEAR_TYPE_TO_DTO.apply(entity.getGearType()));
+        dto.setGearType(entity.getGearType());
         dto.setGearTypePrefix(entity.getGearTypePrefix());
         dto.setNonTargetObservation(entity.getNonTargetObservation());
         dto.setTargetDiscardsObservation(entity.getTargetDiscardsObservation());
@@ -95,7 +95,7 @@ public class ProgramBinder extends ReferentialBinderSupport<Program, ProgramDto>
 
         return toReferentialReference(entity,
                                       getLabel(referentialLocale, entity),
-                                      GEAR_TYPE_TO_DTO.apply(entity.getGearType()),
+                                      entity.getGearType(),
                                       entity.getGearTypePrefix(),
                                       entity.getTripCount());
 
diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java
index ead7519..79d7032 100644
--- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java
+++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/referential/seine/ObservedSystemBinder.java
@@ -45,7 +45,7 @@ public class ObservedSystemBinder extends ReferentialBinderSupport<ObservedSyste
 
         copyDtoReferentialFieldsToEntity(dto, entity);
         copyDtoI18nFieldsToEntity(dto, entity);
-        entity.setSchoolType(SCHOOL_TYPE_TO_ENTITY.apply(dto.getSchoolType()));
+        entity.setSchoolType(dto.getSchoolType());
 
     }
 
@@ -55,7 +55,7 @@ public class ObservedSystemBinder extends ReferentialBinderSupport<ObservedSyste
 
         copyEntityReferentialFieldsToDto(entity, dto);
         copyEntityI18nFieldsToDto(entity, dto);
-        dto.setSchoolType(SCHOOL_TYPE_TO_DTO.apply(entity.getSchoolType()));
+        dto.setSchoolType(entity.getSchoolType());
 
     }
 
diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml
index a769d51..a1eb787 100644
--- a/services-topia-validators/pom.xml
+++ b/services-topia-validators/pom.xml
@@ -49,7 +49,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>services-dto</artifactId>
+      <artifactId>common</artifactId>
       <version>${project.version}</version>
     </dependency>
 
diff --git a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java
index 51240d8..42497a1 100644
--- a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java
+++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySimpleSpeedValidator.java
@@ -28,7 +28,7 @@ import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
 import fr.ird.observe.entities.seine.ActivitySeine;
 import fr.ird.observe.entities.seine.ActivitySeines;
 import fr.ird.observe.entities.seine.Route;
-import fr.ird.observe.util.GPSPoint;
+import fr.ird.observe.common.GPSPoint;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
diff --git a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java
index 1db341d..32b2262 100644
--- a/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java
+++ b/services-topia-validators/src/main/java/fr/ird/observe/services/topia/validators/ActivitySpeedValidator.java
@@ -27,7 +27,7 @@ import com.opensymphony.xwork2.validator.ValidationException;
 import com.opensymphony.xwork2.validator.validators.FieldValidatorSupport;
 import fr.ird.observe.entities.seine.ActivitySeine;
 import fr.ird.observe.entities.seine.Route;
-import fr.ird.observe.util.GPSPoint;
+import fr.ird.observe.common.GPSPoint;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.xwork2.field.CollectionFieldExpressionValidator;
diff --git a/services-topia/pom.xml b/services-topia/pom.xml
index c65e269..270fdd1 100644
--- a/services-topia/pom.xml
+++ b/services-topia/pom.xml
@@ -18,6 +18,11 @@
     <!-- sibling dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>services-dto</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java
index ad8ba80..a919267 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java
@@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.actions.consolidate;
  */
 
 import com.google.common.collect.ImmutableSet;
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
+import fr.ird.observe.common.constants.seine.SchoolType;
 import fr.ird.observe.entities.referentiel.I18nReferenceEntities;
 import fr.ird.observe.entities.referentiel.Ocean;
 import fr.ird.observe.entities.referentiel.Sex;
@@ -35,7 +35,6 @@ import fr.ird.observe.entities.seine.NonTargetCatch;
 import fr.ird.observe.entities.seine.NonTargetLength;
 import fr.ird.observe.entities.seine.TargetLength;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
-import fr.ird.observe.services.dto.constants.seine.SchoolType;
 import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -207,7 +206,7 @@ public class ConsolidateActivitySeineDataResultBuilder {
         return this;
     }
 
-    public ConsolidateActivitySeineDataResultBuilder setSchoolTypeChanged(SchoolTypePersist oldSchoolType, SchoolTypePersist newSchoolType) {
+    public ConsolidateActivitySeineDataResultBuilder setSchoolTypeChanged(SchoolType oldSchoolType, SchoolType newSchoolType) {
         this.oldSchoolType = SchoolType.valueOf(oldSchoolType.name());
         this.newSchoolType = SchoolType.valueOf(newSchoolType.name());
         return this;
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java
index c284470..034b25c 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java
@@ -23,11 +23,9 @@ package fr.ird.observe.services.topia.service.actions.consolidate;
  */
 
 import com.google.common.collect.ImmutableSet;
-import fr.ird.observe.persistence.ObserveTopiaDaoSupplier;
-import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
+import fr.ird.observe.common.constants.seine.NonTargetCatchComputedValueSource;
+import fr.ird.observe.common.constants.seine.SchoolType;
 import fr.ird.observe.entities.LengthWeightComputable;
-import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSourcePersist;
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
 import fr.ird.observe.entities.referentiel.LengthLengthParameter;
 import fr.ird.observe.entities.referentiel.LengthLengthParameters;
 import fr.ird.observe.entities.referentiel.LengthWeightParameter;
@@ -49,6 +47,8 @@ import fr.ird.observe.entities.seine.TargetLength;
 import fr.ird.observe.entities.seine.TargetSample;
 import fr.ird.observe.entities.seine.TripSeine;
 import fr.ird.observe.entities.seine.TripSeines;
+import fr.ird.observe.persistence.ObserveTopiaDaoSupplier;
+import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult;
@@ -194,8 +194,8 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
             }
             return;
         }
-        SchoolTypePersist oldSchoolType = setSeine.getSchoolType();
-        SchoolTypePersist newSchoolType = activity.getSchoolType();
+        SchoolType oldSchoolType = setSeine.getSchoolType();
+        SchoolType newSchoolType = activity.getSchoolType();
         if (oldSchoolType == null || oldSchoolType != newSchoolType) {
 
             // le type de banc a changé, on doit sauver l'activité
@@ -345,7 +345,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
 
             // on essaye de calculer la taille moyenne à partir des échantillons
 
-            NonTargetCatchComputedValueSourcePersist computedSource = null;
+            NonTargetCatchComputedValueSource computedSource = null;
 
             if (CollectionUtils.isNotEmpty(samples)) {
 
@@ -367,7 +367,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
 
                     meanLength = totalLength / totalCount;
 
-                    computedSource = NonTargetCatchComputedValueSourcePersist.fromSample;
+                    computedSource = NonTargetCatchComputedValueSource.fromSample;
                 }
             }
 
@@ -376,7 +376,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
                 // on prend directement la valeur fournie par le référentiel
 
                 meanLength = lengthWeightParameter.getMeanLength();
-                computedSource = NonTargetCatchComputedValueSourcePersist.fromReferentiel;
+                computedSource = NonTargetCatchComputedValueSource.fromReferentiel;
             }
 
             if (meanLength != null) {
@@ -423,7 +423,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
                 if (totalCount != 0) {
 
                     nonTargetCatch.setTotalCount(totalCount);
-                    nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSourcePersist.fromSample);
+                    nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSource.fromSample);
 
                 }
             }
@@ -445,14 +445,14 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
             if (nonTargetCatch.getMeanLength() == null) {
 
                 nonTargetCatch.setMeanLength(lengthWeightParameter.getMeanLength());
-                nonTargetCatch.setMeanLengthComputedSource(NonTargetCatchComputedValueSourcePersist.fromReferentiel);
+                nonTargetCatch.setMeanLengthComputedSource(NonTargetCatchComputedValueSource.fromReferentiel);
 
             }
 
             if (nonTargetCatch.getMeanWeight() == null) {
 
                 nonTargetCatch.setMeanWeight(lengthWeightParameter.getMeanWeight());
-                nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.fromReferentiel);
+                nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSource.fromReferentiel);
 
             }
 
@@ -477,7 +477,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
             // calcul le weight poids à partir de nb estime et du poids moyen
             catchWeight = meanWeight * (float) totalCount / 1000;
             nonTargetCatch.setCatchWeight(catchWeight);
-            nonTargetCatch.setCatchWeightComputedSource(NonTargetCatchComputedValueSourcePersist.fromData);
+            nonTargetCatch.setCatchWeightComputedSource(NonTargetCatchComputedValueSource.fromData);
 
         }
 
@@ -486,19 +486,19 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
             // calcul le nb estime à partir du poids estime et du poids moyen
             totalCount = (int) ((float) 1000 * catchWeight / meanWeight);
             nonTargetCatch.setTotalCount(totalCount);
-            nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSourcePersist.fromData);
+            nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSource.fromData);
 
         }
 
         if (meanWeight == null && totalCount != null && totalCount != 0 && catchWeight != null &&
-                !NonTargetCatchComputedValueSourcePersist.fromSample.equals(nonTargetCatch.getTotalCountComputedSource())) {
+                !NonTargetCatchComputedValueSource.fromSample.equals(nonTargetCatch.getTotalCountComputedSource())) {
 
             // calcul le poids moyen à partir de nb estime et du poids estime
             // uniquement si le nombre estimé ne vient pas des échantillons (voir http://forge.codelutin.com/issues/4670)
 
             meanWeight = catchWeight * (float) 1000 / (float) totalCount;
             nonTargetCatch.setMeanWeight(meanWeight);
-            nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSourcePersist.fromData);
+            nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSource.fromData);
 
         }
     }
@@ -697,7 +697,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements
             return lengthWeightParameter;
         }
 
-        public void setSchoolTypeChanged(SchoolTypePersist oldSchoolType, SchoolTypePersist newSchoolType) {
+        public void setSchoolTypeChanged(SchoolType oldSchoolType, SchoolType newSchoolType) {
             resultBuilder.setSchoolTypeChanged(oldSchoolType, newSchoolType);
         }
 
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java
index 7e46ffe..c06c7b9 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java
@@ -23,21 +23,21 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.diff;
  */
 
 import com.google.common.collect.ImmutableSet;
+import fr.ird.observe.common.constants.ReferenceStatus;
+import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
+import fr.ird.observe.persistence.Entities;
 import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.persistence.Entities;
-import fr.ird.observe.entities.constants.ReferenceStatusPersist;
-import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
+import fr.ird.observe.services.dto.constants.ReferentialLocale;
+import fr.ird.observe.services.dto.referential.ReferentialDto;
+import fr.ird.observe.services.dto.referential.ReferentialMultimap;
+import fr.ird.observe.services.dto.referential.ReferentialReferenceSet;
 import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceState;
 import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceStates;
 import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;
 import fr.ird.observe.services.topia.ObserveServiceTopia;
 import fr.ird.observe.services.topia.binder.BinderEngine;
 import fr.ird.observe.services.topia.binder.referential.ReferentialBinderSupport;
-import fr.ird.observe.services.dto.constants.ReferentialLocale;
-import fr.ird.observe.services.dto.referential.ReferentialDto;
-import fr.ird.observe.services.dto.referential.ReferentialMultimap;
-import fr.ird.observe.services.dto.referential.ReferentialReferenceSet;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.topia.persistence.TopiaDao;
@@ -147,7 +147,7 @@ public class ReferentialSynchronizeDiffServiceTopia extends ObserveServiceTopia
 
         ObserveTopiaPersistenceContext persistenceContext = getTopiaPersistenceContext();
         TopiaDao<E> dao = persistenceContext.getDao(entityType);
-        List<E> entities = dao.forEquals(ObserveReferentialEntity.PROPERTY_STATUS, ReferenceStatusPersist.enabled).findAll();
+        List<E> entities = dao.forEquals(ObserveReferentialEntity.PROPERTY_STATUS, ReferenceStatus.enabled).findAll();
         ReferentialReferenceSet<R> result = toReferentialReferenceSet(referentialName, entities, null);
 
         timeLog.log(startTime, "getEnabledReferenceSet0", referentialName.getName());
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripMapDtoFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripMapDtoFactory.java
index ba2cde5..912be0f 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripMapDtoFactory.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripMapDtoFactory.java
@@ -22,14 +22,10 @@ package fr.ird.observe.services.topia.service.data;
  * #L%
  */
 
-import fr.ird.observe.entities.TripMapPoint;
+import fr.ird.observe.common.TripMapPoint;
 import fr.ird.observe.services.dto.TripMapDto;
-import fr.ird.observe.services.dto.TripMapPointDto;
-import fr.ird.observe.services.dto.constants.TripMapPointType;
 
 import java.util.LinkedHashSet;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * Created on 09/01/16.
@@ -38,20 +34,11 @@ import java.util.stream.Collectors;
  */
 public class TripMapDtoFactory {
 
-    public static TripMapDto of(String tripId, Set<TripMapPoint> points) {
+    public static TripMapDto of(String tripId, LinkedHashSet<TripMapPoint> points) {
         TripMapDto tripMapDto = new TripMapDto();
         tripMapDto.setId(tripId);
-        LinkedHashSet<TripMapPointDto> pointDtos = points.stream().map(TripMapDtoFactory::of).collect(Collectors.toCollection(LinkedHashSet::new));
-        tripMapDto.setPoints(pointDtos);
+        tripMapDto.setPoints(points);
         return tripMapDto;
     }
 
-    private static TripMapPointDto of(TripMapPoint tripMapPoint) {
-        TripMapPointDto result = new TripMapPointDto();
-        result.setLatitude(tripMapPoint.getLatitude());
-        result.setLongitude(tripMapPoint.getLongitude());
-        result.setTime(tripMapPoint.getTime());
-        result.setType(TripMapPointType.valueOf(tripMapPoint.getType().name()));
-        return result;
-    }
 }
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java
index 61f7eff..15baa2f 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java
@@ -25,7 +25,7 @@ package fr.ird.observe.services.topia.service.data.longline;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
 import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.entities.TripMapPoint;
+import fr.ird.observe.common.TripMapPoint;
 import fr.ird.observe.entities.longline.TripLongline;
 import fr.ird.observe.entities.longline.TripLonglineTopiaDao;
 import fr.ird.observe.entities.referentiel.Ocean;
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java
index 1eb7217..a5beb6c 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/SetSeineServiceTopia.java
@@ -22,13 +22,10 @@ package fr.ird.observe.services.topia.service.data.seine;
  * #L%
  */
 
-import fr.ird.observe.entities.constants.seine.SchoolTypePersist;
+import fr.ird.observe.common.constants.seine.SchoolType;
 import fr.ird.observe.entities.seine.ActivitySeine;
 import fr.ird.observe.entities.seine.Route;
 import fr.ird.observe.entities.seine.SetSeine;
-import fr.ird.observe.services.service.data.seine.SetSeineService;
-import fr.ird.observe.services.topia.ObserveServiceTopia;
-import fr.ird.observe.services.topia.binder.data.DataBinderSupport;
 import fr.ird.observe.services.dto.DataReference;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
@@ -38,6 +35,9 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.SetSeineDto;
 import fr.ird.observe.services.service.DataNotFoundException;
+import fr.ird.observe.services.service.data.seine.SetSeineService;
+import fr.ird.observe.services.topia.ObserveServiceTopia;
+import fr.ird.observe.services.topia.binder.data.DataBinderSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
@@ -129,7 +129,7 @@ public class SetSeineServiceTopia extends ObserveServiceTopia implements SetSein
         preCreated.setEndPursingDate(routeDate);
 
         // recuperation du type de set a partir de l'activity
-        SchoolTypePersist schoolType = activitySeine.getSchoolType();
+        SchoolType schoolType = activitySeine.getSchoolType();
         preCreated.setSchoolType(schoolType);
 
         return dataEntityToForm(SetSeineDto.class,
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java
index 691f899..eb2cf3a 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java
@@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.data.seine;
 
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableList;
-import fr.ird.observe.entities.TripMapPoint;
+import fr.ird.observe.common.TripMapPoint;
 import fr.ird.observe.entities.referentiel.Ocean;
 import fr.ird.observe.entities.referentiel.Program;
 import fr.ird.observe.entities.referentiel.Species;
diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java
index b2fccf2..e21526f 100644
--- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java
+++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java
@@ -27,19 +27,18 @@ import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.SetMultimap;
-import fr.ird.observe.persistence.ObserveEntityEnum;
-import fr.ird.observe.persistence.Entities;
+import fr.ird.observe.common.constants.ReferenceStatus;
 import fr.ird.observe.entities.EntityMap;
-import fr.ird.observe.entities.constants.ReferenceStatusPersist;
 import fr.ird.observe.entities.longline.TripLongline;
 import fr.ird.observe.entities.referentiel.ObserveReferentialEntity;
 import fr.ird.observe.entities.referentiel.Species;
 import fr.ird.observe.entities.seine.TripSeine;
+import fr.ird.observe.persistence.Entities;
+import fr.ird.observe.persistence.ObserveEntityEnum;
 import fr.ird.observe.services.dto.DataDto;
 import fr.ird.observe.services.dto.DataReferenceSet;
 import fr.ird.observe.services.dto.Form;
 import fr.ird.observe.services.dto.ReferenceMap;
-import fr.ird.observe.services.dto.constants.ReferenceStatus;
 import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.reference.ReferenceSetDefinition;
 import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinition;
@@ -190,7 +189,7 @@ public class ReferentialServiceTopia extends ObserveServiceTopia implements Refe
 
         Class<ObserveReferentialEntity> entityType = getReferentialEntityType(type);
         ObserveReferentialEntity entity = newEntity(entityType);
-        entity.setStatus(ReferenceStatusPersist.enabled);
+        entity.setStatus(ReferenceStatus.enabled);
         return referentialEntityToForm(type, entity, null);
     }
 
diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java
index 683a783..05d1d4d 100644
--- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java
+++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java
@@ -22,9 +22,7 @@
 package fr.ird.observe.services.topia.entity;
 
 import com.opensymphony.xwork2.interceptor.annotations.After;
-import fr.ird.observe.persistence.ObserveTopiaDaoSupplier;
-import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
-import fr.ird.observe.entities.constants.ReferenceStatusPersist;
+import fr.ird.observe.common.constants.ReferenceStatus;
 import fr.ird.observe.entities.referentiel.LengthWeightParameter;
 import fr.ird.observe.entities.referentiel.LengthWeightParameterTopiaDao;
 import fr.ird.observe.entities.referentiel.LengthWeightParameters;
@@ -34,6 +32,8 @@ import fr.ird.observe.entities.referentiel.Sex;
 import fr.ird.observe.entities.referentiel.SexTopiaDao;
 import fr.ird.observe.entities.referentiel.Species;
 import fr.ird.observe.entities.referentiel.SpeciesTopiaDao;
+import fr.ird.observe.persistence.ObserveTopiaDaoSupplier;
+import fr.ird.observe.persistence.ObserveTopiaPersistenceContext;
 import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest;
 import fr.ird.observe.test.spi.CopyDatabaseConfiguration;
 import org.apache.commons.logging.Log;
@@ -127,7 +127,7 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest {
         entity.setOcean(ocean);
         entity.setStartDate(startDate);
         entity.setEndDate(endDate);
-        entity.setStatus(ReferenceStatusPersist.enabled);
+        entity.setStatus(ReferenceStatus.enabled);
         entity.setCoefficients("a=3.8E-5:b=2.78");
         entity.setLengthWeightFormula("a * Math.pow(L, b)");
         entity.setWeightLengthFormula("Math.pow(P/a, 1/b)");
diff --git a/services/pom.xml b/services/pom.xml
index 766a335..714e081 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -18,6 +18,11 @@
     <!-- sibling dependencies -->
     <dependency>
       <groupId>${project.groupId}</groupId>
+      <artifactId>common</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
       <artifactId>services-dto</artifactId>
       <version>${project.version}</version>
     </dependency>
diff --git a/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java
index 1d6efe6..e811289 100644
--- a/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java
+++ b/services/src/main/java/fr/ird/observe/services/service/actions/consolidate/ConsolidateActivitySeineDataResult.java
@@ -24,7 +24,7 @@ package fr.ird.observe.services.service.actions.consolidate;
 
 import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.services.dto.ObserveDto;
-import fr.ird.observe.services.dto.constants.seine.SchoolType;
+import fr.ird.observe.common.constants.seine.SchoolType;
 
 import java.io.Serializable;
 

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

    

[Observe-commits] 02/04: Introduction module common

codelutin.com scm