Tony CHEMIT pushed to branch develop at ultreiaio / ird-t3
Commits:
-
147c1b60
by Tony CHEMIT at 2018-05-18T08:12:00Z
6 changed files:
- 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
Changes:
| 1 |
-java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "db.properties" "%1"
|
|
| \ No newline at end of file | ||
| 1 |
+java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "%1"
|
|
| \ No newline at end of file |
| 1 | 1 |
#!/bin/sh
|
| 2 | 2 |
|
| 3 |
-java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "db.properties" "$1"
|
|
| 3 |
+java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --create-db "$1"
|
| 1 |
-java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "db.properties" "%1"
|
|
| \ No newline at end of file | ||
| 1 |
+java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "%1"
|
|
| \ No newline at end of file |
| 1 | 1 |
#!/bin/sh
|
| 2 | 2 |
|
| 3 |
-java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "db.properties" "$1"
|
|
| 3 |
+java -Xmx2048M -Xms512M -jar ${project.build.finalName}.jar --fill-db "$1"
|
| ... | ... | @@ -26,7 +26,7 @@ type = string |
| 26 | 26 |
description = Jdbc connection url
|
| 27 | 27 |
key = url
|
| 28 | 28 |
type = string
|
| 29 |
-defaultValue = jdbc:postgresql:${dbName}
|
|
| 29 |
+defaultValue = jdbc:postgresql:%s
|
|
| 30 | 30 |
|
| 31 | 31 |
[action createDb]
|
| 32 | 32 |
description = To create a new database (requires one argument: dbName)
|
| ... | ... | @@ -55,7 +55,7 @@ public class T3Console { |
| 55 | 55 |
throw new IllegalArgumentException(String.format("Need one arguments for command %s. Try with --help to get details.", action));
|
| 56 | 56 |
}
|
| 57 | 57 |
|
| 58 |
- installerConfig = new T3InstallerConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM).setConfigFileName(args[1]));
|
|
| 58 |
+ installerConfig = new T3InstallerConfig(ApplicationConfigInit.forAllScopesWithout(ApplicationConfigScope.HOME, ApplicationConfigScope.SYSTEM));
|
|
| 59 | 59 |
installerConfig.get().parse(args);
|
| 60 | 60 |
|
| 61 | 61 |
Console console = System.console();
|