Tony CHEMIT pushed to branch master at ultreiaio / ird-t3 Commits: bf17b0af by Tony CHEMIT at 2018-05-04T14:24:06Z [jgitflow-maven-plugin]updating poms for 2.9-SNAPSHOT development[skip ci] - - - - - d202d42d by Tony CHEMIT at 2018-05-04T14:55:11Z [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci] - - - - - 0ebc8295 by Tony CHEMIT at 2018-05-04T14:55:12Z [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 07893feb by Tony CHEMIT at 2018-05-04T14:55:12Z [jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci] - - - - - 44fb5654 by Tony CHEMIT at 2018-05-04T15:52:26Z update changelog after release 2.8 [skip ci] - - - - - 147c1b60 by Tony CHEMIT at 2018-05-18T08:12:00Z Problème avec l'installeur - Closes #328 - - - - - 77987e46 by Tony CHEMIT at 2018-05-18T08:49:34Z immprove readme of installer - Closes #329 - - - - - 52cee643 by Tony CHEMIT at 2018-05-18T09:51:12Z [jgitflow-maven-plugin]updating poms for branch'release/2.9' with non-snapshot versions[skip ci] - - - - - 5309c44e by Tony CHEMIT at 2018-05-18T10:18:20Z [jgitflow-maven-plugin]merging 'release/2.9' into 'master' - - - - - 19 changed files: - pom.xml - src/site/markdown/installer.md.vm - 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-installer/src/main/assembly/dist/README.md - t3-installer/src/main/assembly/dist/create-db.bat - t3-installer/src/main/assembly/dist/create-db.sh - t3-installer/src/main/assembly/dist/fill-db.bat - t3-installer/src/main/assembly/dist/fill-db.sh - t3-installer/src/main/config/T3Installer.ini - t3-installer/src/main/java/fr/ird/t3/console/T3Console.java - t3-msaccess-importer/pom.xml - t3-output-balbayav32/pom.xml - t3-web/pom.xml - t3/pom.xml Changes: ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</version> <packaging>pom</packaging> <name>T3 :: Pom</name> ===================================== src/site/markdown/installer.md.vm ===================================== --- a/src/site/markdown/installer.md.vm +++ b/src/site/markdown/installer.md.vm @@ -67,7 +67,7 @@ Son contenu est relu à chaque nouveau lancement. # Remplir une nouvelle base -**Il faut que la base soit créée (mais sans schéma) et que l'extension postgis soit installée**. +**Il faut que la base soit créée (mais sans schéma)**. Sous Linux, Mac ``` ===================================== 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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</version> </parent> <artifactId>t3-input-avdthv36</artifactId> ===================================== t3-installer/pom.xml ===================================== --- a/t3-installer/pom.xml +++ b/t3-installer/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</version> </parent> <artifactId>t3-installer</artifactId> ===================================== t3-installer/src/main/assembly/dist/README.md ===================================== --- a/t3-installer/src/main/assembly/dist/README.md +++ b/t3-installer/src/main/assembly/dist/README.md @@ -1,11 +1,5 @@ # T3 Console -### Before using database commands - -First fill the **db.properties** file with correct values. - -Then use the command you need :). - ## Create a database This will create the database on postgres server, then fill it. ``` @@ -16,6 +10,8 @@ or create-db.bat dbName ``` +**Please see Notes section for more details.** + ## Fill a database This will just fill a database on postgres server. @@ -28,6 +24,8 @@ or fill-db.bat dbName ``` +**Please see Notes section for more details.** + ## Translate application This will open a GUI to translate application. ``` @@ -37,3 +35,39 @@ or ``` translate.bat ``` + +## Notes + +For ```create-db``` or ```fill-db``` commands, the software will ask you three questions: + + * login to connect to database + * password to connect to database + * url pattern to use + +Those values will be stored in a file named ```t3-installer.conf``` and reused at next launch. + +If stored value is ok with you, just press enter. + +Note also that the url pattern must ends with %s (which represents the db name you have given on command line). + +Example on a first launch: +``` +sh create-db.sh myT3Db +Listening for transport dt_socket at address: 8000 +Starting T3 Console with arguments: [--create-db, myT3Db] at Fri May 18 10:40:10 CEST 2018 +Login [Not defined]: t3-admin +Password [Not defined]: pass +Url [jdbc:postgresql:%s]: +INFO [main] (fr.ird.t3.console.T3DatabaseTool:95) createOrFill - 1/5 - Setup and connect to database... +``` + +Next launch: +``` +sh create-db.sh myT3Db +Listening for transport dt_socket at address: 8000 +Starting T3 Console with arguments: [--create-db, myT3Db] at Fri May 18 10:40:10 CEST 2018 +Login [t3-admin]: +Password [pass]: +Url [jdbc:postgresql:%s]: +INFO [main] (fr.ird.t3.console.T3DatabaseTool:95) createOrFill - 1/5 - Setup and connect to database... +``` ===================================== t3-installer/src/main/assembly/dist/create-db.bat ===================================== --- a/t3-installer/src/main/assembly/dist/create-db.bat +++ b/t3-installer/src/main/assembly/dist/create-db.bat @@ -1 +1 @@ -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "db.properties" "%1" \ No newline at end of file +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "%1" \ No newline at end of file ===================================== t3-installer/src/main/assembly/dist/create-db.sh ===================================== --- a/t3-installer/src/main/assembly/dist/create-db.sh +++ b/t3-installer/src/main/assembly/dist/create-db.sh @@ -1,3 +1,3 @@ #!/bin/sh -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "db.properties" "$1" +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "$1" ===================================== t3-installer/src/main/assembly/dist/fill-db.bat ===================================== --- a/t3-installer/src/main/assembly/dist/fill-db.bat +++ b/t3-installer/src/main/assembly/dist/fill-db.bat @@ -1 +1 @@ -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "db.properties" "%1" \ No newline at end of file +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "%1" \ No newline at end of file ===================================== t3-installer/src/main/assembly/dist/fill-db.sh ===================================== --- a/t3-installer/src/main/assembly/dist/fill-db.sh +++ b/t3-installer/src/main/assembly/dist/fill-db.sh @@ -1,3 +1,3 @@ #!/bin/sh -java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "db.properties" "$1" +java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "$1" ===================================== t3-installer/src/main/config/T3Installer.ini ===================================== --- a/t3-installer/src/main/config/T3Installer.ini +++ b/t3-installer/src/main/config/T3Installer.ini @@ -26,7 +26,7 @@ type = string description = Jdbc connection url key = url type = string -defaultValue = jdbc:postgresql:${dbName} +defaultValue = jdbc:postgresql:%s [action createDb] description = To create a new database (requires one argument: dbName) ===================================== t3-installer/src/main/java/fr/ird/t3/console/T3Console.java ===================================== --- a/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java +++ b/t3-installer/src/main/java/fr/ird/t3/console/T3Console.java @@ -55,7 +55,7 @@ public class T3Console { throw new IllegalArgumentException(String.format("Need one arguments for command %s. Try with --help to get details.", action)); } - installerConfig = new T3InstallerConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM).setConfigFileName(args[1])); + installerConfig = new T3InstallerConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM)); installerConfig.get().parse(args); Console console = System.console(); ===================================== 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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</version> </parent> <artifactId>t3-output-balbayav32</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>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</version> </parent> <artifactId>t3-web</artifactId> ===================================== t3/pom.xml ===================================== --- a/t3/pom.xml +++ b/t3/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.t3</groupId> <artifactId>ird-t3</artifactId> - <version>2.8</version> + <version>2.9</version> </parent> <artifactId>t3</artifactId> View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/9b980a2958bbb394f0cd08ad4955a3a6... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-t3/compare/9b980a2958bbb394f0cd08ad4955a3a6... You're receiving this email because of your account on gitlab.com.