Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 34740916 by Tony Chemit at 2017-07-19T01:40:13+02:00 optimize dependencies - - - - - 9ec91009 by Tony Chemit at 2017-07-19T01:41:56+02:00 Optimize license headers - - - - - 16 changed files: - application-web/pom.xml - application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java - application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java - application-web/src/test/resources/log4j.properties - services-rest/pom.xml - services-runner/pom.xml - services-runner/src/main/resources/validators.xml - services-topia/pom.xml - services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java - services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java - services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java - services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java - services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java - services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java - services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java Changes: ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -103,6 +103,11 @@ <artifactId>nuiton-converter</artifactId> </dependency> + <dependency> + <groupId>io.ultreia.java4all.http</groupId> + <artifactId>http-api</artifactId> + </dependency> + <!-- WebMotion --> <dependency> <groupId>org.debux.webmotion</groupId> ===================================== application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/ObserveWebApplicationListener.java @@ -43,7 +43,7 @@ import org.debux.webmotion.server.call.ServerContext; import org.debux.webmotion.server.mapping.Mapping; /** - * @author Tony Chemit - tchemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr */ public class ObserveWebApplicationListener implements WebMotionServerListener { ===================================== application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java ===================================== --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/ObserveWebMotionController.java @@ -29,7 +29,7 @@ import fr.ird.observe.application.web.security.ObserveWebSecurityApplicationCont import org.debux.webmotion.server.WebMotionController; /** - * @author Tony Chemit - tchemit@codelutin.com + * @author Tony Chemit - dev@tchemit.fr */ public abstract class ObserveWebMotionController extends WebMotionController { ===================================== application-web/src/test/resources/log4j.properties ===================================== --- a/application-web/src/test/resources/log4j.properties +++ b/application-web/src/test/resources/log4j.properties @@ -1,6 +1,6 @@ ### # #%L -# ObServe :: Services REST Implementation +# ObServe :: Application Web # %% # Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io # %% ===================================== services-rest/pom.xml ===================================== --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -62,10 +62,6 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> @@ -74,6 +70,11 @@ <artifactId>gson</artifactId> </dependency> + <dependency> + <groupId>org.apache.httpcomponents</groupId> + <artifactId>httpcore</artifactId> + </dependency> + <!-- Nuiton --> <dependency> <groupId>org.nuiton</groupId> ===================================== services-runner/pom.xml ===================================== --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -81,6 +81,10 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> <dependency> <groupId>org.reflections</groupId> ===================================== services-runner/src/main/resources/validators.xml ===================================== --- a/services-runner/src/main/resources/validators.xml +++ b/services-runner/src/main/resources/validators.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- #%L - ObServe :: Application Web Configuration + ObServe :: Services Runner %% Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io %% ===================================== services-topia/pom.xml ===================================== --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -117,10 +117,10 @@ <groupId>org.nuiton.topia</groupId> <artifactId>topia-persistence</artifactId> </dependency> - <!--dependency> + <dependency> <groupId>org.nuiton.topia</groupId> <artifactId>topia-service-migration</artifactId> - </dependency--> + </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>topia-extension</artifactId> ===================================== services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java +++ b/services/src/main/java/fr/ird/observe/services/FormRequestDefinitionProvider.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.form.FormRequestDefinition; ===================================== services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java +++ b/services/src/main/java/fr/ird/observe/services/ObserveDtoInitializer.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import fr.ird.observe.common.constants.GearType; ===================================== services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java +++ b/services/src/main/java/fr/ird/observe/services/ReferenceSetDefinitionProvider.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import com.google.common.collect.ImmutableMap; import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.reference.ReferenceSetDefinition; ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConfigurationAdapter.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson; /* * #%L - * ObServe :: Services REST Implementation + * ObServe :: Services * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java ===================================== --- a/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java +++ b/services/src/main/java/fr/ird/observe/services/gson/ObserveDataSourceConnectionAdapter.java @@ -2,7 +2,7 @@ package fr.ird.observe.services.gson; /* * #%L - * ObServe :: Services REST Implementation + * ObServe :: Services * %% * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/FormRequestDefinitionProviderTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; @@ -31,4 +53,4 @@ public class FormRequestDefinitionProviderTest { } -} \ No newline at end of file +} ===================================== services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java +++ b/services/src/test/java/fr/ird/observe/services/ObserveDtoInitializerTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.dto.referential.ReferentialHelper; import org.junit.Assert; import org.junit.Test; @@ -20,4 +42,4 @@ public class ObserveDtoInitializerTest { public void testReferentialTypes() { Assert.assertEquals(ReferentialHelper.REFERENCE_DTOS.size(), ObserveDtoInitializer.INSTANCE.getReferentialTypes().size()); } -} \ No newline at end of file +} ===================================== services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java ===================================== --- a/services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java +++ b/services/src/test/java/fr/ird/observe/services/ReferenceSetDefinitionProviderTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.services; +/*- + * #%L + * ObServe :: Services + * %% + * Copyright (C) 2008 - 2017 IRD, Code Lutin, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ird.observe.services.dto.DataDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import org.junit.Assert; @@ -40,4 +62,4 @@ public class ReferenceSetDefinitionProviderTest { } -} \ No newline at end of file +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/69b0281e783f4784df49d922c30... --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/69b0281e783f4784df49d922c30... You're receiving this email because of your account on gitlab.com.