branch develop updated (ab3f0e9 -> 08b7d39)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from ab3f0e9 suppression code mort + fixmes new 21e9d0b Ajout de traductions (refs 7708) new adcbd54 gestion des erreurs dans l'ecran de test de connexion au serveur distant (refs #7708) new c518d5a afficher les erreurs de connexion au source de données (refs 7708) new ae7075f ajouter le sablier pendant le test de la connexion (refs 7708) new 3aadb10 conflit entre le fitrage des ressources par le pom et les varibles de templates ftl (refs 7708) new 08b7d39 Merge branch 'feature/7708' into develop The 6 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 08b7d39dd10aae61b443c24d065e673c9d7520b5 Merge: ab3f0e9 3aadb10 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 15:33:27 2015 +0100 Merge branch 'feature/7708' into develop commit 3aadb10e11413e8dd0602cf39f66a441e9e662ff Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 15:28:07 2015 +0100 conflit entre le fitrage des ressources par le pom et les varibles de templates ftl (refs 7708) commit ae7075f36a90c8a102fb71e4fa3438ac5a435e53 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 14:51:51 2015 +0100 ajouter le sablier pendant le test de la connexion (refs 7708) commit c518d5adf16b0a6eb49d64ea7213f54a930de5e6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 12:11:38 2015 +0100 afficher les erreurs de connexion au source de données (refs 7708) commit adcbd548936f528c25a9d3fc06c9e4730ee966cb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 10 17:14:36 2015 +0100 gestion des erreurs dans l'ecran de test de connexion au serveur distant (refs #7708) commit 21e9d0bdaf9bac2abc3ef9464687d33c4446edf1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 10 12:29:45 2015 +0100 Ajout de traductions (refs 7708) Summary of changes: observe-application-swing/pom.xml | 5 + .../fr/ird/observe/ui/storage/StorageUIModel.java | 130 ++++++++++++++------- .../observe-application-swing_en_GB.properties | 5 + .../observe-application-swing_es_ES.properties | 5 + .../observe-application-swing_fr_FR.properties | 11 +- .../controller/v1/ObserveWebErrorController.java | 31 ++--- .../web/request/ObserveWebRequestContext.java | 6 +- .../ObserveWebSecurityApplicationContext.java | 6 + .../observe/services/http/ObserveHttpError.java | 46 ++++++++ .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../BadObserveWebUserPasswordException.java | 2 +- .../security/InvalidAdminKeyApiException.java | 2 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityExceptionSupport.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../observe/services/ObserveHttpErrorAdapter.java | 37 ++++++ .../services/ObserveServiceFactoryRest.java | 9 +- .../services/ObserveServiceRestErrorException.java | 16 +++ .../ObserveServiceRestNotAvailableException.java | 1 + .../services/http/ObserveResponseBuilder.java | 35 +++++- .../services/service/DataSourceServiceTopia.java | 7 +- 26 files changed, 272 insertions(+), 100 deletions(-) create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/AdminApiKeyNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/AuthenticationTokenNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/BadObserveWebUserPasswordException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/InvalidAdminKeyApiException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/InvalidAuthenticationTokenException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/ObserveWebSecurityExceptionSupport.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/SecurityRequestContextNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UnknownObserveWebUserException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UnknownObserveWebUserForDatabaseException.java (96%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UserLoginNotFoundException.java (95%) rename {observe-application-web/src/main/java/fr/ird/observe/application/web => observe-services-api/src/main/java/fr/ird/observe/services}/security/UserPasswordNotFoundException.java (95%) create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java create mode 100644 observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 21e9d0bdaf9bac2abc3ef9464687d33c4446edf1 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 10 12:29:45 2015 +0100 Ajout de traductions (refs 7708) --- .../main/resources/i18n/observe-application-swing_fr_FR.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 808e15b..137359f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1809,8 +1809,8 @@ observe.storage.importRemoteStorage.config=Sélection de la base distante à imp observe.storage.importRemoteStorage.description=Veuillez configurer la connexion vers une base distante.\nAvant de pouvoir poursuivre, vous devez valider la connexion. observe.storage.importRemoteStorageData.config=Choisir la base distante contenant les données à importer observe.storage.importRemoteStorageReferentiel.config=Choisir la base distante contenant le référentiel à importer -observe.storage.importServerStorage.config= -observe.storage.importServerStorage.description= +observe.storage.importServerStorage.config=Sélection du serveur distant à importer +observe.storage.importServerStorage.description=Veuillez configurer la connexion vers un serveur distant.\nAvant de pouvoir poursuivre, vous devez valider la connexion. observe.storage.internalDump.last.modified=(dernier import \: %1$td/%1$tm/%1$tY à %1$tH\:%1$tM) observe.storage.internalDump.not.exist=Pas de base embarquée. observe.storage.label.backup=Base temporaire pour backup -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 adcbd548936f528c25a9d3fc06c9e4730ee966cb Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Nov 10 17:14:36 2015 +0100 gestion des erreurs dans l'ecran de test de connexion au serveur distant (refs #7708) --- .../fr/ird/observe/ui/storage/StorageUIModel.java | 3 +- .../observe/services/ObserveHttpErrorAdapter.java | 37 +++++++++++++++++ .../services/ObserveServiceFactoryRest.java | 9 +---- .../services/ObserveServiceRestErrorException.java | 16 ++++++++ .../ObserveServiceRestNotAvailableException.java | 1 + .../observe/services/http/ObserveHttpError.java | 47 ++++++++++++++++++++++ .../services/http/ObserveResponseBuilder.java | 28 +++++++++++-- 7 files changed, 130 insertions(+), 11 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 520fb3c..5990366 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1718,7 +1718,8 @@ public class StorageUIModel extends WizardModel<StorageStep> { try { - if (DbMode.USE_SERVER.equals(getDbMode())) { + if (DbMode.USE_SERVER.equals(getDbMode()) + || DbMode.CREATE_LOCAL.equals(getDbMode()) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)) { PingService pingService = dataSource.newService(PingService.class); diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java new file mode 100644 index 0000000..79ffbc0 --- /dev/null +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveHttpErrorAdapter.java @@ -0,0 +1,37 @@ +package fr.ird.observe.services; + +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import fr.ird.observe.services.http.ObserveHttpError; + +import java.lang.reflect.Type; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ObserveHttpErrorAdapter implements JsonDeserializer<ObserveHttpError> { + @Override + public ObserveHttpError deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { + + JsonObject jsonObject = json.getAsJsonObject(); + + Integer httpCode = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_HTTP_CODE), Integer.class); + + String message = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_MESSAGE), String.class); + + Class exceptionType = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_EXECPTION_TYPE), Class.class); + + Throwable exception = null; + + if (exceptionType != null) { + + exception = context.deserialize(jsonObject.get(ObserveHttpError.PROPERTY_EXCEPTION), exceptionType); + + } + + return new ObserveHttpError(httpCode, exceptionType, message, exception); + } +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java index b3034ed..a695ff0 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceFactoryRest.java @@ -23,12 +23,9 @@ package fr.ird.observe.services; */ import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.base.Strings; import com.google.common.base.Supplier; import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.reflect.Reflection; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -40,6 +37,7 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRestC import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.ObserveDataSourceConnectionRest; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; +import fr.ird.observe.services.http.ObserveHttpError; import fr.ird.observe.services.http.ObserveRequest; import fr.ird.observe.services.http.ObserveRequestBuilder; import fr.ird.observe.services.http.ObserveRequestMethod; @@ -54,11 +52,7 @@ import org.apache.commons.logging.LogFactory; import java.io.IOException; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; -import java.lang.reflect.ParameterizedType; -import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; import java.util.Collection; -import java.util.List; /** * Created on 16/08/15. @@ -81,6 +75,7 @@ public class ObserveServiceFactoryRest extends ObserveServiceFactorySupport impl // Les ObserveDataSourceConnection sont obligatoirement de type ObserveDataSourceConnectionRest builder.registerTypeAdapter(ObserveDataSourceConnection.class, new ObserveDataSourceConnectionAdapter()); + builder.registerTypeAdapter(ObserveHttpError.class, new ObserveHttpErrorAdapter()); return builder; } diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java new file mode 100644 index 0000000..e6c3033 --- /dev/null +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestErrorException.java @@ -0,0 +1,16 @@ +package fr.ird.observe.services; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class ObserveServiceRestErrorException extends RuntimeException { + + private static final long serialVersionUID = 1L; + + public ObserveServiceRestErrorException() { + } + + public ObserveServiceRestErrorException(String message) { + super(message); + } +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java index f4e0112..1145be6 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRestNotAvailableException.java @@ -38,6 +38,7 @@ public class ObserveServiceRestNotAvailableException extends RuntimeException { private final URL serverUrl; public ObserveServiceRestNotAvailableException(URL serverUrl) { + super("Server " + serverUrl + " not available"); this.serverUrl = serverUrl; } diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java new file mode 100644 index 0000000..224eb1e --- /dev/null +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java @@ -0,0 +1,47 @@ +package fr.ird.observe.services.http; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +// TODO doublon avec fr.ird.observe.application.web.controller.v1.ObserveWebErrorController.Error +public class ObserveHttpError { + + public static final String PROPERTY_HTTP_CODE = "httpCode"; + + public static final String PROPERTY_EXECPTION_TYPE = "exceptionType"; + + public static final String PROPERTY_MESSAGE = "message"; + + public static final String PROPERTY_EXCEPTION = "exception"; + + protected final Integer httpCode; + + protected final Class<?> exceptionType; + + protected final String message; + + protected final Throwable exception; + + public ObserveHttpError(Integer httpCode, Class<?> exceptionType, String message, Throwable exception) { + this.httpCode = httpCode; + this.exceptionType = exceptionType; + this.message = message; + this.exception = exception; + } + + public Integer getHttpCode() { + return httpCode; + } + + public Class<?> getExceptionType() { + return exceptionType; + } + + public String getMessage() { + return message; + } + + public Throwable getException() { + return exception; + } +} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java index 563674a..4851de8 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java @@ -26,6 +26,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Preconditions; import com.google.common.base.Supplier; import com.google.gson.Gson; +import fr.ird.observe.services.ObserveServiceRestErrorException; import fr.ird.observe.services.ObserveServiceRestNotAvailableException; import fr.ird.observe.services.dto.gson.ObserveDtoGsonSupplier; import org.apache.commons.io.Charsets; @@ -107,7 +108,7 @@ public class ObserveResponseBuilder { } - public <T> ObserveResponse<T> build(ObserveRequest request, Type resultType) throws IOException { + public <T> ObserveResponse<T> build(ObserveRequest request, Type resultType) throws Throwable { String baseUrl = request.getBaseUrl(); Preconditions.checkNotNull(baseUrl, "'baseUrl' can't be null"); @@ -117,8 +118,29 @@ public class ObserveResponseBuilder { ResponseContext responseContext = executeRequest(request); - if (responseContext.statusCode != 200 && log.isWarnEnabled()) { - log.warn(String.format("Unexpected status code for url: %s\n%s", baseUrl, responseContext.responseAsString)); + if (responseContext.statusCode != 200) { + if (log.isWarnEnabled()) { + log.warn(String.format("Unexpected status code for url: %s\n%s", baseUrl, responseContext.responseAsString)); + } + + ObserveHttpError error = convertJson(responseContext.responseAsString, ObserveHttpError.class); + + if (error != null) { + + throw new ObserveServiceRestErrorException("" + responseContext.statusCode); + + } else { + + if (error.getException() != null) { + + throw error.getException(); + + } else { + + throw new ObserveServiceRestErrorException(error.getHttpCode() + " : " + error.getMessage()); + + } + } } T resultObject = convertJson(responseContext.responseAsString, resultType); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 c518d5adf16b0a6eb49d64ea7213f54a930de5e6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 12:11:38 2015 +0100 afficher les erreurs de connexion au source de données (refs 7708) --- .../fr/ird/observe/ui/storage/StorageUIModel.java | 38 +++++++++++++++++++++- .../observe-application-swing_en_GB.properties | 5 +++ .../observe-application-swing_es_ES.properties | 5 +++ .../observe-application-swing_fr_FR.properties | 7 +++- .../controller/v1/ObserveWebErrorController.java | 31 ++++-------------- .../web/request/ObserveWebRequestContext.java | 6 ++-- .../ObserveWebSecurityApplicationContext.java | 6 ++++ .../observe/services/http/ObserveHttpError.java | 1 - .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../BadObserveWebUserPasswordException.java | 2 +- .../security/InvalidAdminKeyApiException.java | 2 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityExceptionSupport.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../services/http/ObserveResponseBuilder.java | 11 +++++-- .../services/service/DataSourceServiceTopia.java | 7 +--- 21 files changed, 90 insertions(+), 49 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index 5990366..a8e958c 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -38,6 +38,12 @@ import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; import fr.ird.observe.services.dto.ObserveDbUserDto; +import fr.ird.observe.services.security.BadObserveWebUserPasswordException; +import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport; +import fr.ird.observe.services.security.UnknownObserveWebUserException; +import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; +import fr.ird.observe.services.security.UserLoginNotFoundException; +import fr.ird.observe.services.security.UserPasswordNotFoundException; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DataSourceDumpProducerService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; @@ -1725,7 +1731,7 @@ public class StorageUIModel extends WizardModel<StorageStep> { Version modelServerVersion = pingService.ping(); - if (! getModelVersion().equals(modelServerVersion)) { + if (!getModelVersion().equals(modelServerVersion)) { connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, getModelVersion()); @@ -1758,6 +1764,36 @@ public class StorageUIModel extends WizardModel<StorageStep> { } } + } catch (UnknownObserveWebUserException e) { + + connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (BadObserveWebUserPasswordException e) { + + connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (UnknownObserveWebUserForDatabaseException e) { + + connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (UserLoginNotFoundException e) { + + connexionStatusError = t("observe.storage.error.rest.user.required"); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (UserPasswordNotFoundException e) { + + connexionStatusError = t("observe.storage.error.rest.pasword.required"); + setConnexionStatus(ConnexionStatus.FAILED); + + } catch (ObserveWebSecurityExceptionSupport e) { + + connexionStatusError = e.getClass().getSimpleName(); + setConnexionStatus(ConnexionStatus.FAILED); + } catch (Exception e) { connexionStatusError = e.getMessage(); diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index c9145ec..d97fb75 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -1803,6 +1803,11 @@ observe.storage.detail.remote= observe.storage.detail.server= observe.storage.error.badUrl= observe.storage.error.dbVersionMismatch= +observe.storage.error.rest.database.unknownForUser= +observe.storage.error.rest.password.bad= +observe.storage.error.rest.pasword.required= +observe.storage.error.rest.user.required= +observe.storage.error.rest.user.unknown= observe.storage.error.serverVersionMismatch= observe.storage.importExternalDump.config= observe.storage.importExternalDump.description= diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index a5de89f..ff0694b 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -1805,6 +1805,11 @@ observe.storage.detail.remote= observe.storage.detail.server= observe.storage.error.badUrl= observe.storage.error.dbVersionMismatch=La versión de la base remota (%s)no es compatible con la versión del modelo (%s). +observe.storage.error.rest.database.unknownForUser= +observe.storage.error.rest.password.bad= +observe.storage.error.rest.pasword.required= +observe.storage.error.rest.user.required= +observe.storage.error.rest.user.unknown= observe.storage.error.serverVersionMismatch= observe.storage.importExternalDump.config=Selección de la copia de seguridad a utilizar observe.storage.importExternalDump.description=Seleccione el archivo de una copia de seguridad (*.sql.gz). diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index 137359f..0ad8cf2 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -1800,6 +1800,11 @@ observe.storage.detail.remote=- URL JDBC \: %1s\n- Login \: %2s\n- Mot de passe observe.storage.detail.server=- URL serveur \: %1s\n- Login \: %2s\n- Mot de passe \: %3s \n- Base de données \: %4s observe.storage.error.badUrl=Erreur dans le format de l'URL %s observe.storage.error.dbVersionMismatch=La version de la base distante (%s) n'est pas compatible avec la version du modèle (%s) +observe.storage.error.rest.database.unknownForUser=La base de donnée "%s" n'est pas définie pour l'utilisateur "%s" +observe.storage.error.rest.password.bad=Le mot de passe est invalide +observe.storage.error.rest.pasword.required=Le mot de passe est obligatoire +observe.storage.error.rest.user.required=L'utilisateur est obligatoire +observe.storage.error.rest.user.unknown=L'utilisateur "%s" est inconnue sur le serveur observe.storage.error.serverVersionMismatch=La version du serveur distant (%s) n'est pas compatible avec la version du modèle (%s) observe.storage.importExternalDump.config=Sélection de la sauvegarde à utiliser observe.storage.importExternalDump.description=Veuillez sélectionner le fichier d'une sauvegarde (*.sql.gz). @@ -1850,7 +1855,7 @@ observe.storage.no.dbMode=Aucun type de source de données sélectionné observe.storage.noImportData.config=< Pas de configuration > observe.storage.noImportReferentiel.config=< Pas de configuration > observe.storage.remote.db=(distante) -observe.storage.remote.login=Login +observe.storage.remote.login=Utilisateur observe.storage.remote.password=Mot de passe observe.storage.remote.url=Url observe.storage.remote.useSll=mode ssl ? diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java index 1de298b..67cd792 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/ObserveWebErrorController.java @@ -22,8 +22,9 @@ package fr.ird.observe.application.web.controller.v1; * #L% */ -import fr.ird.observe.application.web.security.ObserveWebSecurityExceptionSupport; +import fr.ird.observe.services.security.ObserveWebSecurityExceptionSupport; import fr.ird.observe.services.dto.UnauthorizedException; +import fr.ird.observe.services.http.ObserveHttpError; import org.debux.webmotion.server.WebMotionController; import org.debux.webmotion.server.WebMotionException; import org.debux.webmotion.server.call.HttpContext; @@ -42,25 +43,7 @@ import java.util.Set; */ public class ObserveWebErrorController extends WebMotionController { - class Error { - - protected final Integer httpCode; - - protected final Class<?> exceptionType; - - protected final String message; - - protected final Throwable exception; - - Error(Integer httpCode, Class<?> exceptionType, String message, Throwable exception) { - this.httpCode = httpCode; - this.exceptionType = exceptionType; - this.message = message; - this.exception = exception; - } - } - - public Error error(HttpContext.ErrorData errorData) { + public ObserveHttpError error(HttpContext.ErrorData errorData) { @SuppressWarnings("ThrowableResultOfMethodCallIgnored") Throwable exception = errorData.getException(); @@ -112,10 +95,10 @@ public class ObserveWebErrorController extends WebMotionController { } - Error error = new Error(statusCode, - exception == null ? null : exception.getClass(), - message, - exception); + ObserveHttpError error = new ObserveHttpError(statusCode, + exception == null ? null : exception.getClass(), + message, + exception); return error; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java index 251782c..b68e7ab 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/request/ObserveWebRequestContext.java @@ -24,9 +24,9 @@ package fr.ird.observe.application.web.request; import com.google.common.base.Optional; import fr.ird.observe.application.web.ObserveWebApplicationContext; -import fr.ird.observe.application.web.security.AdminApiKeyNotFoundException; -import fr.ird.observe.application.web.security.AuthenticationTokenNotFoundException; -import fr.ird.observe.application.web.security.InvalidAdminKeyApiException; +import fr.ird.observe.services.security.AdminApiKeyNotFoundException; +import fr.ird.observe.services.security.AuthenticationTokenNotFoundException; +import fr.ird.observe.services.security.InvalidAdminKeyApiException; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceInitializer; import fr.ird.observe.services.ObserveSpeciesListConfiguration; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java index 01f1abe..39c89f6 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityApplicationContext.java @@ -35,6 +35,12 @@ import fr.ird.observe.application.web.configuration.user.ObserveWebUsers; import fr.ird.observe.services.ObserveDataSourceConfigurationMainFactory; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationAndConnection; +import fr.ird.observe.services.security.BadObserveWebUserPasswordException; +import fr.ird.observe.services.security.InvalidAuthenticationTokenException; +import fr.ird.observe.services.security.UnknownObserveWebUserException; +import fr.ird.observe.services.security.UnknownObserveWebUserForDatabaseException; +import fr.ird.observe.services.security.UserLoginNotFoundException; +import fr.ird.observe.services.security.UserPasswordNotFoundException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.version.Version; diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java b/observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java similarity index 91% rename from observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java rename to observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java index 224eb1e..faf9f3b 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/http/ObserveHttpError.java @@ -3,7 +3,6 @@ package fr.ird.observe.services.http; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ -// TODO doublon avec fr.ird.observe.application.web.controller.v1.ObserveWebErrorController.Error public class ObserveHttpError { public static final String PROPERTY_HTTP_CODE = "httpCode"; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java index 70621fb..7c35bc9 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AdminApiKeyNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/AdminApiKeyNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java index 6e5d666..99e156c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/AuthenticationTokenNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/AuthenticationTokenNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java index 86944ad..853499a 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/BadObserveWebUserPasswordException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/BadObserveWebUserPasswordException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java index f17bdc4..0e1e2c5 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAdminKeyApiException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAdminKeyApiException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java index 45c9f65..f4a34f2 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/InvalidAuthenticationTokenException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/InvalidAuthenticationTokenException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java index 3e829bc..e9be3ef 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/ObserveWebSecurityExceptionSupport.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/ObserveWebSecurityExceptionSupport.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java index 8148647..5a7b8bf 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/SecurityRequestContextNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/SecurityRequestContextNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java index a5dc81a..5f32d79 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java similarity index 96% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java index a3522c5..71e19be 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UnknownObserveWebUserForDatabaseException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UnknownObserveWebUserForDatabaseException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java index 47b15a5..96290d0 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserLoginNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserLoginNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java similarity index 95% rename from observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java rename to observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java index e3a7bea..834cc8c 100644 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/security/UserPasswordNotFoundException.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/security/UserPasswordNotFoundException.java @@ -1,4 +1,4 @@ -package fr.ird.observe.application.web.security; +package fr.ird.observe.services.security; /* * #%L diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java index 4851de8..52af696 100644 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/http/ObserveResponseBuilder.java @@ -123,9 +123,16 @@ public class ObserveResponseBuilder { log.warn(String.format("Unexpected status code for url: %s\n%s", baseUrl, responseContext.responseAsString)); } - ObserveHttpError error = convertJson(responseContext.responseAsString, ObserveHttpError.class); + ObserveHttpError error; - if (error != null) { + try { + error = convertJson(responseContext.responseAsString, ObserveHttpError.class); + } catch (Exception e) { + // si le reponse n'est pas un Json on envoie la reponse tel quel; + throw new ObserveServiceRestErrorException(responseContext.statusCode + " : \n" + responseContext.responseAsString); + } + + if (error == null) { throw new ObserveServiceRestErrorException("" + responseContext.statusCode); diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index 9e45824..19af79f 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -136,9 +136,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS new JdbcHelper(topiaConfiguration).runSelectOnString("SELECT 1;"); } catch (Exception e) { - // Authentification refusée - String message = l(getApplicationLocale(), "observe.services.topia.error.pg.database.badAuthentication"); - throw new DatabaseConnexionNotAuthorizedException(message, e, dataSourceConfiguration); + throw new DatabaseConnexionNotAuthorizedException(e.getMessage(), e, dataSourceConfiguration); } @@ -146,9 +144,6 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } - // FIXME A utiliser pour generé le contenu du fichier fr/ird/observe/services/service/actions/validate/validators.json - // ValidateServiceTopia.showValidators(); - return dataSourceInformation; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 ae7075f36a90c8a102fb71e4fa3438ac5a435e53 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 14:51:51 2015 +0100 ajouter le sablier pendant le test de la connexion (refs 7708) --- .../fr/ird/observe/ui/storage/StorageUIModel.java | 131 +++++++++++---------- 1 file changed, 69 insertions(+), 62 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java index a8e958c..b6259b6 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIModel.java @@ -1697,118 +1697,125 @@ public class StorageUIModel extends WizardModel<StorageStep> { boolean result = false; boolean error = false; connexionStatusError = ""; + setBusy(true); - if (isEditRemoteConfig()) { - config = pgConfig; - } else if (isEditServerConfig()) { - try { - URL url = new URL(serverUrl); + try { + + if (isEditRemoteConfig()) { + config = pgConfig; + } else if (isEditServerConfig()) { + try { + URL url = new URL(serverUrl); + + restConfig.setServerUrl(url); - restConfig.setServerUrl(url); + config = restConfig; - config = restConfig; + } catch (MalformedURLException e) { - } catch (MalformedURLException e) { + connexionStatusError = t("observe.storage.error.badUrl", serverUrl); - connexionStatusError = t("observe.storage.error.badUrl", serverUrl); + setConnexionStatus(ConnexionStatus.FAILED); - setConnexionStatus(ConnexionStatus.FAILED); + } } - } + if (config != null) { - if (config != null) { + ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().newDataSource(config); - ObserveSwingDataSource dataSource = ObserveSwingApplicationContext.get().newDataSource(config); + try { - try { + if (DbMode.USE_SERVER.equals(getDbMode()) + || DbMode.CREATE_LOCAL.equals(getDbMode()) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)) { - if (DbMode.USE_SERVER.equals(getDbMode()) - || DbMode.CREATE_LOCAL.equals(getDbMode()) && CreationMode.IMPORT_SERVER_STORAGE.equals(creationMode)) { + PingService pingService = dataSource.newService(PingService.class); - PingService pingService = dataSource.newService(PingService.class); + Version modelServerVersion = pingService.ping(); - Version modelServerVersion = pingService.ping(); + if (!getModelVersion().equals(modelServerVersion)) { - if (!getModelVersion().equals(modelServerVersion)) { + connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, getModelVersion()); - connexionStatusError = t("observe.storage.error.serverVersionMismatch", modelServerVersion, getModelVersion()); + setConnexionStatus(ConnexionStatus.FAILED); - setConnexionStatus(ConnexionStatus.FAILED); + error = true; + } - error = true; } - } - - if (!error) { + if (!error) { - dataSourceInformation = dataSource.checkCanConnect(); + dataSourceInformation = dataSource.checkCanConnect(); - Version versionDataSource = dataSourceInformation.getVersion(); + Version versionDataSource = dataSourceInformation.getVersion(); - // en mise a jour de la base on ne test pas la version - if (getModelVersion().equals(versionDataSource) || isCanMigrate()) { + // en mise a jour de la base on ne test pas la version + if (getModelVersion().equals(versionDataSource) || isCanMigrate()) { - setConnexionStatus(ConnexionStatus.SUCCESS); + setConnexionStatus(ConnexionStatus.SUCCESS); - result = true; + result = true; - } else { + } else { - connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, getModelVersion()); + connexionStatusError = t("observe.storage.error.dbVersionMismatch", versionDataSource, getModelVersion()); - setConnexionStatus(ConnexionStatus.FAILED); + setConnexionStatus(ConnexionStatus.FAILED); + } } - } - } catch (UnknownObserveWebUserException e) { + } catch (UnknownObserveWebUserException e) { - connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.user.unknown", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (BadObserveWebUserPasswordException e) { + } catch (BadObserveWebUserPasswordException e) { - connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.password.bad", e.getUserLogin()); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (UnknownObserveWebUserForDatabaseException e) { + } catch (UnknownObserveWebUserForDatabaseException e) { - connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.database.unknownForUser", e.getDatabaseName(), e.getRole()); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (UserLoginNotFoundException e) { + } catch (UserLoginNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.user.required"); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.user.required"); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (UserPasswordNotFoundException e) { + } catch (UserPasswordNotFoundException e) { - connexionStatusError = t("observe.storage.error.rest.pasword.required"); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = t("observe.storage.error.rest.pasword.required"); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (ObserveWebSecurityExceptionSupport e) { + } catch (ObserveWebSecurityExceptionSupport e) { - connexionStatusError = e.getClass().getSimpleName(); - setConnexionStatus(ConnexionStatus.FAILED); + connexionStatusError = e.getClass().getSimpleName(); + setConnexionStatus(ConnexionStatus.FAILED); - } catch (Exception e) { + } catch (Exception e) { - connexionStatusError = e.getMessage(); + connexionStatusError = e.getMessage(); - if (log.isErrorEnabled()) { - log.error("Error in test remote", e); - } + if (log.isErrorEnabled()) { + log.error("Error in test remote", e); + } - setConnexionStatus(ConnexionStatus.FAILED); + setConnexionStatus(ConnexionStatus.FAILED); - } finally { - if (dataSource.isOpen()) { - dataSource.close(); + } finally { + if (dataSource.isOpen()) { + dataSource.close(); + } } } + + } finally { + setBusy(false); } return result; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 3aadb10e11413e8dd0602cf39f66a441e9e662ff Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 15:28:07 2015 +0100 conflit entre le fitrage des ressources par le pom et les varibles de templates ftl (refs 7708) --- observe-application-swing/pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/observe-application-swing/pom.xml b/observe-application-swing/pom.xml index 8bc4dd2..04909c6 100644 --- a/observe-application-swing/pom.xml +++ b/observe-application-swing/pom.xml @@ -336,6 +336,11 @@ <includes> <include>**/*</include> </includes> + <!-- on ne filtre pas les fichiers template de generation de text pour éviter + les conflit entre les varibles du pom et les variable du model du template --> + <excludes> + <exclude>ftl/*.ftl</exclude> + </excludes> </resource> </resources> <pluginManagement> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
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 08b7d39dd10aae61b443c24d065e673c9d7520b5 Merge: ab3f0e9 3aadb10 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Nov 12 15:33:27 2015 +0100 Merge branch 'feature/7708' into develop observe-application-swing/pom.xml | 5 + .../fr/ird/observe/ui/storage/StorageUIModel.java | 130 ++++++++++++++------- .../observe-application-swing_en_GB.properties | 5 + .../observe-application-swing_es_ES.properties | 5 + .../observe-application-swing_fr_FR.properties | 11 +- .../controller/v1/ObserveWebErrorController.java | 31 ++--- .../web/request/ObserveWebRequestContext.java | 6 +- .../ObserveWebSecurityApplicationContext.java | 6 + .../observe/services/http/ObserveHttpError.java | 46 ++++++++ .../security/AdminApiKeyNotFoundException.java | 2 +- .../AuthenticationTokenNotFoundException.java | 2 +- .../BadObserveWebUserPasswordException.java | 2 +- .../security/InvalidAdminKeyApiException.java | 2 +- .../InvalidAuthenticationTokenException.java | 2 +- .../ObserveWebSecurityExceptionSupport.java | 2 +- .../SecurityRequestContextNotFoundException.java | 2 +- .../security/UnknownObserveWebUserException.java | 2 +- .../UnknownObserveWebUserForDatabaseException.java | 2 +- .../security/UserLoginNotFoundException.java | 2 +- .../security/UserPasswordNotFoundException.java | 2 +- .../observe/services/ObserveHttpErrorAdapter.java | 37 ++++++ .../services/ObserveServiceFactoryRest.java | 9 +- .../services/ObserveServiceRestErrorException.java | 16 +++ .../ObserveServiceRestNotAvailableException.java | 1 + .../services/http/ObserveResponseBuilder.java | 35 +++++- .../services/service/DataSourceServiceTopia.java | 7 +- 26 files changed, 272 insertions(+), 100 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm