[Observe-commits] 01/01: use jaxx 3.0-alpha-1 + change my email

30 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 34b0e4e691e782f7805b949de289196c74cecb8c
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Fri Dec 30 12:56:38 2016 +0100

    use jaxx 3.0-alpha-1 + change my email
---
 .../src/main/resources/log4j.properties            |  2 +-
 .../src/main/resources/observe-log4j.properties    |  2 +-
 application-swing/pom.xml                          |  2 +-
 .../application/swing/ObserveActionExecutor.java   |  6 ++--
 .../observe/application/swing/ObserveCLAction.java |  2 +-
 .../observe/application/swing/ObserveRunner.java   |  2 +-
 .../swing/ObserveSwingApplicationContext.java      |  4 +--
 .../ObserveSwingApplicationDataSourcesManager.java |  2 +-
 .../swing/ObserveSwingSessionHelper.java           |  2 +-
 .../application/swing/ui/ObserveKeyStrokes.java    |  4 +--
 .../application/swing/ui/ObserveMainUI.jaxx        | 10 +++---
 .../application/swing/ui/ObserveMainUIHandler.java |  2 +-
 .../swing/ui/ObserveMainUIInitializer.java         |  8 ++---
 .../application/swing/ui/ObserveMainUIModel.java   |  4 +--
 .../ird/observe/application/swing/ui/UIHelper.java |  8 ++---
 .../swing/ui/actions/AbstractUIAction.java         |  2 +-
 .../swing/ui/actions/content/GoDownUIAction.java   |  2 +-
 .../swing/ui/actions/content/GoUpUIAction.java     |  2 +-
 .../ui/actions/menu/config/ShowConfigAction.java   | 14 ++++-----
 .../menu/storage/StartServerModeAction.java        |  2 +-
 .../swing/ui/admin/AdminActionModel.java           |  2 +-
 .../swing/ui/admin/AdminActionWorker.java          |  4 +--
 .../application/swing/ui/admin/AdminStep.java      |  4 +--
 .../application/swing/ui/admin/AdminTabUI.jaxx     |  6 ++--
 .../swing/ui/admin/AdminTabUIHandler.java          | 11 +++----
 .../application/swing/ui/admin/AdminUI.jaxx        | 12 ++++----
 .../application/swing/ui/admin/AdminUIHandler.java |  8 ++---
 .../swing/ui/admin/AdminUILauncher.java            |  8 ++---
 .../application/swing/ui/admin/AdminUIModel.java   |  4 +--
 .../swing/ui/admin/config/ConfigUI.jaxx            |  2 +-
 .../swing/ui/admin/config/ConfigUIHandler.java     |  9 ++++--
 .../swing/ui/admin/config/SelectDataUI.jaxx        |  2 +-
 .../swing/ui/admin/config/SelectDataUIHandler.java |  4 +--
 .../ui/admin/consolidate/ConsolidateModel.java     |  2 +-
 .../ui/admin/consolidate/ConsolidateUIHandler.java | 10 +++---
 .../swing/ui/admin/export/ExportModel.java         |  2 +-
 .../swing/ui/admin/export/ExportUI.jaxx            |  2 +-
 .../swing/ui/admin/export/ExportUIHandler.java     | 12 +++++---
 .../swing/ui/admin/report/ReportUIHandler.java     | 36 +++++++++++-----------
 .../swing/ui/admin/resume/ShowResumeUIHandler.java |  6 ++--
 .../swing/ui/admin/save/SaveLocalModel.java        |  2 +-
 .../swing/ui/admin/save/SaveLocalUI.jaxx           |  2 +-
 .../swing/ui/admin/save/SaveLocalUIHandler.java    | 12 ++++----
 .../ui/admin/synchronize/data/DataSynchroUI.jaxx   |  2 +-
 .../synchronize/data/DataSynchroUIHandler.java     |  6 ++--
 .../referential/legacy/SynchronizeModel.java       |  4 +--
 .../referential/legacy/SynchronizeUI.jaxx          |  4 +--
 .../referential/legacy/SynchronizeUIHandler.java   | 21 ++++++-------
 .../referential/ng/ReferentialReplaceUI.jaxx       |  2 +-
 .../ng/ReferentialReplaceUIHandler.java            |  4 +--
 .../ng/ReferentialSynchroUIHandler.java            |  8 ++---
 .../referential/ng/action/ApplyAction.java         |  2 +-
 .../ng/action/RegisterTasksActionSupport.java      |  2 +-
 .../swing/ui/admin/validate/ValidateModel.java     |  2 +-
 .../swing/ui/admin/validate/ValidateUI.jaxx        |  4 +--
 .../swing/ui/admin/validate/ValidateUIHandler.java | 29 +++++++++--------
 .../validate/ValidationMessageTableModel.java      |  2 +-
 .../application/swing/ui/content/ContentUI.jaxx    |  4 +--
 .../swing/ui/content/ContentUIBlockingLayerUI.java |  2 +-
 .../swing/ui/content/ContentUIHandler.java         | 12 ++++----
 .../swing/ui/content/ContentUIInitializer.java     | 24 +++++++--------
 .../swing/ui/content/ContentUIManager.java         |  6 ++--
 .../swing/ui/content/ObserveContentUI.java         |  6 ++--
 .../swing/ui/content/ObserveFocusManager.java      |  4 +--
 .../ui/content/impl/longline/BranchlineUI.jaxx     |  4 +--
 .../content/impl/longline/BranchlineUIHandler.java |  6 ++--
 .../LonglineDetailCompositionUIHandler.java        |  2 +-
 ...onglineDetailCompositionUIValidationHelper.java |  4 +--
 ...LonglineDetailCompositionValidationContext.java |  4 +--
 .../LonglineDetailCompositionValidatorService.java |  4 +--
 .../LonglineGlobalCompositionUIHandler.java        |  2 +-
 .../ui/content/impl/longline/SetLonglineUI.jaxx    |  4 +--
 .../impl/longline/SetLonglineUIHandler.java        | 10 +++---
 .../FloatingObjectTransmittingBuoyOperationUI.jaxx |  2 +-
 ...ngObjectTransmittingBuoyOperationUIHandler.java |  2 +-
 .../ui/content/impl/seine/FloatingObjectUI.jaxx    |  4 +--
 .../impl/seine/FloatingObjectUIHandler.java        |  2 +-
 .../swing/ui/content/impl/seine/SetSeineUI.jaxx    |  4 +--
 .../ui/content/impl/seine/SetSeineUIHandler.java   | 10 +++---
 .../swing/ui/content/list/ContentListUI.jaxx       |  2 +-
 .../ui/content/list/ContentListUIHandler.java      |  2 +-
 .../impl/longline/ActivityLonglinesUIHandler.java  |  2 +-
 .../list/impl/longline/TripLonglinesUIHandler.java |  2 +-
 .../list/impl/seine/ActivitySeinesUIHandler.java   |  2 +-
 .../content/list/impl/seine/RoutesUIHandler.java   |  2 +-
 .../list/impl/seine/TripSeinesUIHandler.java       |  2 +-
 .../open/impl/longline/ActivityLonglineUI.jaxx     |  4 +--
 .../impl/longline/ActivityLonglineUIHandler.java   |  2 +-
 .../content/open/impl/longline/TripLonglineUI.jaxx |  4 +--
 .../open/impl/longline/TripLonglineUIHandler.java  |  2 +-
 .../content/open/impl/seine/ActivitySeineUI.jaxx   |  4 +--
 .../open/impl/seine/ActivitySeineUIHandler.java    |  6 ++--
 .../swing/ui/content/open/impl/seine/RouteUI.jaxx  |  2 +-
 .../ui/content/open/impl/seine/RouteUIHandler.java |  2 +-
 .../ui/content/open/impl/seine/TripSeineUI.jaxx    |  4 +--
 .../open/impl/seine/TripSeineUIHandler.java        |  2 +-
 .../swing/ui/content/ref/ContentReferenceUI.jaxx   |  4 +--
 .../ui/content/ref/ContentReferenceUIHandler.java  |  6 ++--
 .../ui/content/ref/ReferenceHomeCommonUI.java      |  4 +--
 .../ui/content/ref/ReferenceHomeLonglineUI.java    |  4 +--
 .../swing/ui/content/ref/ReferenceHomeSeineUI.java |  4 +--
 .../ui/content/ref/ReferenceHomeUIHandler.java     |  2 +-
 .../ui/content/ref/impl/CountryUIHandler.java      |  2 +-
 .../ui/content/ref/impl/FpaZoneUIHandler.java      |  2 +-
 .../ref/impl/GearCaracteristicTypeUIHandler.java   |  2 +-
 .../ui/content/ref/impl/GearCaracteristicUI.jaxx   |  2 +-
 .../ref/impl/GearCaracteristicUIHandler.java       |  2 +-
 .../swing/ui/content/ref/impl/GearUIHandler.java   |  6 ++--
 .../swing/ui/content/ref/impl/HarbourUI.jaxx       |  2 +-
 .../ui/content/ref/impl/HarbourUIHandler.java      |  2 +-
 .../content/ref/impl/LengthLengthParameterUI.jaxx  |  4 +--
 .../ref/impl/LengthLengthParameterUIHandler.java   |  6 ++--
 .../content/ref/impl/LengthWeightParameterUI.jaxx  |  4 +--
 .../ref/impl/LengthWeightParameterUIHandler.java   |  6 ++--
 .../swing/ui/content/ref/impl/OceanUIHandler.java  |  2 +-
 .../swing/ui/content/ref/impl/OrganismUI.jaxx      |  2 +-
 .../ui/content/ref/impl/OrganismUIHandler.java     |  2 +-
 .../swing/ui/content/ref/impl/PersonUI.jaxx        |  2 +-
 .../swing/ui/content/ref/impl/PersonUIHandler.java |  2 +-
 .../swing/ui/content/ref/impl/ProgramUI.jaxx       |  2 +-
 .../ui/content/ref/impl/ProgramUIHandler.java      |  6 ++--
 .../swing/ui/content/ref/impl/SexUIHandler.java    |  2 +-
 .../swing/ui/content/ref/impl/ShipOwnerUI.jaxx     |  2 +-
 .../ui/content/ref/impl/ShipOwnerUIHandler.java    |  2 +-
 .../content/ref/impl/SizeMeasureTypeUIHandler.java |  2 +-
 .../swing/ui/content/ref/impl/SpeciesGroupUI.jaxx  |  2 +-
 .../ui/content/ref/impl/SpeciesGroupUIHandler.java |  2 +-
 .../ui/content/ref/impl/SpeciesListUIHandler.java  |  6 ++--
 .../swing/ui/content/ref/impl/SpeciesUI.jaxx       |  4 +--
 .../ui/content/ref/impl/SpeciesUIHandler.java      |  6 ++--
 .../ref/impl/VesselSizeCategoryUIHandler.java      |  2 +-
 .../ui/content/ref/impl/VesselTypeUIHandler.java   |  2 +-
 .../swing/ui/content/ref/impl/VesselUI.jaxx        |  4 +--
 .../swing/ui/content/ref/impl/VesselUIHandler.java |  6 ++--
 .../ref/impl/WeightMeasureTypeUIHandler.java       |  2 +-
 .../impl/longline/BaitHaulingStatusUIHandler.java  |  2 +-
 .../impl/longline/BaitSettingStatusUIHandler.java  |  2 +-
 .../ref/impl/longline/BaitTypeUIHandler.java       |  2 +-
 .../impl/longline/CatchFateLonglineUIHandler.java  |  2 +-
 .../ref/impl/longline/EncounterTypeUIHandler.java  |  2 +-
 .../ref/impl/longline/HealthnessUIHandler.java     |  2 +-
 .../ref/impl/longline/HookPositionUIHandler.java   |  2 +-
 .../ref/impl/longline/HookSizeUIHandler.java       |  2 +-
 .../ref/impl/longline/HookTypeUIHandler.java       |  2 +-
 .../longline/ItemHorizontalPositionUIHandler.java  |  2 +-
 .../longline/ItemVerticalPositionUIHandler.java    |  2 +-
 .../impl/longline/LightsticksColorUIHandler.java   |  2 +-
 .../impl/longline/LightsticksTypeUIHandler.java    |  2 +-
 .../ref/impl/longline/LineTypeUIHandler.java       |  2 +-
 .../ref/impl/longline/MaturityStatusUIHandler.java |  2 +-
 .../ref/impl/longline/MitigationTypeUIHandler.java |  2 +-
 .../ref/impl/longline/SensorBrandUIHandler.java    |  2 +-
 .../impl/longline/SensorDataFormatUIHandler.java   |  2 +-
 .../ref/impl/longline/SensorTypeUIHandler.java     |  2 +-
 .../ref/impl/longline/SettingShapeUIHandler.java   |  2 +-
 .../ref/impl/longline/StomacFullnessUIHandler.java |  2 +-
 .../ref/impl/longline/TripTypeUIHandler.java       |  2 +-
 .../longline/VesselActivityLonglineUIHandler.java  |  2 +-
 .../ref/impl/seine/DetectionModeUIHandler.java     |  2 +-
 .../ref/impl/seine/ObjectFateUIHandler.java        |  2 +-
 .../ref/impl/seine/ObjectOperationUIHandler.java   |  2 +-
 .../ref/impl/seine/ObjectTypeUIHandler.java        |  2 +-
 .../ref/impl/seine/ObservedSystemUIHandler.java    |  2 +-
 .../ref/impl/seine/ReasonForDiscardUIHandler.java  |  2 +-
 .../impl/seine/ReasonForNoFishingUIHandler.java    |  2 +-
 .../ref/impl/seine/ReasonForNullSetUIHandler.java  |  2 +-
 .../ref/impl/seine/SpeciesFateUIHandler.java       |  2 +-
 .../ref/impl/seine/SpeciesStatusUIHandler.java     |  2 +-
 .../impl/seine/SurroundingActivityUIHandler.java   |  2 +-
 .../seine/TransmittingBuoyOperationUIHandler.java  |  2 +-
 .../impl/seine/TransmittingBuoyTypeUIHandler.java  |  2 +-
 .../impl/seine/VesselActivitySeineUIHandler.java   |  2 +-
 .../content/ref/impl/seine/WeightCategoryUI.jaxx   |  2 +-
 .../ref/impl/seine/WeightCategoryUIHandler.java    |  2 +-
 .../ui/content/ref/impl/seine/WindUIHandler.java   |  2 +-
 .../ui/content/ref/usage/UsageForDeleteUI.jaxx     |  4 +--
 .../content/ref/usage/UsageForDeleteUIHandler.java |  2 +-
 .../content/ref/usage/UsageForDesactivateUI.jaxx   |  4 +--
 .../ref/usage/UsageForDesactivateUIHandler.java    |  2 +-
 .../ui/content/ref/usage/UsageForDisplayUI.jaxx    |  2 +-
 .../ref/usage/UsageForDisplayUIHandler.java        |  2 +-
 .../content/ref/usage/UsageUIHandlerSupport.java   |  6 ++--
 .../swing/ui/content/table/ContentTableModel.java  |  2 +-
 .../swing/ui/content/table/ContentTableUI.jaxx     |  4 +--
 .../content/table/ContentTableUIInitializer.java   |  2 +-
 .../ui/content/table/ObserveContentTableUI.java    |  4 +--
 .../table/impl/longline/BaitsCompositionUI.jaxx    |  4 +--
 .../impl/longline/BaitsCompositionUIHandler.java   |  2 +-
 .../impl/longline/BranchlinesCompositionUI.jaxx    |  4 +--
 .../longline/BranchlinesCompositionUIHandler.java  |  2 +-
 .../table/impl/longline/CatchLonglineUI.jaxx       |  4 +--
 .../impl/longline/CatchLonglineUIHandler.java      | 10 +++---
 .../content/table/impl/longline/EncounterUI.jaxx   |  4 +--
 .../table/impl/longline/EncounterUIHandler.java    |  2 +-
 .../impl/longline/FloatlinesCompositionUI.jaxx     |  4 +--
 .../longline/FloatlinesCompositionUIHandler.java   |  2 +-
 .../impl/longline/GearUseFeaturesLonglineUI.jaxx   |  4 +--
 .../longline/GearUseFeaturesLonglineUIHandler.java |  8 ++---
 .../table/impl/longline/HooksCompositionUI.jaxx    |  4 +--
 .../impl/longline/HooksCompositionUIHandler.java   |  2 +-
 .../impl/longline/LonglinePositionHelper.java      |  2 +-
 .../content/table/impl/longline/SensorUsedUI.jaxx  |  2 +-
 .../table/impl/longline/SensorUsedUIHandler.java   |  2 +-
 .../ui/content/table/impl/longline/TdrUI.jaxx      |  4 +--
 .../content/table/impl/longline/TdrUIHandler.java  | 10 +++---
 .../table/impl/seine/GearUseFeaturesSeineUI.jaxx   |  4 +--
 .../impl/seine/GearUseFeaturesSeineUIHandler.java  |  8 ++---
 .../content/table/impl/seine/NonTargetCatchUI.jaxx |  4 +--
 .../table/impl/seine/NonTargetCatchUIHandler.java  |  2 +-
 .../table/impl/seine/NonTargetSampleUI.jaxx        |  4 +--
 .../table/impl/seine/NonTargetSampleUIHandler.java |  2 +-
 .../table/impl/seine/ObjectObservedSpeciesUI.jaxx  |  4 +--
 .../impl/seine/ObjectObservedSpeciesUIHandler.java |  2 +-
 .../table/impl/seine/ObjectSchoolEstimateUI.jaxx   |  4 +--
 .../impl/seine/ObjectSchoolEstimateUIHandler.java  |  2 +-
 .../content/table/impl/seine/SchoolEstimateUI.jaxx |  4 +--
 .../table/impl/seine/SchoolEstimateUIHandler.java  |  2 +-
 .../ui/content/table/impl/seine/TargetCatchUI.jaxx |  4 +--
 .../table/impl/seine/TargetCatchUIHandler.java     |  4 +--
 .../table/impl/seine/TargetDiscardCatchUI.jaxx     |  4 +--
 .../impl/seine/TargetDiscardCatchUIHandler.java    |  4 +--
 .../impl/seine/TargetSampleCaptureUIHandler.java   |  2 +-
 .../impl/seine/TargetSampleRejeteUIHandler.java    |  2 +-
 .../content/table/impl/seine/TargetSampleUI.jaxx   |  4 +--
 .../swing/ui/storage/ObstunaAdminAction.java       |  2 +-
 .../swing/ui/storage/RemoteUILauncher.java         |  2 +-
 .../swing/ui/storage/StorageBackupUILauncher.java  |  2 +-
 .../application/swing/ui/storage/StorageStep.java  |  2 +-
 .../application/swing/ui/storage/StorageUI.jaxx    |  4 +--
 .../swing/ui/storage/StorageUIHandler.java         |  4 +--
 .../swing/ui/storage/StorageUILauncher.java        | 10 +++---
 .../swing/ui/storage/StorageUIModel.java           |  6 ++--
 .../swing/ui/storage/presets/RemotePresetsUI.jaxx  |  2 +-
 .../ui/storage/presets/RemotePresetsUIHandler.java |  4 +--
 .../swing/ui/storage/tabs/BackupUIHandler.java     |  2 +-
 .../ui/storage/tabs/ChooseDbModeUIHandler.java     |  2 +-
 .../swing/ui/storage/tabs/ConfigDataUIHandler.java |  2 +-
 .../storage/tabs/ConfigReferentielUIHandler.java   |  2 +-
 .../swing/ui/storage/tabs/ConfigUIHandler.java     |  2 +-
 .../swing/ui/storage/tabs/ConfirmUIHandler.java    |  2 +-
 .../swing/ui/storage/tabs/RolesUIHandler.java      |  4 +--
 .../swing/ui/storage/tabs/SelectDataUIHandler.java |  2 +-
 .../swing/ui/storage/tabs/StorageTabUI.jaxx        |  2 +-
 .../swing/ui/storage/tabs/StorageTabUIHandler.java |  2 +-
 .../tree/ObserveNavigationTreeShowPopupAction.java |  2 +-
 .../navigation/NavigationTreeHeaderHandler.java    |  2 +-
 .../nodes/NavigationTreeNodeSupport.java           |  2 +-
 .../tree/selection/SelectionTreeHeaderHandler.java |  2 +-
 .../ObserveSwingValidatorMessageTableModel.java    |  4 +--
 .../ObserveValidationMessageTableRenderer.java     |  2 +-
 .../util/ObserveValidatorMessageTableRenderer.java |  6 ++--
 .../ui/util/table/AbstractSelectTableAction.java   |  2 +-
 .../ui/util/table/EditableTableModelSupport.java   |  2 +-
 .../swing/ui/util/tree/BeanTreeHeaderHandler.java  |  2 +-
 .../swing/ui/util/tripMap/TripMapUIHandler.java    |  2 +-
 .../swing/validation/ObserveSwingValidator.java    |  2 +-
 ...glineDetailCompositionValidatorServiceTest.java |  4 +--
 pom.xml                                            |  4 +--
 258 files changed, 494 insertions(+), 490 deletions(-)

diff --git a/application-swing-configuration/src/main/resources/log4j.properties b/application-swing-configuration/src/main/resources/log4j.properties
index 3f70d9c..d7f6178 100644
--- a/application-swing-configuration/src/main/resources/log4j.properties
+++ b/application-swing-configuration/src/main/resources/log4j.properties
@@ -50,6 +50,6 @@ log4j.logger.org.nuiton.config=INFO
 log4j.logger.org.nuiton.topia.migration=INFO
 log4j.logger.org.nuiton.topia.service.sql=INFO
 
-log4j.logger.jaxx.runtime.validator.swing.SwingValidator=ERROR
+log4j.logger.org.nuiton.jaxx.validator.swing.SwingValidator=ERROR
 log4j.logger.org.hibernate.orm.deprecation=ERROR
 log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR
diff --git a/application-swing-configuration/src/main/resources/observe-log4j.properties b/application-swing-configuration/src/main/resources/observe-log4j.properties
index d5c68fb..1585cd8 100644
--- a/application-swing-configuration/src/main/resources/observe-log4j.properties
+++ b/application-swing-configuration/src/main/resources/observe-log4j.properties
@@ -50,6 +50,6 @@ log4j.logger.org.nuiton.topia.service.sql=INFO
 log4j.logger.org.nuiton.topia.migration=INFO
 log4j.logger.org.nuiton.config=INFO
 
-log4j.logger.jaxx.runtime.validator.swing.SwingValidator=ERROR
+log4j.logger.org.nuiton.jaxx.validator.swing.SwingValidator=ERROR
 log4j.logger.org.hibernate.orm.deprecation=ERROR
 log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR
diff --git a/application-swing/pom.xml b/application-swing/pom.xml
index 0d3720c..92d946f 100644
--- a/application-swing/pom.xml
+++ b/application-swing/pom.xml
@@ -40,7 +40,7 @@
     <jaxx.addProjectClassPath>true</jaxx.addProjectClassPath>
     <jaxx.addSourcesToClassPath>true</jaxx.addSourcesToClassPath>
     <jaxx.defaultErrorUIFQN>
-      jaxx.runtime.validator.swing.ui.ImageValidationUI
+      org.nuiton.jaxx.validator.swing.ui.ImageValidationUI
     </jaxx.defaultErrorUIFQN>
     <jaxx.useUIManagerForIcon>true</jaxx.useUIManagerForIcon>
     <jaxx.autoImportCss>true</jaxx.autoImportCss>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java
index b2e8cf1..8f490f0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveActionExecutor.java
@@ -24,9 +24,9 @@ package fr.ird.observe.application.swing;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.admin.AdminActionWorker;
 import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
-import jaxx.runtime.swing.application.ActionExecutor;
-import jaxx.runtime.swing.application.ActionWorker;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.application.ActionExecutor;
+import org.nuiton.jaxx.runtime.swing.application.ActionWorker;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 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/ObserveCLAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java
index 727dbce..30e6124 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveCLAction.java
@@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminUILauncher;
 import fr.ird.observe.application.swing.ui.storage.ObstunaAdminAction;
 import fr.ird.observe.application.swing.ui.storage.RemoteUILauncher;
-import jaxx.runtime.swing.application.ActionWorker;
+import org.nuiton.jaxx.runtime.swing.application.ActionWorker;
 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/ObserveRunner.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveRunner.java
index d224c36..f7d4b85 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
@@ -30,7 +30,7 @@ import fr.ird.observe.application.swing.ui.actions.menu.storage.StartServerModeA
 import fr.ird.observe.application.swing.ui.util.FloatConverter;
 import fr.ird.observe.application.swing.validation.ObserveSwingValidator;
 import fr.ird.observe.common.ObserveUtil;
-import jaxx.runtime.swing.application.ApplicationRunner;
+import org.nuiton.jaxx.runtime.swing.application.ApplicationRunner;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.commons.beanutils.Converter;
 import org.apache.commons.beanutils.converters.DateConverter;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java
index f542666..6427a70 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationContext.java
@@ -40,8 +40,8 @@ import fr.ird.observe.services.runner.ObserveDataSourceConfigurationMainFactory;
 import fr.ird.observe.services.runner.ObserveServiceMainFactory;
 import fr.ird.observe.services.service.actions.validate.ValidateServiceUtils;
 import fr.ird.observe.services.service.actions.validate.ValidatorDto;
-import jaxx.runtime.context.DefaultApplicationContext;
-import jaxx.runtime.context.JAXXContextEntryDef;
+import org.nuiton.jaxx.runtime.context.DefaultApplicationContext;
+import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.h2.tools.Server;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java
index fa0e8c6..f8e1c5e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java
@@ -57,7 +57,7 @@ import static fr.ird.observe.application.swing.configuration.ObserveSwingApplica
 import static fr.ird.observe.application.swing.ui.UIHelper.askUser;
 import static fr.ird.observe.application.swing.ui.UIHelper.displayInfo;
 import static fr.ird.observe.application.swing.ui.UIHelper.handlingError;
-import static jaxx.runtime.swing.editor.bean.BeanUIUtil.PopupHandler.log;
+import static org.nuiton.jaxx.runtime.swing.editor.bean.BeanUIUtil.PopupHandler.log;
 import static org.nuiton.i18n.I18n.n;
 import static org.nuiton.i18n.I18n.t;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingSessionHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingSessionHelper.java
index 077f1d4..7d684f9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingSessionHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingSessionHelper.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing;
  * #L%
  */
 
-import jaxx.runtime.swing.session.SwingSession;
+import org.nuiton.jaxx.runtime.swing.session.SwingSession;
 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/ObserveKeyStrokes.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java
index fc13bae..9e54c2b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveKeyStrokes.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ui.actions.AbstractUIAction;
-import jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.JAXXObject;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.swing.AbstractButton;
@@ -44,7 +44,7 @@ import static org.nuiton.i18n.I18n.t;
 /**
  * Created on 23/12/16.
  *
- * @author Tony Chemit - chemit@codelutin.com
+ * @author Tony Chemit - dev@tchemit.fr
  * @since 6.0
  */
 public abstract class ObserveKeyStrokes {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx
index a614d42..b8d557b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUI.jaxx
@@ -84,11 +84,11 @@
     fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree
     fr.ird.observe.application.swing.ui.tree.navigation.NavigationTreeHeader
 
-    jaxx.runtime.swing.CardLayout2
-    jaxx.runtime.swing.CardLayout2Ext
-    jaxx.runtime.swing.BlockingLayerUI
-    jaxx.runtime.swing.StatusMessagePanel
-    jaxx.runtime.validator.swing.SwingValidatorMessageTableModel
+    org.nuiton.jaxx.runtime.swing.CardLayout2
+    org.nuiton.jaxx.runtime.swing.CardLayout2Ext
+    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
+    org.nuiton.jaxx.runtime.swing.StatusMessagePanel
+    org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel
 
     org.jdesktop.swingx.JXTitledPanel
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
index 7a86ace..5ff3561 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java
@@ -22,7 +22,7 @@
 package fr.ird.observe.application.swing.ui;
 
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Le handler de l'ui principale.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
index 9d41ef0..c0a3163 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIInitializer.java
@@ -41,10 +41,10 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.StringNavigatio
 import fr.ird.observe.application.swing.ui.util.ObserveSwingValidatorMessageTableModel;
 import fr.ird.observe.application.swing.ui.util.ObserveValidatorMessageTableRenderer;
 import fr.ird.observe.services.dto.constants.ReferentialLocale;
-import jaxx.runtime.context.JAXXInitialContext;
-import jaxx.runtime.swing.ErrorDialogUI;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
-import jaxx.runtime.validator.swing.SwingValidatorUtil;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.swing.ErrorDialogUI;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.i18n.I18n;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java
index 72d4f3a..056bf16 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIModel.java
@@ -26,8 +26,8 @@ import fr.ird.observe.application.swing.ObserveRunner;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
-import jaxx.runtime.JAXXObject;
-import jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.SwingUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jdesktop.beans.AbstractBean;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
index 7197ac1..23e201a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/UIHelper.java
@@ -34,10 +34,10 @@ import fr.ird.observe.services.dto.DataFileDto;
 import fr.ird.observe.services.dto.IdDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.security.InvalidAuthenticationTokenException;
-import jaxx.runtime.JAXXObject;
-import jaxx.runtime.SwingUtil;
-import jaxx.runtime.swing.ErrorDialogUI;
-import jaxx.runtime.swing.renderer.DecoratorTableCellRenderer;
+import org.nuiton.jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.swing.ErrorDialogUI;
+import org.nuiton.jaxx.runtime.swing.renderer.DecoratorTableCellRenderer;
 import org.apache.commons.io.FileUtils;
 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/actions/AbstractUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java
index acbdbaa..39f39d1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/AbstractUIAction.java
@@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ui.ObserveKeyStrokes;
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
-import jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.JAXXObject;
 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/actions/content/GoDownUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java
index b1d8393..baabc8b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoDownUIAction.java
@@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree;
 import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
-import jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.JAXXObject;
 
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java
index c559767..681e9d7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/content/GoUpUIAction.java
@@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.tree.navigation.NavigationTree;
 import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
-import jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.JAXXObject;
 
 import javax.swing.AbstractButton;
 import javax.swing.JComponent;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java
index ca6c613..d4c1d27 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java
@@ -35,19 +35,17 @@ import fr.ird.observe.application.swing.ui.ObserveUIMode;
 import fr.ird.observe.application.swing.ui.actions.AbstractUIAction;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.SpeciesListDto;
-import jaxx.runtime.swing.config.ConfigCallBackUI;
-import jaxx.runtime.swing.config.ConfigCategoryUI;
-import jaxx.runtime.swing.config.ConfigUI;
-import jaxx.runtime.swing.config.ConfigUIHandler;
-import jaxx.runtime.swing.config.ConfigUIHelper;
-import jaxx.runtime.swing.config.model.ConfigUIModelBuilder;
-import jaxx.runtime.swing.config.model.MainCallBackFinalizer;
-import jaxx.runtime.swing.editor.bean.BeanFilterableComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanFilterableComboBox;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jdesktop.swingx.renderer.DefaultTableRenderer;
 import org.nuiton.config.ConfigOptionDef;
 import org.nuiton.decorator.Decorator;
+import org.nuiton.jaxx.config.ConfigCategoryUI;
+import org.nuiton.jaxx.config.ConfigUI;
+import org.nuiton.jaxx.config.ConfigUIHelper;
+import org.nuiton.jaxx.config.model.ConfigUIModelBuilder;
+import org.nuiton.jaxx.config.model.MainCallBackFinalizer;
 
 import javax.swing.DefaultCellEditor;
 import javax.swing.Icon;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java
index 4127577..2922894 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/storage/StartServerModeAction.java
@@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon
 import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.ObserveUIMode;
 import fr.ird.observe.application.swing.ui.actions.AbstractUIAction;
-import jaxx.runtime.swing.ErrorDialogUI;
+import org.nuiton.jaxx.runtime.swing.ErrorDialogUI;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.h2.tools.Server;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java
index 91a7016..15ea633 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionModel.java
@@ -21,7 +21,7 @@
  */
 package fr.ird.observe.application.swing.ui.admin;
 
-import jaxx.runtime.swing.wizard.ext.WizardExtStepModel;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtStepModel;
 
 /**
  * Le modèle de base pour les actions.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java
index fff055a..e5369b0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminActionWorker.java
@@ -21,8 +21,8 @@
  */
 package fr.ird.observe.application.swing.ui.admin;
 
-import jaxx.runtime.swing.application.ActionWorker;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.application.ActionWorker;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
 import java.util.concurrent.Callable;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java
index 98f8f38..c77ef8c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminStep.java
@@ -43,8 +43,8 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.Refe
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroUI;
 import fr.ird.observe.application.swing.ui.admin.validate.ValidateModel;
 import fr.ird.observe.application.swing.ui.admin.validate.ValidateUI;
-import jaxx.runtime.swing.wizard.ext.WizardExtStep;
-import jaxx.runtime.swing.wizard.ext.WizardExtUI;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtStep;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUI;
 
 import javax.swing.ImageIcon;
 import java.lang.reflect.Constructor;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx
index 495df20..5321e41 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUI.jaxx
@@ -25,7 +25,7 @@
 <!-- **************************** -->
 
 <JPanel id="mainPanel" abstract='true'
-        implements='jaxx.runtime.swing.wizard.WizardStepUI<AdminStep, AdminUIModel>, java.beans.PropertyChangeListener'>
+        implements='org.nuiton.jaxx.runtime.swing.wizard.WizardStepUI<AdminStep, AdminUIModel>, java.beans.PropertyChangeListener'>
 
   <import>
     fr.ird.observe.application.swing.ObserveSwingApplicationContext
@@ -33,8 +33,8 @@
     fr.ird.observe.application.swing.ui.admin.*
     fr.ird.observe.application.swing.ui.storage.StorageUIModel
 
-    jaxx.runtime.swing.wizard.ext.WizardState
-    jaxx.runtime.swing.CardLayout2
+    org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState
+    org.nuiton.jaxx.runtime.swing.CardLayout2
 
     java.awt.Color
     java.awt.Dimension
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java
index 0065c62..aac5a43 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminTabUIHandler.java
@@ -37,7 +37,7 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
 import fr.ird.observe.services.service.data.DeleteTripResult;
 import fr.ird.observe.services.service.data.ExportTripResult;
 import fr.ird.observe.services.service.data.ImportTripResult;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -63,8 +63,6 @@ public class AdminTabUIHandler<U extends AdminTabUI> {
 
     protected U ui;
 
-    protected AdminUIModel model;
-
     protected AdminUI parentUI;
 
     /** Service de decoration. */
@@ -72,13 +70,12 @@ public class AdminTabUIHandler<U extends AdminTabUI> {
 
     public void beforeInit(U ui) {
         this.ui = ui;
-        this.model = ui.getModel();
         this.parentUI = ui.getContextValue(AdminUI.class, "parent");
     }
 
     public void afterInit(U ui) {
-
-        model.addPropertyChangeListener(AdminUIModel.STEP_PROPERTY_NAME, e -> ui.getProgress().setString(getProgressString(model.getStepIndex(model.getStep()), model.getSteps().size())));
+        AdminUIModel model = ui.getModel();
+        ui.getModel().addPropertyChangeListener(AdminUIModel.STEP_PROPERTY_NAME, e -> ui.getProgress().setString(getProgressString(model.getStepIndex(model.getStep()), model.getSteps().size())));
         model.addPropertyChangeListener(AdminUIModel.STEPS_PROPERTY_NAME, e -> ui.getProgress().setString(getProgressString(model.getStepIndex(model.getStep()), model.getSteps().size())));
 
         AdminStep step = ui.getStep();
@@ -104,7 +101,7 @@ public class AdminTabUIHandler<U extends AdminTabUI> {
     }
 
     public AdminUIModel getModel() {
-        return model;
+        return ui.getModel();
     }
 
     public final DecoratorService getDecoratorService() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx
index b19bef6..bb212c6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUI.jaxx
@@ -20,16 +20,16 @@
   #L%
   -->
 
-<JPanel id='synchroPanel' implements='jaxx.runtime.swing.wizard.ext.WizardExtUI<AdminStep, AdminUIModel>'>
+<JPanel id='synchroPanel' implements='org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUI<AdminStep, AdminUIModel>'>
 
   <import>
     fr.ird.observe.application.swing.ui.UIHelper
 
-    jaxx.runtime.JAXXContext
-    jaxx.runtime.swing.BlockingLayerUI
-    jaxx.runtime.swing.wizard.ext.WizardExtUI
-    jaxx.runtime.swing.wizard.ext.WizardExtUtil
-    jaxx.runtime.swing.wizard.ext.WizardState
+    org.nuiton.jaxx.runtime.JAXXContext
+    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
+    org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUI
+    org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUtil
+    org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState
 
     javax.swing.ImageIcon
     javax.swing.UIManager
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java
index f09ea52..828ccd2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIHandler.java
@@ -30,10 +30,10 @@ import fr.ird.observe.application.swing.ui.admin.config.ConfigUI;
 import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI;
 import fr.ird.observe.application.swing.ui.admin.resume.ShowResumeUI;
 import fr.ird.observe.application.swing.ui.admin.save.SaveLocalUI;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.WizardUILancher;
-import jaxx.runtime.swing.wizard.ext.WizardExtUtil;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtUtil;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 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/admin/AdminUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java
index e255be9..5810d81 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUILauncher.java
@@ -28,10 +28,10 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.ObserveUIMode;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.admin.config.ConfigModel;
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.swing.wizard.BusyChangeListener;
-import jaxx.runtime.swing.wizard.WizardUILancher;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.swing.wizard.BusyChangeListener;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jdesktop.swingx.JXTitledPanel;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java
index d63efd3..108c545 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/AdminUIModel.java
@@ -33,8 +33,8 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.data.DataSynchroMod
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.SynchronizeModel;
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.ReferentialSynchroModel;
 import fr.ird.observe.application.swing.ui.admin.validate.ValidateModel;
-import jaxx.runtime.swing.wizard.ext.WizardExtModel;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardExtModel;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 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/admin/config/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx
index 15efd26..cf1c5dd 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUI.jaxx
@@ -34,7 +34,7 @@
     fr.ird.observe.application.swing.ui.admin.AdminTabUI
     fr.ird.observe.application.swing.ui.storage.StorageUIModel
 
-    jaxx.runtime.SwingUtil
+    org.nuiton.jaxx.runtime.SwingUtil
     java.awt.Color
 
     javax.swing.Icon
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java
index 1f0729c..f842472 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/ConfigUIHandler.java
@@ -27,11 +27,12 @@ import fr.ird.observe.application.swing.ui.ObserveKeyStrokes;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
+import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
 import fr.ird.observe.application.swing.ui.storage.StorageStep;
 import fr.ird.observe.application.swing.ui.storage.StorageUILauncher;
 import fr.ird.observe.application.swing.ui.storage.StorageUIModel;
 import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -90,10 +91,10 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa
         }
         if (checkBox.isSelected()) {
             // ajout de l'operation
-            getModel().addOperation(op);
+            ui.getModel().addOperation(op);
         } else {
             // supprime cette opération
-            getModel().removeOperation(op);
+            ui.getModel().removeOperation(op);
         }
     }
 
@@ -126,6 +127,7 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa
         if (log.isDebugEnabled()) {
             log.debug("After modifiy source model isValid : " + sourceModel.isValid() + " / " + sourceModel.isValidStep());
         }
+        AdminUIModel model = ui.getModel();
         model.getConfigModel().removeLocalSource();
         model.getConfigModel().getLocalSourceModel().validate();
         model.validate();
@@ -137,6 +139,7 @@ public class ConfigUIHandler extends AdminTabUIHandler<ConfigUI> implements UIHa
         }
         StorageUIModel sourceModel = ui.getCentralSourceModel();
         StorageUILauncher.obtainConnexion(ui, ui.getParentContainer(Window.class), sourceModel);
+        AdminUIModel model = ui.getModel();
         model.getConfigModel().removeCentralSource();
         model.getConfigModel().getCentralSourceModel().validate(StorageStep.CONFIG);
         model.validate();
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx
index b7a720e..360b0ce 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUI.jaxx
@@ -31,7 +31,7 @@
     fr.ird.observe.application.swing.ui.tree.selection.SelectionTree
     fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeHeader
 
-    jaxx.runtime.SwingUtil
+    org.nuiton.jaxx.runtime.SwingUtil
 
   </import>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUIHandler.java
index 29b93e3..83581f3 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/config/SelectDataUIHandler.java
@@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.admin.config;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
 import fr.ird.observe.application.swing.ui.tree.selection.SelectionTree;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import javax.swing.SwingUtilities;
 
@@ -45,7 +45,7 @@ public class SelectDataUIHandler extends AdminTabUIHandler<SelectDataUI> impleme
         UIHelper.setLayerUI(ui.getSelectTreePane(), parentUI.getConfigBlockLayerUI());
 
         SelectionTree tree = ui.getSelectTree();
-        model.getSelectDataModel().setSelectionDataModel(tree.getTreeModel());
+        getModel().getSelectDataModel().setSelectionDataModel(tree.getTreeModel());
 
         tree.installUI();
         //FIXME Init tree ?
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java
index bf978ef..260f98a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateModel.java
@@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.ui.admin.AdminActionModel;
 import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
 import fr.ird.observe.application.swing.ui.util.ProgressModel;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 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/admin/consolidate/ConsolidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java
index 4bdd1a5..738fb09 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java
@@ -31,8 +31,8 @@ import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySe
 import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService;
 import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest;
 import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -63,7 +63,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple
     }
 
     public ConsolidateModel getStepModel() {
-        return model.getConsolidateModel();
+        return getModel().getConsolidateModel();
     }
 
     public void startAction() {
@@ -75,9 +75,9 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple
             log.debug(this);
         }
 
-        getStepModel().setSource(model.getConfigModel().getSafeLocalSource(false));
+        getStepModel().setSource(getModel().getConfigModel().getSafeLocalSource(false));
 
-        Set<DataReference<?>> trips = model.getSelectDataModel().getSelectionDataModel().getSelectedData();
+        Set<DataReference<?>> trips = getModel().getSelectDataModel().getSelectionDataModel().getSelectedData();
         ImmutableSet<String> tripIds = ImmutableSet.copyOf(trips.stream()
                                                                 .filter(DataReference.newTripSeinePredicate())
                                                                 .map(DataReference.ID_FUNCTION)
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java
index 3ccb28f..02229d6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportModel.java
@@ -32,7 +32,7 @@ import fr.ird.observe.application.swing.ui.util.ProgressModel;
 import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx
index 97dd25a..7e4017d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jaxx
@@ -29,7 +29,7 @@
     fr.ird.observe.application.swing.ui.admin.AdminUI
     fr.ird.observe.application.swing.ui.admin.AdminStep
 
-    jaxx.runtime.swing.wizard.ext.WizardState
+    org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState
   </import>
 
   <ExportModel id='stepModel' initializer='getModel().getExportModel()'/>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java
index e24e5b3..5eeb27b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java
@@ -32,6 +32,7 @@ import fr.ird.observe.application.swing.ui.ObserveKeyStrokes;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
+import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
 import fr.ird.observe.application.swing.ui.admin.config.ConfigUI;
 import fr.ird.observe.application.swing.ui.content.ref.usage.UsageForDisplayUI;
 import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel;
@@ -51,9 +52,9 @@ import fr.ird.observe.services.service.data.ImportTripResult;
 import fr.ird.observe.services.service.data.TripManagementService;
 import fr.ird.observe.services.service.referential.MissingReferentialResult;
 import fr.ird.observe.services.service.referential.ReferentialService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.MyDefaultCellEditor;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.MyDefaultCellEditor;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -146,7 +147,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa
                 }
             }
         });
-
+        AdminUIModel model = ui.getModel();
         model.getExportModel().getProgressModel().installUI(ui.getProgressBar());
     }
 
@@ -175,6 +176,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa
     private WizardState doPrepareAction0() throws Exception {
 
         DecoratorService decoratorProvider = getDecoratorService();
+        AdminUIModel model = ui.getModel();
         ExportModel stepModel = model.getExportModel();
 
         ReferentialReferenceDecorator<ProgramDto> pDecorator = decoratorProvider.getReferentialReferenceDecorator(ProgramDto.class);
@@ -230,6 +232,7 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa
 
     private WizardState doStartAction0() throws Exception {
 
+        AdminUIModel model = ui.getModel();
         ExportModel stepModel = model.getExportModel();
 
         boolean insertMissingReferentials = stepModel.isInsertMissingReferentials();
@@ -289,7 +292,6 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa
                 if (insertMissingReferentials && result != null) {
 
                     String message = t("observe.message.show.usage.for.missingReferentials");
-                    String message2 = t("observe.message.show.usage.for.missingReferentials2");
 
                     ReferenceMap usages = localDataSource.getReferentialMap(result.getMissingIds());
                     UsageForDisplayUI usagesUI = UsageForDisplayUI.build(message, usages);
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java
index a7f6b8f..2e78f54 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/report/ReportUIHandler.java
@@ -36,10 +36,10 @@ import fr.ird.observe.services.service.actions.report.DataMatrix;
 import fr.ird.observe.services.service.actions.report.Report;
 import fr.ird.observe.services.service.actions.report.ReportService;
 import fr.ird.observe.services.service.actions.report.ReportVariable;
-import jaxx.runtime.context.JAXXInitialContext;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.decorator.Decorator;
@@ -92,7 +92,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
         ReportModel stepModel = getStepModel();
         stepModel.addPropertyChangeListener(evt -> {
 
-            if (getModel().getModelState() == WizardState.CANCELED) {
+            if (ui.getModel().getModelState() == WizardState.CANCELED) {
 
                 // action annulée, on ne declanche plus rien
                 return;
@@ -205,7 +205,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
     }
 
     public void updateSelectedReport(Report report) {
-        getModel().setBusy(true);
+        ui.getModel().setBusy(true);
         try {
             if (log.isInfoEnabled()) {
                 log.info("New selected report : " + report);
@@ -213,7 +213,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
             getStepModel().setSelectedReport(report);
 
         } finally {
-            getModel().setBusy(false);
+            ui.getModel().setBusy(false);
         }
     }
 
@@ -237,7 +237,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
     }
 
     public void chooseReportFile() {
-        ReportModel model = getModel().getReportModel();
+        ReportModel model = ui.getModel().getReportModel();
         File f = UIHelper.chooseFile(
                 ui,
                 t("observe.title.choose.reportFile"),
@@ -287,7 +287,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
             log.info("New selected report [" + report + "]");
         }
 
-        getModel().setBusy(true);
+        ui.getModel().setBusy(true);
 
         try {
             // on regénère l'ui de configuration des variables
@@ -305,11 +305,11 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
 
                 try {
 
-                    ObserveSwingDataSource dataSource = getModel().getConfigModel().getSafeLocalSource(true);
+                    ObserveSwingDataSource dataSource = ui.getModel().getConfigModel().getSafeLocalSource(true);
 
                     ReportService reportService = dataSource.newReportService();
 
-                    report = reportService.populateVariables(report, getModel().getSelectDataModel().getSelectedTrip().getId());
+                    report = reportService.populateVariables(report, ui.getModel().getSelectDataModel().getSelectedTrip().getId());
 
                 } catch (Exception e) {
                     throw new ObserveSwingTechnicalException("unable to populate report : " + report.getName(), e);
@@ -367,7 +367,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
             }
         } finally {
 
-            getModel().setBusy(false);
+            ui.getModel().setBusy(false);
 
         }
     }
@@ -393,13 +393,13 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
             return;
         }
 
-        getModel().setBusy(true);
+        ui.getModel().setBusy(true);
 
         try {
 
             Report report = model.getSelectedReport();
 
-            DataReference trip = getModel().getSelectDataModel().getSelectedTrip();
+            DataReference trip = ui.getModel().getSelectDataModel().getSelectedTrip();
 
             if (log.isDebugEnabled()) {
                 log.debug("Build result for report [" + report.getName() + "] on " + trip);
@@ -414,7 +414,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
 
             long startTime = TimeLog.getTime();
 
-            ObserveSwingDataSource dataSource = getModel().getConfigModel().getSafeLocalSource(true);
+            ObserveSwingDataSource dataSource = ui.getModel().getConfigModel().getSafeLocalSource(true);
             if (!dataSource.isOpen()) {
                 dataSource.open();
             }
@@ -448,13 +448,13 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
 
         } finally {
 
-            getModel().setBusy(false);
+            ui.getModel().setBusy(false);
 
         }
     }
 
     protected ReportModel getStepModel() {
-        return model.getReportModel();
+        return ui.getModel().getReportModel();
     }
 
     protected void updateValidState(Report report, Map<String, Object> variables) {
@@ -464,7 +464,7 @@ public class ReportUIHandler extends AdminTabUIHandler<ReportUI> implements UIHa
     }
 
     public void destroy() {
-        ObserveSwingDataSource dataSource = model.getConfigModel().getSafeLocalSource(false);
+        ObserveSwingDataSource dataSource = ui.getModel().getConfigModel().getSafeLocalSource(false);
 
         if (dataSource.isOpen()) {
             dataSource.close();
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java
index 018ba28..0f82c63 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/resume/ShowResumeUIHandler.java
@@ -25,8 +25,9 @@ import fr.ird.observe.application.swing.I18nEnumHelper;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
 import static org.nuiton.i18n.I18n.t;
 
@@ -45,6 +46,7 @@ public class ShowResumeUIHandler extends AdminTabUIHandler<ShowResumeUI> impleme
     }
 
     public void updateText() {
+        AdminUIModel model = ui.getModel();
         StringBuilder buffer = new StringBuilder();
         if (!model.isWasStarted()) {
             buffer.append(t("observe.admin.resume.no.operation.done"));
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java
index edfc6fb..94c1b0c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalModel.java
@@ -26,7 +26,7 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon
 import fr.ird.observe.application.swing.ui.admin.AdminActionModel;
 import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 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/admin/save/SaveLocalUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jaxx
index 1c59b97..fb40989 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jaxx
@@ -30,7 +30,7 @@
     fr.ird.observe.application.swing.ui.admin.AdminStep
     fr.ird.observe.application.swing.ui.admin.AdminUI
 
-    jaxx.runtime.swing.CardLayout2Ext
+    org.nuiton.jaxx.runtime.swing.CardLayout2Ext
 
     java.awt.Color
     java.io.File
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java
index cbe5193..793328f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java
@@ -30,8 +30,8 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.legacy.
 import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext;
 import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
 import fr.ird.observe.services.service.sql.SqlScriptProducerService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -87,8 +87,8 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement
         getModel().setStepState(AdminStep.SAVE_LOCAL, WizardState.SUCCESSED);
 //        getUi().getProgression().setText(t("observe.synchro.message.saveLocal.skip"));
         // on passe directement à l'opération suivante
-        if (model.getNextStep() != null) {
-            model.gotoNextStep();
+        if (getModel().getNextStep() != null) {
+            getModel().gotoNextStep();
         }
     }
 
@@ -121,9 +121,9 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement
             log.debug(this);
         }
 
-        source = model.getConfigModel().getSafeLocalSource(false);
+        source = getModel().getConfigModel().getSafeLocalSource(false);
 
-        SaveLocalModel stepModel = model.getSaveLocalModel();
+        SaveLocalModel stepModel = getModel().getSaveLocalModel();
         if (!stepModel.isLocalSourceNeedSave()) {
             sendMessage("Aucune modification sur la base locale, opération non requise.");
             // pas de modification sur la base locale
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx
index 2c01b63..2671ffd 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jaxx
@@ -30,7 +30,7 @@
     fr.ird.observe.application.swing.ui.admin.AdminStep
     fr.ird.observe.application.swing.ui.tree.selection.SelectionTree
     fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeHeader
-    jaxx.runtime.SwingUtil
+    org.nuiton.jaxx.runtime.SwingUtil
 
     javax.swing.ListSelectionModel
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
index 122660a..fe92c8b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java
@@ -49,8 +49,8 @@ import fr.ird.observe.services.service.data.ExportTripResult;
 import fr.ird.observe.services.service.data.ImportTripRequest;
 import fr.ird.observe.services.service.data.ImportTripResult;
 import fr.ird.observe.services.service.data.TripManagementService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
 import javax.swing.DefaultListModel;
 import javax.swing.border.TitledBorder;
@@ -120,7 +120,7 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple
     }
 
     public DataSynchroModel getStepModel() {
-        return model.getDataSynchroModel();
+        return getModel().getDataSynchroModel();
     }
 
     public void doStartAction() {
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java
index 62c8260..aa1993c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeModel.java
@@ -29,8 +29,8 @@ import fr.ird.observe.services.service.actions.synchro.referential.legacy.Unidir
 import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeContext;
 import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeEngine;
 import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeResult;
-import jaxx.runtime.swing.model.JaxxDefaultListModel;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultListModel;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
 import javax.swing.DefaultListSelectionModel;
 import java.util.List;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx
index 2bd538e..3aae649 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jaxx
@@ -30,8 +30,8 @@
     fr.ird.observe.application.swing.ui.admin.AdminUI
     fr.ird.observe.application.swing.ui.admin.AdminStep
 
-    jaxx.runtime.swing.CardLayout2
-    jaxx.runtime.swing.wizard.ext.WizardState
+    org.nuiton.jaxx.runtime.swing.CardLayout2
+    org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState
 
   </import>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
index cc80083..3b9a254 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java
@@ -38,11 +38,11 @@ import fr.ird.observe.services.service.actions.synchro.referential.legacy.Unidir
 import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeEngine;
 import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeLocalService;
 import fr.ird.observe.services.service.actions.synchro.referential.legacy.UnidirectionalReferentialSynchronizeResult;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.CardLayout2;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
-import jaxx.runtime.swing.model.JaxxDefaultListModel;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.CardLayout2;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.model.JaxxDefaultListModel;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
@@ -73,7 +73,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple
     private static final Log log = LogFactory.getLog(SynchronizeUIHandler.class);
 
     public SynchronizeModel getStepModel() {
-        return model.getSynchronizeReferentielModel();
+        return ui.getModel().getSynchronizeReferentielModel();
     }
 
     @Override
@@ -106,10 +106,10 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple
 
         // on cree les sources de données
 
-        ObserveSwingDataSource source = model.getConfigModel().getSafeLocalSource(false);
+        ObserveSwingDataSource source = ui.getModel().getConfigModel().getSafeLocalSource(false);
         stepModel.setSource(source);
 
-        ObserveSwingDataSource centralSource = model.getConfigModel().getSafeCentralSource(false);
+        ObserveSwingDataSource centralSource = ui.getModel().getConfigModel().getSafeCentralSource(false);
         stepModel.setCentralSource(centralSource);
 
         openSource(source);
@@ -200,8 +200,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple
 
             beforeSuccess();
 
-            getModel().setStepState(WizardState.SUCCESSED);
-//            updateState(getUi(), WizardState.SUCCESSED);
+            ui.getModel().setStepState(WizardState.SUCCESSED);
 
         }
 
@@ -339,7 +338,7 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple
 
             }
 
-            getModel().getSaveLocalModel().addStepForSave(AdminStep.SYNCHRONIZE);
+            ui.getModel().getSaveLocalModel().addStepForSave(AdminStep.SYNCHRONIZE);
 
         }
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx
index 54cf56b..478f4f6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUI.jaxx
@@ -25,7 +25,7 @@
     fr.ird.observe.services.dto.referential.ReferentialDto
     fr.ird.observe.services.dto.reference.ReferentialReference
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
   </import>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java
index 987af24..e7dc99c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialReplaceUIHandler.java
@@ -25,8 +25,8 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng;
 import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 
 import java.awt.Dimension;
 import java.beans.PropertyChangeListener;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
index 223786c..5d42c6e5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java
@@ -35,9 +35,9 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree
 import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
 import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffService;
 import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine;
-import jaxx.runtime.context.JAXXInitialContext;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -70,7 +70,7 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy
     }
 
     public ReferentialSynchroModel getStepModel() {
-        return model.getReferentialSynchroModel();
+        return getModel().getReferentialSynchroModel();
     }
 
     @Override
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java
index fa67d9e..210726b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java
@@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceEngine;
 import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsRequest;
 import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeServiceProduceSqlsResult;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 
 import java.awt.event.ActionEvent;
 import java.util.Set;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java
index b9cf5ec..b1e7089 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/RegisterTasksActionSupport.java
@@ -36,7 +36,7 @@ import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree
 import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
-import jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
 import org.apache.commons.lang3.NotImplementedException;
 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/admin/validate/ValidateModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java
index b0ae56b..7f62f88 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateModel.java
@@ -37,7 +37,7 @@ import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType
 import fr.ird.observe.services.service.actions.validate.ValidateService;
 import fr.ird.observe.services.service.actions.validate.ValidatorDto;
 import fr.ird.observe.services.service.actions.validate.ValidatorHelper;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx
index c36b7dd..c90e261 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jaxx
@@ -36,8 +36,8 @@
     fr.ird.observe.application.swing.ui.admin.validate.ValidationMessageTableModel
 
 
-    jaxx.runtime.swing.wizard.ext.WizardState
-    jaxx.runtime.validator.swing.SimpleBeanValidatorMessageTableModel
+    org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState
+    org.nuiton.jaxx.validator.swing.SimpleBeanValidatorMessageTableModel
 
     org.jdesktop.swingx.JXTitledPanel
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java
index 5b943b9..724e208 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java
@@ -32,6 +32,7 @@ import fr.ird.observe.application.swing.ui.ObserveKeyStrokes;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.admin.AdminStep;
 import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler;
+import fr.ird.observe.application.swing.ui.admin.AdminUIModel;
 import fr.ird.observe.application.swing.ui.admin.config.ConfigUI;
 import fr.ird.observe.application.swing.ui.admin.config.SelectDataUI;
 import fr.ird.observe.application.swing.ui.tree.selection.SelectionTreeModel;
@@ -53,10 +54,10 @@ import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType
 import fr.ird.observe.services.service.actions.validate.ValidateService;
 import fr.ird.observe.services.service.actions.validate.ValidationMessage;
 import fr.ird.observe.services.service.actions.validate.ValidatorDto;
-import jaxx.runtime.SwingUtil;
-import jaxx.runtime.context.JAXXInitialContext;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.ext.WizardState;
+import org.nuiton.jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.ext.WizardState;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -140,7 +141,8 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
         final SelectDataUI selectTabUI = (SelectDataUI) parentUI.getStepUI(AdminStep.SELECT_DATA);
 
-        getModel().getValidateModel().addPropertyChangeListener(ValidateModel.PROPERTY_MODEL_MODE, evt -> {
+        AdminUIModel model = ui.getModel();
+        model.getValidateModel().addPropertyChangeListener(ValidateModel.PROPERTY_MODEL_MODE, evt -> {
             ValidationModelMode value = (ValidationModelMode) evt.getNewValue();
             if (value == null) {
                 // rien a faire pour le moment...
@@ -231,7 +233,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
         ValidateUI tabUI = ui;
 
-        getModel().setBusy(true);
+        ui.getModel().setBusy(true);
         // on nettoye le modele des refs
         try {
             tabUI.refSelectionModel.clearSelection();
@@ -256,7 +258,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
             }
             tabUI.refList.setSelectedIndex(0);
         } finally {
-            getModel().setBusy(false);
+            ui.getModel().setBusy(false);
         }
 
     }
@@ -314,7 +316,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
         launchValidation();
 
-        Map<Class<? extends IdDto>, ValidateResultForDtoType<? extends IdDto>> messages = model.getValidateModel().getMessages();
+        Map<Class<? extends IdDto>, ValidateResultForDtoType<? extends IdDto>> messages = ui.getModel().getValidateModel().getMessages();
         if (messages == null || messages.isEmpty()) {
 
             // pas de validation ou bien pas d'erreurs rencontrées
@@ -335,6 +337,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
 
         // on recupere la source de données
+        AdminUIModel model = ui.getModel();
         source = model.getConfigModel().getSafeLocalSource(false);
 
         DecoratorService decoratorService = getDecoratorService();
@@ -372,6 +375,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
     public void launchValidation() throws Exception {
 
+        AdminUIModel model = ui.getModel();
         // on vide les anciens messages
         ValidateModel stepModel = model.getValidateModel();
         stepModel.setMessages(null);
@@ -451,6 +455,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
     public void saveReport() {
         WizardState finalState = null;
+        AdminUIModel model = ui.getModel();
         ValidateModel validationModel = model.getValidateModel();
         try {
             if (validationModel.isGenerateReport()) {
@@ -536,7 +541,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
     public void updateValidationScopes(JCheckBox checkBox) {
         NuitonValidatorScope scope = getValidatorScope(checkBox);
-        ValidateModel validateModel = getModel().getValidateModel();
+        ValidateModel validateModel = ui.getModel().getValidateModel();
         if (checkBox.isSelected()) {
             // ajout du scope
             validateModel.addScope(scope);
@@ -548,7 +553,7 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
 
     public String updateValidatorResumeLabel(@SuppressWarnings("unused") boolean valid) {
 
-        ValidateModel validateModel = getModel().getValidateModel();
+        ValidateModel validateModel = ui.getModel().getValidateModel();
 
         if (validateModel == null) {
             return null;
@@ -576,11 +581,11 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements
     }
 
     public void changeValidationReportDirectory(ValidateConfigUI configUI, File f) {
-        getModel().getValidateModel().setReportFile(new File(f, configUI.validationReportFilenameText.getText()));
+        ui.getModel().getValidateModel().setReportFile(new File(f, configUI.validationReportFilenameText.getText()));
     }
 
     public void changeValidationReportFilename(ValidateConfigUI configUI, String filename) {
-        getModel().getValidateModel().setReportFile(new File(configUI.validationReportDirectoryText.getText(), filename));
+        ui.getModel().getValidateModel().setReportFile(new File(configUI.validationReportDirectoryText.getText(), filename));
     }
 
 }
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java
index 433a55a..e0d832c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidationMessageTableModel.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.admin.validate;
 
 import com.google.common.collect.Lists;
 import fr.ird.observe.services.service.actions.validate.ValidationMessage;
-import jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.SwingUtil;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.table.AbstractTableModel;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx
index 07f70cf..ab15237 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUI.jaxx
@@ -46,8 +46,8 @@
 
     org.jdesktop.jxlayer.JXLayer
 
-    jaxx.runtime.swing.BlockingLayerUI
-    jaxx.runtime.validator.swing.SwingValidatorMessageTableModel
+    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
+    org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel
 
     javax.swing.JComboBox
     javax.swing.JList
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java
index d8088ec..088f720 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIBlockingLayerUI.java
@@ -25,10 +25,10 @@ package fr.ird.observe.application.swing.ui.content;
 import com.google.common.collect.ImmutableSet;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ui.actions.AbstractUIAction;
-import jaxx.runtime.swing.BlockingLayerUI;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jdesktop.jxlayer.JXLayer;
+import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
 
 import javax.swing.Action;
 import javax.swing.ActionMap;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
index a110078..7482f6e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIHandler.java
@@ -53,12 +53,12 @@ import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.reference.ReferentialReferenceSet;
 import fr.ird.observe.services.dto.reference.ReferentialReferences;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.context.DefaultJAXXContext;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
-import jaxx.runtime.swing.editor.bean.BeanListHeader;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
-import jaxx.runtime.validator.swing.SwingValidatorUtil;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.context.DefaultJAXXContext;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.apache.commons.logging.Log;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
index ef555ba..9492876 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIInitializer.java
@@ -41,18 +41,18 @@ import fr.ird.observe.services.dto.reference.AbstractReference;
 import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
-import jaxx.runtime.JAXXValidator;
-import jaxx.runtime.SwingUtil;
-import jaxx.runtime.swing.JAXXWidgetUtil;
-import jaxx.runtime.swing.editor.EnumEditor;
-import jaxx.runtime.swing.editor.NumberEditor;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
-import jaxx.runtime.swing.editor.bean.BeanListHeader;
-import jaxx.runtime.swing.editor.bean.BeanUIUtil;
-import jaxx.runtime.swing.editor.cell.NumberCellEditor;
-import jaxx.runtime.swing.renderer.DecoratorListCellRenderer;
-import jaxx.runtime.swing.renderer.EnumEditorRenderer;
-import jaxx.runtime.validator.swing.SwingValidatorUtil;
+import org.nuiton.jaxx.validator.JAXXValidator;
+import org.nuiton.jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.swing.JAXXWidgetUtil;
+import org.nuiton.jaxx.runtime.swing.editor.EnumEditor;
+import org.nuiton.jaxx.runtime.swing.editor.NumberEditor;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanUIUtil;
+import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor;
+import org.nuiton.jaxx.runtime.swing.renderer.DecoratorListCellRenderer;
+import org.nuiton.jaxx.runtime.swing.renderer.EnumEditorRenderer;
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.apache.commons.lang3.BooleanUtils;
 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/ContentUIManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
index c1fbc4f..d462691 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ContentUIManager.java
@@ -27,9 +27,9 @@ import fr.ird.observe.application.swing.ui.ObserveMainUI;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeNodeSupport;
 import fr.ird.observe.services.dto.AbstractObserveDto;
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.context.JAXXInitialContext;
-import jaxx.runtime.swing.CardLayout2;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.swing.CardLayout2;
 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/ObserveContentUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveContentUI.java
index 3181e8a..33259c8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveContentUI.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveContentUI.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content;
 import fr.ird.observe.application.swing.db.DataContext;
 import fr.ird.observe.application.swing.db.ObserveSwingDataSource;
 import fr.ird.observe.services.dto.IdDto;
-import jaxx.runtime.JAXXObject;
-import jaxx.runtime.swing.BlockingLayerUI;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 
 import javax.swing.Icon;
 import javax.swing.JToolBar;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java
index aac2b15..5ca9995 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ObserveFocusManager.java
@@ -69,8 +69,8 @@ import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetDiscar
 import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleCaptureUI;
 import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleRejeteUI;
 import fr.ird.observe.application.swing.ui.content.table.impl.seine.TargetSampleUI;
-import jaxx.runtime.swing.editor.NumberEditor;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.NumberEditor;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 import org.jdesktop.swingx.JXDatePicker;
 import org.nuiton.jaxx.widgets.select.FilterableDoubleList;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx
index 7192af4..e89a343 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUI.jaxx
@@ -33,8 +33,8 @@
 
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
     org.nuiton.jaxx.widgets.datetime.DateTimeEditor
     org.nuiton.jaxx.widgets.datetime.TimeEditor
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java
index 90a8430..b20a213 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/BranchlineUIHandler.java
@@ -31,9 +31,9 @@ import fr.ird.observe.application.swing.ui.content.ContentUIHandler;
 import fr.ird.observe.application.swing.ui.content.ContentUIModel;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.BranchlineHelper;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.apache.commons.lang3.BooleanUtils;
 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/longline/LonglineDetailCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
index 2a2b494..0f580ea 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIHandler.java
@@ -45,7 +45,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionDto;
 import fr.ird.observe.services.dto.longline.SetLonglineDetailCompositionHelper;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.SetLonglineDetailCompositionService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.lang3.BooleanUtils;
 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/longline/LonglineDetailCompositionUIValidationHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
index 7b4ef6e..bd140d7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java
@@ -30,8 +30,8 @@ import fr.ird.observe.services.dto.longline.BasketDto;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
 import fr.ird.observe.services.dto.longline.SectionWithTemplate;
-import jaxx.runtime.validator.swing.SwingValidator;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.bean.simple.SimpleBeanValidator;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java
index 8e16795..de600ab 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidationContext.java
@@ -27,8 +27,8 @@ import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.services.dto.longline.BasketDto;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
-import jaxx.runtime.validator.swing.SwingValidator;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
 import org.nuiton.validator.NuitonValidatorScope;
 import org.nuiton.validator.bean.simple.SimpleBeanValidatorEvent;
 import org.nuiton.validator.bean.simple.SimpleBeanValidatorListener;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java
index 7b2bbed..25c0c08 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorService.java
@@ -26,8 +26,8 @@ import fr.ird.observe.application.swing.decoration.DecoratorService;
 import fr.ird.observe.services.dto.longline.BasketDto;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
-import jaxx.runtime.validator.swing.SwingValidator;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.JComponent;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java
index fc217a2..00a9dc5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineGlobalCompositionUIHandler.java
@@ -42,7 +42,7 @@ import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
 import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionHelper;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.SetLonglineGlobalCompositionService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx
index 6bad926..6fcdb83 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUI.jaxx
@@ -43,8 +43,8 @@
     fr.ird.observe.application.swing.ui.util.BooleanEditor
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
     org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor
     org.nuiton.jaxx.widgets.datetime.DateTimeEditor
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java
index 35f3202..3b16c85 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/longline/SetLonglineUIHandler.java
@@ -39,11 +39,11 @@ import fr.ird.observe.services.dto.longline.SetLonglineHelper;
 import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.SetLonglineService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.HidorButton;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
-import jaxx.runtime.validator.swing.SwingValidatorUtil;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.HidorButton;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.jaxx.widgets.gis.CoordinateFormat;
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 8ff994d..eb3a43b 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
@@ -39,7 +39,7 @@
     fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
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 47eb55f..ddf6b87 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
@@ -42,7 +42,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectTransmittingBuoyHelper;
 import fr.ird.observe.services.dto.seine.TransmittingBuoyDto;
 import fr.ird.observe.services.dto.seine.TransmittingBuoyHelper;
 import fr.ird.observe.services.service.data.seine.TransmittingBuoyOperationService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx
index 11d8f39..da2a340 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUI.jaxx
@@ -37,8 +37,8 @@
     fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
index c992178..4f31315 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/FloatingObjectUIHandler.java
@@ -37,7 +37,7 @@ import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectDto;
 import fr.ird.observe.services.dto.seine.FloatingObjectHelper;
 import fr.ird.observe.services.service.data.seine.FloatingObjectService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx
index 24512bf..ac7226e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/impl/seine/SetSeineUI.jaxx
@@ -38,8 +38,8 @@
     fr.ird.observe.application.swing.ui.util.BooleanEditor
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.nuiton.jaxx.widgets.datetime.DateTimeEditor
 
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 5623d20..ee0b707 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
@@ -41,11 +41,11 @@ import fr.ird.observe.services.dto.seine.SetSeineDto;
 import fr.ird.observe.services.dto.seine.SetSeineHelper;
 import fr.ird.observe.services.service.data.seine.RouteService;
 import fr.ird.observe.services.service.data.seine.SetSeineService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.HidorButton;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
-import jaxx.runtime.validator.swing.SwingValidatorUtil;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.HidorButton;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx
index be5837f..105fd52 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUI.jaxx
@@ -31,7 +31,7 @@
     fr.ird.observe.services.dto.IdDto
     fr.ird.observe.services.dto.reference.DataReference
 
-    jaxx.runtime.swing.editor.bean.BeanListHeader
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java
index 79168fa..a968d50 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/ContentListUIHandler.java
@@ -31,7 +31,7 @@ import fr.ird.observe.services.dto.DataDto;
 import fr.ird.observe.services.dto.IdDto;
 import fr.ird.observe.services.dto.reference.AbstractReference;
 import fr.ird.observe.services.dto.reference.DataReference;
-import jaxx.runtime.swing.editor.bean.BeanListHeader;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader;
 import org.apache.commons.collections4.CollectionUtils;
 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/list/impl/longline/ActivityLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java
index 8508b4b..abcc087 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/ActivityLonglinesUIHandler.java
@@ -32,7 +32,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN
 import fr.ird.observe.services.dto.longline.ActivityLonglineDto;
 import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.reference.DataReference;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import static org.nuiton.i18n.I18n.n;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java
index 31878d3..eeb9554 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/longline/TripLonglinesUIHandler.java
@@ -34,7 +34,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ProgramDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import static org.nuiton.i18n.I18n.n;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java
index ebca0fa..dbf26fb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/ActivitySeinesUIHandler.java
@@ -31,7 +31,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN
 import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import static org.nuiton.i18n.I18n.n;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java
index 724b00c..a5c0925 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/RoutesUIHandler.java
@@ -31,7 +31,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN
 import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import static org.nuiton.i18n.I18n.n;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java
index d525e2b..92df751 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/list/impl/seine/TripSeinesUIHandler.java
@@ -33,7 +33,7 @@ import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import static org.nuiton.i18n.I18n.n;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx
index 8ed1e4d..3b096f8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUI.jaxx
@@ -36,8 +36,8 @@
     fr.ird.observe.application.swing.ui.actions.content.DeleteDataUIAction
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.nuiton.jaxx.widgets.datetime.DateTimeEditor
     org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
index 1c1eba2..91995af 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/ActivityLonglineUIHandler.java
@@ -36,7 +36,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.result.TripChildSaveResultDto;
 import fr.ird.observe.services.service.data.longline.ActivityLonglineService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx
index be34255..1e1649b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUI.jaxx
@@ -40,8 +40,8 @@
 
     org.jdesktop.swingx.JXDatePicker
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
index 7a6a5a3..fd2e72c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/longline/TripLonglineUIHandler.java
@@ -40,7 +40,7 @@ import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.referential.VesselHelper;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.TripLonglineService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx
index ea1eac1..0e16c34 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUI.jaxx
@@ -43,8 +43,8 @@
     fr.ird.observe.application.swing.ui.actions.content.AddActivitySeineFloatingObjectUIAction
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.nuiton.jaxx.widgets.datetime.TimeEditor
     org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
index f27d008..3eb3bad 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/ActivitySeineUIHandler.java
@@ -39,9 +39,9 @@ import fr.ird.observe.services.dto.seine.ActivitySeineHelper;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.service.data.seine.ActivitySeineService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx
index bc6c119..ca96029 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUI.jaxx
@@ -32,7 +32,7 @@
 
     org.jdesktop.swingx.JXDatePicker
 
-    jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
index bdc61ce..f33a350 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/RouteUIHandler.java
@@ -40,7 +40,7 @@ import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.RouteHelper;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.service.data.seine.RouteService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx
index fc48291..9eb9664 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUI.jaxx
@@ -43,8 +43,8 @@
 
     org.jdesktop.swingx.JXDatePicker
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
     java.beans.PropertyChangeEvent
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
index 6283f2d..545a43c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/open/impl/seine/TripSeineUIHandler.java
@@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
 import fr.ird.observe.services.dto.seine.TripSeineHelper;
 import fr.ird.observe.services.service.data.seine.TripSeineService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.util.DateUtil;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx
index a5f0a25..77e406e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ContentReferenceUI.jaxx
@@ -42,8 +42,8 @@
     fr.ird.observe.application.swing.ui.actions.global.ResetDataGlobalUIAction
     fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction
 
-    jaxx.runtime.swing.editor.bean.BeanListHeader
-    jaxx.runtime.validator.swing.SwingValidator
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader
+    org.nuiton.jaxx.validator.swing.SwingValidator
 
     javax.swing.DefaultListModel
     javax.swing.ListSelectionModel
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 2a54b91..5c09b13 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
@@ -47,9 +47,9 @@ import fr.ird.observe.services.dto.referential.ReferentialDto;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.DataNotFoundException;
 import fr.ird.observe.services.service.referential.ReferentialService;
-import jaxx.runtime.swing.CardLayout2Ext;
-import jaxx.runtime.swing.editor.bean.BeanListHeader;
-import jaxx.runtime.validator.swing.SwingValidatorUtil;
+import org.nuiton.jaxx.runtime.swing.CardLayout2Ext;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanListHeader;
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeCommonUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeCommonUI.java
index aa8d0a9..ad39b83 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeCommonUI.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeCommonUI.java
@@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.ref;
  * #L%
  */
 
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
 
 /**
  * Created on 22/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeLonglineUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeLonglineUI.java
index 3d1e195..a22b429 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeLonglineUI.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeLonglineUI.java
@@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.ref;
  * #L%
  */
 
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
 
 /**
  * Created on 22/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java
index 3701cb4..2891545 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeSeineUI.java
@@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.content.ref;
  * #L%
  */
 
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.context.JAXXInitialContext;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.context.JAXXInitialContext;
 
 /**
  * Created on 22/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java
index fa1d82d..2eb0217 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/ReferenceHomeUIHandler.java
@@ -32,7 +32,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.referential.ProgramDto;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import javax.swing.JButton;
 import javax.swing.JPanel;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java
index 8401cb2..e319913 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/CountryUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.CountryDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java
index d702a87..15b3e64 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/FpaZoneUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.FpaZoneDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java
index 3c30e02..d76d9d2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 3841193..69cc6f7 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
@@ -30,7 +30,7 @@
     fr.ird.observe.services.dto.referential.GearCaracteristicDto
     fr.ird.observe.services.dto.referential.GearCaracteristicTypeDto
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     fr.ird.observe.common.constants.ReferenceStatus
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java
index 13573fd..79527ff 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearCaracteristicUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.GearCaracteristicDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java
index 6300189..3a934d1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/GearUIHandler.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.GearDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelListener;
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 806acfb..9a477dd 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
@@ -29,7 +29,7 @@
     fr.ird.observe.services.dto.referential.HarbourDto
     fr.ird.observe.services.dto.referential.CountryDto
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.nuiton.jaxx.widgets.gis.absolute.CoordinatesEditor
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java
index fcdae79..2c6ccb2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/HarbourUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.HarbourDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 9086f17..78aba8d 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
@@ -32,8 +32,8 @@
     fr.ird.observe.application.swing.ui.UIHelper
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     javax.swing.JScrollPane
     javax.swing.JTable
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java
index 1bc1854..3dea3b4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthLengthParameterUIHandler.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.LengthLengthParameterDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelListener;
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 e14edf4..499e7c3 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
@@ -35,8 +35,8 @@
     fr.ird.observe.application.swing.ui.UIHelper
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.jdesktop.swingx.JXDatePicker
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java
index d326753..c6bd411 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/LengthWeightParameterUIHandler.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.LengthWeightParameterDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelListener;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIHandler.java
index a94bdf7..85a55ad 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OceanUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.OceanDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 2d5076d..af13628 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
@@ -30,7 +30,7 @@
     fr.ird.observe.services.dto.referential.OrganismDto
     fr.ird.observe.services.dto.referential.CountryDto
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     fr.ird.observe.common.constants.ReferenceStatus
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIHandler.java
index a09172f..05abfc8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/OrganismUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.OrganismDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 2c2a7d0..9f4f9fd 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
@@ -35,7 +35,7 @@
     javax.swing.JScrollPane
     javax.swing.table.TableCellRenderer
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     fr.ird.observe.common.constants.ReferenceStatus
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIHandler.java
index 68805a0..dbf00f1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/PersonUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.PersonDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 8d429b1..0d6a51f 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
@@ -36,7 +36,7 @@
     fr.ird.observe.application.swing.ui.content.ref.impl.ProgramObservationEnum
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.jdesktop.swingx.JXDatePicker
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java
index 4c49f4c..e6e4eec 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ProgramUIHandler.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ProgramDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelListener;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIHandler.java
index 63ea56d..9a4d256 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SexUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.SexDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 f7a9971..2ca3ce4 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
@@ -27,7 +27,7 @@
     fr.ird.observe.services.dto.referential.ShipOwnerDto
     fr.ird.observe.services.dto.referential.CountryDto
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     fr.ird.observe.common.constants.ReferenceStatus
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIHandler.java
index 8b70253..19db29f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/ShipOwnerUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.ShipOwnerDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIHandler.java
index bcb5b1d..1022b63 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SizeMeasureTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 67f5633..d5763f7 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
@@ -28,7 +28,7 @@
   <import>
     fr.ird.observe.services.dto.referential.SpeciesGroupDto
 
-    jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     fr.ird.observe.common.constants.ReferenceStatus
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIHandler.java
index 9b78481..56c32a0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesGroupUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.SpeciesGroupDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 1/11/15.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java
index f684c97..f2639b9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesListUIHandler.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.SpeciesListDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelListener;
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 5cc30ff..1ea0f89 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
@@ -33,8 +33,8 @@
     fr.ird.observe.services.dto.referential.OceanDto
     fr.ird.observe.services.dto.referential.SizeMeasureTypeDto
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
     org.nuiton.jaxx.widgets.select.FilterableDoubleList
 
     java.util.Collection
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java
index 2becaea..543d32a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/SpeciesUIHandler.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.SpeciesDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelListener;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIHandler.java
index 2f5f86b..a1b33f6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselSizeCategoryUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIHandler.java
index b51ed81..8cce61f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.VesselTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 6caedb8..ccbfbde 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
@@ -34,8 +34,8 @@
     fr.ird.observe.services.dto.referential.VesselTypeDto
     fr.ird.observe.services.dto.referential.ShipOwnerDto
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.jdesktop.swingx.JXDatePicker
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java
index 27d014a..0ec43f5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/VesselUIHandler.java
@@ -25,9 +25,9 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.VesselDto;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.event.TableModelListener;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIHandler.java
index c329014..f5cdc3b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/WeightMeasureTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIHandler.java
index 4bd2988..0b973eb 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitHaulingStatusUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIHandler.java
index dc665c2..6c77e48 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitSettingStatusUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java
index 15c6ed1..e1ad86a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/BaitTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.BaitTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIHandler.java
index 8ed1ea3..1746b00 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/CatchFateLonglineUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.CatchFateLonglineDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIHandler.java
index 01d013e..be55f97 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/EncounterTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIHandler.java
index 2a18dc7..f5fe29a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HealthnessUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.HealthnessDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIHandler.java
index e07fa60..3fe5690 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookPositionUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.HookPositionDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIHandler.java
index d9ba3a2..c49800d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookSizeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.HookSizeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIHandler.java
index e56c947..c33a78e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/HookTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.HookTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIHandler.java
index 6dbbfdf..fdefe3a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemHorizontalPositionUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.ItemHorizontalPositionDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIHandler.java
index 5829260..4c41398 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/ItemVerticalPositionUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.ItemVerticalPositionDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIHandler.java
index 9384ac2..2045297 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksColorUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.LightsticksColorDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIHandler.java
index e4b9bb9..9925a67 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LightsticksTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.LightsticksTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIHandler.java
index cbb4ef6..9f22def 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/LineTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.LineTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIHandler.java
index f5c7f06..0175043 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MaturityStatusUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.MaturityStatusDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIHandler.java
index d16ec7c..e008cfa 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/MitigationTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.MitigationTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIHandler.java
index 1a51dad..4b5f829 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorBrandUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.SensorBrandDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIHandler.java
index 369cbc2..70e21e1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorDataFormatUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIHandler.java
index d5adda4..3fa3cf6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SensorTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.SensorTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIHandler.java
index f4ae157..4da2930 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/SettingShapeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.SettingShapeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIHandler.java
index 37ecb2d..0d26ec8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/StomacFullnessUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIHandler.java
index 7468457..d17a88f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/TripTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.TripTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIHandler.java
index 1af65a4..d959481 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/longline/VesselActivityLonglineUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.longline;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIHandler.java
index 6223db8..d4d0456 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/DetectionModeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.DetectionModeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java
index f1f1435..d90fcd8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectFateUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.ObjectFateDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIHandler.java
index f8dd7e5..903e93e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectOperationUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIHandler.java
index 9ee9e2a..4ee439c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObjectTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.ObjectTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIHandler.java
index 6d3403f..18f24aa 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ObservedSystemUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.ObservedSystemDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIHandler.java
index 18b383c..f726def 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForDiscardUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIHandler.java
index b21781b..445dc44 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNoFishingUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.ReasonForNoFishingDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIHandler.java
index 1e423dc..f625092 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/ReasonForNullSetUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.ReasonForNullSetDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIHandler.java
index 2acb17a..7b2f9ab 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesFateUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.SpeciesFateDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIHandler.java
index 7e6f425..d375e07 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SpeciesStatusUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.SpeciesStatusDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIHandler.java
index 9e4e550..1aa01e0 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/SurroundingActivityUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.SurroundingActivityDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIHandler.java
index c46da0c..7135691 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyOperationUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIHandler.java
index 7bdb128..f4602a2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/TransmittingBuoyTypeUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIHandler.java
index d7a077b..08fe97c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/VesselActivitySeineUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.VesselActivitySeineDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
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 598e64b..9118463 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
@@ -31,7 +31,7 @@
     fr.ird.observe.services.dto.referential.SpeciesDto
     fr.ird.observe.application.swing.ui.UIHelper
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     javax.swing.JScrollPane
     javax.swing.JTable
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIHandler.java
index c26b144..e690d3b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WeightCategoryUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.WeightCategoryDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIHandler.java
index 1474b26..481652f 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/impl/seine/WindUIHandler.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.ref.impl.seine;
 
 import fr.ird.observe.application.swing.ui.content.ref.ContentReferenceUIHandler;
 import fr.ird.observe.services.dto.referential.seine.WindDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx
index 345bebe..07b9210 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUI.jaxx
@@ -27,8 +27,8 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
 
     fr.ird.observe.services.dto.reference.AbstractReference
     fr.ird.observe.services.dto.reference.ReferenceMap
-    jaxx.runtime.context.JAXXInitialContext
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.context.JAXXInitialContext
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
     java.util.List
 
     static org.nuiton.i18n.I18n.t
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUIHandler.java
index d9b8e08..bf00a54 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDeleteUIHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.ref.usage;
  * #L%
  */
 
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx
index 826b714..50deb65 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUI.jaxx
@@ -27,8 +27,8 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
 
     fr.ird.observe.services.dto.reference.AbstractReference
     fr.ird.observe.services.dto.reference.ReferenceMap
-    jaxx.runtime.context.JAXXInitialContext
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.context.JAXXInitialContext
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
     java.util.List
 
     static org.nuiton.i18n.I18n.t
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUIHandler.java
index f58daf6..2559207 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDesactivateUIHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.ref.usage;
  * #L%
  */
 
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx
index d6076b4..00f0ae4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUI.jaxx
@@ -26,7 +26,7 @@ Interface graphique pour afficher la liste des usages d'une entitee donnee.
   <import>
 
     fr.ird.observe.services.dto.reference.ReferenceMap
-    jaxx.runtime.context.JAXXInitialContext
+    org.nuiton.jaxx.runtime.context.JAXXInitialContext
 
     static org.nuiton.i18n.I18n.t
   </import>
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUIHandler.java
index 6b3f0e6..2cb7492 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageForDisplayUIHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.ref.usage;
  * #L%
  */
 
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 
 import javax.swing.JLabel;
 import javax.swing.JPanel;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java
index 7fc047d..c872ae9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/ref/usage/UsageUIHandlerSupport.java
@@ -32,9 +32,9 @@ import fr.ird.observe.services.dto.reference.DataReference;
 import fr.ird.observe.services.dto.reference.ReferenceMap;
 import fr.ird.observe.services.dto.reference.ReferentialReference;
 import fr.ird.observe.services.dto.referential.ReferentialDto;
-import jaxx.runtime.JAXXObject;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 import org.apache.commons.lang3.BooleanUtils;
 import org.nuiton.decorator.Decorator;
 import org.nuiton.decorator.JXPathDecorator;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java
index 66a52a8..4c48b11 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableModel.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.content.table;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.services.dto.AbstractObserveDto;
 import fr.ird.observe.services.dto.IdDto;
-import jaxx.runtime.validator.swing.SwingValidator;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
 import org.apache.commons.collections4.CollectionUtils;
 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/table/ContentTableUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx
index 1d2fe60..45a7d36 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUI.jaxx
@@ -38,8 +38,8 @@
     fr.ird.observe.application.swing.ui.actions.global.ResetDataGlobalUIAction
     fr.ird.observe.application.swing.ui.actions.global.SaveDataGlobalUIAction
 
-    jaxx.runtime.swing.BlockingLayerUI
-    jaxx.runtime.validator.swing.SwingValidator
+    org.nuiton.jaxx.runtime.swing.BlockingLayerUI
+    org.nuiton.jaxx.validator.swing.SwingValidator
 
     fr.ird.observe.services.dto.AbstractObserveDto
     fr.ird.observe.services.dto.IdDto
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java
index e984175..9beb0bf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ContentTableUIInitializer.java
@@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.content.ContentUIInitializer;
 import fr.ird.observe.application.swing.ui.content.ObserveActionMap;
 import fr.ird.observe.application.swing.ui.util.BooleanEditor;
 import fr.ird.observe.services.dto.IdDto;
-import jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.SwingUtil;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.jaxx.application.bean.JavaBeanObjectUtil;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java
index b500761..0d0ff87 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/ObserveContentTableUI.java
@@ -24,8 +24,8 @@ package fr.ird.observe.application.swing.ui.content.table;
 
 import fr.ird.observe.application.swing.ui.content.ObserveContentUI;
 import fr.ird.observe.services.dto.IdDto;
-import jaxx.runtime.swing.BlockingLayerUI;
-import jaxx.runtime.validator.swing.SwingValidator;
+import org.nuiton.jaxx.runtime.swing.BlockingLayerUI;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
 
 import javax.swing.JComponent;
 import javax.swing.JTable;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx
index b4ee063..ea4b817 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUI.jaxx
@@ -34,8 +34,8 @@
     fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto
     fr.ird.observe.application.swing.ui.content.table.*
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     static org.nuiton.i18n.I18n.n
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java
index ea6a51e..53ae09e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BaitsCompositionUIHandler.java
@@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.longline.BaitsCompositionDto;
 import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
 import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto;
 import fr.ird.observe.services.dto.referential.longline.BaitTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/longline/BranchlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx
index 652a4c5..27dc876 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUI.jaxx
@@ -33,8 +33,8 @@
     fr.ird.observe.services.dto.referential.longline.LineTypeDto
     fr.ird.observe.application.swing.ui.content.table.*
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     static org.nuiton.i18n.I18n.n
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java
index 24e79dc..482307c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/BranchlinesCompositionUIHandler.java
@@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.longline.BranchlinesCompositionDto;
 import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
 import fr.ird.observe.services.dto.referential.longline.HookSizeDto;
 import fr.ird.observe.services.dto.referential.longline.HookTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/longline/CatchLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx
index 9a053e1..b991dda 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUI.jaxx
@@ -50,8 +50,8 @@
     fr.ird.observe.application.swing.ui.util.BooleanEditor
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
     org.nuiton.jaxx.widgets.select.FilterableDoubleList
     org.nuiton.jaxx.widgets.datetime.DateTimeEditor
     org.nuiton.jaxx.widgets.datetime.TimeEditor
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java
index a1206d7..f2f718c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/CatchLonglineUIHandler.java
@@ -61,11 +61,11 @@ import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.BranchlineService;
 import fr.ird.observe.services.service.data.longline.SetLonglineCatchService;
 import fr.ird.observe.services.service.data.longline.TripLonglineService;
-import jaxx.runtime.context.JAXXContextEntryDef;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidator;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.apache.commons.lang3.BooleanUtils;
 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/table/impl/longline/EncounterUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx
index 40d26ed..dce6d0d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUI.jaxx
@@ -35,8 +35,8 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java
index 0d42539..f89e479 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/EncounterUIHandler.java
@@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.referential.longline.EncounterTypeDto;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.ActivityLongLineEncounterService;
 import fr.ird.observe.services.service.referential.ReferentialService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/longline/FloatlinesCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx
index d933f34..2e54977 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUI.jaxx
@@ -33,8 +33,8 @@
     fr.ird.observe.services.dto.referential.longline.LineTypeDto
     fr.ird.observe.application.swing.ui.content.table.*
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     static org.nuiton.i18n.I18n.n
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java
index 42e4316..e203ed7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/FloatlinesCompositionUIHandler.java
@@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.content.table.ContentTableUIHandler;
 import fr.ird.observe.services.dto.longline.FloatlinesCompositionDto;
 import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
 import fr.ird.observe.services.dto.referential.longline.LineTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/longline/GearUseFeaturesLonglineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx
index ffb58b4..61e0dc8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUI.jaxx
@@ -37,8 +37,8 @@
     fr.ird.observe.application.swing.ui.util.BooleanEditor
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
index d35a99f..83f0af2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/GearUseFeaturesLonglineUIHandler.java
@@ -47,10 +47,10 @@ import fr.ird.observe.services.dto.referential.GearDto;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.TripLonglineGearUseService;
 import fr.ird.observe.services.service.referential.ReferentialService;
-import jaxx.runtime.SwingUtil;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx
index b38d70a..2161b13 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUI.jaxx
@@ -34,8 +34,8 @@
     fr.ird.observe.services.dto.referential.longline.HookSizeDto
     fr.ird.observe.application.swing.ui.content.table.*
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     static fr.ird.observe.application.swing.ui.UIHelper.getStringValue
     static org.nuiton.i18n.I18n.n
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java
index 0b1b549..d99b9ca 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/HooksCompositionUIHandler.java
@@ -29,7 +29,7 @@ import fr.ird.observe.services.dto.longline.HooksCompositionDto;
 import fr.ird.observe.services.dto.longline.SetLonglineGlobalCompositionDto;
 import fr.ird.observe.services.dto.referential.longline.HookSizeDto;
 import fr.ird.observe.services.dto.referential.longline.HookTypeDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/longline/LonglinePositionHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java
index 609f348..774a7ce 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/LonglinePositionHelper.java
@@ -32,7 +32,7 @@ import fr.ird.observe.services.dto.longline.LonglinePositionAwareDto;
 import fr.ird.observe.services.dto.longline.LonglinePositionSetDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
 import fr.ird.observe.services.dto.reference.DataReference;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 
 import java.beans.PropertyChangeListener;
 import java.util.Collection;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx
index 57024f2..fc6ff88 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUI.jaxx
@@ -36,7 +36,7 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java
index 74e0ee8..847ade9 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/SensorUsedUIHandler.java
@@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto;
 import fr.ird.observe.services.dto.referential.longline.SensorTypeDto;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.ActivityLongLineSensorUsedService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.jaxx.runtime.JaxxFileChooser;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx
index 38214f9..c6f32de 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUI.jaxx
@@ -39,8 +39,8 @@
     fr.ird.observe.services.dto.referential.longline.SensorBrandDto
     fr.ird.observe.application.swing.ui.content.table.*
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
     org.nuiton.jaxx.widgets.select.FilterableDoubleList
 
     org.nuiton.jaxx.widgets.datetime.DateTimeEditor
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java
index 22cb050..a678522 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/longline/TdrUIHandler.java
@@ -42,11 +42,11 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto;
 import fr.ird.observe.services.dto.result.SaveResultDto;
 import fr.ird.observe.services.service.data.longline.TdrService;
 import fr.ird.observe.services.service.data.longline.TripLonglineService;
-import jaxx.runtime.context.JAXXContextEntryDef;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.HidorButton;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.context.JAXXContextEntryDef;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.HidorButton;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.jaxx.runtime.JaxxFileChooser;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx
index 2eb06ae..801b280 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUI.jaxx
@@ -37,8 +37,8 @@
     fr.ird.observe.application.swing.ui.util.BooleanEditor
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
index 5682e7d..e123cbc 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/GearUseFeaturesSeineUIHandler.java
@@ -47,10 +47,10 @@ import fr.ird.observe.services.dto.seine.TripSeineGearUseDto;
 import fr.ird.observe.services.dto.seine.TripSeineGearUseHelper;
 import fr.ird.observe.services.service.data.seine.TripSeineGearUseService;
 import fr.ird.observe.services.service.referential.ReferentialService;
-import jaxx.runtime.SwingUtil;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx
index 71fe60c..a3f1ea8 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetCatchUI.jaxx
@@ -40,8 +40,8 @@
     fr.ird.observe.application.swing.ui.util.JComment
     fr.ird.observe.application.swing.validation.ObserveSwingValidator
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
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 faafb80..142e464 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
@@ -45,7 +45,7 @@ import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchDto;
 import fr.ird.observe.services.dto.seine.SetSeineNonTargetCatchHelper;
 import fr.ird.observe.services.service.data.seine.NonTargetCatchService;
 import fr.ird.observe.services.service.data.seine.TripSeineService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/seine/NonTargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx
index a6a133f..1bc5d68 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUI.jaxx
@@ -41,8 +41,8 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
index 6ffe9b5..bfcce01 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/NonTargetSampleUIHandler.java
@@ -40,7 +40,7 @@ import fr.ird.observe.services.dto.seine.NonTargetSampleDto;
 import fr.ird.observe.services.dto.seine.NonTargetSampleHelper;
 import fr.ird.observe.services.dto.seine.SetSeineDto;
 import fr.ird.observe.services.service.data.seine.NonTargetSampleService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorScope;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx
index 0fad771..5259cc1 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUI.jaxx
@@ -37,8 +37,8 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java
index 73be194..7a8ae89 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectObservedSpeciesUIHandler.java
@@ -39,7 +39,7 @@ import fr.ird.observe.services.dto.seine.ObjectObservedSpeciesDto;
 import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;
 import fr.ird.observe.services.service.data.seine.ObjectObservedSpeciesService;
 import fr.ird.observe.services.service.referential.ReferentialService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/seine/ObjectSchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx
index f4ffe84..982c143 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUI.jaxx
@@ -36,8 +36,8 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java
index cb0fdf1..396e5ca 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/ObjectSchoolEstimateUIHandler.java
@@ -37,7 +37,7 @@ import fr.ird.observe.services.dto.seine.FloatingObjectSchoolEstimateHelper;
 import fr.ird.observe.services.dto.seine.ObjectSchoolEstimateDto;
 import fr.ird.observe.services.service.data.seine.ObjectSchoolEstimateService;
 import fr.ird.observe.services.service.referential.ReferentialService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/seine/SchoolEstimateUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx
index 8e27408..e58258d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUI.jaxx
@@ -36,8 +36,8 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java
index 853aaf5..086616d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/SchoolEstimateUIHandler.java
@@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateDto;
 import fr.ird.observe.services.dto.seine.SetSeineSchoolEstimateHelper;
 import fr.ird.observe.services.service.data.seine.SchoolEstimateService;
 import fr.ird.observe.services.service.data.seine.TripSeineService;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/table/impl/seine/TargetCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx
index d2c791b..8cfb432 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUI.jaxx
@@ -37,8 +37,8 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.apache.commons.lang3.BooleanUtils
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java
index 845ec71..9e752f2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetCatchUIHandler.java
@@ -43,8 +43,8 @@ import fr.ird.observe.services.dto.seine.TargetCatchDto;
 import fr.ird.observe.services.dto.seine.TargetCatchHelper;
 import fr.ird.observe.services.service.data.seine.TargetCatchService;
 import fr.ird.observe.services.service.data.seine.TripSeineService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.decorator.Decorator;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx
index 901e2f8..426d10d 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUI.jaxx
@@ -39,8 +39,8 @@
     fr.ird.observe.application.swing.ui.util.BooleanEditor
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     org.apache.commons.lang3.BooleanUtils
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
index a9d54e7..571e0ae 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetDiscardCatchUIHandler.java
@@ -44,8 +44,8 @@ import fr.ird.observe.services.dto.seine.TargetCatchDto;
 import fr.ird.observe.services.dto.seine.TargetCatchHelper;
 import fr.ird.observe.services.service.data.seine.TargetCatchService;
 import fr.ird.observe.services.service.data.seine.TripSeineService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.decorator.Decorator;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUIHandler.java
index 2116363..45b51f6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleCaptureUIHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine;
  * #L%
  */
 
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUIHandler.java
index a2dbe2d..4dc53d6 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleRejeteUIHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.content.table.impl.seine;
  * #L%
  */
 
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 /**
  * Created on 06/12/16.
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx
index 82b8381..1918fa3 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/content/table/impl/seine/TargetSampleUI.jaxx
@@ -36,8 +36,8 @@
     fr.ird.observe.application.swing.ui.content.table.*
     fr.ird.observe.application.swing.ui.util.JComment
 
-    jaxx.runtime.swing.editor.NumberEditor
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.NumberEditor
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
     java.awt.Dimension
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java
index 5430680..67aa9db 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/ObstunaAdminAction.java
@@ -38,7 +38,7 @@ import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto;
 import fr.ird.observe.services.service.BabModelVersionException;
 import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException;
 import fr.ird.observe.services.service.DatabaseNotFoundException;
-import jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.JAXXContext;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.version.Version;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java
index 601c843..c2167bf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/RemoteUILauncher.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.ui.storage;
 import fr.ird.observe.application.swing.configuration.constants.DbMode;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.storage.tabs.SecurityModel;
-import jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.JAXXContext;
 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/storage/StorageBackupUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java
index 364e33d..baf6e5c 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageBackupUILauncher.java
@@ -40,7 +40,7 @@ import fr.ird.observe.services.service.data.ExportTripRequest;
 import fr.ird.observe.services.service.data.ExportTripResult;
 import fr.ird.observe.services.service.data.ImportTripRequest;
 import fr.ird.observe.services.service.data.TripManagementService;
-import jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.JAXXContext;
 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/storage/StorageStep.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageStep.java
index 45c2ed9..f14de8a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageStep.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageStep.java
@@ -22,7 +22,7 @@
 package fr.ird.observe.application.swing.ui.storage;
 
 import fr.ird.observe.application.swing.I18nEnumHelper;
-import jaxx.runtime.swing.wizard.WizardStep;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardStep;
 
 /**
  * Pour caractériser les étapes (correspond aux onglets de l'ui).
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx
index dd1d78d..2e8615e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUI.jaxx
@@ -20,7 +20,7 @@
   #L%
   -->
 
-<JDialog id="storageMain" implements='jaxx.runtime.swing.wizard.WizardUI<StorageStep, StorageUIModel>'
+<JDialog id="storageMain" implements='org.nuiton.jaxx.runtime.swing.wizard.WizardUI<StorageStep, StorageUIModel>'
          width='550' height='600' defaultCloseOperation='dispose_on_close'>
 
   <import>
@@ -37,7 +37,7 @@
 
     java.awt.Window
 
-    jaxx.runtime.JAXXContext
+    org.nuiton.jaxx.runtime.JAXXContext
     javax.swing.UIManager
   </import>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
index 809a01d..7e143ae 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java
@@ -51,8 +51,8 @@ import fr.ird.observe.services.dto.ObserveDbUserDto;
 import fr.ird.observe.services.dto.source.DataSourceCreateConfigurationDto;
 import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
 import fr.ird.observe.services.service.sql.SqlScriptProducerService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.wizard.WizardUILancher;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
 import org.apache.commons.io.FileUtils;
 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/storage/StorageUILauncher.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
index 4e1e923..c33097e 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUILauncher.java
@@ -26,11 +26,11 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig;
 import fr.ird.observe.application.swing.configuration.constants.DbMode;
 import fr.ird.observe.application.swing.ui.UIHelper;
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.JAXXObject;
-import jaxx.runtime.swing.wizard.BusyChangeListener;
-import jaxx.runtime.swing.wizard.WizardModel;
-import jaxx.runtime.swing.wizard.WizardUILancher;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.swing.wizard.BusyChangeListener;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardModel;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
 import org.apache.commons.collections4.CollectionUtils;
 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/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
index c88516b..47d2edf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java
@@ -55,9 +55,9 @@ import fr.ird.observe.services.service.DatabaseNotFoundException;
 import fr.ird.observe.services.service.PingService;
 import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest;
 import fr.ird.observe.services.service.sql.SqlScriptProducerService;
-import jaxx.runtime.JAXXContext;
-import jaxx.runtime.swing.wizard.WizardModel;
-import jaxx.runtime.swing.wizard.WizardUILancher;
+import org.nuiton.jaxx.runtime.JAXXContext;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardModel;
+import org.nuiton.jaxx.runtime.swing.wizard.WizardUILancher;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jaxx
index ec7db8d..bd65549 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jaxx
@@ -25,7 +25,7 @@
     fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration
     fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration
 
-    jaxx.runtime.swing.editor.bean.BeanComboBox
+    org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox
 
   </import>
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java
index cf3b63c..77d99c4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java
@@ -40,8 +40,8 @@ import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseExceptio
 import fr.ird.observe.services.security.UserLoginNotFoundException;
 import fr.ird.observe.services.security.UserPasswordNotFoundException;
 import fr.ird.observe.services.service.PingService;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.bean.BeanComboBox;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.bean.BeanComboBox;
 import org.nuiton.decorator.Decorator;
 import org.nuiton.decorator.JXPathDecorator;
 import org.nuiton.version.Version;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java
index cd2c084..ab80606 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/BackupUIHandler.java
@@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs;
 import fr.ird.observe.application.swing.ui.ObserveKeyStrokes;
 import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.storage.StorageStep;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import javax.swing.AbstractAction;
 import java.awt.event.ActionEvent;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java
index 6516ad0..69356de 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ChooseDbModeUIHandler.java
@@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ObserveTextGenerator;
 import fr.ird.observe.application.swing.configuration.constants.CreationMode;
 import fr.ird.observe.application.swing.ui.storage.StorageStep;
 import fr.ird.observe.application.swing.ui.storage.StorageUIModel;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import javax.swing.JPanel;
 import javax.swing.JRadioButton;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUIHandler.java
index 8f228e7..ac82989 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigDataUIHandler.java
@@ -27,7 +27,7 @@ import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.storage.StorageStep;
 import fr.ird.observe.application.swing.ui.storage.StorageUILauncher;
 import fr.ird.observe.application.swing.ui.storage.StorageUIModel;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/storage/tabs/ConfigReferentielUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUIHandler.java
index 0e91b47..30693d5 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigReferentielUIHandler.java
@@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.UIHelper;
 import fr.ird.observe.application.swing.ui.storage.StorageStep;
 import fr.ird.observe.application.swing.ui.storage.StorageUILauncher;
 import fr.ird.observe.application.swing.ui.storage.StorageUIModel;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/storage/tabs/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java
index e5c0b38..4515edf 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java
@@ -36,7 +36,7 @@ import fr.ird.observe.application.swing.ui.storage.StorageStep;
 import fr.ird.observe.application.swing.ui.storage.StorageUIModel;
 import fr.ird.observe.services.dto.presets.RemoteDataSourceConfiguration;
 import fr.ird.observe.services.dto.presets.ServerDataSourceConfiguration;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/storage/tabs/ConfirmUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUIHandler.java
index 1752982..38da99a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfirmUIHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs;
  * #L%
  */
 
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import static org.nuiton.i18n.I18n.t;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUIHandler.java
index 2d9eaea..2b2e301 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesUIHandler.java
@@ -23,8 +23,8 @@ package fr.ird.observe.application.swing.ui.storage.tabs;
  */
 
 import fr.ird.observe.application.swing.ui.UIHelper;
-import jaxx.runtime.spi.UIHandler;
-import jaxx.runtime.swing.editor.MyDefaultCellEditor;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.swing.editor.MyDefaultCellEditor;
 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/storage/tabs/SelectDataUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java
index b128c4c..e5f5333 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java
@@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs;
  */
 
 import fr.ird.observe.application.swing.ui.ObserveKeyStrokes;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import static org.nuiton.i18n.I18n.t;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx
index 2762099..939e449 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUI.jaxx
@@ -25,7 +25,7 @@
 <!-- **************************** -->
 
 <JPanel id="tabPanel" abstract='true'
-        implements='jaxx.runtime.swing.wizard.WizardStepUI<StorageStep, StorageUIModel>'>
+        implements='org.nuiton.jaxx.runtime.swing.wizard.WizardStepUI<StorageStep, StorageUIModel>'>
 
   <import>
     fr.ird.observe.application.swing.I18nEnumHelper
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java
index 7dc823c..f18d4da 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/StorageTabUIHandler.java
@@ -25,7 +25,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
 import fr.ird.observe.application.swing.ObserveTextGenerator;
 import fr.ird.observe.application.swing.ui.storage.StorageUIModel;
 import fr.ird.observe.services.configuration.ObserveDataSourceInformation;
-import jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.JAXXObject;
 
 import javax.swing.JLabel;
 
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java
index d622c3e..248a31b 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/ObserveNavigationTreeShowPopupAction.java
@@ -44,7 +44,7 @@ import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.seine.ActivitySeineDto;
 import fr.ird.observe.services.dto.seine.RouteDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import jaxx.runtime.SwingUtil;
+import org.nuiton.jaxx.runtime.SwingUtil;
 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/tree/navigation/NavigationTreeHeaderHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java
index 75a86e0..e26de57 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/NavigationTreeHeaderHandler.java
@@ -29,7 +29,7 @@ import fr.ird.observe.application.swing.ui.tree.navigation.nodes.NavigationTreeN
 import fr.ird.observe.services.dto.longline.TripLonglineDto;
 import fr.ird.observe.services.dto.referential.ProgramDto;
 import fr.ird.observe.services.dto.seine.TripSeineDto;
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jdesktop.swingx.decorator.ColorHighlighter;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java
index 2180882..ae98648 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/navigation/nodes/NavigationTreeNodeSupport.java
@@ -28,7 +28,7 @@ import fr.ird.observe.application.swing.ui.actions.content.SelectNodeUIAction;
 import fr.ird.observe.application.swing.ui.content.ContentUI;
 import fr.ird.observe.application.swing.ui.tree.ObserveTreeNodeSupport;
 import fr.ird.observe.services.ObserveServicesProvider;
-import jaxx.runtime.JAXXObject;
+import org.nuiton.jaxx.runtime.JAXXObject;
 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/tree/selection/SelectionTreeHeaderHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeHeaderHandler.java
index 13a6824..c11fae7 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeHeaderHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTreeHeaderHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.tree.selection;
  * #L%
  */
 
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 
 import javax.swing.SwingUtilities;
 import java.beans.PropertyChangeListener;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java
index ab20db3..0b700c4 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveSwingValidatorMessageTableModel.java
@@ -22,8 +22,8 @@ package fr.ird.observe.application.swing.ui.util;
  * #L%
  */
 
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.JComponent;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
index 8672165..721dc30 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidationMessageTableRenderer.java
@@ -25,7 +25,7 @@ package fr.ird.observe.application.swing.ui.util;
 import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
 import fr.ird.observe.application.swing.ui.admin.validate.ValidationMessageTableModel;
 import fr.ird.observe.services.service.actions.validate.ValidationMessage;
-import jaxx.runtime.validator.swing.SwingValidatorUtil;
+import org.nuiton.jaxx.validator.swing.SwingValidatorUtil;
 import org.nuiton.validator.NuitonValidatorScope;
 
 import javax.swing.ImageIcon;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java
index 070c6c6..b4db998 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/ObserveValidatorMessageTableRenderer.java
@@ -23,9 +23,9 @@ package fr.ird.observe.application.swing.ui.util;
  */
 
 import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableModel;
-import jaxx.runtime.validator.swing.SwingValidatorMessageTableRenderer;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableModel;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessageTableRenderer;
 import org.apache.commons.lang3.BooleanUtils;
 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/util/table/AbstractSelectTableAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java
index f629f20..a54131a 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/AbstractSelectTableAction.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.util.table;
  * #L%
  */
 
-import jaxx.runtime.swing.JTables;
+import org.nuiton.jaxx.runtime.swing.JTables;
 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/util/table/EditableTableModelSupport.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java
index f9bb7a5..512a247 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/table/EditableTableModelSupport.java
@@ -23,7 +23,7 @@ package fr.ird.observe.application.swing.ui.util.table;
  */
 
 import fr.ird.observe.application.swing.ui.UIHelper;
-import jaxx.runtime.swing.editor.cell.NumberCellEditor;
+import org.nuiton.jaxx.runtime.swing.editor.cell.NumberCellEditor;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jdesktop.swingx.autocomplete.ComboBoxCellEditor;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java
index 35bdd41..8abffc2 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tree/BeanTreeHeaderHandler.java
@@ -22,7 +22,7 @@ package fr.ird.observe.application.swing.ui.util.tree;
  * #L%
  */
 
-import jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 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/util/tripMap/TripMapUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/util/tripMap/TripMapUIHandler.java
index d288d48..98f1945 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
@@ -30,7 +30,7 @@ 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 jaxx.runtime.spi.UIHandler;
+import org.nuiton.jaxx.runtime.spi.UIHandler;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.geotools.geometry.DirectPosition2D;
diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java
index 8cab507..6058eae 100644
--- a/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java
+++ b/application-swing/src/main/java/fr/ird/observe/application/swing/validation/ObserveSwingValidator.java
@@ -24,7 +24,7 @@ package fr.ird.observe.application.swing.validation;
 import com.opensymphony.xwork2.ActionContext;
 import com.opensymphony.xwork2.util.ValueStack;
 import fr.ird.observe.application.swing.ObserveSwingApplicationContext;
-import jaxx.runtime.validator.swing.SwingValidator;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.nuiton.validator.NuitonValidatorFactory;
diff --git a/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java b/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java
index 5e7888a..b3fcc30 100644
--- a/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java
+++ b/application-swing/src/test/java/fr/ird/observe/application/swing/ui/content/impl/longline/LonglineDetailCompositionValidatorServiceTest.java
@@ -28,8 +28,8 @@ import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationCon
 import fr.ird.observe.services.dto.longline.BasketDto;
 import fr.ird.observe.services.dto.longline.BranchlineDto;
 import fr.ird.observe.services.dto.longline.SectionDto;
-import jaxx.runtime.validator.swing.SwingValidator;
-import jaxx.runtime.validator.swing.SwingValidatorMessage;
+import org.nuiton.jaxx.validator.swing.SwingValidator;
+import org.nuiton.jaxx.validator.swing.SwingValidatorMessage;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.junit.Assert;
diff --git a/pom.xml b/pom.xml
index e4642c3..fb48393 100644
--- a/pom.xml
+++ b/pom.xml
@@ -57,8 +57,6 @@
       <id>tchemit</id>
       <name>Tony Chemit</name>
       <email>dev@tchemit.fr</email>
-      <organization>CodeLutin</organization>
-      <organizationUrl>http://codelutin.com</organizationUrl>
       <roles>
         <role>lead</role>
         <role>developer</role>
@@ -162,7 +160,7 @@
     <processorPluginVersion>1.3</processorPluginVersion>
 
     <topiaVersion>3.2</topiaVersion>
-    <jaxxVersion>2.37</jaxxVersion>
+    <jaxxVersion>3.0-alpha-1</jaxxVersion>
     <nuitonI18nVersion>3.6.2</nuitonI18nVersion>
     <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion>
     <nuitonUtilsVersion>3.0-rc-16</nuitonUtilsVersion>

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

    

[Observe-commits] 01/01: use jaxx 3.0-alpha-1 + change my email

codelutin.com scm