branch develop updated (88e7990 -> 3ba643f)
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 88e7990 Ajout d'un adapter Gson pour les Class new 3ba643f Ajout de méthodes de création des différentes datasources The 1 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 3ba643fc497f6e350da60493fb1e8ab190be076d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 3 16:38:06 2015 +0200 Ajout de méthodes de création des différentes datasources Summary of changes: .../ObserveWebSecurityApplicationContext.java | 2 + .../ObserveDataSourceConfigurationMainFactory.java | 52 +++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) -- 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 3ba643fc497f6e350da60493fb1e8ab190be076d Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Sep 3 16:38:06 2015 +0200 Ajout de méthodes de création des différentes datasources --- .../ObserveWebSecurityApplicationContext.java | 2 + .../ObserveDataSourceConfigurationMainFactory.java | 52 +++++++++++++++++++++- 2 files changed, 53 insertions(+), 1 deletion(-) 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 b5b5942..260a437 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 @@ -94,6 +94,8 @@ public class ObserveWebSecurityApplicationContext implements Closeable { jdbcUrl, login, password.toCharArray(), + true, + true, true ); 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 index 6e2b6a8..e9e18cb 100644 --- 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 @@ -1,8 +1,13 @@ package fr.ird.observe.services; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationRest; +import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopiaPG; +import java.io.File; +import java.net.URL; + /** * Created on 30/08/15. * @@ -10,14 +15,59 @@ import fr.ird.observe.services.configuration.ObserveDataSourceConfigurationTopia */ public class ObserveDataSourceConfigurationMainFactory { - public ObserveDataSourceConfiguration createObserveDataSourceConfigurationTopiaPG(String label, String jdbcUrl, String username, char[] password, boolean useSsl) { + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationTopiaPG(String label, + String jdbcUrl, + String username, + char[] password, + boolean useSsl, + boolean showMigrationProgression, + boolean showMigrationSql) { + ObserveDataSourceConfigurationTopiaPG result = new ObserveDataSourceConfigurationTopiaPG(); result.setLabel(label); result.setJdbcUrl(jdbcUrl); result.setUsername(username); result.setPassword(password); result.setUseSsl(useSsl); + result.setShowMigrationProgression(showMigrationProgression); + result.setShowMigrationSql(showMigrationSql); + + return result; + + } + + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationTopiaH2(String label, + File directory, + String databaseName, + String username, + char[] password, + boolean showMigrationProgression, + boolean showMigrationSql) { + + ObserveDataSourceConfigurationTopiaH2 result = new ObserveDataSourceConfigurationTopiaH2(); + result.setLabel(label); + result.setDbName(databaseName); + result.setUsername(username); + result.setPassword(password); + result.setDirectory(directory); + result.setShowMigrationProgression(showMigrationProgression); + result.setShowMigrationSql(showMigrationSql); + return result; + } + public ObserveDataSourceConfiguration createObserveDataSourceConfigurationRest(String label, + URL serverUrl, + String authenticationToken) { + + ObserveDataSourceConfigurationRest result = new ObserveDataSourceConfigurationRest(); + result.setLabel(label); + result.setServerUrl(serverUrl); + result.setAuthenticationToken(authenticationToken); + + return result; + + } } + -- 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