This is an automated email from the git hooks/post-receive script. New commit to branch feature/7494 in repository observe. See http://git.codelutin.com/observe.git commit 0ef9322a16f08204fff12502db2a98394fdc0bad Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 29 13:56:08 2015 +0200 Réactivitation des modules reset et de l'application web + Suppression d'objets non utiles et mise à jur de l'api de configuration pour les services rest --- .../ObserveDataSourceConfigurationRest.java | 23 +++++++++++ .../services/ObserveServiceContextRest.java | 47 ---------------------- .../ird/observe/services/ObserveServiceRest.java | 20 --------- pom.xml | 8 ++-- 4 files changed, 27 insertions(+), 71 deletions(-) diff --git a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java index 50226ce..1f637fc 100644 --- a/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveDataSourceConfigurationRest.java @@ -9,6 +9,13 @@ import java.net.URL; */ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConfiguration { + private static final long serialVersionUID = 1L; + + /** + * Le libellé de la data source. + */ + protected String label; + /** * L'url du serveur à utiliser. */ @@ -19,6 +26,15 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf */ protected String authenticationToken; + @Override + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } + public URL getServerUrl() { return serverUrl; } @@ -34,4 +50,11 @@ public class ObserveDataSourceConfigurationRest implements ObserveDataSourceConf public void setAuthenticationToken(String authenticationToken) { this.authenticationToken = authenticationToken; } + + @Override + public boolean datasourceExists() { + //TODO + return false; + } + } diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java deleted file mode 100644 index 926a7dc..0000000 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceContextRest.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.ird.observe.services; - -import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; -import fr.ird.observe.services.dto.constants.ReferentialLocale; - -import java.net.URL; -import java.util.Date; - -/** - * Created on 16/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveServiceContextRest implements ObserveServiceContext { - - protected ObserveServiceApplicationContext applicationContext; - - protected ObserveDataSourceConfigurationRest dataSourceConfiguration; - - @Override - public ReferentialLocale getReferentialLocale() { - return applicationContext.getReferentialLocale(); - } - - @Override - public Date now() { - return new Date(); - } - - public void setDataSourceConfiguration(ObserveDataSourceConfigurationRest dataSourceConfiguration) { - this.dataSourceConfiguration = dataSourceConfiguration; - } - - public void setApplicationContext(ObserveServiceApplicationContext applicationContext) { - this.applicationContext = applicationContext; - } - - public URL getServicesRemoteBaseUrl() { - return dataSourceConfiguration.getServerUrl(); - } - - public String getAuthenticationToken() { - return dataSourceConfiguration.getAuthenticationToken(); - } - - -} diff --git a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java b/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java deleted file mode 100644 index 4a9b000..0000000 --- a/observe-services-rest/src/main/java/fr/ird/observe/services/ObserveServiceRest.java +++ /dev/null @@ -1,20 +0,0 @@ -package fr.ird.observe.services; - -/** - * Created on 16/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class ObserveServiceRest implements ObserveService { - - protected ObserveServiceContextRest serviceContext; - - public void setServiceContext(ObserveServiceContextRest serviceContext) { - this.serviceContext = serviceContext; - } - - @Override - public void setServiceContext(ObserveServiceContext serviceContext) { - - } -} diff --git a/pom.xml b/pom.xml index 32c0ab1..56b2d70 100644 --- a/pom.xml +++ b/pom.xml @@ -89,10 +89,10 @@ <!--<module>observe-validation</module>--> <module>observe-services-configuration-topia</module> <module>observe-services-topia</module> - <!--<module>observe-services-configuration-rest</module>--> - <!--<module>observe-services-rest</module>--> - <!--<module>observe-services-runner</module>--> - <!--<module>observe-application-web</module>--> + <module>observe-services-configuration-rest</module> + <module>observe-services-rest</module> + <module>observe-services-runner</module> + <module>observe-application-web</module> <!--<module>observe-application-swing</module>--> </modules> <!--scm> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.