This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 3ba428e4cd137332f29ec010b37567281f63775f Merge: f83390a 9ca1de5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 2 17:24:41 2015 +0200 Retour sur develop pour pouvoir utiliser la partie ouverture de base (RAF la creation d'une base locale). Merge branch 'feature/7549' into develop .../main/java/fr/ird/observe/ObserveCLAction.java | 6 - .../observe/ObserveSwingApplicationContext.java | 38 +- .../ird/observe/business/util/SecurityModel.java | 217 ---------- .../ObserveSwingApplicationConfig.java | 9 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 116 ++++-- .../java/fr/ird/observe/db/constantes/DbMode.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 11 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../observe/ui/admin/report/ReportUIHandler.java | 3 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 455 ++++++++++++--------- .../ird/observe/ui/storage/RemoteUILauncher.java | 48 +-- .../ird/observe/ui/storage/StorageUIHandler.java | 96 +++-- .../fr/ird/observe/ui/storage/StorageUIModel.java | 94 +++-- .../observe/ui/storage/tabs/RolesTableModel.java | 62 ++- .../fr/ird/observe/ui/storage/tabs/RolesUI.css | 2 +- .../fr/ird/observe/ui/storage/tabs/RolesUI.jaxx | 2 +- .../ird/observe/ui/storage/tabs/SecurityModel.java | 174 ++++++++ .../ftl/dataSourceConnectionReport_fr.ftl | 20 +- .../observe-application-swing_en_GB.properties | 5 + .../observe-application-swing_es_ES.properties | 5 + .../observe-application-swing_fr_FR.properties | 5 + .../web/ObserveWebApplicationContext.java | 6 +- .../web/ObserveWebApplicationListener.java | 3 + .../ObserveWebApplicationConfiguration.java | 10 + .../ObserveWebApplicationConfigurationOption.java | 2 + .../controller/v1/DataSourceServiceController.java | 29 +- .../web/controller/v1/PingServiceController.java | 11 +- .../ObserveDtoConverter.java} | 34 +- .../web/injector/ObserveDtoInjector.java | 30 +- .../ObserveWebSecurityApplicationContext.java | 6 +- .../src/main/resources/observeweb.conf | 3 +- .../migration/AbstractDataSourceMigration.java | 61 ++- .../i18n/observe-entities_en_GB.properties | 4 - .../i18n/observe-entities_es_ES.properties | 4 - .../i18n/observe-entities_fr_FR.properties | 4 - .../services/service/BabModelVersionException.java | 34 ++ .../services/service/DataSourceService.java | 28 +- .../ird/observe/services/service/PingService.java | 5 +- .../ObserveDataSourceConfiguration.java | 4 + .../configuration/ObserveDataSourceConnection.java | 4 +- .../ObserveDataSourceConnectionSupport.java | 2 + .../ObserveDataSourceInformation.java | 62 +++ .../ObserveDataSourceConfigurationRest.java | 17 + .../ObserveDataSourceConnectionRest.java | 2 + ...ObserveDataSourceConfigurationTopiaSupport.java | 13 + .../ObserveDataSourceConnectionTopia.java | 2 + .../observe/services/dto/ObserveDbUserDtos.java | 22 + .../services/dto/constants/ObserveDbRole.java | 14 + .../src/main/xmi/observe-services-dto-common.zargo | Bin 36919 -> 39020 bytes .../fr/ird/observe/services/TestClassResource.java | 5 + .../ird/observe/services/TestMethodResource.java | 10 +- .../service/DataSourceServiceRestTest.java | 4 +- .../ObserveDataSourceConfigurationMainFactory.java | 13 +- .../fr/ird/observe/services/ObserveJdbcHelper.java | 154 +++++++ .../observe/services/ObserveSecurityHelper.java | 306 ++++++++++++++ .../services/dto/ObserveDtosInitializer.java | 5 + .../services/service/DataSourceServiceTopia.java | 141 ++++++- .../i18n/observe-services-topia_en_GB.properties | 1 + .../i18n/observe-services-topia_es_ES.properties | 1 + .../i18n/observe-services-topia_fr_FR.properties | 1 + .../services/ApplicationContextResource.java | 3 + .../ObserveDataSourceConnectionTopiaTaiste.java | 2 + .../services/service/AbstractServiceTopiaTest.java | 2 +- .../service/DataSourceServiceTopiaTest.java | 6 +- .../fr/ird/observe/services/service/RigthTest.java | 36 +- .../main/java/fr/ird/observe/test/TestHelper.java | 32 ++ .../src/main/resources/observetest.properties | 3 + 67 files changed, 1777 insertions(+), 737 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.