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 d7745fd4908285511c26864592cc313bf20fc935 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Aug 20 11:21:46 2015 +0200 Introduction du module de configuration pour l'implantation REST --- .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 11 ++++++++--- .../ObserveRestDataSourceConfiguration.java | 4 +--- .../fr.ird.observe.services.ObserveServiceFactory | 0 .../src/test/resources/log4j.properties | 0 .../LICENSE.txt | 0 .../README.txt | 0 .../pom.xml | 16 +++++++++++++--- .../services/rest/client/ObserveRestClientService.java | 0 .../rest/client/ObserveRestClientServiceContext.java | 0 .../rest/client/ObserveRestClientServiceFactory.java | 2 +- .../client/service/ReferentialServiceRestClient.java | 0 .../fr.ird.observe.services.ObserveServiceFactory | 0 .../rest/client/service/ReferentialServiceRestTest.java | 0 .../src/test/resources/log4j.properties | 0 16 files changed, 23 insertions(+), 10 deletions(-) diff --git a/observe-services-rest-client/LICENSE.txt b/observe-services-configuration-rest/LICENSE.txt similarity index 100% copy from observe-services-rest-client/LICENSE.txt copy to observe-services-configuration-rest/LICENSE.txt diff --git a/observe-services-rest-client/README.txt b/observe-services-configuration-rest/README.txt similarity index 100% copy from observe-services-rest-client/README.txt copy to observe-services-configuration-rest/README.txt diff --git a/observe-services-rest-client/pom.xml b/observe-services-configuration-rest/pom.xml similarity index 84% copy from observe-services-rest-client/pom.xml copy to observe-services-configuration-rest/pom.xml index ae97bff..b810ff3 100644 --- a/observe-services-rest-client/pom.xml +++ b/observe-services-configuration-rest/pom.xml @@ -10,10 +10,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-services-rest-client</artifactId> + <artifactId>observe-services-configuration-rest</artifactId> - <name>ObServe :: Services (client REST)</name> - <description>ObServe services (client REST)</description> + <name>ObServe :: Services REST Configuration</name> + <description>ObServe services REST Configuration</description> <dependencies> @@ -25,6 +25,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java similarity index 81% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java rename to observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java index 45a2074..818a12b 100644 --- a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientDataSourceConfiguration.java +++ b/observe-services-configuration-rest/src/main/java/fr/ird/observe/services/configuration/ObserveRestDataSourceConfiguration.java @@ -1,7 +1,5 @@ package fr.ird.observe.services.rest.client; -import fr.ird.observe.services.ObserveDataSourceConfiguration; - import java.net.URL; /** @@ -9,7 +7,7 @@ import java.net.URL; * * @author Tony Chemit - chemit@codelutin.com */ -public class ObserveRestClientDataSourceConfiguration implements ObserveDataSourceConfiguration { +public class ObserveRestDataSourceConfiguration implements ObserveDataSourceConfiguration { /** * L'url du serveur à utiliser. diff --git a/observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory similarity index 100% copy from observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory copy to observe-services-configuration-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory diff --git a/observe-services-rest-client/src/test/resources/log4j.properties b/observe-services-configuration-rest/src/test/resources/log4j.properties similarity index 100% copy from observe-services-rest-client/src/test/resources/log4j.properties copy to observe-services-configuration-rest/src/test/resources/log4j.properties diff --git a/observe-services-rest-client/LICENSE.txt b/observe-services-rest/LICENSE.txt similarity index 100% rename from observe-services-rest-client/LICENSE.txt rename to observe-services-rest/LICENSE.txt diff --git a/observe-services-rest-client/README.txt b/observe-services-rest/README.txt similarity index 100% rename from observe-services-rest-client/README.txt rename to observe-services-rest/README.txt diff --git a/observe-services-rest-client/pom.xml b/observe-services-rest/pom.xml similarity index 78% rename from observe-services-rest-client/pom.xml rename to observe-services-rest/pom.xml index ae97bff..52b344e 100644 --- a/observe-services-rest-client/pom.xml +++ b/observe-services-rest/pom.xml @@ -10,10 +10,10 @@ <version>4.0.2-SNAPSHOT</version> </parent> - <artifactId>observe-services-rest-client</artifactId> + <artifactId>observe-services-rest</artifactId> - <name>ObServe :: Services (client REST)</name> - <description>ObServe services (client REST)</description> + <name>ObServe :: Services REST Implementation</name> + <description>ObServe services REST Implementation</description> <dependencies> @@ -25,9 +25,19 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>observe-services-api</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>observe-services-configuration-rest</artifactId> + <version>${project.version}</version> + </dependency> <!-- commons dependencies --> diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java similarity index 100% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientService.java diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java similarity index 100% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceContext.java diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java similarity index 96% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java index 054661c..00041f5 100644 --- a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java +++ b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/ObserveRestClientServiceFactory.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.rest.client; import com.google.common.base.Preconditions; import com.google.common.cache.LoadingCache; -import fr.ird.observe.services.ObserveDataSourceConfiguration; +import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceApplicationContext; import fr.ird.observe.services.ObserveServiceFactorySupport; diff --git a/observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java b/observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java similarity index 100% rename from observe-services-rest-client/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java rename to observe-services-rest/src/main/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestClient.java diff --git a/observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory b/observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory similarity index 100% rename from observe-services-rest-client/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory rename to observe-services-rest/src/main/resources/META-INF/services/fr.ird.observe.services.ObserveServiceFactory diff --git a/observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java b/observe-services-rest/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java similarity index 100% rename from observe-services-rest-client/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java rename to observe-services-rest/src/test/java/fr/ird/observe/services/rest/client/service/ReferentialServiceRestTest.java diff --git a/observe-services-rest-client/src/test/resources/log4j.properties b/observe-services-rest/src/test/resources/log4j.properties similarity index 100% rename from observe-services-rest-client/src/test/resources/log4j.properties rename to observe-services-rest/src/test/resources/log4j.properties -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.