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 ef3be40f607d1aeddaddb3e11a7047faf1a9f45e Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 31 00:29:31 2015 +0200 ajout d'une usine de configuration de sources de données neutre au niveau du runner de services, nettoyage de code et passage en scope compile des différentes configurations --- observe-services-runner/pom.xml | 2 -- .../ObserveDataSourceConfigurationMainFactory.java | 24 ++++++++++++++++++++++ .../services/ObserveServiceMainFactory.java | 3 +-- 3 files changed, 25 insertions(+), 4 deletions(-) diff --git a/observe-services-runner/pom.xml b/observe-services-runner/pom.xml index 2fb3820..a110705 100644 --- a/observe-services-runner/pom.xml +++ b/observe-services-runner/pom.xml @@ -37,13 +37,11 @@ <groupId>${project.groupId}</groupId> <artifactId>observe-services-configuration-rest</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>observe-services-configuration-topia</artifactId> <version>${project.version}</version> - <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java new file mode 100644 index 0000000..c5fd02f --- /dev/null +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveDataSourceConfigurationMainFactory.java @@ -0,0 +1,24 @@ +package fr.ird.observe.services; + +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; + +/** + * Created on 30/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ObserveDataSourceConfigurationMainFactory { + + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationTopiaPG(String label, String jdbcUrl, String username, char[] password, boolean useSsl) { + ObserveDataSourceConfigurationTopiaPG result = new ObserveDataSourceConfigurationTopiaPG(); + result.setLabel(label); + result.setJdbcUrl(jdbcUrl); + result.setUsername(username); + result.setPassword(password); + result.setUseSsl(useSsl); + return result; + + } + +} diff --git a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java index 3d3c462..cf860e6 100644 --- a/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java +++ b/observe-services-runner/src/main/java/fr/ird/observe/services/ObserveServiceMainFactory.java @@ -6,7 +6,6 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import java.io.Closeable; import java.util.ServiceLoader; /** @@ -14,7 +13,7 @@ import java.util.ServiceLoader; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveServiceMainFactory implements ObserveServiceFactory, Closeable { +public class ObserveServiceMainFactory implements ObserveServiceFactory { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceMainFactory.class); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.