April 2017 - T3-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-t3][develop] up builds [skip ci]
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 82b4734c by Tony CHEMIT at 2017-04-10T15:48:05+02:00 up builds [skip ci] - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,9 +86,9 @@ stage: script: - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/$STAGE/' | bash - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/$STAGE/' | bash latest-site: <<: *env_test @@ -143,13 +143,13 @@ release: <<: *staging when: manual script: - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/$STAGE/' | bash drop: <<: *staging when: manual script: - - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/drop-stage.sh | sed 's/$1/$STAGE/' | bash production: stage: Production View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/82b4734c11004ab79dd4341b113cfb40…

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: update license headers
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: eef88869 by Tony CHEMIT at 2017-04-10T15:45:57+02:00 update license headers - - - - - 51e5331d by Tony CHEMIT at 2017-04-10T15:45:57+02:00 fix readme - - - - - 24 changed files: - README.md - t3-msaccess-importer/pom.xml - t3-msaccess-importer/src/main/java/fr/ird/converter/FloatConverter.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessDataSource.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityMeta.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityProxyHandler.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessHitModel.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntity.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityMetaProvider.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityVisitor.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AnalyseAccessDB.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/HitModel.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/ImporterHelper.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/package-info.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/IntToCoordonne.java - t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/package-info.java - t3-msaccess-importer/src/main/java/fr/ird/type/CoordinateHelper.java - t3-msaccess-importer/src/main/java/fr/ird/type/SexagecimalPosition.java - t3-msaccess-importer/src/main/java/fr/ird/type/package-info.java - t3-test/pom.xml - t3-test/src/main/java/fr/ird/t3/FakeT3ServiceContext.java - t3-test/src/main/java/fr/ird/t3/T3ActionFixtures.java - t3-test/src/main/resources/log4j.properties - t3-test/src/main/resources/t3-TopiaContextImpl.properties Changes: ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,12 +1,13 @@ # T3 -[![Maven Central](https://img.shields.io/maven-central/v/fr.ird.t3/t3.svg)](http://m… -![Build Status](https://gitlab.com/ultreia.io/ird-t3/badges/develop/build.svg) +[![Maven Central status](https://img.shields.io/maven-central/v/fr.ird.t3/t3.svg)](https://s… +![Build Status](https://gitlab.com/ultreiaio/ird-t3/badges/develop/build.svg) +[![GNU AFFERO GENERAL PUBLIC LICENSE, Version 3.0](https://img.shields.io/badge/license-AGPL3-green.svg)](http://www.gnu.… # Resources -* [Changelog and downloads](https://gitlab.com/ultreia.io/ird-t3/blob/develop/CHANGELOG.md) -* [Documentation](http://t3.ultreia.io) +* [Changelog and downloads](https://gitlab.com/ultreiaio/ird-t3/blob/develop/CHANGELOG.md) +* [Documentation](http://ultreiaio.gitlab.io/ird-t3) * [Mailing-list (Devel)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/t3-devel) * [Mailing-list (Commits)](http://list.forge.codelutin.com/cgi-bin/mailman/listinfo/t3-commi…) * [Contact](mailto:dev@tchemit.fr) ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -2,7 +2,7 @@ <!-- #%L - T3 :: Actions + T3 :: MS Access Importer %% Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io %% ===================================== t3-msaccess-importer/src/main/java/fr/ird/converter/FloatConverter.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/converter/FloatConverter.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/converter/FloatConverter.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: FloatConverter.java 1387 2011-04-15 11:09:26Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessDataSource.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessDataSource.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessDataSource.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AbstractAccessDataSource.java 1493 2011-07-19 09:49:04Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityMeta.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityMeta.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityMeta.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AbstractAccessEntityMeta.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityProxyHandler.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityProxyHandler.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessEntityProxyHandler.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AbstractAccessEntityProxyHandler.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessHitModel.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessHitModel.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AbstractAccessHitModel.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AbstractAccessHitModel.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntity.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntity.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntity.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AccessEntity.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityMetaProvider.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityMetaProvider.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityMetaProvider.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AccessEntityMetaProvider.java 1155 2010-12-12 10:46:13Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityVisitor.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityVisitor.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AccessEntityVisitor.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AccessEntityVisitor.java 1354 2011-04-07 16:23:37Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AnalyseAccessDB.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AnalyseAccessDB.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/AnalyseAccessDB.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: AnalyseAccessDB.java 1493 2011-07-19 09:49:04Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/HitModel.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/HitModel.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/HitModel.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: HitModel.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/ImporterHelper.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/ImporterHelper.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/ImporterHelper.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: ImporterHelper.java 1466 2011-06-06 09:32:58Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/package-info.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/package-info.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/importer/package-info.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: package-info.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/IntToCoordonne.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/IntToCoordonne.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/IntToCoordonne.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: IntToCoordonne.java 1303 2011-02-15 12:08:28Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/package-info.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/package-info.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/msaccess/type/package-info.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: package-info.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/type/CoordinateHelper.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/type/CoordinateHelper.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/type/CoordinateHelper.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: CoordinateHelper.java 1303 2011-02-15 12:08:28Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/type/SexagecimalPosition.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/type/SexagecimalPosition.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/type/SexagecimalPosition.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: SexagecimalPosition.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-msaccess-importer/src/main/java/fr/ird/type/package-info.java ===================================== --- a/t3-msaccess-importer/src/main/java/fr/ird/type/package-info.java +++ b/t3-msaccess-importer/src/main/java/fr/ird/type/package-info.java @@ -1,11 +1,8 @@ /* * #%L - * MS-Access Importer - * - * $Id: package-info.java 1302 2011-02-15 08:47:40Z chemit $ - * $HeadURL: https://svn.mpl.ird.fr/osiris/observe/msaccess-importer/tags/msaccess-impor… $ + * T3 :: MS Access Importer * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * Copyright (C) 2010 - 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 Affero General Public License as published by ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -2,7 +2,7 @@ <!-- #%L - T3 :: Actions + T3 :: Test %% Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io %% ===================================== t3-test/src/main/java/fr/ird/t3/FakeT3ServiceContext.java ===================================== --- a/t3-test/src/main/java/fr/ird/t3/FakeT3ServiceContext.java +++ b/t3-test/src/main/java/fr/ird/t3/FakeT3ServiceContext.java @@ -1,6 +1,6 @@ /* * #%L - * T3 :: Actions + * T3 :: Test * %% * Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== t3-test/src/main/java/fr/ird/t3/T3ActionFixtures.java ===================================== --- a/t3-test/src/main/java/fr/ird/t3/T3ActionFixtures.java +++ b/t3-test/src/main/java/fr/ird/t3/T3ActionFixtures.java @@ -1,6 +1,6 @@ /* * #%L - * T3 :: Actions + * T3 :: Test * %% * Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io * %% ===================================== t3-test/src/main/resources/log4j.properties ===================================== --- a/t3-test/src/main/resources/log4j.properties +++ b/t3-test/src/main/resources/log4j.properties @@ -1,6 +1,6 @@ ### # #%L -# T3 :: Actions +# T3 :: Test # %% # Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io # %% ===================================== t3-test/src/main/resources/t3-TopiaContextImpl.properties ===================================== --- a/t3-test/src/main/resources/t3-TopiaContextImpl.properties +++ b/t3-test/src/main/resources/t3-TopiaContextImpl.properties @@ -1,6 +1,6 @@ ### # #%L -# T3 :: Actions +# T3 :: Test # %% # Copyright (C) 2010 - 2017 IRD, Code Lutin, Ultreia.io # %% View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/392d266b30b33f6827b2f4b12278cb5…

1 0

[Git][ultreiaio/ird-t3][develop] Add contribution guide
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 392d266b by Tony CHEMIT at 2017-04-10T13:45:17+00:00 Add contribution guide - - - - - 1 changed file: - + CONTRIBUTING.md Changes: ===================================== CONTRIBUTING.md ===================================== --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,33 @@ +# Release (without stage) + +``` +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-and-release-stage.sh | sed 's/$1/frirdobserve/' | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-changelog.sh | bash +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash +``` + +# Release (with stage) + +Create stage + +``` +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 +``` + +And to release stage + +``` +wget -q -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash +``` + +# Generate site + +``` +mvn clean verify site -DperformRelease scm-publish:publish-scm +``` \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/392d266b30b33f6827b2f4b12278cb52…

1 0

[Git][ultreiaio/ird-t3][develop] improve performance on loading script
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: d7bdbdc7 by Tony CHEMIT at 2017-04-10T15:12:36+02:00 improve performance on loading script - - - - - 1 changed file: - t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java @@ -74,20 +74,30 @@ public class T3JdbcHelper extends JdbcHelper { try (Connection connection = openConnection()) { try (Statement preparedStatement = connection.createStatement()) { - int currentBuffer = 0; - StringBuilder currentStatement = new StringBuilder(); + int statementCount = 0; + StringBuilder currentStatement = null; for (String sqlStatement : new SqlFileReader(reader)) { if (sqlStatement.startsWith("--")) { continue; } - currentStatement.append("\n").append(sqlStatement); if (sqlStatement.trim().endsWith(";")) { - preparedStatement.addBatch(currentStatement.toString()); - currentBuffer++; - currentStatement = new StringBuilder(); + if (currentStatement == null) { + preparedStatement.addBatch(sqlStatement); + } else { + currentStatement.append("\n").append(sqlStatement); + preparedStatement.addBatch(currentStatement.toString()); + currentStatement = null; + } + statementCount++; + } else { + if (currentStatement == null) { + currentStatement = new StringBuilder(sqlStatement); + } else { + currentStatement.append("\n").append(sqlStatement); + } } - if (currentBuffer % BUZZER_SIZE == 0) { + if (statementCount % BUZZER_SIZE == 0) { preparedStatement.executeBatch(); preparedStatement.clearBatch(); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/d7bdbdc75068ac4fa156809e2c8c10c0…

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: improve sql script loading
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 3162de0a by Tony CHEMIT at 2017-04-10T15:02:50+02:00 improve sql script loading - - - - - b70063d4 by Tony CHEMIT at 2017-04-10T15:03:17+02:00 chmod - - - - - 10 changed files: - t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java - t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java - − t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java - t3-domain/src/test/java/fr/ird/t3/entities/AbstractDatabaseTest.java - t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProviderTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java - t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java - t3-installer/src/main/assembly/dist/debug.sh - t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java - t3-installer/src/test/java/fr/ird/t3/tools/db/reference/AbstractReferenceImporterIT.java Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java @@ -24,7 +24,6 @@ package fr.ird.t3; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.services.T3ServiceContext; import java.io.File; import java.io.IOException; @@ -51,13 +50,13 @@ public class T3SqlScriptsImporter { /** Logger. */ private static final Log log = LogFactory.getLog(T3SqlScriptsImporter.class); - protected final File scriptsDirectory; + private final File scriptsDirectory; - protected ImmutableSet<File> scriptsFile; + private ImmutableSet<File> scriptsFile; - public static final Predicate<File> SKIP_SPECIES_LENGTH_STEP_FILE = input -> !input.getName().toLowerCase().contains("specieslengthstep.sql"); + static final Predicate<File> SKIP_SPECIES_LENGTH_STEP_FILE = input -> !input.getName().toLowerCase().contains("specieslengthstep.sql"); - public static void importReferential(File buildRootDirectory, T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException, TopiaException { + static void importReferential(File buildRootDirectory, T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException, TopiaException { Version t3DataVersion = serviceContext.getApplicationConfiguration().getT3DataVersion(); File scriptsZip = Paths.get(buildRootDirectory.getAbsolutePath()) @@ -92,12 +91,14 @@ public class T3SqlScriptsImporter { public void prepare() { - List<String> scriptsName = Lists.newArrayList(scriptsDirectory.list((dir, name) -> name.endsWith(".sql"))); - Collections.sort(scriptsName); + String[] list = scriptsDirectory.list((dir, name) -> name.endsWith(".sql")); ImmutableSet.Builder<File> filesBuilder = ImmutableSet.builder(); - - for (String ddlScriptName : scriptsName) { - filesBuilder.add(new File(scriptsDirectory, ddlScriptName)); + if (list != null) { + List<String> scriptsName = Lists.newArrayList(list); + Collections.sort(scriptsName); + for (String ddlScriptName : scriptsName) { + filesBuilder.add(new File(scriptsDirectory, ddlScriptName)); + } } scriptsFile = filesBuilder.build(); } @@ -113,15 +114,11 @@ public class T3SqlScriptsImporter { log.info(" o Loading sql script ...(" + scriptFile.getName() + ")"); } if (filePredicate.test(scriptFile)) { - loadScript(serviceContext, scriptFile); + serviceContext.getApplicationContext().newJdbcHelper().executeSql(scriptFile); } } } - protected void loadScript(T3ServiceContext serviceContext, File script) throws IOException { - - T3ScriptHelper.loadScript(serviceContext.getApplicationContext(), script); - } } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java @@ -21,12 +21,20 @@ package fr.ird.t3.entities; * #L% */ +import java.io.BufferedReader; import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; +import java.io.Reader; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; import java.sql.Connection; -import java.sql.PreparedStatement; import java.sql.SQLException; +import java.sql.Statement; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; import org.nuiton.topia.persistence.jdbc.JdbcHelper; +import org.nuiton.util.sql.SqlFileReader; /** * Created by tchemit on 03/04/17. @@ -35,18 +43,63 @@ import org.nuiton.topia.persistence.jdbc.JdbcHelper; */ public class T3JdbcHelper extends JdbcHelper { - public T3JdbcHelper(JdbcConfiguration jdbcConfiguration) { + public static final int BUZZER_SIZE = 100; + + T3JdbcHelper(JdbcConfiguration jdbcConfiguration) { super(jdbcConfiguration); } - public void executeSql(String sql) { + public void executeSql(File file) { + + try (BufferedReader bufferedReader = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) { + executeSql(bufferedReader); + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + + public void executeSql(InputStream file) { + + try (InputStreamReader bufferedReader = new InputStreamReader(file, StandardCharsets.UTF_8)) { + executeSql(bufferedReader); + } catch (IOException e) { + throw new RuntimeException(e); + } + + } + + public void executeSql(Reader reader) { + try (Connection connection = openConnection()) { - try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { - preparedStatement.execute(); + try (Statement preparedStatement = connection.createStatement()) { + + int currentBuffer = 0; + StringBuilder currentStatement = new StringBuilder(); + for (String sqlStatement : new SqlFileReader(reader)) { + if (sqlStatement.startsWith("--")) { + continue; + } + currentStatement.append("\n").append(sqlStatement); + if (sqlStatement.trim().endsWith(";")) { + preparedStatement.addBatch(currentStatement.toString()); + currentBuffer++; + currentStatement = new StringBuilder(); + } + + if (currentBuffer % BUZZER_SIZE == 0) { + preparedStatement.executeBatch(); + preparedStatement.clearBatch(); + } + } + preparedStatement.executeBatch(); + preparedStatement.clearBatch(); } } catch (SQLException e) { throw new RuntimeException(e); } + + } public void backup(File file, boolean compress) { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java deleted ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * #%L - * T3 :: Domain - * %% - * Copyright (C) 2010 - 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 Affero 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 Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ird.t3.entities; - -import com.google.common.base.Charsets; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; -import java.io.BufferedReader; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.sql.Connection; -import java.sql.SQLException; -import java.sql.Statement; -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.support.TopiaSqlWork; -import org.nuiton.util.sql.SqlFileReader; - -/** - * Usefull method to deal with sql scripts. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 1.0 - */ -public class T3ScriptHelper { - - /** Logger. */ - private static final Log log = LogFactory.getLog(T3ScriptHelper.class); - - public static void exportDatabase(T3TopiaApplicationContext rootTx, File outputFile) throws TopiaException { - - if (log.isInfoEnabled()) { - log.info("Export database to file " + outputFile); - } - rootTx.newJdbcHelper().backup(outputFile, false); - } - - public static void loadReferentiel(T3TopiaApplicationContext tx, String location) throws IOException, TopiaException { - try (InputStream resourceAsStream = T3EntityHelper.class.getResourceAsStream(location)) { - loadScript(tx, resourceAsStream); - } - } - - public static void loadScript(T3TopiaApplicationContext tx, InputStream resourceAsStream) throws IOException, TopiaException { - - String script = IOUtils.toString(resourceAsStream, Charsets.UTF_8.name()); - - tx.newJdbcHelper().executeSql(script); - - } - - public static void loadScript(T3TopiaApplicationContext tx, File file) throws IOException, TopiaException { - - try (InputStream resourceAsStream = new FileInputStream(file)) { - loadScript(tx, resourceAsStream); - } - } - - public static void loadScriptLineByLine(T3TopiaApplicationContext tx, File script, PropertyChangeListener listener) throws TopiaException, IOException { - - try (BufferedReader stream = new BufferedReader(new InputStreamReader(new FileInputStream(script), Charsets.UTF_8))) { - - try (T3TopiaPersistenceContext persistenceContext = tx.newPersistenceContext()) { - - persistenceContext.getSqlSupport().doSqlWork(new TopiaSqlWork() { - - final int batchSize = 100; - int lineCount = 0; - - void flushStatement(Statement statement) throws SQLException { - - statement.executeBatch(); - statement.clearBatch(); - - } - - @Override - public void execute(Connection connection) throws SQLException { - try (Statement statement = connection.createStatement()) { - - int batchSize = 0; - - for (String statementStr : new SqlFileReader(stream)) { - - String trimLine = statementStr.trim(); - - if (trimLine.isEmpty() || trimLine.startsWith("--")) { - continue; - } - if (log.isDebugEnabled()) { - log.debug("Inject line : " + trimLine); - } - listener.propertyChange(new PropertyChangeEvent(script, "newLine", null, lineCount++)); - statement.addBatch(trimLine); - batchSize++; - - if (batchSize % this.batchSize == 0) { - flushStatement(statement); - } - - } - - flushStatement(statement); - } - } - }); - } - } - - } - - protected T3ScriptHelper() { - // hide helper constructor - } -} ===================================== t3-domain/src/test/java/fr/ird/t3/entities/AbstractDatabaseTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/AbstractDatabaseTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/AbstractDatabaseTest.java @@ -22,6 +22,8 @@ package fr.ird.t3.entities; import fr.ird.t3.T3IOUtil; import java.io.File; +import java.io.IOException; +import java.io.InputStream; import org.junit.Rule; import org.junit.rules.TestWatcher; import org.junit.runner.Description; @@ -29,8 +31,6 @@ import org.nuiton.topia.persistence.TopiaException; public abstract class AbstractDatabaseTest { - public static final long TIMESTAMP = System.nanoTime(); - @Rule public T3Database db = new T3Database(); @@ -71,16 +71,16 @@ public abstract class AbstractDatabaseTest { T3EntityHelper.releaseRootContext(rootCtxt); } - public File getTestBasedir() { - return testBasedir; - } - - public T3TopiaApplicationContext getRootCtxt() { - return rootCtxt; - } - public T3TopiaPersistenceContext beginTransaction() throws TopiaException { return rootCtxt.newPersistenceContext(); } + + public void loadClassPathScript(String location) { + try (InputStream resourceAsStream = getClass().getResourceAsStream(location)) { + rootCtxt.newJdbcHelper().executeSql(resourceAsStream); + } catch (IOException e) { + throw new TopiaException(e); + } + } } } ===================================== t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProviderTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProviderTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/conversion/WeightCategoryLogBookConvertorProviderTest.java @@ -21,7 +21,6 @@ package fr.ird.t3.entities.conversion; import fr.ird.t3.entities.AbstractDatabaseTest; -import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.entities.T3TopiaPersistenceContext; import org.junit.Assert; import org.junit.Test; @@ -37,13 +36,10 @@ public class WeightCategoryLogBookConvertorProviderTest extends AbstractDatabase @Test public void newInstance() throws Exception { - T3ScriptHelper.loadReferentiel( - db.getRootCtxt(), - "/db/WeightCategoryLogBookConvertorProviderTest.sql"); + db.loadClassPathScript("/db/WeightCategoryLogBookConvertorProviderTest.sql"); - try (T3TopiaPersistenceContext tx= beginTransaction()) { - WeightCategoryLogBookConvertorProvider provider = - WeightCategoryLogBookConvertorProvider.newInstance(tx); + try (T3TopiaPersistenceContext tx = beginTransaction()) { + WeightCategoryLogBookConvertorProvider provider = WeightCategoryLogBookConvertorProvider.newInstance(tx); Assert.assertNotNull(provider); } ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/LengthWeightConversionHelperTest.java @@ -26,7 +26,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Range; import com.google.common.collect.Sets; import fr.ird.t3.entities.AbstractDatabaseTest; -import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.type.T3Date; import java.util.Date; @@ -49,8 +48,7 @@ public class LengthWeightConversionHelperTest extends AbstractDatabaseTest { @Before public void setUp() throws Exception { - T3ScriptHelper.loadReferentiel( - db.getRootCtxt(), "/db/LengthWeightConversionHelperTest.sql"); + db.loadClassPathScript("/db/LengthWeightConversionHelperTest.sql"); } @Test ===================================== t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java ===================================== --- a/t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java +++ b/t3-domain/src/test/java/fr/ird/t3/entities/reference/WeightCategoryTreatmentImplTest.java @@ -23,7 +23,6 @@ package fr.ird.t3.entities.reference; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ird.t3.entities.AbstractDatabaseTest; -import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.entities.T3TopiaPersistenceContext; import java.util.Comparator; import java.util.List; @@ -41,7 +40,7 @@ public class WeightCategoryTreatmentImplTest extends AbstractDatabaseTest { @Test public void testGetOldCategoryCode() throws Exception { - T3ScriptHelper.loadReferentiel(db.getRootCtxt(), "/db/WeightCategoryTreatmentImplTest.sql"); + db.loadClassPathScript("/db/WeightCategoryTreatmentImplTest.sql"); try (T3TopiaPersistenceContext tx = beginTransaction()) { WeightCategoryTreatmentTopiaDao dao = tx.getWeightCategoryTreatmentDao(); ===================================== t3-installer/src/main/assembly/dist/debug.sh ===================================== --- a/t3-installer/src/main/assembly/dist/debug.sh +++ b/t3-installer/src/main/assembly/dist/debug.sh ===================================== t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java +++ b/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java @@ -27,7 +27,6 @@ import com.google.common.base.Preconditions; import fr.ird.t3.T3Config; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; -import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.user.JdbcConfiguration; import fr.ird.t3.services.DefaultT3ServiceContext; @@ -139,7 +138,7 @@ public class T3ApplicationInstaller { if (log.isInfoEnabled()) { log.info("3/6 - Create database schema..."); } - boolean schemaFound = createDatabase(); + createDatabase(); T3SqlScriptsImporter dllScriptsImporter = new T3SqlScriptsImporter(ddlScriptsDirectory); dllScriptsImporter.prepare(); @@ -148,11 +147,7 @@ public class T3ApplicationInstaller { log.info("4/6 - Loading ddl from " + dllScriptsImporter.getScriptsFile().size() + " scripts."); } - if (schemaFound) { - log.info("4/6 - Loading ddl skip (schema already exists)"); - } else { - dllScriptsImporter.importScripts(serviceContext, file -> true); - } + dllScriptsImporter.importScripts(serviceContext, file -> true); T3SqlScriptsImporter referentialScriptsImporter = new T3SqlScriptsImporter(referentialScriptsDirectory); referentialScriptsImporter.prepare(); @@ -178,7 +173,7 @@ public class T3ApplicationInstaller { if (log.isInfoEnabled()) { log.info(" o Load postGis data... from " + unzipFile + " script."); } - loadScriptLineByLine(unzipFile); + serviceContext.getApplicationContext().newJdbcHelper().executeSql(unzipFile); } } @@ -240,7 +235,7 @@ public class T3ApplicationInstaller { } } - private boolean createDatabase() { + private void createDatabase() { try { @@ -256,7 +251,6 @@ public class T3ApplicationInstaller { rootContext.createSchema(); } - return schemaFound; } catch (TopiaException e) { throw new IllegalStateException("could not start db", e); @@ -282,14 +276,6 @@ public class T3ApplicationInstaller { return unzupDirectory; } - private void loadScriptLineByLine(File script) throws TopiaException, IOException { - - - T3ScriptHelper.loadScriptLineByLine(serviceContext.getApplicationContext(), script, - evt -> log.debug("Sql line " + evt.getNewValue() + " done.")); - } - - private void destroy() { T3EntityHelper.releaseRootContext(serviceContext.getApplicationContext()); ===================================== t3-installer/src/test/java/fr/ird/t3/tools/db/reference/AbstractReferenceImporterIT.java ===================================== --- a/t3-installer/src/test/java/fr/ird/t3/tools/db/reference/AbstractReferenceImporterIT.java +++ b/t3-installer/src/test/java/fr/ird/t3/tools/db/reference/AbstractReferenceImporterIT.java @@ -24,7 +24,6 @@ package fr.ird.t3.tools.db.reference; import fr.ird.t3.T3IOUtil; -import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.tools.AbstracToolTest; import java.io.File; @@ -95,7 +94,13 @@ public abstract class AbstractReferenceImporterIT<E extends TopiaEntity, T exten // export referentiel File outputFile = new File(inputFile.getParentFile(), "newReferentiel.sql"); - T3ScriptHelper.exportDatabase(serviceContext.getApplicationContext(), outputFile); + + if (log.isInfoEnabled()) { + log.info("Export database to file " + outputFile); + } + + serviceContext.getApplicationContext().newJdbcHelper().backup(outputFile, false); + } public <T extends TopiaEntity> void deleteEntities(Class<T> entityType) { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/d10e8af8f4e1e0a3a090861f9952ff0…

1 0

[Git][ultreiaio/ird-t3][develop] improve installeur
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: d10e8af8 by Tony CHEMIT at 2017-04-10T13:55:37+02:00 improve installeur - - - - - 1 changed file: - t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java Changes: ===================================== t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java +++ b/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java @@ -33,11 +33,8 @@ import fr.ird.t3.entities.user.JdbcConfiguration; import fr.ird.t3.services.DefaultT3ServiceContext; import fr.ird.t3.services.T3ServiceContext; import fr.ird.t3.services.T3ServiceFactory; -import java.beans.PropertyChangeEvent; -import java.beans.PropertyChangeListener; import java.io.File; import java.io.FileInputStream; -import java.io.FilenameFilter; import java.io.IOException; import java.util.List; import java.util.Locale; @@ -96,45 +93,39 @@ public class T3ApplicationInstaller { } } - public static void usage() { - StringBuilder buffer = new StringBuilder(T3ApplicationInstaller.class.getSimpleName() + " requires 4 parameters :"); - buffer.append("\n").append("- databse connection properties file"); - buffer.append("\n").append("- postgis structure script creation"); - buffer.append("\n").append("- referential scripts directory"); - buffer.append("\n").append("- postgis data script").append("\n"); - System.out.println(buffer.toString()); + private static void usage() { + String buffer = T3ApplicationInstaller.class.getSimpleName() + " requires 4 parameters :" + "\n" + "- databse connection properties file" + + "\n" + "- postgis structure script creation" + + "\n" + "- referential scripts directory" + + "\n" + "- postgis data script" + "\n"; + System.out.println(buffer); } - protected final File connectionFile; + private final File connectionFile; - protected final File[] postgisDataFiles; + private final File[] postgisDataFiles; - protected final File ddlScriptsDirectory; + private final File ddlScriptsDirectory; - protected final File referentialScriptsDirectory; + private final File referentialScriptsDirectory; - protected T3ServiceContext serviceContext; + private T3ServiceContext serviceContext; - protected JdbcConfiguration jdbcConfiguration; + private JdbcConfiguration jdbcConfiguration; - protected T3ApplicationInstaller(File connectionFile, - File ddlScriptsDirectory, - File referentialScriptsDirectory, - File postgisDataScript) { + private T3ApplicationInstaller(File connectionFile, + File ddlScriptsDirectory, + File referentialScriptsDirectory, + File postgisDataScript) { this.connectionFile = connectionFile; this.ddlScriptsDirectory = ddlScriptsDirectory; this.referentialScriptsDirectory = referentialScriptsDirectory; - postgisDataFiles = postgisDataScript.listFiles(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(".zip"); - } - }); + postgisDataFiles = postgisDataScript.listFiles((dir, name) -> name.endsWith(".zip")); } - public void run() throws Exception { + private void run() throws Exception { if (log.isInfoEnabled()) { log.info("1/6 - Setup installer..."); } @@ -148,7 +139,7 @@ public class T3ApplicationInstaller { if (log.isInfoEnabled()) { log.info("3/6 - Create database schema..."); } - createDatabase(); + boolean schemaFound = createDatabase(); T3SqlScriptsImporter dllScriptsImporter = new T3SqlScriptsImporter(ddlScriptsDirectory); dllScriptsImporter.prepare(); @@ -157,7 +148,11 @@ public class T3ApplicationInstaller { log.info("4/6 - Loading ddl from " + dllScriptsImporter.getScriptsFile().size() + " scripts."); } - dllScriptsImporter.importScripts(serviceContext, file -> true); + if (schemaFound) { + log.info("4/6 - Loading ddl skip (schema already exists)"); + } else { + dllScriptsImporter.importScripts(serviceContext, file -> true); + } T3SqlScriptsImporter referentialScriptsImporter = new T3SqlScriptsImporter(referentialScriptsDirectory); referentialScriptsImporter.prepare(); @@ -168,7 +163,7 @@ public class T3ApplicationInstaller { } referentialScriptsImporter.importScripts(serviceContext, file -> true); - File unzipDirectory = createUnzipDirectory("postgis-data"); + File unzipDirectory = createUnzipDirectory(); if (log.isInfoEnabled()) { log.info("6/6 - Import postGis data from " + postgisDataFiles.length + " scripts."); @@ -187,7 +182,7 @@ public class T3ApplicationInstaller { } } - protected void setup() throws IOException { + private void setup() throws IOException { // initialize configuration @@ -232,7 +227,7 @@ public class T3ApplicationInstaller { ); } - protected void checkDatabaseConnection() throws IOException { + private void checkDatabaseConnection() throws IOException { // check jdbc connection try { @@ -245,7 +240,7 @@ public class T3ApplicationInstaller { } } - protected void createDatabase() { + private boolean createDatabase() { try { @@ -261,12 +256,15 @@ public class T3ApplicationInstaller { rootContext.createSchema(); } + return schemaFound; + } catch (TopiaException e) { throw new IllegalStateException("could not start db", e); } + } - protected File unzipFile(File unzipDirectory, File script) throws IOException { + private File unzipFile(File unzipDirectory, File script) throws IOException { List<String>[] lists = ZipUtil.scanAndExplodeZip(script, unzipDirectory, null); ZipUtil.uncompress(script, unzipDirectory); @@ -275,30 +273,24 @@ public class T3ApplicationInstaller { return result; } - protected File createUnzipDirectory(String name) throws IOException { + private File createUnzipDirectory() throws IOException { String tmpPath = System.getProperty("java.io.tmpdir"); File tmpDir = new File(tmpPath); - File unzupDirectory = new File(tmpDir, name + "_" + System.nanoTime()); + File unzupDirectory = new File(tmpDir, "postgis-data" + "_" + System.nanoTime()); unzupDirectory.deleteOnExit(); FileUtil.createDirectoryIfNecessary(unzupDirectory); return unzupDirectory; } - protected void loadScriptLineByLine(File script) throws TopiaException, IOException { + private void loadScriptLineByLine(File script) throws TopiaException, IOException { - T3ScriptHelper.loadScriptLineByLine(serviceContext.getApplicationContext(), script, new PropertyChangeListener() { - @Override - public void propertyChange(PropertyChangeEvent evt) { - if (log.isInfoEnabled()) { - log.info("Sql line " + evt.getNewValue() + " done."); - } - } - }); + T3ScriptHelper.loadScriptLineByLine(serviceContext.getApplicationContext(), script, + evt -> log.debug("Sql line " + evt.getNewValue() + " done.")); } - protected void destroy() { + private void destroy() { T3EntityHelper.releaseRootContext(serviceContext.getApplicationContext()); } View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/d10e8af8f4e1e0a3a090861f9952ff0f…

1 0

[Git][ultreiaio/ird-t3][develop] use correct method (See #252)
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 629aa7ce by Tony CHEMIT at 2017-04-10T13:39:31+02:00 use correct method (See #252) - - - - - 2 changed files: - t3-domain/src/main/java/fr/ird/t3/services/UserService.java - t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java Changes: ===================================== t3-domain/src/main/java/fr/ird/t3/services/UserService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/UserService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/UserService.java @@ -56,7 +56,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste } public T3User getUserById(String userId) throws Exception { - return userDAO.forTopiaIdEquals(userId).findAnyOrNull(); + return userDAO.forTopiaIdEquals(userId).findUnique(); } public List<T3User> getUsers() throws Exception { @@ -149,7 +149,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste commit(); } - public void removeOutputDatabaseConfiguration(String userId, String dbconfigurationId) throws Exception { + public void removeOutputDatabase(String userId, String dbconfigurationId) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/admin/UserOutputDatabaseAction.java @@ -60,7 +60,7 @@ public class UserOutputDatabaseAction extends AbstractUserDatabaseAction<UserOut @Override protected void delete(String userId, UserOutputDatabase database) throws Exception { - getUserService().removeUserT3Database(userId, database.getTopiaId()); + getUserService().removeOutputDatabase(userId, database.getTopiaId()); } @Override View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/629aa7ce61977b6c9c9d7ef73d20b9a9…

1 0

[Git][ultreiaio/ird-t3][develop] up pg gav, fix some config getter, i18n, ready to release \o/
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: a122771a by Tony CHEMIT at 2017-04-10T13:31:27+02:00 up pg gav, fix some config getter, i18n, ready to release \o/ - - - - - 27 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/T3Config.java - t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java - t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java - t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcH2Helper.java → t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java - t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java - t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java - t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java - t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java - t3-domain/src/main/java/fr/ird/t3/services/UserService.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java - t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java - t3-domain/src/main/resources/t3-datadb.properties - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - + t3-installer/src/main/assembly/dist/debug.sh - t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java - t3-installer/src/main/resources/log4j.properties - t3-output-balbayav32/pom.xml - t3-test/pom.xml - t3-web/pom.xml - t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java - t3-web/src/main/resources/i18n/t3-web_fr_FR.properties Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -114,7 +114,7 @@ <struts2Version>2.3.14</struts2Version> <jqueryPluginVersion>3.5.1</jqueryPluginVersion> <h2Version>1.3.176</h2Version> - <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> + <postgresqlVersion>9.4.1212.jre7</postgresqlVersion> <xworkVersion>2.3.31</xworkVersion> <hibernateVersion>5.1.3.Final</hibernateVersion> <slf4jVersion>1.7.25</slf4jVersion> @@ -274,7 +274,7 @@  <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <version>${postgresqlVersion}</version> </dependency> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -120,7 +120,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -161,7 +161,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-domain/src/main/java/fr/ird/t3/T3Config.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3Config.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3Config.java @@ -28,7 +28,6 @@ import java.io.BufferedReader; import java.io.File; import java.io.IOException; import java.nio.file.Files; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Properties; @@ -145,11 +144,11 @@ public class T3Config extends GeneratedT3Config { } public List<Integer> getLevel2DefaultSpeciesAsList() { - return Arrays.asList(getLevel2DefaultSpecies()); + return get().getOptionAsList(T3ConfigOption.LEVEL2_DEFAULT_SPECIES.getKey()).getOptionAsInt(); } public List<Integer> getLevel3DefaultSpeciesAsList() { - return Arrays.asList(getLevel3DefaultSpecies()); + return get().getOptionAsList(T3ConfigOption.LEVEL3_DEFAULT_SPECIES.getKey()).getOptionAsInt(); } public boolean isUpdateSchema() { ===================================== t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3SqlScriptsImporter.java @@ -22,17 +22,16 @@ package fr.ird.t3; */ import com.google.common.base.Preconditions; -import com.google.common.base.Predicate; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; import fr.ird.t3.entities.T3ScriptHelper; import fr.ird.t3.services.T3ServiceContext; import java.io.File; -import java.io.FilenameFilter; import java.io.IOException; import java.nio.file.Paths; import java.util.Collections; import java.util.List; +import java.util.function.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; @@ -44,7 +43,7 @@ import org.nuiton.version.Version; * <p> * Created on 30/01/16. * - * @author Tony Chemit - chemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr * @since 2.0 */ public class T3SqlScriptsImporter { @@ -56,12 +55,7 @@ public class T3SqlScriptsImporter { protected ImmutableSet<File> scriptsFile; - public static final Predicate<File> SKIP_SPECIES_LENGTH_STEP_FILE = new Predicate<File>() { - @Override - public boolean apply(File input) { - return !input.getName().toLowerCase().contains("specieslengthstep.sql"); - } - }; + public static final Predicate<File> SKIP_SPECIES_LENGTH_STEP_FILE = input -> !input.getName().toLowerCase().contains("specieslengthstep.sql"); public static void importReferential(File buildRootDirectory, T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException, TopiaException { @@ -98,12 +92,7 @@ public class T3SqlScriptsImporter { public void prepare() { - List<String> scriptsName = Lists.newArrayList(scriptsDirectory.list(new FilenameFilter() { - @Override - public boolean accept(File dir, String name) { - return name.endsWith(".sql"); - } - })); + List<String> scriptsName = Lists.newArrayList(scriptsDirectory.list((dir, name) -> name.endsWith(".sql"))); Collections.sort(scriptsName); ImmutableSet.Builder<File> filesBuilder = ImmutableSet.builder(); @@ -117,20 +106,20 @@ public class T3SqlScriptsImporter { return scriptsFile; } - public void importScripts(T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException, TopiaException { + public void importScripts(T3ServiceContext serviceContext, Predicate<File> filePredicate) throws IOException { for (File scriptFile : scriptsFile) { if (log.isInfoEnabled()) { log.info(" o Loading sql script ...(" + scriptFile.getName() + ")"); } - if (filePredicate.apply(scriptFile)) { + if (filePredicate.test(scriptFile)) { loadScript(serviceContext, scriptFile); } } } - protected void loadScript(T3ServiceContext serviceContext, File script) throws TopiaException, IOException { + protected void loadScript(T3ServiceContext serviceContext, File script) throws IOException { T3ScriptHelper.loadScript(serviceContext.getApplicationContext(), script); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/CountAndWeight.java @@ -24,7 +24,7 @@ package fr.ird.t3.entities; /** * Created on 26/01/16. * - * @author Tony Chemit - chemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr * @since 2.0 */ public class CountAndWeight { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcH2Helper.java → t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcH2Helper.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3JdbcHelper.java @@ -22,21 +22,33 @@ package fr.ird.t3.entities; */ import java.io.File; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.SQLException; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; -import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; +import org.nuiton.topia.persistence.jdbc.JdbcHelper; /** * Created by tchemit on 03/04/17. * * @author Tony Chemit - dev(a)tchemit.fr */ -public class T3JdbcH2Helper extends JdbcH2Helper { +public class T3JdbcHelper extends JdbcHelper { - public T3JdbcH2Helper(JdbcConfiguration jdbcConfiguration) { + public T3JdbcHelper(JdbcConfiguration jdbcConfiguration) { super(jdbcConfiguration); } - @Override + public void executeSql(String sql) { + try (Connection connection = openConnection()) { + try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { + preparedStatement.execute(); + } + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + public void backup(File file, boolean compress) { String options = ""; if (compress) { @@ -44,4 +56,5 @@ public class T3JdbcH2Helper extends JdbcH2Helper { } runSelectOnString("SCRIPT TO '" + file.getAbsolutePath() + "'" + options); } + } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3ScriptHelper.java @@ -35,10 +35,7 @@ import java.sql.Statement; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaApplicationContext; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; -import org.nuiton.topia.persistence.jdbc.JdbcHelper; import org.nuiton.topia.persistence.support.TopiaSqlWork; import org.nuiton.util.sql.SqlFileReader; @@ -58,38 +55,35 @@ public class T3ScriptHelper { if (log.isInfoEnabled()) { log.info("Export database to file " + outputFile); } - new T3JdbcH2Helper(rootTx.getConfiguration()).backup(outputFile, false); + rootTx.newJdbcHelper().backup(outputFile, false); } - public static void loadReferentiel(TopiaApplicationContext tx, String location) throws IOException, TopiaException { + public static void loadReferentiel(T3TopiaApplicationContext tx, String location) throws IOException, TopiaException { try (InputStream resourceAsStream = T3EntityHelper.class.getResourceAsStream(location)) { loadScript(tx, resourceAsStream); } } - public static void loadScript(TopiaApplicationContext tx, InputStream resourceAsStream) throws IOException, TopiaException { + public static void loadScript(T3TopiaApplicationContext tx, InputStream resourceAsStream) throws IOException, TopiaException { String script = IOUtils.toString(resourceAsStream, Charsets.UTF_8.name()); - new JdbcHelper(tx.getConfiguration()).runUpdate(script); - } + tx.newJdbcHelper().executeSql(script); - public static void loadScript(TopiaApplicationContext tx, File file) throws IOException, TopiaException { + } - InputStream resourceAsStream = new FileInputStream(file); + public static void loadScript(T3TopiaApplicationContext tx, File file) throws IOException, TopiaException { - try { + try (InputStream resourceAsStream = new FileInputStream(file)) { loadScript(tx, resourceAsStream); - } finally { - resourceAsStream.close(); } } - public static void loadScriptLineByLine(TopiaApplicationContext tx, File script, PropertyChangeListener listener) throws TopiaException, IOException { + public static void loadScriptLineByLine(T3TopiaApplicationContext tx, File script, PropertyChangeListener listener) throws TopiaException, IOException { try (BufferedReader stream = new BufferedReader(new InputStreamReader(new FileInputStream(script), Charsets.UTF_8))) { - try (T3TopiaPersistenceContext persistenceContext = (T3TopiaPersistenceContext) tx.newPersistenceContext()) { + try (T3TopiaPersistenceContext persistenceContext = tx.newPersistenceContext()) { persistenceContext.getSqlSupport().doSqlWork(new TopiaSqlWork() { ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3TopiaApplicationContext.java @@ -106,6 +106,10 @@ public class T3TopiaApplicationContext extends AbstractT3TopiaApplicationContext return new T3TopiaApplicationContext(topiaConfiguration); } + public T3JdbcHelper newJdbcHelper() { + return new T3JdbcHelper(getConfiguration()); + } + private T3TopiaApplicationContext(TopiaConfiguration topiaConfiguration) { super(topiaConfiguration); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/data/RfUsageStatus.java @@ -26,7 +26,7 @@ package fr.ird.t3.entities.data; * <p> * Created on 01/02/16. * - * @author Tony Chemit - chemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr * @see SampleWell#getRfMinus10UsageStatus() * @see SampleWell#getRfPlus10UsageStatus() () * @since 2.0 ===================================== t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/reference/WeightCategories.java @@ -29,7 +29,7 @@ import java.util.List; /** * Created on 25/01/16. * - * @author Tony Chemit - chemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr */ public class WeightCategories { ===================================== t3-domain/src/main/java/fr/ird/t3/services/UserService.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/UserService.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/UserService.java @@ -68,7 +68,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste user.setPassword(newPassword); T3User userToSave = userDAO.create(user); userDAO.update(userToSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } public void updateUser(T3User user) throws Exception { @@ -84,7 +84,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste userToSave.setPassword(encodePassword(user.getPassword())); } userDAO.update(userToSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } public void deleteUser(String userId) throws Exception { @@ -93,18 +93,17 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste throw new IllegalArgumentException("Could not find user with id : " + userId); } userDAO.delete(user); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void addUserT3Database(String userId, - UserT3Database dbConfiguration) throws Exception { + public void addUserT3Database(String userId, UserT3Database dbConfiguration) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); UserT3Database dbConfigurationtoSave = userT3DatabaseDAODAO.create(dbConfiguration); user.addUserT3Database(dbConfigurationtoSave); userDAO.update(user); - getT3TopiaPersistenceContext().get().commit(); + commit(); } public void updateUserT3Database(UserT3Database dbConfiguration) throws Exception { @@ -113,11 +112,10 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste UserT3Database dbConfigurationtoSave = getUserT3Database(dbconfigurationId); updateDatabaseConfiguration(dbConfiguration, dbConfigurationtoSave); userT3DatabaseDAODAO.update(dbConfigurationtoSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void removeUserT3Database(String userId, - String dbconfigurationId) throws Exception { + public void removeUserT3Database(String userId, String dbconfigurationId) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); @@ -126,11 +124,10 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste getUserT3Database(dbconfigurationId); user.removeUserT3Database(dbConfigurationtoSave); userDAO.update(user); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void addOutputDatabase(String userId, - UserOutputDatabase dbConfiguration) throws Exception { + public void addOutputDatabase(String userId, UserOutputDatabase dbConfiguration) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); @@ -138,7 +135,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste userOutputDatabaseDAO.create(dbConfiguration); user.addUserOutputDatabase(dbConfigurationtoSave); userDAO.update(user); - getT3UserTopiaPersistenceContext().get().commit(); + commit(); } public void updateUserOuputDatabase( @@ -149,11 +146,10 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste getUserOutputDatabase(dbconfigurationId); updateDatabaseConfiguration(dbConfiguration, dbConfigurationtoSave); userOutputDatabaseDAO.update(dbConfigurationtoSave); - getT3TopiaPersistenceContext().get().commit(); + commit(); } - public void removeOutputDatabaseConfiguration(String userId, - String dbconfigurationId) throws Exception { + public void removeOutputDatabaseConfiguration(String userId, String dbconfigurationId) throws Exception { T3User user = getUserById(userId); Preconditions.checkNotNull(user, "Could not find user with id : " + userId); @@ -163,7 +159,7 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste user.removeUserOutputDatabase(dbConfigurationtoSave); userDAO.update(user); - getT3UserTopiaPersistenceContext().get().commit(); + commit(); } public UserT3Database getUserT3Database(String dbconfigurationId) throws TopiaException { @@ -186,21 +182,23 @@ public class UserService extends T3ServiceSupport implements T3UserTopiaPersiste return dbConfigurationtoSave; } - public boolean checkPassword(T3User user, - String password) throws Exception { + public boolean checkPassword(T3User user, String password) throws Exception { String s = encodePassword(password); return s.equals(user.getPassword()); } - public static String encodePassword(String password) { + private static String encodePassword(String password) { return StringUtil.encodeMD5(password); } - protected void updateDatabaseConfiguration(UserDatabase dbConfiguration, - UserDatabase dbConfigurationtoSave) throws TopiaException { + private void updateDatabaseConfiguration(UserDatabase dbConfiguration, UserDatabase dbConfigurationtoSave) { dbConfigurationtoSave.setDescription(dbConfiguration.getDescription()); dbConfigurationtoSave.setUrl(dbConfiguration.getUrl()); dbConfigurationtoSave.setLogin(dbConfiguration.getLogin()); } + private void commit() { + getT3UserTopiaPersistenceContext().get().commit(); + } + } ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackSupport.java @@ -36,7 +36,7 @@ import org.nuiton.version.Version; /** * Created on 25/01/16. * - * @author Tony Chemit - chemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr * @since 2.0 */ public abstract class T3MigrationCallbackSupport extends TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion { ===================================== t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/migration/T3MigrationCallbackV2_0.java @@ -29,7 +29,7 @@ import org.nuiton.version.Versions; /** * Created on 25/01/16. * - * @author Tony Chemit - chemit(a)codelutin.com + * @author Tony Chemit - dev(a)tchemit.fr * @since 2.0 */ public class T3MigrationCallbackV2_0 extends T3MigrationCallbackSupport { ===================================== t3-domain/src/main/resources/t3-datadb.properties ===================================== --- a/t3-domain/src/main/resources/t3-datadb.properties +++ b/t3-domain/src/main/resources/t3-datadb.properties @@ -19,7 +19,7 @@ # #L% ### # DB configuration -hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect +hibernate.dialect=org.hibernate.dialect.PostgreSQL9Dialect hibernate.connection.driver_class=org.postgresql.Driver hibernate.connection.provider_class=org.hibernate.hikaricp.internal.HikariCPConnectionProvider hibernate.show_sql=false ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -131,7 +131,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -132,7 +132,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -132,7 +132,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -75,7 +75,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> ===================================== t3-installer/src/main/assembly/dist/debug.sh ===================================== --- /dev/null +++ b/t3-installer/src/main/assembly/dist/debug.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +java -agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=8000 -Xmx1024M -Xms512M -jar ${project.build.finalName}.jar "db.properties" "scripts/ddl" "scripts/referential" "scripts/zones" ===================================== t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java +++ b/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java @@ -24,7 +24,6 @@ package fr.ird.t3.tools; import com.google.common.base.Preconditions; -import com.google.common.base.Predicates; import fr.ird.t3.T3Config; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; @@ -158,7 +157,7 @@ public class T3ApplicationInstaller { log.info("4/6 - Loading ddl from " + dllScriptsImporter.getScriptsFile().size() + " scripts."); } - dllScriptsImporter.importScripts(serviceContext, Predicates.<File>alwaysTrue()); + dllScriptsImporter.importScripts(serviceContext, file -> true); T3SqlScriptsImporter referentialScriptsImporter = new T3SqlScriptsImporter(referentialScriptsDirectory); referentialScriptsImporter.prepare(); @@ -167,7 +166,7 @@ public class T3ApplicationInstaller { if (log.isInfoEnabled()) { log.info("5/6 - Load referential from " + referentialScriptsImporter.getScriptsFile().size() + " scripts."); } - referentialScriptsImporter.importScripts(serviceContext, Predicates.<File>alwaysTrue()); + referentialScriptsImporter.importScripts(serviceContext, file -> true); File unzipDirectory = createUnzipDirectory("postgis-data"); ===================================== t3-installer/src/main/resources/log4j.properties ===================================== --- a/t3-installer/src/main/resources/log4j.properties +++ b/t3-installer/src/main/resources/log4j.properties @@ -39,3 +39,5 @@ log4j.appender.file.layout.ConversionPattern=%d{dd MMM yyyy HH:mm:ss} %5p [%t] ( # levels log4j.logger.org.hibernate=WARN +log4j.logger.org.hibernate.orm.deprecation=ERROR +log4j.logger.com.zaxxer.hikari.HikariDataSource=ERROR ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -106,7 +106,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>test</scope> </dependency> ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -84,7 +84,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -164,7 +164,7 @@ </dependency> <dependency> - <groupId>postgresql</groupId> + <groupId>org.postgresql</groupId> <artifactId>postgresql</artifactId> <scope>runtime</scope> </dependency> ===================================== t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java +++ b/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java @@ -107,9 +107,7 @@ public class T3ApplicationListener implements ServletContextListener { log.info("Configuration initialized."); T3ApplicationContext applicationContext = new T3ApplicationContext(); - T3ApplicationContext.setT3ApplicationContext( - sce.getServletContext(), applicationContext - ); + T3ApplicationContext.setT3ApplicationContext(sce.getServletContext(), applicationContext); // initialize configuration applicationContext.setConfiguration(configuration); @@ -138,8 +136,7 @@ public class T3ApplicationListener implements ServletContextListener { ); // init database (and create minimal admin user if required) - initInternalDatabase(applicationContext, - serviceContext); + initInternalDatabase(applicationContext, serviceContext); } @Override @@ -216,9 +213,7 @@ public class T3ApplicationListener implements ServletContextListener { applicationContext.setInternalRootContext(internalRootContext); - boolean schemaNeedUpdate = - !isInternalSchemaCreated(internalRootContext) || - configuration.isUpdateSchema(); + boolean schemaNeedUpdate = !isInternalSchemaCreated(internalRootContext) || configuration.isUpdateSchema(); if (schemaNeedUpdate) { @@ -230,8 +225,7 @@ public class T3ApplicationListener implements ServletContextListener { } try { - createAdminUser(serviceContext, - applicationContext.getInternalRootContext()); + createAdminUser(serviceContext, applicationContext.getInternalRootContext()); } catch (Exception e) { throw new IllegalStateException( ===================================== t3-web/src/main/resources/i18n/t3-web_fr_FR.properties ===================================== --- a/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties +++ b/t3-web/src/main/resources/i18n/t3-web_fr_FR.properties @@ -75,7 +75,7 @@ t3.common.currentDirection=Direction du courant t3.common.currentVelocity=Vitesse du courant t3.common.database.general.caracteristics=Statistiques générales t3.common.database.ocean.caracteristics=Statistiques de l'océan -t3.common.database.tripsWithAllData=Marées avec totues les données calculées (%s / %s) +t3.common.database.tripsWithAllData=Marées avec toutes les données calculées (%s / %s) t3.common.database.tripsWithNoData=Marées avec aucune donnée calculée (%s / %s) t3.common.database.tripsWithSomeData=Marées avec une partie des données calculées (%s / %s) t3.common.date=Date View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/a122771a3edc08f1bf1b5323700917c1…

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: 6da5522c by 166231 at 2017-04-10T10:19:19+00:00 Site checkin for project T3 - - - - - 18 changed files: - aggregate-third-party-report.html - changelog.html - changes-report.html - config-report.html - dependency-convergence.html - dependency-management.html - dependency-updates-report.html - dev-activity.html - file-activity.html - index.html - install.html - installer.html - integration.html - issue-tracking.html - license.html - model.html - plugin-management.html - plugin-updates-report.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/6da5522cd6096e6362e30c46736a94e9…

1 0

[Git][ultreiaio/ird-t3][develop] prepare next release
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 1a9a1974 by Tony CHEMIT at 2017-04-10T11:55:46+02:00 prepare next release - - - - - 8 changed files: - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AtlanticOceanFixtures.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/IndianOceanFixtures.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/OceanFixtures.java - t3-input-avdthv36/src/license/THIRD-PARTY.properties - t3-installer/src/license/THIRD-PARTY.properties - t3-output-balbayav32/src/license/THIRD-PARTY.properties - t3-web/pom.xml - t3-web/src/license/THIRD-PARTY.properties Changes: ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AtlanticOceanFixtures.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AtlanticOceanFixtures.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AtlanticOceanFixtures.java @@ -1,5 +1,26 @@ package fr.ird.t3.actions.io.input; +/*- + * #%L + * T3 :: Input AVDTH v 35 + * %% + * Copyright (C) 2010 - 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 Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * Created by tchemit on 10/04/17. * ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/IndianOceanFixtures.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/IndianOceanFixtures.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/IndianOceanFixtures.java @@ -1,5 +1,26 @@ package fr.ird.t3.actions.io.input; +/*- + * #%L + * T3 :: Input AVDTH v 35 + * %% + * Copyright (C) 2010 - 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 Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * Created by tchemit on 10/04/17. * ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/OceanFixtures.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/OceanFixtures.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/OceanFixtures.java @@ -1,5 +1,26 @@ package fr.ird.t3.actions.io.input; +/*- + * #%L + * T3 :: Input AVDTH v 35 + * %% + * Copyright (C) 2010 - 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 Affero 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 Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ + /** * Created by tchemit on 10/04/17. * ===================================== t3-input-avdthv36/src/license/THIRD-PARTY.properties ===================================== --- a/t3-input-avdthv36/src/license/THIRD-PARTY.properties +++ b/t3-input-avdthv36/src/license/THIRD-PARTY.properties @@ -11,8 +11,6 @@ # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 -# - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -28,6 +26,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Apr 03 08:33:39 CEST 2017 +#Mon Apr 10 11:53:44 CEST 2017 +commons-lang--commons-lang--2.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License ===================================== t3-installer/src/license/THIRD-PARTY.properties ===================================== --- a/t3-installer/src/license/THIRD-PARTY.properties +++ b/t3-installer/src/license/THIRD-PARTY.properties @@ -2,15 +2,17 @@ #------------------------------------------------------------------------------- # Already used licenses in project : # - Affero General Public License (AGPL) +# - Apache 2 # - Apache License 2.0 +# - Apache License, version 2.0 # - BSD License # - BSD-style license # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Public License Version 1.0 -# - GNU Lesser General Public License, version 2.1 +# - Eclipse Distribution License (EDL), Version 1.0 +# - Eclipse Public License (EPL), Version 1.0 +# - Eclipse Public License 1.0 # - GNU Library or Lesser General 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) v 3.0 # - Lesser General Public License (LPGL) # - Lesser General Public License (LPGL) v 2.1 @@ -20,11 +22,11 @@ # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - The MIT License -# - license.txt #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Nov 30 15:26:41 CET 2015 +#Mon Apr 10 11:55:01 CEST 2017 +commons-lang--commons-lang--2.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License ===================================== t3-output-balbayav32/src/license/THIRD-PARTY.properties ===================================== --- a/t3-output-balbayav32/src/license/THIRD-PARTY.properties +++ b/t3-output-balbayav32/src/license/THIRD-PARTY.properties @@ -11,8 +11,6 @@ # - Eclipse Distribution License (EDL), Version 1.0 # - Eclipse Public License (EPL), Version 1.0 # - Eclipse Public License 1.0 -# - Eclipse Public License, Version 1.0 -# - GNU Lesser General Public License, Version 2.1 # - GNU Library or Lesser General Public License # - Indiana University Extreme! Lab Software License, version 1.1.1 # - Lesser General Public License (LGPL) v 3.0 @@ -28,6 +26,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Apr 03 08:28:18 CEST 2017 +#Mon Apr 10 11:53:54 CEST 2017 +commons-lang--commons-lang--2.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -97,6 +97,7 @@ <dependency> <groupId>org.nuiton.web</groupId> <artifactId>nuiton-struts2</artifactId> + <scope>runtime</scope> </dependency> <!--dependency> <groupId>org.nuiton.web</groupId> ===================================== t3-web/src/license/THIRD-PARTY.properties ===================================== --- a/t3-web/src/license/THIRD-PARTY.properties +++ b/t3-web/src/license/THIRD-PARTY.properties @@ -25,7 +25,8 @@ # Please fill the missing licenses for dependencies : # # -#Tue Apr 04 08:14:12 CEST 2017 +#Mon Apr 10 11:54:08 CEST 2017 +commons-lang--commons-lang--2.0=The Apache Software License, Version 2.0 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/1a9a19740c1ff664384d0161d35262d3…

1 0

[Git][ultreiaio/ird-t3][develop] 4 commits: add msaccess importer module
by Tony CHEMIT April 10, 2017

April 10, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: b3476dd4 by Tony CHEMIT at 2017-04-10T11:19:37+02:00 add msaccess importer module - - - - - 71a6fbb4 by Tony CHEMIT at 2017-04-10T11:19:40+02:00 make its works again on avdthv35 - - - - - 64ba75ba by Tony CHEMIT at 2017-04-10T11:20:13+02:00 fix import data code - - - - - ee00660d by Tony CHEMIT at 2017-04-10T11:20:22+02:00 up on its - - - - - 30 changed files: - pom.xml - t3-actions/src/license/THIRD-PARTY.properties - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java - t3-domain/pom.xml - t3-domain/src/license/THIRD-PARTY.properties - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3EntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/AbstractT3InputMSAccess.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/RemoveProxyEntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3AccessEntityProxyHandler.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3DataEntityVisitor.java - t3-domain/src/main/java/fr/ird/t3/io/input/access/T3ReferentielEntityVisitor.java - t3-input-avdthv33/pom.xml - t3-input-avdthv33/src/license/THIRD-PARTY.properties - t3-input-avdthv33/src/main/java/fr/ird/t3/io/input/avdth/v33/T3DataEntityVisitorAvdth33.java - t3-input-avdthv35/pom.xml - t3-input-avdthv35/src/license/THIRD-PARTY.properties - t3-input-avdthv35/src/main/java/fr/ird/t3/io/input/avdth/v35/T3DataEntityVisitorAvdth35.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionAtlanticOceanIT.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionITSupport.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceActionIndianOceanIT.java - + t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/AtlanticOceanFixtures.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionAtlanticOceanIT.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionITSupport.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/ImportInputSourceActionIndianOceanIT.java - + t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/IndianOceanFixtures.java - + t3-input-avdthv35/src/test/java/fr/ird/t3/actions/io/input/OceanFixtures.java - t3-input-avdthv36/pom.xml - t3-input-avdthv36/src/main/java/fr/ird/t3/io/input/avdth/v36/T3DataEntityVisitorAvdth36.java - + t3-msaccess-importer/LICENSE.txt - + t3-msaccess-importer/README.md The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/c4f19b89353385540dd13c11e6e23a0…

1 0

[Git][ultreiaio/ird-t3][develop] 3 commits: add page builds
by Tony CHEMIT April 4, 2017

April 4, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 60dbc3e4 by Tony CHEMIT at 2017-04-03T16:55:59+02:00 add page builds - - - - - ac3f1fdd by Tony CHEMIT at 2017-04-04T10:05:38+02:00 update gitignore [skip ci] - - - - - c4f19b89 by Tony CHEMIT at 2017-04-04T22:04:00+02:00 replace topia transcation filter with the bad proxy pattenr, prefer use a simple supplier instead - - - - - 30 changed files: - .gitignore - pom.xml - + src/site/resources/.gitlab-ci.yml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/Level2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level3/Level3Action.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/AnalyzeInputSourceAction.java - t3-actions/src/main/java/fr/ird/t3/actions/io/input/ImportInputSourceAction.java - t3-actions/src/main/java/fr/ird/t3/actions/io/output/ExportAction.java - t3-actions/src/test/java/fr/ird/t3/actions/AbstractActionResumeTest.java - − t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-actions/src/test/java/fr/ird/t3/io/output/fake/v0/T3OutputFakeImpl.java - t3-actions/src/test/java/fr/ird/t3/models/LengthCompositionModelHelperTest.java - t3-actions/src/test/java/fr/ird/t3/models/SpeciesCountModelHelperTest.java - t3-actions/src/test/java/fr/ird/t3/models/WeightCompositionModelHelperTest.java - t3-domain/pom.xml - t3-domain/src/main/java/fr/ird/t3/actions/T3Action.java - t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratum.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/CatchStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratum.java - t3-domain/src/main/java/fr/ird/t3/actions/stratum/SampleStratumLoader.java - t3-domain/src/main/java/fr/ird/t3/entities/T3EntityHelper.java - t3-domain/src/main/java/fr/ird/t3/io/output/T3Output.java - t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java - t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java - t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java - + t3-domain/src/main/java/fr/ird/t3/services/T3TopiaPersistenceContextAware.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/4acaac547cc4a82ef291bc7c478a3e1…

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3
by Tony CHEMIT April 3, 2017

April 3, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: 16d0e266 by Tony CHEMIT at 2017-04-03T17:01:25+02:00 Site checkin for project T3 - - - - - 4 changed files: - + .gitlab-ci.yml - changelog.html - dev-activity.html - file-activity.html Changes: ===================================== .gitlab-ci.yml ===================================== --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file ===================================== changelog.html ===================================== The diff for this file was not included because it is too large. ===================================== dev-activity.html ===================================== --- a/dev-activity.html +++ b/dev-activity.html @@ -90,7 +90,7 @@ <h2><a name="Developer_Activity_Report"></a>Developer Activity Report</h2> <div class="section"> <h3><a name="Changes_between_2017-03-04_and_2017-04-04"></a>Changes between 2017-03-04 and 2017-04-04</h3> -<p>Total commits: 5<br />Total number of files changed: 723</p> +<p>Total commits: 6<br />Total number of files changed: 724</p> <table border="0" class="table table-striped"> <tr class="a"> <th>Developer</th> @@ -98,8 +98,8 @@ <th>Total Number of Files Changed</th></tr> <tr class="b"> <td>Tony CHEMIT <dev(a)tchemit.fr></td> -<td>5</td> -<td>723</td></tr></table></div></div> +<td>6</td> +<td>724</td></tr></table></div></div> </div> </div> </div> ===================================== file-activity.html ===================================== The diff for this file was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/16d0e266e90b583fd68cd584e2eb63b1…

1 0

[Git][ultreiaio/ird-t3][pages] Site checkin for project T3
by Tony CHEMIT April 3, 2017

April 3, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: 14bbba69 by Tony CHEMIT at 2017-04-03T16:22:23+02:00 Site checkin for project T3 - - - - - 4 changed files: - − .gitlab-ci.yml - aggregate-third-party-report.html - − application-config-report.html - changelog.html The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/14bbba697543ac61666f946f0eaebd94…

1 0

[Git][ultreiaio/ird-t3][develop] Use nuiton-config last api (See #257)
by Tony CHEMIT April 3, 2017

April 3, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 4acaac54 by Tony CHEMIT at 2017-04-03T15:13:44+02:00 Use nuiton-config last api (See #257) - - - - - 26 changed files: - t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-domain/pom.xml - + t3-domain/src/main/config/T3.ini - − t3-domain/src/main/java/fr/ird/t3/T3ApplicationConfigProvider.java - t3-domain/src/main/java/fr/ird/t3/T3Configuration.java → t3-domain/src/main/java/fr/ird/t3/T3Config.java - − t3-domain/src/main/java/fr/ird/t3/T3ConfigurationOption.java - t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java - t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java - t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java - t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java - t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java - − t3-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider - t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java - t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java - t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java - t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java - t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java - t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java - t3-web/src/main/java/fr/ird/t3/web/T3Session.java - t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java - t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java Changes: ===================================== t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-actions/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,8 +20,8 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.T3IOUtil; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -59,7 +59,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -78,8 +78,8 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } Properties defaultProps = new Properties(); - defaultProps.put(T3ConfigurationOption.DATA_DIRECTORY.getKey(), testDir); - applicationConfiguration = new T3Configuration(defaultProps); + defaultProps.put(T3ConfigOption.DATA_DIRECTORY.getKey(), testDir); + applicationConfiguration = new T3Config(defaultProps); try { // where to put h2 database @@ -133,7 +133,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -191,11 +191,38 @@ </includes> <filtering>true</filtering> </resource> +  + <resource> + <directory>target/generated-sources/java</directory> + <includes> + <include>**/*.xml</include> + </includes> + </resource> </resources> <plugins> <plugin> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-config-maven-plugin</artifactId> + <executions> + <execution> + <phase>generate-sources</phase> + <id>generate-config</id> + <configuration> + <modelName>T3</modelName> + <generatePropertyChangeSupport>true</generatePropertyChangeSupport> + <packageName>fr.ird.t3</packageName> + <useNuitonI18n>true</useNuitonI18n> + </configuration> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> <groupId>org.nuiton.eugene</groupId> <artifactId>eugene-maven-plugin</artifactId> <configuration> ===================================== t3-domain/src/main/config/T3.ini ===================================== --- /dev/null +++ b/t3-domain/src/main/config/T3.ini @@ -0,0 +1,154 @@ +description = t3.application.config + +[option contextPath] +description = t3.config.context.path.description +key = context.path +type = string +defaultValue = t3 +transient = true +final = true + +[option dataDirectory] +description = t3.config.data.directory.description +key = data.directory +type = file +defaultValue = /var/local/t3/${context.path} +transient = true +final = true + +[option internalDbDirectory] +description = t3.config.internal.db.directory.description +key = internal.db.directory +type = file +defaultValue = ${data.directory}/db +transient = true +final = true + +[option parameterProfileDirectory] +description = t3.config.parameterProfiles.storage.directory.description +key = parameterProfiles.storage.directory +type = file +defaultValue = ${data.directory}/parameter-profiles +transient = true +final = true + +[option logFile] +description = t3.user.log.file.description +key = user.log.file +type = file +defaultValue = ${data.directory}/t3-log.properties +transient = true +final = true + +[option userLogDirectory] +description = t3.user.log.directory.description +key = user.log.directory +type = file +defaultValue = ${data.directory}/logs +transient = true +final = true + +[option treatmentWorkingDirectory] +description = t3.config.treatment.working.directory.description +key = treatment.working.directory +type = file +defaultValue = ${data.directory}/treatments +transient = true +final = true + +[option stratumWeightRatio] +description = t3.config.stratum.weightRatio.description +key = stratum.weightRatio +type = Float +defaultValue = 250 +transient = true +final = true + +[option rf1MinimumRate] +description = t3.config.rf1.minimumrate.description +key = rf1.minimumrate +type = Float +defaultValue = 0.8 +transient = true +final = true + +[option rf1MaximumRate] +description = t3.config.rf1.maximumrate.description +key = rf1.maximumrate +type = Float +defaultValue = 1.2 +transient = true +final = true + +[option rfTotMax] +description = t3.config.rfTot.maximum.description +key = rfTot.maximum +type = Float +defaultValue = 250 +transient = true +final = true + +[option rfMinus10Max] +description = t3.config.rfMinus10.maximum.description +key = rfMinus10.maximum +type = Float +defaultValue = 500 +transient = true +final = true + +[option rfPlus10Max] +description = t3.config.rfPlus10.maximum.description +key = rfPlus10.maximum +type = Float +defaultValue = 500 +transient = true +final = true + +[option rfMinus10MinNumber] +description = t3.config.rfMinus10.minNumber.description +key = rfMinus10.minNumber +type = Integer +defaultValue = 75 +transient = true +final = true + +[option rfPlus10MinNumber] +description = t3.config.rfPlus10.minNumber.description +key = rfPlus10.minNumber +type = Integer +defaultValue = 75 +transient = true +final = true + +[option weightedSetWeight] +description = t3.config.level0.weightedSetWeight.description +key = level0.weightedSetWeight +type = Float +defaultValue = 40 +transient = true +final = true + +[option level2DefaultSpecies] +description = t3.config.level2.defaultSpecies.description +key = level2.defaultSpecies +type = Integer[] +defaultValue = 1,2,3 +transient = true +final = true + +[option level3DefaultSpecies] +description = t3.config.level3.defaultSpecies.description +key = level3.defaultSpecies +type = Integer[] +defaultValue = 1,2,3,4,5,6 +transient = true +final = true + +[option t3DataVersion] +description = t3.config.data.version.description +key = data.version +type = version +defaultValue = +transient = true +final = true + ===================================== t3-domain/src/main/java/fr/ird/t3/T3ApplicationConfigProvider.java deleted ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3ApplicationConfigProvider.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * #%L - * T3 :: Domain - * %% - * Copyright (C) 2010 - 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 Affero 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 Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ird.t3; - -import java.util.Locale; -import org.nuiton.config.ApplicationConfigProvider; -import org.nuiton.config.ConfigActionDef; -import org.nuiton.config.ConfigOptionDef; - - -import static org.nuiton.i18n.I18n.l; - -/** - * Application config provider (for site generation). - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 1.3.1 - */ -public class T3ApplicationConfigProvider implements ApplicationConfigProvider { - - @Override - public String getName() { - return "t3"; - } - - @Override - public String getDescription(Locale locale) { - return l(locale, "t3.application.config"); - } - - @Override - public ConfigOptionDef[] getOptions() { - return T3ConfigurationOption.values(); - } - - @Override - public ConfigActionDef[] getActions() { - return new ConfigActionDef[0]; - } -} ===================================== t3-domain/src/main/java/fr/ird/t3/T3Configuration.java → t3-domain/src/main/java/fr/ird/t3/T3Config.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3Configuration.java +++ b/t3-domain/src/main/java/fr/ird/t3/T3Config.java @@ -27,8 +27,8 @@ import com.google.common.io.Resources; import java.io.BufferedReader; import java.io.File; import java.io.IOException; -import java.net.URL; import java.nio.file.Files; +import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.Properties; @@ -39,7 +39,6 @@ import org.apache.log4j.PropertyConfigurator; import org.nuiton.config.ApplicationConfig; import org.nuiton.config.ArgumentsParserException; import org.nuiton.util.FileUtil; -import org.nuiton.version.Version; /** * T3 configuration @@ -47,35 +46,31 @@ import org.nuiton.version.Version; * @author Tony Chemit - dev(a)tchemit.fr * @since 1.0 */ -public class T3Configuration { +public class T3Config extends GeneratedT3Config { /** Logger. */ - protected static Log log = LogFactory.getLog(T3Configuration.class); + protected static Log log = LogFactory.getLog(T3Config.class); - private final MyApplicationConfig config; + public T3Config(Properties defaultProps) { - public T3Configuration(Properties defaultProps) { - - config = new MyApplicationConfig(); - config.setConfigFileName("t3.conf"); + ApplicationConfig applicationConfig = get(); + applicationConfig.loadDefaultOptions(T3ConfigOption.values()); + applicationConfig.setConfigFileName("t3.conf"); if (log.isInfoEnabled()) { log.info(this + " is initializing..."); } - config.loadDefaultOptions(T3ConfigurationOption.values()); if (defaultProps != null) { for (Map.Entry<Object, Object> entry : defaultProps.entrySet()) { - config.setDefaultOption( - String.valueOf(entry.getKey()), - String.valueOf(entry.getValue()) + applicationConfig.setDefaultOption(String.valueOf(entry.getKey()), String.valueOf(entry.getValue()) ); } } } - public T3Configuration() { + public T3Config() { this(null); } @@ -90,13 +85,13 @@ public class T3Configuration { // parse configuration (with no parameters) parse(); - createDirectory(T3ConfigurationOption.DATA_DIRECTORY, + createDirectory(T3ConfigOption.DATA_DIRECTORY, "data directory"); - createDirectory(T3ConfigurationOption.USER_LOG_DIRECTORY, + createDirectory(T3ConfigOption.USER_LOG_DIRECTORY, "user logs directory"); - createDirectory(T3ConfigurationOption.TREATMENT_WORKING_DIRECTORY, + createDirectory(T3ConfigOption.TREATMENT_WORKING_DIRECTORY, "treatment workdir directory"); File log4jConfigurationFile = getLog4jConfigurationFile(); @@ -117,20 +112,18 @@ public class T3Configuration { } - public File getLog4jConfigurationFile() { - return config.getOptionAsFile(T3ConfigurationOption.LOG_FILE.key); - } - - protected void parse() { + public void parse() { try { - config.parse(); + get().parse(); } catch (ArgumentsParserException e) { - if (log.isErrorEnabled()) { - log.error("Could not parse configuration", e); - } + throw new IllegalStateException("Could not parse configuration",e); } } + public File getLog4jConfigurationFile() { + return get().getOptionAsFile(T3ConfigOption.LOG_FILE.getKey()); + } + public File getTreatmentWorkingDirectory(String name, boolean create) { File file = getTreatmentWorkingDirectory(); @@ -148,86 +141,19 @@ public class T3Configuration { } public String getApplicationVersion() { - return config.getOption("application.version"); - } - - public Version getT3DataVersion() { - return config.getOptionAsVersion(T3ConfigurationOption.T3_DATA_VERSION.key); - } - - public URL getApplicationSite() { - return config.getOptionAsURL("application.site.url"); - } - - public File getDataDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.DATA_DIRECTORY.key); - } - - public File getInternalDbDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.INTERNAL_DB_DIRECTORY.key); - } - - public File getParameterProfilePath() { - return config.getOptionAsFile(T3ConfigurationOption.PARAMETER_PROFILE_DIRECTORY.key); - } - - public File getTreatmentWorkingDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.TREATMENT_WORKING_DIRECTORY.key); - } - - public File getUserLogDirectory() { - return config.getOptionAsFile(T3ConfigurationOption.USER_LOG_DIRECTORY.key); + return get().getOption("application.version"); } - public Float getWeightedSetWeight() { - return config.getOptionAsFloat(T3ConfigurationOption.WEIGHTED_SET_WEIGHT.key); + public List<Integer> getLevel2DefaultSpeciesAsList() { + return Arrays.asList(getLevel2DefaultSpecies()); } - public Float getStratumWeightRatio() { - return config.getOptionAsFloat(T3ConfigurationOption.STRATUM_WEIGHT_RATIO.key); - } - - public float getRF1MinimumRate() { - return config.getOptionAsFloat(T3ConfigurationOption.RF1_MINIMUM_RATE.key); - } - - public float getRF1MaximumRate() { - return config.getOptionAsFloat(T3ConfigurationOption.RF1_MAXIMUM_RATE.key); - } - - public int getRFTotMax() { - return config.getOptionAsInt(T3ConfigurationOption.RF_TOT_MAX.key); - } - - public int getRFMinus10Max() { - return config.getOptionAsInt(T3ConfigurationOption.RF_MINUS10_MAX.key); - } - - public int getRFPlus10Max() { - return config.getOptionAsInt(T3ConfigurationOption.RF_PLUS10_MAX.key); - } - - public int getRFMinus10MinNumber() { - return config.getOptionAsInt(T3ConfigurationOption.RF_MINUS10_MIN_NUMBER.key); - } - - public int getRFPlus10MinNumber() { - return config.getOptionAsInt(T3ConfigurationOption.RF_PLUS10_MIN_NUMBER.key); - } - - public List<Integer> getLevel2DefaultSpecies() { - ApplicationConfig.OptionList optionAsList = config.getOptionAsList(T3ConfigurationOption.LEVEL2_DEFAULT_SPECIES.key); - return optionAsList.getOptionAsInt(); - } - - public List<Integer> getLevel3DefaultSpecies() { - ApplicationConfig.OptionList optionAsList = config.getOptionAsList(T3ConfigurationOption.LEVEL3_DEFAULT_SPECIES.key); - return optionAsList.getOptionAsInt(); + public List<Integer> getLevel3DefaultSpeciesAsList() { + return Arrays.asList(getLevel3DefaultSpecies()); } public boolean isUpdateSchema() { - Boolean result = config.getOptionAsBoolean("updateSchema"); - return result != null && result; + return get().getOptionAsBoolean("updateSchema"); } /** @@ -237,9 +163,9 @@ public class T3Configuration { * the directory to create * @param name a name used for logs */ - protected void createDirectory(T3ConfigurationOption key, String name) { + private void createDirectory(T3ConfigOption key, String name) { - File directory = config.getOptionAsFile(key.getKey()); + File directory = get().getOptionAsFile(key.getKey()); Preconditions.checkNotNull( directory, @@ -278,7 +204,7 @@ public class T3Configuration { LogManager.resetConfiguration(); PropertyConfigurator.configure(finalLogConfigurationProperties); - log = LogFactory.getLog(T3Configuration.class); + log = LogFactory.getLog(T3Config.class); if (log.isInfoEnabled()) { log.info("Configuration des logs chargée depuis le fichier " + logFile); } @@ -291,17 +217,10 @@ public class T3Configuration { for (Map.Entry<Object, Object> entry : sourceProperties.entrySet()) { String key = (String) entry.getKey(); String value = (String) entry.getValue(); - String newValue = config.replaceRecursiveOptions(value); + String newValue = get().replaceRecursiveOptions(value); targetProperties.setProperty(key, newValue); } return targetProperties; } - private static class MyApplicationConfig extends ApplicationConfig { - - @Override - public String replaceRecursiveOptions(String option) { - return super.replaceRecursiveOptions(option); - } - } } ===================================== t3-domain/src/main/java/fr/ird/t3/T3ConfigurationOption.java deleted ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/T3ConfigurationOption.java +++ /dev/null @@ -1,205 +0,0 @@ -/* - * #%L - * T3 :: Domain - * %% - * Copyright (C) 2010 - 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 Affero 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 Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package fr.ird.t3; - -import java.io.File; -import org.nuiton.config.ConfigOptionDef; -import org.nuiton.version.Version; - - -import static org.nuiton.i18n.I18n.n; - -/** - * All T3 configuration options. - * - * @since 1.0 - */ -public enum T3ConfigurationOption implements ConfigOptionDef { - - CONTEXT_PATH( - "context.path", - n("t3.config.context.path.description"), - "t3", - String.class), - - /** Main directory where to put t3 data (logs, and others...). */ - DATA_DIRECTORY( - "data.directory", - n("t3.config.data.directory.description"), - "/var/local/t3/${context.path}", - File.class), - INTERNAL_DB_DIRECTORY( - "internal.db.directory", - n("t3.config.internal.db.directory.description"), - "${data.directory}/db", - File.class), - - PARAMETER_PROFILE_DIRECTORY( - "parameterProfiles.storage.directory", - n("t3.config.parameterProfiles.storage.directory.description"), - "${data.directory}/parameter-profiles", - File.class), - - LOG_FILE( - "user.log.file", - n("t3.user.log.file.description"), - "${data.directory}/t3-log.properties", - File.class), - - USER_LOG_DIRECTORY( - "user.log.directory", - n("t3.user.log.directory.description"), - "${data.directory}/logs", - File.class), - - TREATMENT_WORKING_DIRECTORY( - "treatment.working.directory", - n("t3.config.treatment.working.directory.description"), - "${data.directory}/treatments", - File.class), - STRATUM_WEIGHT_RATIO( - "stratum.weightRatio", - n("t3.config.stratum.weightRatio.description"), - "250", - Float.class), - RF1_MINIMUM_RATE( - "rf1.minimumrate", - n("t3.config.rf1.minimumrate.description"), - "0.8", - Float.class), - RF1_MAXIMUM_RATE( - "rf1.maximumrate", - n("t3.config.rf1.maximumrate.description"), - "1.2", - Float.class), - RF_TOT_MAX( - "rfTot.maximum", - n("t3.config.rfTot.maximum.description"), - "250", - Float.class), - RF_MINUS10_MAX( - "rfMinus10.maximum", - n("t3.config.rfMinus10.maximum.description"), - "500", - Float.class), - RF_PLUS10_MAX( - "rfPlus10.maximum", - n("t3.config.rfPlus10.maximum.description"), - "500", - Float.class), - RF_MINUS10_MIN_NUMBER( - "rfMinus10.minNumber", - n("t3.config.rfMinus10.minNumber.description"), - "75", - Integer.class), - RF_PLUS10_MIN_NUMBER( - "rfPlus10.minNumber", - n("t3.config.rfPlus10.minNumber.description"), - "75", - Integer.class), - WEIGHTED_SET_WEIGHT( - "level0.weightedSetWeight", - n("t3.config.level0.weightedSetWeight.description"), - "40", - Float.class), - LEVEL2_DEFAULT_SPECIES( - "level2.defaultSpecies", - n("t3.config.level2.defaultSpecies.description"), - "1,2,3", // YFT, SKJ, BET - int[].class), - LEVEL3_DEFAULT_SPECIES( - "level3.defaultSpecies", - n("t3.config.level3.defaultSpecies.description"), - "1,2,3,4,5,6", // YFT, SKJ, BET, ALB, LTA, FRI - int[].class), - T3_DATA_VERSION( - "data.version", - n("t3.config.data.version.description"), - "", - Version.class),; - - /** Configuration key. */ - protected final String key; - - /** I18n key of option description */ - protected final String description; - - /** Type of option */ - protected final Class<?> type; - - /** Default value of option. */ - protected String defaultValue; - - T3ConfigurationOption(String key, - String description, - String defaultValue, - Class<?> type) { - this.key = key; - this.description = description; - this.defaultValue = defaultValue; - this.type = type; - } - - @Override - public String getKey() { - return key; - } - - @Override - public Class<?> getType() { - return type; - } - - @Override - public String getDescription() { - return description; - } - - @Override - public String getDefaultValue() { - return defaultValue; - } - - @Override - public boolean isTransient() { - return true; - } - - @Override - public boolean isFinal() { - return true; - } - - @Override - public void setDefaultValue(String defaultValue) { - this.defaultValue = defaultValue; - } - - @Override - public void setTransient(boolean newValue) { - // not used - } - - @Override - public void setFinal(boolean newValue) { - // not used - } -} ===================================== t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/actions/T3ActionContext.java @@ -24,7 +24,7 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.opensymphony.xwork2.LocaleProvider; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3Messager; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; @@ -112,7 +112,7 @@ public class T3ActionContext<C extends T3ActionConfiguration> implements T3Messa } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return serviceContext.getApplicationConfiguration(); } ===================================== t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/entities/T3UserTopiaApplicationContext.java @@ -22,8 +22,8 @@ package fr.ird.t3.entities; */ import com.google.common.base.Charsets; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.T3IOUtil; import fr.ird.t3.entities.user.T3UserImpl; import java.io.File; @@ -49,7 +49,7 @@ public class T3UserTopiaApplicationContext extends AbstractT3UserTopiaApplicatio * @param configuration application configuration where to find db directory * @return the new fresh root context of the internal db */ - public static T3UserTopiaApplicationContext newInternalDb(T3Configuration configuration) { + public static T3UserTopiaApplicationContext newInternalDb(T3Config configuration) { URL dbConfigFile = T3UserTopiaApplicationContext.class.getResource(T3_INTERNAL_DB_PROPERTIES); @@ -60,7 +60,7 @@ public class T3UserTopiaApplicationContext extends AbstractT3UserTopiaApplicatio try (InputStreamReader reader = new InputStreamReader(dbConfigFile.openStream(), Charsets.UTF_8)) { result = new RecursiveProperties(); - String key = T3ConfigurationOption.INTERNAL_DB_DIRECTORY.getKey(); + String key = T3ConfigOption.INTERNAL_DB_DIRECTORY.getKey(); result.setProperty(key, internalDbDirectory.getAbsolutePath()); result.load(reader); ===================================== t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/DefaultT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.services; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaApplicationContext; @@ -43,7 +43,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { private Locale locale; - private final T3Configuration applicationConfiguration; + private final T3Config applicationConfiguration; private final T3ServiceFactory serviceFactory; @@ -69,7 +69,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { T3TopiaApplicationContext transactionContext, T3UserTopiaPersistenceContext internalTransaction, T3TopiaPersistenceContext transaction, - T3Configuration applicationConfiguration, + T3Config applicationConfiguration, T3ServiceFactory serviceFactory) { return new DefaultT3ServiceContext(locale, internalTransactionContext, @@ -85,7 +85,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { T3TopiaApplicationContext applicationContext, T3UserTopiaPersistenceContext internalTransaction, T3TopiaPersistenceContext transaction, - T3Configuration applicationConfiguration, + T3Config applicationConfiguration, T3ServiceFactory serviceFactory) { this.locale = locale; this.internalApplicationContext = internalApplicationContext; @@ -123,7 +123,7 @@ public class DefaultT3ServiceContext implements T3ServiceContext { } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.services; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaApplicationContext; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaApplicationContext; @@ -48,7 +48,7 @@ public interface T3ServiceContext { Locale getLocale(); - T3Configuration getApplicationConfiguration(); + T3Config getApplicationConfiguration(); T3ServiceFactory getServiceFactory(); ===================================== t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java ===================================== --- a/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java +++ b/t3-domain/src/main/java/fr/ird/t3/services/T3ServiceSupport.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.services; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaPersistenceContext; import java.util.Locale; @@ -56,7 +56,7 @@ public class T3ServiceSupport implements T3Service { return serviceContext.getLocale(); } - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return serviceContext.getApplicationConfiguration(); } ===================================== t3-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider deleted ===================================== --- a/t3-domain/src/main/resources/META-INF/services/org.nuiton.util.config.ApplicationConfigProvider +++ /dev/null @@ -1 +0,0 @@ -fr.ird.t3.T3ApplicationConfigProvider \ No newline at end of file ===================================== t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-input-avdthv33/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -66,7 +66,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -88,7 +88,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -96,7 +96,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex }; realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -151,7 +151,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-input-avdthv35/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -61,7 +61,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -83,7 +83,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -92,7 +92,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -146,7 +146,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java ===================================== --- a/t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java +++ b/t3-input-avdthv36/src/test/java/fr/ird/t3/actions/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.actions; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -61,7 +61,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -83,7 +83,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -92,7 +92,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -146,7 +146,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java +++ b/t3-installer/src/main/java/fr/ird/t3/tools/T3ApplicationInstaller.java @@ -25,7 +25,7 @@ package fr.ird.t3.tools; import com.google.common.base.Preconditions; import com.google.common.base.Predicates; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3ScriptHelper; @@ -192,7 +192,7 @@ public class T3ApplicationInstaller { // initialize configuration - T3Configuration configuration = new T3Configuration(); + T3Config configuration = new T3Config(); configuration.init(); ===================================== t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java ===================================== --- a/t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java +++ b/t3-installer/src/test/java/fr/ird/t3/tools/FakeT3ServiceContext.java @@ -23,8 +23,8 @@ */ package fr.ird.t3.tools; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3EntityHelper; @@ -68,7 +68,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; private boolean initOk; @@ -86,8 +86,8 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } Properties defaultProps = new Properties(); - defaultProps.put(T3ConfigurationOption.DATA_DIRECTORY.getKey(), testDir); - applicationConfiguration = new T3Configuration(defaultProps) { + defaultProps.put(T3ConfigOption.DATA_DIRECTORY.getKey(), testDir); + applicationConfiguration = new T3Config(defaultProps) { @Override public void init() { parse(); @@ -141,7 +141,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java ===================================== --- a/t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java +++ b/t3-output-balbayav32/src/test/java/fr/ird/t3/io/output/balbaya/v32/FakeT3ServiceContext.java @@ -20,7 +20,7 @@ */ package fr.ird.t3.io.output.balbaya.v32; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.T3IOUtil; import fr.ird.t3.T3SqlScriptsImporter; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -67,7 +67,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex protected File testDir; - protected T3Configuration applicationConfiguration; + protected T3Config applicationConfiguration; private Locale locale; @@ -89,7 +89,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex File treatmentDirectory = new File(testDir, "treatment"); FileUtil.createDirectoryIfNecessary(treatmentDirectory); - T3Configuration realConfiguration = new T3Configuration() { + T3Config realConfiguration = new T3Config() { @Override public void init() { parse(); @@ -98,7 +98,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex realConfiguration.init(); Version t3DataVersion = realConfiguration.getT3DataVersion(); - applicationConfiguration = Mockito.mock(T3Configuration.class); + applicationConfiguration = Mockito.mock(T3Config.class); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory()).thenReturn(treatmentDirectory); Mockito.when(applicationConfiguration.getT3DataVersion()).thenReturn(t3DataVersion); Mockito.when(applicationConfiguration.getTreatmentWorkingDirectory(Mockito.anyString(), Mockito.anyBoolean())).thenCallRealMethod(); @@ -156,7 +156,7 @@ public class FakeT3ServiceContext extends TestWatcher implements T3ServiceContex } @Override - public T3Configuration getApplicationConfiguration() { + public T3Config getApplicationConfiguration() { return applicationConfiguration; } ===================================== t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java +++ b/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationContext.java @@ -23,7 +23,7 @@ package fr.ird.t3.web; import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionContext; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3UserTopiaApplicationContext; import java.util.Map; import java.util.Set; @@ -47,7 +47,7 @@ public class T3ApplicationContext { private static final String APPLICATION_CONTEXT_PARAMETER = "t3ApplicationContext"; /** Application configuration. */ - protected T3Configuration configuration; + protected T3Config configuration; /** Root context for the internal database. */ protected T3UserTopiaApplicationContext internalRootContext; @@ -111,11 +111,11 @@ public class T3ApplicationContext { session.close(); } - public T3Configuration getConfiguration() { + public T3Config getConfiguration() { return configuration; } - public void setConfiguration(T3Configuration configuration) { + public void setConfiguration(T3Config configuration) { this.configuration = configuration; } ===================================== t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java +++ b/t3-web/src/main/java/fr/ird/t3/web/T3ApplicationListener.java @@ -21,8 +21,8 @@ package fr.ird.t3.web; import fr.ird.converter.FloatConverter; -import fr.ird.t3.T3Configuration; -import fr.ird.t3.T3ConfigurationOption; +import fr.ird.t3.T3Config; +import fr.ird.t3.T3ConfigOption; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3UserTopiaApplicationContext; import fr.ird.t3.entities.T3UserTopiaPersistenceContext; @@ -52,7 +52,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.util.TopiaUtil; import org.nuiton.util.converter.ConverterUtil; /** @@ -100,8 +99,8 @@ public class T3ApplicationListener implements ServletContextListener { // initialize configuration Properties defaultProps = new Properties(); - defaultProps.put(T3ConfigurationOption.CONTEXT_PATH.getKey(), contextPath); - T3Configuration configuration = new T3Configuration(defaultProps); + defaultProps.put(T3ConfigOption.CONTEXT_PATH.getKey(), contextPath); + T3Config configuration = new T3Config(defaultProps); configuration.init(); log = LogFactory.getLog(T3ApplicationListener.class); @@ -211,7 +210,7 @@ public class T3ApplicationListener implements ServletContextListener { T3ServiceContext serviceContext) { try { - T3Configuration configuration = serviceContext.getApplicationConfiguration(); + T3Config configuration = serviceContext.getApplicationConfiguration(); T3UserTopiaApplicationContext internalRootContext = T3UserTopiaApplicationContext.newInternalDb(configuration); applicationContext.setInternalRootContext(internalRootContext); ===================================== t3-web/src/main/java/fr/ird/t3/web/T3Session.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/T3Session.java +++ b/t3-web/src/main/java/fr/ird/t3/web/T3Session.java @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.opensymphony.xwork2.ActionContext; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.actions.T3ActionContext; import fr.ird.t3.entities.T3EntityHelper; import fr.ird.t3.entities.T3TopiaApplicationContext; @@ -295,7 +295,7 @@ public class T3Session implements Closeable, Serializable { if (result == null) { - T3Configuration configuration = T3ActionSupport.getApplicationConfig(); + T3Config configuration = T3ActionSupport.getApplicationConfig(); File userLogDirectory = configuration.getUserLogDirectory(); String filename = String.format(FILE_LOG_PATTERN, ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/T3ActionSupport.java @@ -25,7 +25,7 @@ import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; import com.opensymphony.xwork2.ActionContext; -import fr.ird.t3.T3Configuration; +import fr.ird.t3.T3Config; import fr.ird.t3.entities.T3TopiaPersistenceContext; import fr.ird.t3.entities.T3UserTopiaPersistenceContext; import fr.ird.t3.entities.data.TripTopiaDao; @@ -154,7 +154,7 @@ public class T3ActionSupport extends BaseAction implements TopiaTransactionAware return getApplicationConfig().getApplicationVersion(); } - public static T3Configuration getApplicationConfig() { + public static T3Config getApplicationConfig() { return getT3ApplicationContext().getConfiguration(); } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level0/ComputeRF1ConfigureAction.java @@ -43,7 +43,7 @@ public class ComputeRF1ConfigureAction extends AbstractLevel0ConfigureAction<Com protected void loadDefaultConfiguration(ComputeRF1Configuration config) throws TopiaException { super.loadDefaultConfiguration(config); - config.setMinimumRate(getApplicationConfig().getRF1MinimumRate()); - config.setMaximumRate(getApplicationConfig().getRF1MaximumRate()); + config.setMinimumRate(getApplicationConfig().getRf1MinimumRate()); + config.setMaximumRate(getApplicationConfig().getRf1MaximumRate()); } } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level1/ManageLevel1ConfigurationAction.java @@ -146,19 +146,19 @@ public class ManageLevel1ConfigurationAction extends AbstractConfigureAction<Lev conf.setFleetIds(ids); // default rftotMax - conf.setRfTotMax(getApplicationConfig().getRFTotMax()); + conf.setRfTotMax(getApplicationConfig().getRfTotMax().intValue()); // default rfMinus10Max - conf.setRfMinus10Max(getApplicationConfig().getRFMinus10Max()); + conf.setRfMinus10Max(getApplicationConfig().getRfMinus10Max().intValue()); // default rfPlus10Max - conf.setRfPlus10Max(getApplicationConfig().getRFPlus10Max()); + conf.setRfPlus10Max(getApplicationConfig().getRfPlus10Max().intValue()); // default rfMinus10MinNumber - conf.setRfMinus10MinNumber(getApplicationConfig().getRFMinus10MinNumber()); + conf.setRfMinus10MinNumber(getApplicationConfig().getRfMinus10MinNumber()); // default rfPlus10MinNumber - conf.setRfPlus10MinNumber(getApplicationConfig().getRFPlus10MinNumber()); + conf.setRfPlus10MinNumber(getApplicationConfig().getRfPlus10MinNumber()); } ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level2/ConfigureLevel2Step1Action.java @@ -185,7 +185,7 @@ public class ConfigureLevel2Step1Action extends AbstractConfigureAction<Level2Co if (!isValidating() && !configurationInSession) { List<Integer> level2DefaultSpecies = - getApplicationConfig().getLevel2DefaultSpecies(); + getApplicationConfig().getLevel2DefaultSpeciesAsList(); // use default species for (Species aSpecies : conf.getSpecies()) { ===================================== t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java ===================================== --- a/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java +++ b/t3-web/src/main/java/fr/ird/t3/web/actions/data/level3/ConfigureLevel3Step1Action.java @@ -182,7 +182,7 @@ public class ConfigureLevel3Step1Action extends AbstractConfigureAction<Level3Co if (!isValidating() && !configurationInSession) { List<Integer> level3DefaultSpecies = - getApplicationConfig().getLevel3DefaultSpecies(); + getApplicationConfig().getLevel3DefaultSpeciesAsList(); // keep default species of level 3 for (Species aSpecies : conf.getSpecies()) { View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/4acaac547cc4a82ef291bc7c478a3e10…

1 0

[Git][ultreiaio/ird-t3][develop] update license header
by Tony CHEMIT April 3, 2017

April 3, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 7ed621af by Tony CHEMIT at 2017-04-03T10:08:04+02:00 update license header - - - - - 30 changed files: - pom.xml - src/site/site.xml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/Level0Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/StandardizeSampleMeasuresAction.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/7ed621afd63e9a9d9a514dd0445b6342…

1 0

[Git][ultreiaio/ird-t3][develop] Let's update topia and nuiton api (See #257)
by Tony CHEMIT April 3, 2017

April 3, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 60d60bb0 by Tony CHEMIT at 2017-04-03T10:04:05+02:00 Let's update topia and nuiton api (See #257) - - - - - 30 changed files: - pom.xml - t3-actions/pom.xml - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripAction.java - t3-actions/src/main/java/fr/ird/t3/actions/admin/DeleteTripConfiguration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/AbstractLevel0Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeRF2Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeSetDurationAndPositiveSetCountAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeTripEffortsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ComputeWellPlanWeightCategoriesProportionsAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/ConvertCatchesWeightCategoriesAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level0/Level0Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/AbstractLevel1Action.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ComputeWeightOfCategoriesForSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSampleSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ConvertSetSpeciesFrequencyToWeightAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleCountedAndMeasuredAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/ExtrapolateSampleWeightToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Configuration.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/Level1Step.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/RedistributeSampleNumberToSetAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level1/StandardizeSampleMeasuresAction.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2CatchStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratum.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratumLoader.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratumLoaderAtlantic.java - t3-actions/src/main/java/fr/ird/t3/actions/data/level2/L2SampleStratumLoaderIndian.java The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/60d60bb093a0b17d2e499c1bfa153121…

1 0

[Git][ultreiaio/ird-t3][pages] add pages build
by Tony CHEMIT April 2, 2017

April 2, 2017

Tony CHEMIT pushed to branch pages at ultreiaio / ird-t3 Commits: 01d2910d by Tony CHEMIT at 2017-04-02T08:27:24+02:00 add pages build - - - - - 1 changed file: - + .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,11 @@ +pages: + stage: deploy + script: + - mkdir .public + - cp -r * .public + - mv .public public + artifacts: + paths: + - public + only: + - pages \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/01d2910d9a5861c50a33918a4f37d1e4…

1 0

[Git][ultreiaio/ird-t3] Pushed new branch pages
by Tony CHEMIT April 2, 2017

April 2, 2017

Tony CHEMIT pushed new branch pages at ultreiaio / ird-t3

1 0

[Git][ultreiaio/ird-t3][develop] 2 commits: review site + align pom for next release
by Tony CHEMIT April 2, 2017

April 2, 2017

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 68f178ae by Tony CHEMIT at 2017-04-02T08:16:48+02:00 review site + align pom for next release - - - - - ee9cfe19 by Tony CHEMIT at 2017-04-02T08:21:15+02:00 review builds - - - - - 14 changed files: - .gitlab-ci.yml - pom.xml - src/site/markdown/install.md - src/site/markdown/installer.md.vm - src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png - src/site/resources/images/logos/logo-OT_web.png → src/site/resources/img/logo-OT_web.png - + src/site/resources/img/logo_IntelliJIDEA.png - src/site/resources/images/logos/logo_ird.png → src/site/resources/img/logo_ird.png - + src/site/resources/img/maven-feather.png - + src/site/resources/img/struts2-logo.png - src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png - − src/site/resources/site.js - src/site/site.xml - t3-installer/src/main/assembly/bin.xml Changes: ===================================== .gitlab-ci.yml ===================================== --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,6 @@ stages: - Production .before_script_default: &before_script_default - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which zip || ( apt-get update -y && apt-get install zip -y )' @@ -22,13 +19,12 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL + - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) + - . ~/env/bin/prepare-env.sh .before_script_clone: &before_script_clone - tags: - - gitlab-org - - shared before_script: - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )' - 'which zip || ( apt-get update -y && apt-get install zip -y )' @@ -36,13 +32,26 @@ stages: - ssh-add <(echo "$SSH_PRIVATE_KEY") - mkdir -p ~/.ssh - '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config' - - (cd ~ ; git clone ssh://git@gitlab.com/maven.ultreia.io/env.git) - - . ~/env/bin/prepare-env-with-clone.sh "$MAVEN_PRIVATE_KEY" "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + - git config --global user.name $GITLAB_USER_ID + - git config --global user.email $GITLAB_USER_EMAIL + - (cd ~ ; git clone ssh://git@gitlab.com/ultreiaio/env.git) + - . ~/env/bin/prepare-env-with-clone.sh "$CI_PROJECT_PATH" "$CI_PROJECT_NAME" + +.env_test: &env_test + environment: + name: test + +.env_staging: &env_staging + environment: + name: staging + +.env_production: &env_production + environment: + name: production .deploy_site: &deploy_site script: - - mvn install -DskipTests - - mvn site-deploy -DperformRelease + - mvn clean install site -DperformRelease scm-publish:publish-scm .deploy_demo_latest: &deploy_demo_latest stage: Test @@ -61,18 +70,6 @@ build: except: - triggers -.env_test: &env_test - environment: - name: test - -.env_staging: &env_staging - environment: - name: staging - -.env_production: &env_production - environment: - name: production - .test_manual: &test_manual stage: Test <<: *before_script_default @@ -87,7 +84,11 @@ stage: <<: *test_manual <<: *before_script_clone script: - - . ~/env/bin/stage.sh "$MASTER" "$DEVELOP" "$STAGE" + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-stage.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/update-staging-changelog.sh | sed 's/$1/frirdobserve/' | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/create-milestone.sh | bash + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/close-stage.sh | sed 's/$1/frirdobserve/' | bash latest-site: <<: *env_test @@ -132,7 +133,7 @@ nightly-demo: staging-demo: <<: *staging script: - - mvn install -am -p t3-web -DskipTests -Pdeploy-demo -DperformRelease + - mvn install -am -pl t3-web -DskipTests -Pdeploy-demo -DperformRelease staging-site: <<: *staging @@ -142,7 +143,13 @@ release: <<: *staging when: manual script: - - . ~/env/bin/close_stage.sh "$STAGE" + - wget -O - https://gitlab.com/ultreiaio/pom/raw/master/bin/release-stage.sh | sed 's/$1/frirdobserve/' | bash + +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 ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2</version> + <version>9</version> </parent> <groupId>fr.ird.t3</groupId> @@ -36,7 +36,7 @@ <name>T3</name> <description>Projet T3+</description> - <url>http://t3.ultreia.io</url> + <url>https://ultreiaio.gitlab.io/ird-t3</url> <inceptionYear>2010</inceptionYear> <organization> <name>IRD</name> @@ -84,31 +84,26 @@ </developerConnection> </scm--> <scm> - <url>https://gitlab.com/ultreia.io/ird-observe</url> - <connection>scm:git:git@gitlab.com:ultreia.io/ird-observe.git</connection> - <developerConnection>scm:git:ssh://git@gitlab.com:ultreia.io/ird-observe.git</developerConnection> + <url>https://gitlab.com/ultreiaio/ird-t3</url> + <connection>scm:git:git@gitlab.com:ultreiaio/ird-t3.git</connection> + <developerConnection>scm:git:ssh://git@gitlab.com:ultreiaio/ird-t3.git</developerConnection> </scm> - <issueManagement> - <system>gitlab</system> - <url>https://gitlab.com/ultreia.io/ird-observe</url> - </issueManagement> <distributionManagement> <site> - <id>doc.ultreia.io</id> + <id>gitlab.com</id> + <url>scm:git:https://git@gitlab.com/${organizationId}/${projectId}.git</url> </site> </distributionManagement> <properties> - <organizationId>ultreia.io</organizationId> + <organizationId>ultreiaio</organizationId> <projectId>ird-t3</projectId> <t3-data.version>1.1</t3-data.version>  - <gitlabPluginVersion>1.0.4</gitlabPluginVersion> - <eugenePluginVersion>2.6.2</eugenePluginVersion> <topiaVersion>2.8.1.3</topiaVersion> <nuitonUtilsVersion>2.6.12</nuitonUtilsVersion> @@ -138,14 +133,12 @@ <locales>fr</locales> <generateSitemap>true</generateSitemap> <relativizeDecorationLinks>false</relativizeDecorationLinks> - <siteSourcesType>md</siteSourcesType> - <helper.distributionSiteUrlPrefix>scpexe://ultreia.io/var/www/t3</helper.distributionSiteUrlPrefix>  <gitlab.changesTitle>T3 changelog</gitlab.changesTitle> <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> <gitlab.changesAuthorEmail>dev(a)tchemit.fr</gitlab.changesAuthorEmail> - <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> + <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> <commonsCollectionsVersion>3.2.1</commonsCollectionsVersion> <commonsLang3Version>3.1</commonsLang3Version> @@ -520,6 +513,24 @@ </configuration> </plugin> + <plugin> + <artifactId>maven-scm-publish-plugin</artifactId> + <configuration> + <pubScmUrl>${project.distributionManagement.site.url}</pubScmUrl> + <scmBranch>pages</scmBranch> + <content>${project.reporting.outputDirectory}</content> + </configuration> + <executions> + <execution> + <id>scm-publish</id> + <phase>site-deploy</phase> + <goals> + <goal>publish-scm</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> </pluginManagement> @@ -662,19 +673,6 @@ </executions> </plugin> - <plugin> - <groupId>org.nuiton</groupId> - <artifactId>helper-maven-plugin</artifactId> - <executions> - <execution> - <id>compute-distribution-site-url</id> - <goals> - <goal>compute-distribution-site-url</goal> - </goals> - <phase>pre-site</phase> - </execution> - </executions> - </plugin> </plugins> </build> </profile> ===================================== src/site/markdown/install.md ===================================== --- a/src/site/markdown/install.md +++ b/src/site/markdown/install.md @@ -14,7 +14,7 @@ Elle se déroule en deux étapes : ## Récupération de l'application -Récupérez la dernière application depuis [la page des téléchargements](https://gitlab.com/ultreia.io/ird-t3/blob/develop/CHANGELO…. +Récupérez la dernière application depuis [la page des téléchargements](https://gitlab.com/ultreiaio/ird-t3/blob/develop/CHANGELOG…. ## Préparation de la configuration ===================================== src/site/markdown/installer.md.vm ===================================== --- a/src/site/markdown/installer.md.vm +++ b/src/site/markdown/installer.md.vm @@ -7,7 +7,7 @@ Présentation de l'outil utilitaire pour installer une base T3+. ## Téléchargement L'installeur est disponible sous la forme d'une archive zip (**t3-xxx.zip**) sur la -[page des téléchargements](https://gitlab.com/ultreia.io/ird-t3/blob/develop/CHANGELO…. +[page des téléchargements](https://gitlab.com/ultreiaio/ird-t3/blob/develop/CHANGELOG…. ## Lancement ===================================== src/site/resources/images/logos/argouml-logo.png → src/site/resources/img/argouml-logo.png ===================================== Binary files a/src/site/resources/images/logos/argouml-logo.png and b/src/site/resources/img/argouml-logo.png differ ===================================== src/site/resources/images/logos/logo-OT_web.png → src/site/resources/img/logo-OT_web.png ===================================== Binary files a/src/site/resources/images/logos/logo-OT_web.png and b/src/site/resources/img/logo-OT_web.png differ ===================================== src/site/resources/img/logo_IntelliJIDEA.png ===================================== Binary files /dev/null and b/src/site/resources/img/logo_IntelliJIDEA.png differ ===================================== src/site/resources/images/logos/logo_ird.png → src/site/resources/img/logo_ird.png ===================================== Binary files a/src/site/resources/images/logos/logo_ird.png and b/src/site/resources/img/logo_ird.png differ ===================================== src/site/resources/img/maven-feather.png ===================================== Binary files /dev/null and b/src/site/resources/img/maven-feather.png differ ===================================== src/site/resources/img/struts2-logo.png ===================================== Binary files /dev/null and b/src/site/resources/img/struts2-logo.png differ ===================================== src/site/resources/images/logos/topia-logo.png → src/site/resources/img/topia-logo.png ===================================== Binary files a/src/site/resources/images/logos/topia-logo.png and b/src/site/resources/img/topia-logo.png differ ===================================== src/site/resources/site.js deleted ===================================== --- a/src/site/resources/site.js +++ /dev/null @@ -1,284 +0,0 @@ -/*- - * #%L - * ObServe - * %% - * 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 Affero 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 Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -$(document).ready(function () { - - var metas = $('#mavenProjectProperties'); - - if (metas.length == 0) { - return; - } - - $.debugOn = function () { - $('#mavenProjectProperties').attr('DEBUG', true); - }; - - $.debugOff = function () { - $('#mavenProjectProperties').attr('DEBUG', null); - }; - - var debug = function (metas) { - return metas.attr('DEBUG'); - }; - - var urlParameters = decodeURIComponent(window.location.search.slice(1)) - .split('&') - .reduce(function _reduce(a, b) { - b = b.split('='); - a[b[0]] = b[1]; - return a; - }, {}); - - if (urlParameters.debug) { - $.debugOn(); - } - - var projectId = metas.attr('projectId'); - var version = metas.attr('version'); - var locale = metas.attr('locale'); - - var rootUrl= 'http://' + window.location.hostname ; - var useDocUrl = false; - var localeInPath = window.location.pathname.indexOf('/' + locale + '/') > -1; - - var DEBUG = debug(metas); - - if (DEBUG) { - console.info("localeInPath: " + localeInPath); - } - - var addVersion = function (metas) { - - var DEBUG = debug(metas); - - var versionsUrl = rootUrl + '/versions'; - - $.get(versionsUrl) - .fail(function () { - console.error("can't load url: " + versionsUrl); - }) - .done(function (allVersions) { - - if (DEBUG) { - console.info("Versions url: " + versionsUrl); - console.info("All versions: " + allVersions); - } - - var labels; - if ('en' == locale) { - labels = {develop: 'in progress', latest: 'latest release'}; - } else { - labels = {develop: 'en cours', latest: 'dernière stable'}; - } - var versions = allVersions.split(' '); - if (DEBUG) { - console.info("Versions : " + versions); - console.info("version : " + version); - } - var versionsHtml = "<select id='versions' class='versions pull-left'>"; - $(versions).each(function (index, value) { - value = value.trim(); - var label; - if ('develop' == value || 'latest' == value) { - label = labels[value]; - } else { - label = value; - } - - if (DEBUG) { - console.info("Version to add " + label + " (" + value + ")"); - } - versionsHtml += "<option value='" + value + "'"; - if (version == value) { - versionsHtml += " selected='selected'"; - } - versionsHtml += ">Version " + label + "</option>"; - }); - versionsHtml += "</select><span class='divider'>»</span>"; - - $('#breadcrumbs').find('> ul > li:nth-child(2)').html(versionsHtml); - $('#versions').change(function () { - var DEBUG = debug(metas); - var newVersion = $(this).val(); - var newUrl = rootUrl + '/' + newVersion; - if (localeInPath) { - newUrl += "/" + locale; - } - if (DEBUG) { - console.info("Change to version: " + newUrl); - } - window.location = newUrl; - }); - - }); - - }; - - var addScmwebeditor = function (metas) { - - var editorUrl = 'https://scmwebeditor.nuiton.org/scmwebeditor/edit.action'; - - if ('develop' != version) { - return; - } - - var skipDefaultFiles = [ - "project-info.html", - "team-list.html", - "mail-lists.html", - "integration.html", - "issue-tracking.html", - "license.html", - "source-repository.html", - "dependencies.html", - "dependency-info.html", - "dependency-convergence.html", - "plugin-management.html", - "plugins.html", - "dependency-management.html", - "project-summary.html", - "project-reports.html", - "dev-activity.html", - "file-activity.html", - "changelog.html", - "surefire-report.html", - "third-party-report.html", - "sonar.html", - "dependency-updates-report.html", - "plugin-updates-report.html", - "property-updates-report.html", - "changes-report.html", - "redmine-report.html", - "application-config-report.html" - ]; - - var DEBUG = debug(metas); - - var scm = 'https://gitlab.com/ultreia.io/observe.git'; - - if (DEBUG) { - console.info('scm: ' + scm); - } - - var sourcesType = metas.attr('sourcesType'); - - var pathname = document.location.pathname; - - // remove prefix - if (useDocUrl) { - pathname = pathname.replace('/' + projectId + '/develop', ''); - } else { - pathname = pathname.replace('/develop', ''); - } - - if (DEBUG) { - console.info('pathname: ' + pathname); - } - - var path; - if (pathname.indexOf('target/site') > 0) { - path = pathname.substr(pathname.indexOf('/site')). replace('/site/', ''); - } else { - if (pathname == '/' || pathname == '') { - // on / page - path = 'index.html'; - } else { - path = pathname; - } - } - - if (localeInPath) { - - // locale detected in path (means not default locale) - // remove locale from path - path = path.substr(('/' + locale).length); - } - - if (DEBUG) { - console.info('path: ' + path); - } - if ($.inArray(path, skipDefaultFiles) > -1) { - // skip this file - if (DEBUG) { - console.info('skipDefaultFiles: ' + path); - } - return; - } - - var skipFiles = metas.attr('scmwebeditor_skipFiles'); - if (skipFiles && skipFiles.indexOf(',' + path + ',') > -1) { - // skip this file - if (DEBUG) { - console.info('skipFiles: ' + path); - } - return; - } - - path = path.replace('.html', ''); - if (path.indexOf('/') == 0) { - path = path.substr(1); - } - - var vmFiles = metas.attr('scmwebeditor_vmFiles'); - - // add vm on vmFiles - if (vmFiles && vmFiles.indexOf(',' + path + ',') > -1) { - if (DEBUG) { - console.info("Found vm file: " + path); - } - path += '.' + sourcesType + '.vm'; - } else { - if (DEBUG) { - console.info("Not found vm file: " + path); - } - path += '.' + sourcesType; - } - - if (DEBUG) { - console.info('final path: ' + path); - } - - var address = scm + "/src/site"; - if (localeInPath) { - address += '/' + locale; - } - address += '/' + sourcesType + '/' + path; - if (DEBUG) { - console.info('address: ' + address); - } - var url = editorUrl + "?scmType=Git&selectedBranch=develop&repositoryRoot=" + scm + "&address=" + address; - - if (DEBUG) { - console.info('edit url: ' + url); - } - - $('#publishDate').prepend( - "<li class='pull-right'><a target='edit' href='" + url + - "'>Éditer la page</a></li>" + - "<li class='divider pull-right'>|</li>" - ); - - }; - - addScmwebeditor(metas); - - addVersion(metas); - -}); ===================================== src/site/site.xml ===================================== --- a/src/site/site.xml +++ b/src/site/site.xml @@ -22,14 +22,14 @@ <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.4</version> + <version>1.6</version> </skin> <custom> @@ -48,40 +48,28 @@ <bannerLeft> <name>${project.name}</name> - <src>${project.url}/${siteDeployClassifier}/images/logos/logo-OT_web.png</src> + <src>./img/logo-OT_web.png</src> <href>index.html</href> </bannerLeft> <poweredBy> - <logo href="http://maven.apache.org" name="Maven" - img="http://maven-site.nuiton.org/public/images/logos/maven-feather.png"/> - - <logo href="http://struts.apache.org/" name="Struts 2" - img="${project.url}/${siteDeployClassifier}/images/logos/struts2-logo.png"/> - - <logo href="http://topia.nuiton.org" name="ToPIA" - img="${project.url}/${siteDeployClassifier}/images/logos/topia-logo.png"/> - - <logo href="http://argouml.tigris.org/" name="ArgoUML" - img="${project.url}/${siteDeployClassifier}/images/logos/argouml-logo.png"/> + <logo href="http://maven.apache.org/" name="Maven" img="./img/maven-feather.png"/> + <logo href="http://struts.apache.org/" name="Struts 2" img="./img/struts2-logo.png"/> + <logo href="http://topia.nuiton.org" name="ToPIA" img="./img/topia-logo.png"/> + <logo href="http://argouml.tigris.org/" name="ArgoUML" img="./img/argouml-logo.png"/> + <logo href="https://www.jetbrains.com/idea" name="IntelliJ" img="./img/logo_IntelliJIDEA.png"/> </poweredBy> <body> - <head> - <script type="text/javascript" src="site.js"> </script> - <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> - </head> - <links> - <item name="Forge" href="https:/gitlab.com/ultreia.io/ird-t3"/> + <item name="GitLab" href="https:/gitlab.com/ultreiaio/ird-t3"/> <item name="Ultreia.io" href="http://ultreia.io"/> </links> <breadcrumbs> <item name="${project.name}" href="${project.url}/index.html"/> - <item name="${project.version}" href="${project.url}/v/${siteDeployClassifier}/index.html"/> </breadcrumbs> <menu name="Utilisateur"> @@ -103,12 +91,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='md' - scmwebeditor_vmFiles=",install,installer,"/> - </footer> </body> </project> ===================================== t3-installer/src/main/assembly/bin.xml ===================================== --- a/t3-installer/src/main/assembly/bin.xml +++ b/t3-installer/src/main/assembly/bin.xml @@ -21,22 +21,26 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #L% --> -<assembly> +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> <id>bin</id> <formats> <format>zip</format> </formats> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <scope>runtime</scope> - </dependencySet> - </dependencySets> <fileSets> <fileSet> - <directory>target</directory> + <directory>${project.build.directory}/lib</directory> + <outputDirectory>lib</outputDirectory> + <fileMode>0755</fileMode> + <includes> + <include>*.jar</include> + </includes> + </fileSet> + + <fileSet> + <directory>${project.build.directory}</directory> <outputDirectory/> <fileMode>0755</fileMode> <includes> @@ -45,7 +49,7 @@ </fileSet> <fileSet> - <directory>target/classes</directory> + <directory>${project.build.outputDirectory}</directory> <outputDirectory/> <includes> <include>THIRD-PARTY.txt</include> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/a67b4c27c4bc7c4a62d4e5e9deef90b…

1 0