GitLab

at 2018-05-04T14:24:06Z

[jgitflow-maven-plugin]updating poms for 2.9-SNAPSHOT development[skip ci]
[jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts[skip ci]
[jgitflow-maven-plugin]merging 'master' into 'develop'
[jgitflow-maven-plugin]Updating develop poms back to pre merge state[skip ci]
update changelog after release 2.8 [skip ci]

Problème avec l'installeur - Closes #328

immprove readme of installer - Closes #329

[jgitflow-maven-plugin]updating poms for branch'release/2.9' with non-snapshot versions[skip ci]
[jgitflow-maven-plugin]merging 'release/2.9' into 'master'

   <groupId>fr.ird.t3</groupId>

   <artifactId>ird-t3</artifactId>

-  <version>2.8</version>

+  <version>2.9</version>

   <packaging>pom</packaging>

   <name>T3 :: Pom</name>

 # 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

 ```

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-actions</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-domain</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-input-avdthv33</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-input-avdthv35</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-input-avdthv36</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-installer</artifactId>

 # 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.

 ```

 create-db.bat dbName

 ```

+**Please see Notes section for more details.**

+

 ## Fill a database

 This will just fill a database on postgres server.

 fill-db.bat dbName

 ```

+**Please see Notes section for more details.**

+

 ## Translate application

 This will open a GUI to translate application.

 ```

 ```

 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...

+```
-java  -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "db.properties" "%1"
+java  -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "%1"
 #!/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"
-java  -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "db.properties" "%1"
+java  -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "%1"
 #!/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"
 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)

                 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();

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-msaccess-importer</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-output-balbayav32</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3-web</artifactId>

   <parent>

     <groupId>fr.ird.t3</groupId>

     <artifactId>ird-t3</artifactId>

-    <version>2.8</version>

+    <version>2.9</version>

   </parent>

   <artifactId>t3</artifactId>

Tony CHEMIT pushed to branch master at ultreiaio / ird-t3

Commits:

19 changed files:

Changes: