September 2017 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] fix snapshot
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d3dbb631 by Tony CHEMIT at 2017-09-05T23:48:38+02:00 fix snapshot - - - - - 1 changed file: - pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -176,8 +176,6 @@ <geoToolsVersion>17.2</geoToolsVersion> <guavaVersion>23.0</guavaVersion> - <gitlabPluginVersion>1.0.12-SNAPSHOT</gitlabPluginVersion> -  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d3dbb631b00f31a20b5f9db0abc… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/d3dbb631b00f31a20b5f9db0abc… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] move some tests + use new pom and new deploy layout
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 2b89c068 by Tony CHEMIT at 2017-09-05T23:43:00+02:00 move some tests + use new pom and new deploy layout - - - - - 12 changed files: - .gitlab-ci.yml - CHANGELOG.md - observe/pom.xml - pom.xml - server-configuration/pom.xml - server/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java → server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java - server/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java → server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java - server/src/test/resources/observeweb-test.conf → server-configuration/src/test/resources/observeweb-test.conf - − server/src/test/java/fr/ird/observe/server/controller/v1/ClassMappingRestApiTest.java - services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java - − services-client/src/test/java/fr/ird/observe/services/client/ClassMappingClientTest.java - services-local/src/main/java/fr/ird/observe/services/local/ObserveServiceFactoryLocal.java Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -77,10 +77,22 @@ stage: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - close-milestone.sh - create-stage.sh - - close-stage.sh + - drop-stage.sh - update-staging-changelog.sh - create-milestone.sh +release: + <<: *env_staging + <<: *test_manual + <<: *before_script_clone + script: + - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y + - close-milestone.sh + - create-stage.sh + - close-and-release-stage.sh + - update-changelog.sh + - create-milestone.sh + deploy-snapshot: <<: *env_staging <<: *test_manual @@ -138,13 +150,13 @@ staging-site: <<: *staging <<: *deploy_site -release: +stage-release: <<: *staging when: manual script: - release-stage.sh -drop: +stage-drop: <<: *staging when: manual script: ===================================== CHANGELOG.md ===================================== The diff for this file was not included because it is too large. ===================================== observe/pom.xml ===================================== --- a/observe/pom.xml +++ b/observe/pom.xml @@ -20,7 +20,8 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -104,6 +105,40 @@ </executions> </plugin> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <configuration> + <serverId>doc.ultreia.io</serverId> + <url>scpexe://ultreia.io/var/www/observe/release</url> + </configuration> + <executions> + <execution> + <phase>deploy</phase> + <id>deploy-zip</id> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <fromFile>${project.build.directory}/client-${project.version}.zip</fromFile> + <toFile>observe-${project.version}.zip</toFile> + </configuration> + </execution> + <execution> + <phase>deploy</phase> + <id>deploy-war</id> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <fromFile>${project.build.directory}/server-${project.version}.war</fromFile> + <toFile>observe-${project.version}.war</toFile> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> </build> </project> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>24</version> + <version>25</version> </parent> <groupId>fr.ird.observe</groupId> @@ -164,7 +164,7 @@ <nuitonUtilsVersion>3.0-rc-18</nuitonUtilsVersion> <nuitonConverterVersion>1.0</nuitonConverterVersion> <nuitonVersionVersion>1.0-rc-2</nuitonVersionVersion> - <httpVersion>1.0.6</httpVersion> + <httpVersion>1.0.7</httpVersion> <xworkVersion>2.3.33</xworkVersion> <flexmarkVersion>0.26.4</flexmarkVersion> <hibernateVersion>5.1.9.Final</hibernateVersion> @@ -176,6 +176,8 @@ <geoToolsVersion>17.2</geoToolsVersion> <guavaVersion>23.0</guavaVersion> + <gitlabPluginVersion>1.0.12-SNAPSHOT</gitlabPluginVersion> +  <license.licenseName>gpl_v3</license.licenseName> <license.organizationName>IRD, Code Lutin, Ultreia.io</license.organizationName> @@ -199,6 +201,7 @@ <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> <gitlab.fromMilestone>5.0</gitlab.fromMilestone> + <gitlab.stagingUrl>https://observe.ultreia.io/release</gitlab.stagingUrl>  <maven.deploy.skip>true</maven.deploy.skip> @@ -857,31 +860,6 @@ </plugin> <plugin> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> - <execution> - <id>enforce-maven</id> - <goals> - <goal>enforce</goal> - </goals> - <inherited>true</inherited> - <phase>initialize</phase> - <configuration> - <rules> - <requireMavenVersion> - <version>3.5.0</version> - </requireMavenVersion> - </rules> - <ignoreCache>true</ignoreCache> - <failFast>true</failFast> - <fail>true</fail> - - </configuration> - </execution> - </executions> - </plugin> - - <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>buildnumber-maven-plugin</artifactId> <executions> @@ -1009,18 +987,21 @@ <configuration> <releaseArtifacts> <releaseArtifact> + <flatLayout>true</flatLayout> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> <name>Application</name> <type>zip</type> </releaseArtifact> <releaseArtifact> + <flatLayout>true</flatLayout> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> <name>Serveur</name> <type>war</type> </releaseArtifact> </releaseArtifacts> + </configuration> </plugin> ===================================== server-configuration/pom.xml ===================================== --- a/server-configuration/pom.xml +++ b/server-configuration/pom.xml @@ -99,6 +99,20 @@ <scope>compile</scope> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <scope>test</scope> + </dependency> + +  + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> <build> ===================================== server/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java → server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java ===================================== --- a/server/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java +++ b/server-configuration/src/test/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelperTest.java @@ -92,7 +92,7 @@ public class ObserveWebDatabasesHelperTest { public void setUp() throws IOException { java.nio.file.Files.createDirectories(new File(System.getProperty("java.io.tmpdir")).toPath()); - configuration = new ServerConfig("observeweb-test.conf"); + configuration = new ServerConfig("src/main/test/resources/observeweb-test.conf"); configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); observeWebDatabasesHelper = new ObserveWebDatabasesHelper(); ===================================== server/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java → server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java ===================================== --- a/server/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java +++ b/server-configuration/src/test/java/fr/ird/observe/server/configuration/user/ObserveWebUsersHelperTest.java @@ -77,7 +77,7 @@ public class ObserveWebUsersHelperTest { public void setUp() throws Exception { java.nio.file.Files.createDirectories(new File(System.getProperty("java.io.tmpdir")).toPath()); - configuration = new ServerConfig("observeweb-test.conf"); + configuration = new ServerConfig("src/main/test/resources/observeweb-test.conf"); configuration.setBaseDirectory(Files.createTempDir()); configuration.init(); observeWebUsersHelper = new ObserveWebUsersHelper(); ===================================== server/src/test/resources/observeweb-test.conf → server-configuration/src/test/resources/observeweb-test.conf ===================================== ===================================== server/src/test/java/fr/ird/observe/server/controller/v1/ClassMappingRestApiTest.java deleted ===================================== --- a/server/src/test/java/fr/ird/observe/server/controller/v1/ClassMappingRestApiTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package fr.ird.observe.server.controller.v1; - -/*- - * #%L - * ObServe :: Server - * %% - * 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 javax.annotation.Generated; -import org.junit.Test; - -@Generated(value = "io.ultreia.java4all.http.maven.plugin.GenerateHttpApiMojo", date = "Sun Jul 16 14:27:04 CEST 2017") -public class ClassMappingRestApiTest { - - @Test - public void test() { - new ClassMappingRestApi(); - } - -} ===================================== services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java ===================================== --- a/services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java +++ b/services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java @@ -59,7 +59,7 @@ public class ObserveServiceFactoryClient extends ObserveServiceFactorySupport im } }); - private final static ClassMappingClient CLASS_MAPPING = new ClassMappingClient(); + private final static ClassMappingClient CLASS_MAPPING = ClassMappingClient.get(); @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { ===================================== services-client/src/test/java/fr/ird/observe/services/client/ClassMappingClientTest.java deleted ===================================== --- a/services-client/src/test/java/fr/ird/observe/services/client/ClassMappingClientTest.java +++ /dev/null @@ -1,36 +0,0 @@ -package fr.ird.observe.services.client; - -/*- - * #%L - * ObServe :: Services client implementation - * %% - * 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 javax.annotation.Generated; -import org.junit.Test; - -@Generated(value = "io.ultreia.java4all.http.maven.plugin.GenerateHttpClientMojo", date = "Fri Sep 01 17:24:34 CEST 2017") -public class ClassMappingClientTest { - - @Test - public void test() { - new ClassMappingClient(); - } - -} ===================================== services-local/src/main/java/fr/ird/observe/services/local/ObserveServiceFactoryLocal.java ===================================== --- a/services-local/src/main/java/fr/ird/observe/services/local/ObserveServiceFactoryLocal.java +++ b/services-local/src/main/java/fr/ird/observe/services/local/ObserveServiceFactoryLocal.java @@ -61,7 +61,7 @@ public class ObserveServiceFactoryLocal extends ObserveServiceFactorySupport { /** Logger. */ private static final Log log = LogFactory.getLog(ObserveServiceFactoryLocal.class); private static final TimeLog TIME_LOG = new TimeLog(ObserveServiceFactoryLocal.class, 500, 1000); - private static final ClassMappingLocal CLASS_MAPPING = new ClassMappingLocal(); + private static final ClassMappingLocal CLASS_MAPPING = ClassMappingLocal.get(); @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2b89c068354373ce6314178f6a2… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/2b89c068354373ce6314178f6a2… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] use toolkit 1.3 with new very nice apis
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7e25c9db by Tony CHEMIT at 2017-09-05T20:21:17+02:00 use toolkit 1.3 with new very nice apis - - - - - 30 changed files: - CONTRIBUTING.md - client/pom.xml - client/src/main/java/fr/ird/observe/client/ui/ObserveMainUIInitializer.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIManager.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/UiToModelClassMapping.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaPersistenceContext.java - pom.xml - server/pom.xml - services-client/pom.xml - services-client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java - services-local/pom.xml - services-local/src/main/java/fr/ird/observe/services/local/ObserveServiceFactoryLocal.java - − services-local/src/main/java/fr/ird/observe/services/local/ObserveServiceLocalClassMapping.java - services-local/src/main/java/fr/ird/observe/services/local/service/LastUpdateDateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/ObserveServiceLocal.java - services/src/main/java/fr/ird/observe/services/service/DataNotFoundException.java → services-local/src/main/java/fr/ird/observe/services/local/service/PingServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/consolidate/ConsolidateDataServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/report/ReportServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java - services-local/src/main/java/fr/ird/observe/services/local/service/actions/validate/ValidateServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLongLineEncounterServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLongLineSensorUsedServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/ActivityLonglineServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/BranchlineServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineCatchServiceLocal.java - services-local/src/main/java/fr/ird/observe/services/local/service/data/longline/SetLonglineDetailCompositionServiceLocal.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7e25c9db045fb4feeae4918a246… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7e25c9db045fb4feeae4918a246… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Simplify jobs
by Tony CHEMIT 05 Sep '17

05 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 320f090d by Tony CHEMIT at 2017-09-05T17:37:20+00:00 Simplify jobs - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,10 +1,5 @@ image: java:8u102-jdk -variables: - DEVELOP: "develop" - MASTER: "master" - STAGE: "frirdobserve" - stages: - Build - Test @@ -13,7 +8,6 @@ stages: .before_script_default: &before_script_default before_script: - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh @@ -23,7 +17,6 @@ stages: .before_script_clone: &before_script_clone before_script: - - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh @@ -45,20 +38,20 @@ stages: .deploy_site: &deploy_site script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/clean install -DskipTests/' | bash - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/site -DperformRelease scm-publish:publish-scm/' | bash + - execute-maven.sh 'clean install -DskipTests' + - execute-maven.sh 'site -DperformRelease scm-publish:publish-scm' .deploy_demo_latest: &deploy_demo_latest stage: Test script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/-Padd-git-commit-id-to-project-version -N/' | bash - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl server -DskipTests -Pdeploy-demo -Dclassifier=latest/' | bash + - execute-maven.sh '-Padd-git-commit-id-to-project-version -N' + - execute-maven.sh 'install -am -pl server -DskipTests -Pdeploy-demo -Dclassifier=latest' build: stage: Build <<: *before_script_default script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify -DskipTests/' | bash + - execute-maven.sh 'verify -DskipTests' only: - develop - develop-5.x @@ -82,18 +75,18 @@ stage: <<: *before_script_clone script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + - close-milestone.sh + - create-stage.sh + - close-stage.sh + - update-staging-changelog.sh + - create-milestone.sh deploy-snapshot: <<: *env_staging <<: *test_manual script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/deploy -DperformRelease/' | bash + - execute-maven.sh 'deploy -DperformRelease' latest-site: <<: *env_test @@ -115,7 +108,7 @@ nightly-build: <<: *nightly script: - apt-get update -y && apt-get install libc6-i386 libx32stdc++6 -y - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/verify -DperformRelease/' | bash + - execute-maven.sh 'verify -DperformRelease' nightly-site: stage: Test @@ -139,7 +132,7 @@ nightly-demo: staging-demo: <<: *staging script: - - wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/execute-maven.sh | sed 's/$1/install -am -pl server -DskipTests -Pdeploy-demo -DperformRelease/' | bash + - execute-maven.sh 'install -am -pl server -DskipTests -Pdeploy-demo -DperformRelease' staging-site: <<: *staging @@ -149,19 +142,10 @@ release: <<: *staging when: manual script: - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + - release-stage.sh drop: <<: *staging when: manual script: - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash - -production: - stage: Production - only: - - tags - <<: *env_production - when: manual - script: - - echo "Envoyer les notifications" + - drop-stage.sh View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/320f090d830769a702f00b3d223… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/320f090d830769a702f00b3d223… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] optimize dependencies
by Tony CHEMIT 03 Sep '17

03 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: ec066c75 by Tony CHEMIT at 2017-09-04T00:42:45+02:00 optimize dependencies - - - - - 7 changed files: - dto/pom.xml - dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java - persistence/pom.xml - persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql - persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java - services-client/pom.xml - services-client/src/license/THIRD-PARTY.properties Changes: ===================================== dto/pom.xml ===================================== --- a/dto/pom.xml +++ b/dto/pom.xml @@ -62,6 +62,7 @@ <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>io.ultreia.java4all.i18n</groupId> ===================================== dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java ===================================== --- a/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java +++ b/dto/src/main/java/fr/ird/observe/spi/DtoModelClasses.java @@ -1,5 +1,27 @@ package fr.ird.observe.spi; +/*- + * #%L + * ObServe :: Dto + * %% + * 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.ImmutableSet; import fr.ird.observe.dto.data.DataDto; import fr.ird.observe.dto.data.longline.ActivityLonglineDto; ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -84,6 +84,7 @@ <dependency> <groupId>io.ultreia.java4all.http</groupId> <artifactId>http-api</artifactId> + <scope>provided</scope> </dependency>  ===================================== persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql ===================================== --- a/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql +++ b/persistence/src/main/resources/db/migration/6.901/09_fill_object_material-common.sql @@ -1,3 +1,24 @@ +--- +-- #%L +-- ObServe :: Persistence +-- %% +-- 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% +--- INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, NULL , 'FAD' , '1' , NULL , 'FAD' , 'FAD' , 'FAD' , false, false, false, NULL , NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 1, '16' , 'DFAD' , '1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.1' , 'DFAD (drifting FAD)' , 'DFAD (FAD dérivant)' , 'DFAD (FAD a la deriva)' , true , true , false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); INSERT INTO observe_seine.objectMaterial (topiaid, topiaversion, topiacreatedate, lastupdatedate, needComment, status, legacyCode, standardCode, code, parent, label1, label2, label3, selectable, childrenMultiSelectable, childSelectionMandatory, objectMaterialType, validation, biodegradable, nonEntangling) values ('fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.3' , 0, CURRENT_DATE, CURRENT_TIMESTAMP, false, 0, '19' , NULL , '1-1-1' , 'fr.ird.observe.entities.referentiel.seine.ObjectMaterial#0#0.2' , 'Experimental FAD' , 'Objet expérimental' , 'Objeto experimental' , true , false, false, 'fr.ird.observe.entities.referentiel.seine.ObjectMaterialType#0#0', NULL , false, false); ===================================== persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java ===================================== --- a/persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java +++ b/persistence/src/test/java/fr/ird/observe/spi/DbModelHelperTest.java @@ -1,5 +1,27 @@ package fr.ird.observe.spi; +/*- + * #%L + * ObServe :: Persistence + * %% + * 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.binder.data.DataDtoReferenceBinderSupport; import fr.ird.observe.binder.referential.ReferentialDtoReferenceBinderSupport; import fr.ird.observe.dto.data.DataDto; ===================================== services-client/pom.xml ===================================== --- a/services-client/pom.xml +++ b/services-client/pom.xml @@ -62,10 +62,6 @@ </dependency> <dependency> <groupId>fr.ird.observe.toolkit</groupId> - <artifactId>common-db</artifactId> - </dependency> - <dependency> - <groupId>fr.ird.observe.toolkit</groupId> <artifactId>common-service</artifactId> </dependency> ===================================== services-client/src/license/THIRD-PARTY.properties ===================================== --- a/services-client/src/license/THIRD-PARTY.properties +++ b/services-client/src/license/THIRD-PARTY.properties @@ -2,26 +2,22 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Apache 2.0 -# - Apache License 2.0 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Eclipse Public License 1.0 -# - GNU Lesser Public License # - General Public License (GPL) -# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 # - MIT License -# - MPL 1.1 # - New BSD License # - The Apache Software License, Version 2.0 -# - The New BSD License -# - WTFPL +# - The MIT License #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Thu Sep 01 11:23:55 CEST 2016 +#Mon Sep 04 00:38:17 CEST 2017 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ec066c75c39c2f03a7d3d08e1b4… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/ec066c75c39c2f03a7d3d08e1b4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] introduce spi api
by Tony CHEMIT 03 Sep '17

03 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 553dc4da by Tony CHEMIT at 2017-09-04T00:27:33+02:00 introduce spi api - - - - - 30 changed files: - CONTRIBUTING.md - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportModel.java - client/src/main/java/fr/ird/observe/client/ui/admin/export/ExportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ContentUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ContentReferenceUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/ref/ReferenceHomeUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/LonglineDetailCompositionUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/simple/longline/SetLonglineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/FloatingObjectUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/FloatingObjectUIModel.java - client/src/main/java/fr/ird/observe/client/ui/content/simple/seine/SetSeineUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/NavigationTree.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ClassNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/ReferenceNavigationTreeNodeSupport.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/ActivitiesLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/longline/GearUseFeaturesLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsCommonNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsLonglineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/referential/ReferentialsSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/ActivitiesSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/GearUseFeaturesSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/navigation/nodes/seine/RoutesSeineNavigationTreeNode.java - client/src/main/java/fr/ird/observe/client/ui/tree/selection/SelectionTreeModel.java - − dto/src/main/java/fr/ird/observe/binder/DtoReferenceBinders.java - dto/src/main/java/fr/ird/observe/binder/data/seine/TripSeineDtoReferenceBinder.java - − dto/src/main/java/fr/ird/observe/dto/DtoFormDefinitions.java - − dto/src/main/java/fr/ird/observe/dto/DtoReferenceDefinitions.java - dto/src/main/java/fr/ird/observe/dto/decoration/DecoratorService.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/553dc4da2bf3b50d35192ae3918… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/553dc4da2bf3b50d35192ae3918… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Rethink modules for services (remove services-runner + rename to local and client)
by Tony CHEMIT 01 Sep '17

01 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 7719a794 by Tony CHEMIT at 2017-09-01T17:51:08+02:00 Rethink modules for services (remove services-runner + rename to local and client) - - - - - 30 changed files: - CONTRIBUTING.md - client-configuration/src/main/resources/log4j.properties - client-configuration/src/main/resources/observe-log4j.properties - client/pom.xml - client/src/main/java/fr/ird/observe/client/ObserveSwingApplicationContext.java - client/src/main/java/fr/ird/observe/client/db/ObserveDataSourcesManager.java - client/src/main/java/fr/ird/observe/client/db/ObserveSwingDataSource.java - client/src/main/java/fr/ird/observe/client/ui/storage/StorageUIModel.java - pom.xml - server-configuration/pom.xml - server-configuration/src/main/java/fr/ird/observe/server/configuration/ObserveWebApplicationConfigInitException.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/ServerConfig.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/InvalidObserveWebDatabaseException.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/InvalidObserveWebDatabaseRoleException.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/InvalidObserveWebDatabasesException.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/ObserveWebDatabase.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/ObserveWebDatabaseRole.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/ObserveWebDatabases.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/ObserveWebDatabasesHelper.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/impl/ObserveWebDatabaseBean.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/impl/ObserveWebDatabaseImmutable.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/impl/ObserveWebDatabaseRoleBean.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/impl/ObserveWebDatabaseRoleImmutable.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/impl/ObserveWebDatabasesBean.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/db/impl/ObserveWebDatabasesImmutable.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/user/InvalidObserveWebUserException.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/user/InvalidObserveWebUserPermissionException.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/user/InvalidObserveWebUsersException.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/user/ObserveWebUser.java - server-configuration/src/main/java/fr/ird/observe/server/configuration/user/ObserveWebUserPermission.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7719a79400e6a08dc9bedddbd59… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/7719a79400e6a08dc9bedddbd59… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: [PS][Echantillons][Faune accessoires] Report du type de mensuration standard (See #835)
by Tony CHEMIT 01 Sep '17

01 Sep '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: d00daa68 by Tony CHEMIT at 2017-09-01T15:43:24+02:00 [PS][Echantillons][Faune accessoires] Report du type de mensuration standard (See #835) - - - - - cbee8b09 by Tony CHEMIT at 2017-09-01T15:45:10+02:00 Amélioration des logs (on essaye de ne plus afficher les détails techniques (topia par exemple) - - - - - 30 changed files: - client/src/main/java/fr/ird/observe/client/ui/admin/report/ReportUIHandler.java - client/src/main/java/fr/ird/observe/client/ui/admin/report/ResultTableModel.java - client/src/test/java/fr/ird/observe/client/ObserveTextGeneratorTest.java - − client/src/test/resources/log4j.properties - − dto/src/test/resources/log4j.properties - persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java - persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_7_0_RC_6.java - + persistence/src/main/resources/db/migration/6.903/01_fill_non_target_sample_size_measure_type-common.sql - − persistence/src/test/resources/log4j.properties - pom.xml - − server/src/test/resources/log4j.properties - services-rest/src/test/java/fr/ird/observe/services/rest/service/actions/report/AbstractReportServiceRestTest.java - − services-rest/src/test/resources/log4j.properties - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/ObserveServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java - services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java - services-topia/src/test/java/fr/ird/observe/services/binder/BinderEngineTest.java → services-topia/src/test/java/fr/ird/observe/binder/BinderEngineTest.java - services-topia/src/test/java/fr/ird/observe/dto/decoration/DecoratorServiceTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/AbstractReportServiceTopiaTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatch2Test.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroup2Test.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchByGroupTest.java - services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/report/ReportAccessoryCatchTest.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c7a89f4433616cdf12230f7a6f… --- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/c7a89f4433616cdf12230f7a6f… You're receiving this email because of your account on gitlab.com.

1 0