This is an automated email from the git hooks/post-receive script. New change to branch feature/7531 in repository observe. See http://git.codelutin.com/observe.git discards a74653a utilisation des services dans doSave et doDelete discards e6cec26 début d'utilisation des services dans doSave et doDelete (refs #7531) adds ea09607 lancement de l'application + connexion aux bases H2 et PG (refs #7528 #7529) adds 93fd18f utilisation de la classe ObserveSwingDataSource pour gérer les connection au source de données, (refs #7529) adds fdde99f commexion au serveur de données (refs #7529) adds dc60289 ignorer un test et mise à jour des dépendences (refs #7529) adds 733fcf2 creation d'un base local (refs #7529) adds 726eaba chargement de la base de données local au démarage (refs #7528) adds 9076109 Fix merge adds 5abc310 Renommage getModle en getModel adds 4ce182d Démarage de client swing (termine #7328) estion des data source dans l'application swing (termine #7529) Merge branch 'feature/7528' into develop new e11ff67 début d'utilisation des services dans doSave et doDelete (refs #7531) new 4a26bd2 utilisation des services dans doSave et doDelete new 3f97619 Fix merge This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (a74653a) \ N -- N -- N refs/heads/feature/7531 (3f97619) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 3f9761934c1677a16f7bf67a3637350a4a27b054 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 24 19:26:43 2015 +0200 Fix merge commit 4a26bd22257c118708548289976a12a23c7fe298 Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 18:15:26 2015 +0200 utilisation des services dans doSave et doDelete commit e11ff675ce00b4d47b7fdcb9ccc73043b1442bcf Author: Kevin Morin <morin@codelutin.com> Date: Thu Sep 24 17:08:04 2015 +0200 début d'utilisation des services dans doSave et doDelete (refs #7531) Summary of changes: observe-application-swing/pom.xml | 11 + .../src/main/filters/observe-ui.properties | 1 + .../java/fr/ird/observe/ObserveActionExecutor.java | 22 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 30 +- .../main/java/fr/ird/observe/ObserveConfig.java | 1004 ----- .../main/java/fr/ird/observe/ObserveContext.java | 594 --- .../fr/ird/observe/ObserveResourceManager.java | 20 +- .../main/java/fr/ird/observe/ObserveRunner.java | 74 +- .../{business => }/ObserveServiceHelper.java | 63 +- .../observe/ObserveSwingApplicationContext.java | 764 ++++ .../fr/ird/observe/business/IObserveConfig.java | 4 +- .../business/ObserveApplicationContext.java | 9 +- .../ird/observe/business/db/DataSourceConfig.java | 2 +- .../ird/observe/business/db/DataSourceFactory.java | 2 +- .../db/constants/CommonDataSourceConfigParam.java | 1 + .../business/report/model/ReportExecute.java | 15 +- .../business/validation/ObserveValidator.java | 6 +- .../validation/ValidationMessageDetector.java | 2 +- .../ObserveApplicationConfigProvider.java | 7 +- .../ObserveSwingApplicationConfig.java | 1152 +++++ .../ObserveSwingApplicationConfigOption.java} | 217 +- .../ObserveSwingApplicationConfigProvider.java | 37 + .../fr/ird/observe/db/ObserveSwingDataSource.java | 304 ++ .../constantes}/ConnexionStatus.java | 2 +- .../constants => db/constantes}/CreationMode.java | 28 +- .../db/constants => db/constantes}/DbMode.java | 7 +- .../db/event/ObserveSwingDataSourceEvent.java | 18 +- .../db/event/ObserveSwingDataSourceListener.java | 22 +- .../ObserveSwingDataSourceListenerAdapter.java | 14 +- .../src/main/java/fr/ird/observe/package.html | 2 +- .../main/java/fr/ird/observe/ui/ObserveMainUI.css | 1 + .../main/java/fr/ird/observe/ui/ObserveMainUI.jaxx | 4 +- .../fr/ird/observe/ui/ObserveMainUIHandler.java | 51 +- .../java/fr/ird/observe/ui/ObserveUICallback.java | 12 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 18 +- .../actions/ChangeApplicationLanguageAction.java | 12 +- .../observe/ui/actions/ChangeDbLanguageAction.java | 12 +- .../observe/ui/actions/ChangeStorageAction.java | 6 +- .../observe/ui/actions/CloseApplicationAction.java | 6 +- .../fr/ird/observe/ui/actions/CloseHelpAction.java | 10 +- .../ird/observe/ui/actions/CloseStorageAction.java | 21 +- .../fr/ird/observe/ui/actions/GotoSiteAction.java | 8 +- .../ui/actions/ImportStorageFromFileAction.java | 9 +- .../ird/observe/ui/actions/LaunchAdminAction.java | 4 +- .../ui/actions/ReloadApplicationAction.java | 8 +- .../actions/ReloadDefaultConfigurationAction.java | 12 +- .../observe/ui/actions/ReloadResourcesAction.java | 8 +- .../observe/ui/actions/ReloadStorageAction.java | 92 +- .../ui/actions/SaveStorageToFileAction.java | 32 +- .../ird/observe/ui/actions/ShowConfigAction.java | 128 +- .../observe/ui/actions/ShowStorageInfoAction.java | 4 +- .../observe/ui/actions/StartServerModeAction.java | 7 +- .../ui/actions/shared/CloseAndCreateUIAction.java | 6 +- .../ui/actions/shared/CloseOpenUIAction.java | 6 +- .../observe/ui/actions/shared/ReOpenUIAction.java | 5 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminTabUI.jaxx | 6 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 33 +- .../fr/ird/observe/ui/admin/AdminUILauncher.java | 28 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 107 +- .../observe/ui/admin/config/ConfigUIHandler.java | 2 - .../ui/admin/consolidate/ConsolidateModel.java | 8 +- .../ui/admin/consolidate/ConsolidateUIHandler.java | 8 +- .../ird/observe/ui/admin/export/ExportModel.java | 14 +- .../observe/ui/admin/export/ExportUIHandler.java | 12 +- .../ui/admin/gps/GPSActivityTableModel.java | 4 +- .../observe/ui/admin/gps/ImportGPSConfigUI.jaxx | 6 +- .../observe/ui/admin/gps/ImportGPSUIHandler.java | 5 +- .../observe/ui/admin/report/ReportUIHandler.java | 21 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 28 +- .../ObsoleteEntityListCellRenderer.java | 4 +- .../ui/admin/synchronize/SynchronizeModel.java | 20 +- .../ui/admin/synchronize/SynchronizeUIHandler.java | 17 +- .../ui/admin/validate/ValidateConfigUI.jaxx | 6 +- .../validate/ValidateEntityListCellRenderer.java | 4 +- .../observe/ui/admin/validate/ValidateModel.java | 6 +- .../ui/admin/validate/ValidateUIHandler.java | 11 +- .../java/fr/ird/observe/ui/content/ContentUI.jaxx | 15 +- .../ird/observe/ui/content/ContentUIHandler.java | 143 +- .../observe/ui/content/ContentUIInitializer.java | 215 +- .../content/impl/longline/BranchlineUIHandler.java | 15 +- .../impl/longline/LonglineDetailCompositionUI.jaxx | 4 +- .../LonglineDetailCompositionUIHandler.java | 28 +- .../impl/longline/LonglineGlobalCompositionUI.jaxx | 14 +- .../LonglineGlobalCompositionUIHandler.java | 10 - .../impl/longline/SetLonglineUIHandler.java | 11 - .../ActivitySeineObservedSystemUIHandler.java | 11 - .../impl/seine/FloatingObjectUIHandler.java | 11 - .../ui/content/impl/seine/SetSeineUIHandler.java | 11 - .../ui/content/list/ContentListUIHandler.java | 23 +- .../ui/content/open/ContentOpenableUIHandler.java | 10 - .../open/impl/longline/TripLonglineUIHandler.java | 4 +- .../ui/content/open/impl/seine/RouteUIHandler.java | 7 +- .../open/impl/seine/TripSeineUIHandler.java | 4 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/ref/ReferenceHomeUIHandler.java | 11 - .../ui/content/ref/UniqueKeyTableModel.java | 4 +- .../ui/content/table/ContentTableUIHandler.java | 25 +- .../impl/longline/CatchLonglineUIHandler.java | 21 +- .../table/impl/longline/EncounterUIHandler.java | 6 +- .../longline/GearUseFeaturesLonglineUIHandler.java | 12 +- .../table/impl/longline/SensorUsedUIHandler.java | 9 +- .../content/table/impl/longline/TdrUIHandler.java | 16 +- .../impl/seine/GearUseFeaturesSeineUIHandler.java | 12 +- .../table/impl/seine/NonTargetCatchUIHandler.java | 18 +- .../impl/seine/ObjectObservedSpeciesUIHandler.java | 19 +- .../impl/seine/ObjectSchoolEstimateUIHandler.java | 6 +- .../table/impl/seine/SchoolEstimateUIHandler.java | 10 +- .../table/impl/seine/TargetCatchUIHandler.java | 2 +- .../impl/seine/TargetDiscardCatchUIHandler.java | 2 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 2 +- .../ird/observe/ui/storage/RemoteUILauncher.java | 3 +- .../ui/storage/StorageBackupUILauncher.java | 68 +- .../ird/observe/ui/storage/StorageUIHandler.java | 893 ++-- .../ird/observe/ui/storage/StorageUILauncher.java | 52 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 1213 +++--- .../ird/observe/ui/storage/tabs/ChooseDbModeUI.css | 13 + .../observe/ui/storage/tabs/ChooseDbModeUI.jaxx | 14 +- .../ird/observe/ui/storage/tabs/ConfigDataUI.jaxx | 2 +- .../ui/storage/tabs/ConfigReferentielUI.jaxx | 2 +- .../fr/ird/observe/ui/storage/tabs/ConfigUI.css | 26 + .../fr/ird/observe/ui/storage/tabs/ConfigUI.jaxx | 46 +- .../ui/storage/tabs}/DataSelectionModel.java | 255 +- .../ird/observe/ui/storage/tabs/SelectDataUI.jaxx | 4 +- .../ui/storage/tabs/StorageTabUIHandler.java | 67 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 23 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 95 +- .../ui/tree/NavigationTreeSelectionModel.java | 4 +- .../ird/observe/ui/tree/ObserveDataProvider.java | 10 +- .../tree/ObserveNavigationTreeShowPopupAction.java | 14 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 27 +- .../ui/tree/loadors/AbstractNodeChildLoador.java | 6 +- .../loadors/ActivityLonglinesNodeChildLoador.java | 4 +- .../tree/loadors/ActivitySeineNodeChildLoador.java | 4 +- .../loadors/ActivitySeinesNodeChildLoador.java | 4 +- .../loadors/ProgramLonglineNodeChildLoador.java | 4 +- .../tree/loadors/ProgramSeineNodeChildLoador.java | 4 +- .../ui/tree/loadors/RootNodeChildLoador.java | 4 +- .../ui/tree/loadors/RoutesNodeChildLoador.java | 4 +- .../java/fr/ird/observe/ui/usage/UsagesUI.jaxx | 6 +- .../fr/ird/observe/ui/usage/UsagesUIHandler.java | 4 +- ...ObserveSimpleValidatorMessageTableRenderer.java | 4 +- .../util/ObserveValidatorMessageTableRenderer.java | 4 +- .../observe/ui/util/tripMap/TripMapUIHandler.java | 12 +- .../org.nuiton.config.ApplicationConfigProvider | 2 +- .../observe-application-swing_en_GB.properties | 1823 ++++---- .../observe-application-swing_es_ES.properties | 2125 +++++----- .../observe-application-swing_fr_FR.properties | 4405 ++++++++++---------- ...{action-import-gps.png => action-db-server.png} | Bin .../src/main/resources/observeSwing.conf | 5 + ...glineDetailCompositionValidatorServiceTest.java | 127 +- .../DataSourceDumpProducerServiceController.java | 29 + .../controller/v1/DataSourceServiceController.java | 3 +- .../web/controller/v1/PingServiceController.java | 8 +- .../ObserveWebSecurityApplicationContext.java | 2 +- observe-entities/pom.xml | 62 +- .../src/main/xmi/observe-common.properties | 2 +- .../src/main/xmi/observe-longline.properties | 2 +- .../src/main/xmi/observe-seine.properties | 2 +- .../ird/observe/services/service/PingService.java | 2 + observe-services-configuration-api/pom.xml | 6 + .../configuration/ObserveDataSourceConnection.java | 5 + .../ObserveDataSourceConnectionSupport.java | 13 +- observe-services-configuration-rest/pom.xml | 6 + .../ObserveDataSourceConnectionRest.java | 7 +- observe-services-configuration-topia/pom.xml | 4 +- .../ObserveDataSourceConnectionTopia.java | 7 +- .../services/dto/gson/ObserveDtoGsonSupplier.java | 2 + .../observe/services/dto/gson/VersionAdapter.java | 36 + .../services/dto/referential/ProgramDtos.java | 44 + .../services/dto/referential/ReferentialDtos.java | 116 +- .../main/xmi/observe-services-dto-common.zargo~ | Bin 35328 -> 0 bytes .../ird/observe/services/TestMethodResource.java | 2 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 35 + .../services/ObserveServiceContextTopia.java | 3 + .../EntityToReferentialReferenceDtoBuilder.java | 13 + .../services/dto/ObserveDtosInitializer.java | 284 +- .../services/service/DataSourceServiceTopia.java | 12 +- .../ObserveDataSourceConnectionTopiaTaiste.java | 3 +- ...EntityToReferentialReferenceDtoBuilderTest.java | 57 + pom.xml | 3 + 181 files changed, 9865 insertions(+), 8270 deletions(-) delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveConfig.java delete mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveContext.java rename observe-application-swing/src/main/java/fr/ird/observe/{business => }/ObserveServiceHelper.java (85%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java rename observe-application-swing/src/main/java/fr/ird/observe/{ => configuration}/ObserveApplicationConfigProvider.java (90%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfig.java rename observe-application-swing/src/main/java/fr/ird/observe/{ObserveConfigOption.java => configuration/ObserveSwingApplicationConfigOption.java} (75%) create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigProvider.java create mode 100644 observe-application-swing/src/main/java/fr/ird/observe/db/ObserveSwingDataSource.java rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/ConnexionStatus.java (97%) rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/CreationMode.java (72%) rename observe-application-swing/src/main/java/fr/ird/observe/{business/db/constants => db/constantes}/DbMode.java (88%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceEvent.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceEvent.java (74%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceListener.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceListener.java (74%) copy observe-business/src/main/java/fr/ird/observe/db/event/DataSourceListenerAdapter.java => observe-application-swing/src/main/java/fr/ird/observe/db/event/ObserveSwingDataSourceListenerAdapter.java (70%) rename {observe-business/src/main/java/fr/ird/observe/db/model => observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs}/DataSelectionModel.java (60%) copy observe-application-swing/src/main/resources/icons/{action-import-gps.png => action-db-server.png} (100%) create mode 100644 observe-application-swing/src/main/resources/observeSwing.conf create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceDumpProducerServiceController.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/gson/VersionAdapter.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/referential/ProgramDtos.java delete mode 100644 observe-services-model/src/main/xmi/observe-services-dto-common.zargo~ create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/builder/EntityToReferentialReferenceDtoBuilderTest.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.