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

[Git][ultreiaio/ird-t3][master] 87 commits: [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts
by Tony CHEMIT 10 Apr '17

10 Apr '17

Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: dea620c1 by Maven Release at 2016-02-19T17:21:10+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 73164dba by Maven Release at 2016-02-19T17:21:10+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - fd4b1d85 by Maven Release at 2016-02-19T17:21:11+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - f51878c9 by Pascal Cauquil at 2016-06-24T15:45:47+02:00 Correction d'un libellé - - - - - 98bd6bc5 by Pascal Cauquil at 2016-06-24T16:00:47+02:00 Correction d'un libellé - - - - - df86c626 by Pascal Cauquil at 2016-06-28T12:43:22+02:00 Rajout des clés t3.error.no.sampleQuality et t3.error.no.sampleType dans les clés i18n - - - - - 1a940e34 by Pascal Cauquil at 2016-06-28T12:47:10+02:00 Déplacement des deux clés de libellés précédemment ajoutées - - - - - 07adf81e by Pascal Cauquil at 2016-06-28T12:49:54+02:00 Ajout de 2 clés de traduction dans le fichier des traductions EN - - - - - a3c35138 by Tony CHEMIT at 2017-02-25T17:56:49+01:00 migrate to gitlab - - - - - 4e4c43d9 by Tony CHEMIT at 2017-02-25T18:01:39+01:00 remove code lutin from site - - - - - 4d23de5d by Tony CHEMIT at 2017-02-25T18:40:15+01:00 fix tests (how to get t3-data) - - - - - 360bfeb2 by Tony CHEMIT at 2017-02-25T18:52:28+01:00 add changelog - - - - - 43e16988 by Tony CHEMIT at 2017-02-25T19:09:17+01:00 fix installer build - - - - - aa5b3bc1 by Tony CHEMIT at 2017-02-27T09:22:26+01:00 fix release build - - - - - 2575a23b by Tony CHEMIT at 2017-02-27T09:57:33+01:00 add issue templates - - - - - f13a0efe by Tony CHEMIT at 2017-02-27T09:58:53+01:00 review builds - - - - - 24cb26ee by Tony CHEMIT at 2017-02-27T10:02:46+01:00 review builds - - - - - 135ad12e by Tony CHEMIT at 2017-02-27T10:07:36+01:00 review builds - - - - - 8c03e41b by Tony CHEMIT at 2017-02-27T10:28:28+01:00 use env stage script - - - - - d79c9178 by Tony CHEMIT at 2017-02-27T10:31:06+01:00 fix issue templates location - - - - - bdfd9195 by Tony CHEMIT at 2017-02-27T10:32:30+01:00 fix issue templates location - - - - - 960c9d41 by Tony CHEMIT at 2017-02-27T13:34:23+01:00 improve builds - - - - - e0be90d6 by Tony CHEMIT at 2017-02-27T13:38:19+01:00 remove tags - - - - - 22bd54fa by Tony CHEMIT at 2017-02-27T14:02:36+01:00 remove tags - - - - - fd308fcd by Tony CHEMIT at 2017-02-27T14:15:46+01:00 improve builds - - - - - d2addeeb by Tony CHEMIT at 2017-02-27T14:33:26+01:00 try to fix builds - - - - - a79e3881 by Tony CHEMIT at 2017-02-27T14:36:12+01:00 try to fix builds - - - - - f4dde888 by Tony CHEMIT at 2017-02-27T14:38:00+01:00 try to fix builds - - - - - 9f842bfc by Tony CHEMIT at 2017-02-27T14:45:52+01:00 try to fix builds (at last) - - - - - 15e9ddb1 by Tony CHEMIT at 2017-02-27T14:51:26+01:00 try to fix builds (at last) - - - - - 7ff07e58 by Tony CHEMIT at 2017-02-27T14:53:44+01:00 try to fix builds (at last again) - - - - - 30b56c03 by Tony CHEMIT at 2017-02-27T15:08:08+01:00 adjust builds - - - - - a19ce311 by Tony CHEMIT at 2017-02-27T16:32:50+01:00 add demo ci jobs - - - - - 2d818c46 by Tony CHEMIT at 2017-02-27T16:39:12+01:00 improve deploy-demo job - - - - - 85552c53 by Tony CHEMIT at 2017-02-28T10:46:32+01:00 Meilleure gestion de la configuration et des logs (See #256) - - - - - ade7db17 by Tony CHEMIT at 2017-02-28T10:46:47+01:00 Meilleure gestion de la configuration et des logs (See #256) - - - - - 9776a822 by Tony CHEMIT at 2017-02-28T10:52:03+01:00 Review install doc - - - - - 1425d72c by Tony CHEMIT at 2017-02-28T10:54:03+01:00 Meilleure gestion de la configuration et des logs (See #256) - - - - - c67abf2f by Tony CHEMIT at 2017-02-28T10:58:24+01:00 remove tgas from builds - - - - - 66931025 by Tony CHEMIT at 2017-02-28T11:00:19+01:00 add tags from builds - - - - - 6545c1c8 by Tony CHEMIT at 2017-02-28T11:05:43+01:00 add tags from builds - - - - - 4ddde8ff by Tony CHEMIT at 2017-02-28T11:06:54+01:00 add tags from builds - - - - - dafa3062 by Tony CHEMIT at 2017-02-28T11:12:54+01:00 remove tags from builds - - - - - 6e1a58e0 by Tony CHEMIT at 2017-02-28T11:25:45+01:00 add my own runner - - - - - 7720cf08 by Tony CHEMIT at 2017-02-28T11:35:12+01:00 adapt tags - - - - - 3c4a5a6b by Tony CHEMIT at 2017-02-28T12:09:33+01:00 review builds - - - - - ba71992b by Tony CHEMIT at 2017-02-28T12:27:02+01:00 optimize builds - - - - - 29628329 by Tony CHEMIT at 2017-02-28T12:28:45+01:00 optimize builds + fix format - - - - - 2e143b12 by Tony CHEMIT at 2017-02-28T12:50:28+01:00 optimize builds - - - - - 1eb1d16e by Tony CHEMIT at 2017-02-28T13:15:01+01:00 do not build build job when trigger - - - - - 697bfe15 by Tony CHEMIT at 2017-02-28T13:16:39+01:00 do not build build job when trigger [ci skip] - - - - - 4b498de0 by Tony CHEMIT at 2017-02-28T13:22:48+01:00 optimize dependencies - - - - - 924e941c by Tony CHEMIT at 2017-02-28T13:40:47+01:00 [skip ci] do not run its on release - - - - - d58dbef5 by Tony CHEMIT at 2017-02-28T14:03:58+01:00 [skip ci] improve builds - - - - - dbf0729f by Tony CHEMIT at 2017-02-28T15:10:49+01:00 try new pipelines flow - - - - - 58eb9b1b by Tony CHEMIT at 2017-02-28T15:32:35+01:00 one more time... - - - - - 02fb7272 by Tony CHEMIT at 2017-02-28T15:38:37+01:00 one more time... - - - - - 1c80893c by Tony CHEMIT at 2017-02-28T15:40:06+01:00 one more time... - - - - - c9022434 by Tony CHEMIT at 2017-02-28T15:46:21+01:00 one more time... - - - - - a67b4c27 by Tony CHEMIT at 2017-03-02T10:47:15+01:00 improve demo build - - - - - 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 - - - - - 60d60bb0 by Tony CHEMIT at 2017-04-03T10:04:05+02:00 Let's update topia and nuiton api (See #257) - - - - - 7ed621af by Tony CHEMIT at 2017-04-03T10:08:04+02:00 update license header - - - - - 4acaac54 by Tony CHEMIT at 2017-04-03T15:13:44+02:00 Use nuiton-config last api (See #257) - - - - - 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 - - - - - 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 - - - - - 1a9a1974 by Tony CHEMIT at 2017-04-10T11:55:46+02:00 prepare next release - - - - - a122771a by Tony CHEMIT at 2017-04-10T13:31:27+02:00 up pg gav, fix some config getter, i18n, ready to release \o/ - - - - - 629aa7ce by Tony CHEMIT at 2017-04-10T13:39:31+02:00 use correct method (See #252) - - - - - d10e8af8 by Tony CHEMIT at 2017-04-10T13:55:37+02:00 improve installeur - - - - - 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 - - - - - d7bdbdc7 by Tony CHEMIT at 2017-04-10T15:12:36+02:00 improve performance on loading script - - - - - 392d266b by Tony CHEMIT at 2017-04-10T13:45:17+00:00 Add contribution guide - - - - - 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 - - - - - 82b4734c by Tony CHEMIT at 2017-04-10T15:48:05+02:00 up builds [skip ci] - - - - - 45544af0 by Tony CHEMIT at 2017-04-10T15:51:38+02:00 up release builds - - - - - 86b75b67 by 166231 at 2017-04-10T14:24:20+00:00 [jgitflow-maven-plugin]updating poms for 2.0 branch with snapshot versions - - - - - 7f544622 by 166231 at 2017-04-10T14:24:33+00:00 [jgitflow-maven-plugin]updating poms for branch'release/2.0' with non-snapshot versions - - - - - e1595aab by 166231 at 2017-04-10T14:30:57+00:00 [jgitflow-maven-plugin]merging 'release/2.0' into 'master' - - - - - 30 changed files: - .gitignore - + .gitlab-ci.yml - + .gitlab/issue_templates/Bug.md - + .gitlab/issue_templates/Feature.md - + .gitlab/issue_templates/Task.md - + CHANGELOG.md - + CONTRIBUTING.md - + README.md - − changelog.txt - pom.xml - + src/site/markdown/index.md - + src/site/markdown/install.md - src/site/rst/installer.rst.vm → src/site/markdown/installer.md.vm - + src/site/markdown/model.md - + src/site/markdown/scripts-postgis.md - + src/site/resources/.gitlab-ci.yml - + 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/img/topia-logo.png - − src/site/rst/index.rst - − src/site/rst/install.rst.vm - − src/site/rst/model.rst - − src/site/rst/scripts-postgis.rst - src/site/site.xml - t3-actions/README.txt → t3-actions/README.md - t3-actions/pom.xml The diff was not included because it is too large. View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/75c993b42dcd75c776c0d08f7ff9627…

1 0

[Git][ultreiaio/ird-t3][develop] 6 commits: [jgitflow-maven-plugin]updating poms for 2.0 branch with snapshot versions
by Tony CHEMIT 10 Apr '17

10 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 86b75b67 by 166231 at 2017-04-10T14:24:20+00:00 [jgitflow-maven-plugin]updating poms for 2.0 branch with snapshot versions - - - - - 7f544622 by 166231 at 2017-04-10T14:24:33+00:00 [jgitflow-maven-plugin]updating poms for branch'release/2.0' with non-snapshot versions - - - - - e1595aab by 166231 at 2017-04-10T14:30:57+00:00 [jgitflow-maven-plugin]merging 'release/2.0' into 'master' - - - - - 237c8952 by 166231 at 2017-04-10T14:31:00+00:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 40800720 by 166231 at 2017-04-10T14:31:00+00:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - fbd0168a by 166231 at 2017-04-10T14:31:01+00:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/f9304adc5230c719fadff7cee678a7f…

1 0

[Git][ultreiaio/ird-t3][develop] [jgitflow-maven-plugin]updating poms for 2.1-SNAPSHOT development
by Tony CHEMIT 10 Apr '17

10 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: f9304adc by 166231 at 2017-04-10T14:24:20+00:00 [jgitflow-maven-plugin]updating poms for 2.1-SNAPSHOT development - - - - - 12 changed files: - pom.xml - t3-actions/pom.xml - t3-domain/pom.xml - t3-input-avdthv33/pom.xml - t3-input-avdthv35/pom.xml - t3-input-avdthv36/pom.xml - t3-installer/pom.xml - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-test/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -17,8 +17,7 @@ along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -29,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> <packaging>pom</packaging> <name>T3</name> @@ -474,14 +473,13 @@ <configuration>  <tasks> - <echo message="Copy model to site"/> - <copy verbose="true" failonerror="false" overwrite="true" - todir="${project.reporting.outputDirectory}/model"> + <echo message="Copy model to site" /> + <copy verbose="true" failonerror="false" overwrite="true" todir="${project.reporting.outputDirectory}/model"> <fileset dir="${basedir}/doc/modelisation/t3"> - <include name="**/*.png"/> + <include name="**/*.png" /> </fileset> <fileset dir="${basedir}/t3-domain/src/main/xmi"> - <include name="t3-persistence.zargo"/> + <include name="t3-persistence.zargo" /> </fileset> </copy> </tasks> ===================================== t3-actions/pom.xml ===================================== --- a/t3-actions/pom.xml +++ b/t3-actions/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-actions</artifactId> ===================================== t3-domain/pom.xml ===================================== --- a/t3-domain/pom.xml +++ b/t3-domain/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-domain</artifactId> ===================================== t3-input-avdthv33/pom.xml ===================================== --- a/t3-input-avdthv33/pom.xml +++ b/t3-input-avdthv33/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv33</artifactId> ===================================== t3-input-avdthv35/pom.xml ===================================== --- a/t3-input-avdthv35/pom.xml +++ b/t3-input-avdthv35/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv35</artifactId> ===================================== t3-input-avdthv36/pom.xml ===================================== --- a/t3-input-avdthv36/pom.xml +++ b/t3-input-avdthv36/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -20,15 +20,14 @@ along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-installer</artifactId> @@ -293,12 +292,9 @@ <phase>prepare-package</phase> <configuration> <tasks> - <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-ddl.zip" - dest="${explodedDataDirection}"/> - <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-referential.zip" - dest="${explodedDataDirection}"/> - <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-zones.zip" - dest="${explodedDataDirection}"/> + <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-ddl.zip" dest="${explodedDataDirection}" /> + <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-referential.zip" dest="${explodedDataDirection}" /> + <unzip src="${explodedDataDirection}/t3-data-${t3-data.version}-zones.zip" dest="${explodedDataDirection}" /> </tasks> </configuration> <goals> ===================================== t3-msaccess-importer/pom.xml ===================================== --- a/t3-msaccess-importer/pom.xml +++ b/t3-msaccess-importer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-msaccess-importer</artifactId> ===================================== t3-output-balbayav32/pom.xml ===================================== --- a/t3-output-balbayav32/pom.xml +++ b/t3-output-balbayav32/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-output-balbayav32</artifactId> ===================================== t3-test/pom.xml ===================================== --- a/t3-test/pom.xml +++ b/t3-test/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-test</artifactId> ===================================== t3-web/pom.xml ===================================== --- a/t3-web/pom.xml +++ b/t3-web/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -16,7 +16,7 @@ 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/>. + along with this program. If not, see <http://www.gnu.org/licenses />. #L% --> @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>pom</artifactId> - <version>2.0-SNAPSHOT</version> + <version>2.1-SNAPSHOT</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/f9304adc5230c719fadff7cee678a7fe…

1 0

[Git][ultreiaio/ird-t3] Pushed new branch release/2.0
by Tony CHEMIT 10 Apr '17

10 Apr '17

Tony CHEMIT pushed new branch release/2.0 at ultreiaio / ird-t3

1 0

[Git][ultreiaio/ird-t3][develop] up release builds
by Tony CHEMIT 10 Apr '17

10 Apr '17

Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3 Commits: 45544af0 by Tony CHEMIT at 2017-04-10T15:51:38+02:00 up release builds - - - - - 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/close-stage.sh | sed 's/$1/$STAGE/' | 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/$STAGE/' | bash latest-site: <<: *env_test View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/commit/45544af06931af4ecadadfc575179f15…

1 0

[Git][ultreiaio/ird-t3][develop] up builds [skip ci]
by Tony CHEMIT 10 Apr '17

10 Apr '17

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 10 Apr '17

10 Apr '17

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 10 Apr '17

10 Apr '17

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 10 Apr '17

10 Apr '17

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 10 Apr '17

10 Apr '17

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