Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: bed7c052 by Tony CHEMIT at 2018-10-16T22:19:44Z Nom du script de lancement .exe - Closes #1147 - - - - - 22 changed files: - client/pom.xml - client/src/main/assembly/bin.xml - client/src/main/assembly/dist/go.bat - client/src/main/assembly/dist/go.sh - client/src/main/assembly/dist/scripts/postgresql/create.bat - client/src/main/assembly/dist/scripts/postgresql/create.sh - client/src/main/assembly/dist/scripts/postgresql/drop.bat - client/src/main/assembly/dist/scripts/postgresql/drop.sh - client/src/main/assembly/dist/scripts/postgresql/update-security.bat - client/src/main/assembly/dist/scripts/postgresql/update-security.sh - client/src/main/assembly/dist/scripts/postgresql/update.bat - client/src/main/assembly/dist/scripts/postgresql/update.sh - client/src/main/assembly/dist/scripts/server/create.bat - client/src/main/assembly/dist/scripts/server/create.sh - client/src/main/assembly/dist/scripts/server/drop.bat - client/src/main/assembly/dist/scripts/server/drop.sh - client/src/main/assembly/dist/scripts/server/update-security.bat - client/src/main/assembly/dist/scripts/server/update-security.sh - client/src/main/assembly/dist/scripts/server/update.bat - client/src/main/assembly/dist/scripts/server/update.sh - client/src/main/assembly/dist/util/generate-id.bat - client/src/main/assembly/dist/util/generate-id.sh Changes: ===================================== client/pom.xml ===================================== @@ -851,6 +851,34 @@ <properties> <devMode>false</devMode> </properties> + + <build> + + <plugins> + + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <inherited>false</inherited> + <executions> + + <execution> + <id>Prepare release files</id> + <phase>integration-test</phase> + <configuration> + <target> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/observe.jar"/> + <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/observe.exe"/> + </target> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + </plugins> + </build> </profile> <!-- This profile update license stuff with new goal update-file-header --> ===================================== client/src/main/assembly/bin.xml ===================================== @@ -33,8 +33,8 @@ <outputDirectory/> <fileMode>0755</fileMode> <includes> - <include>${project.build.finalName}.jar</include> - <include>${project.build.finalName}.exe</include> + <include>observe.jar</include> + <include>observe.exe</include> </includes> </fileSet> ===================================== client/src/main/assembly/dist/go.bat ===================================== @@ -1 +1 @@ -java -jar ${project.build.finalName}.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file +java -jar observe.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file ===================================== client/src/main/assembly/dist/go.sh ===================================== @@ -24,4 +24,4 @@ ### #!/bin/sh -java -jar ${project.build.finalName}.jar "$@" \ No newline at end of file +java -jar observe.jar "$@" \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/create.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/create.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/drop.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/drop.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update-security.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update-security.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour la sécurité sur une base postgres -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --obstuna-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../observe.jar --obstuna-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/postgresql/update.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour une base obstuna (le schéma sera mis à jour si nécessaire) -java -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin update \ No newline at end of file +java -Xmx1536M -Xms512M -jar ../observe.jar --obstuna-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/create.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/create.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin create \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin create \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/drop.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/drop.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour vider une base obstuna (toutes les tables seront supprimées) -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin drop \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin drop \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update-security.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update-security.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour la sécurité sur une base postgres -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --server-admin security \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --server-admin update \ No newline at end of file +java -Xmx2048M -Xms512M -jar ../observe.jar --server-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/scripts/server/update.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour mettre à jour une base server (le schéma sera mis à jour si nécessaire) -java -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar --server-admin update \ No newline at end of file +java -Xmx1536M -Xms512M -jar ../observe.jar --server-admin update \ No newline at end of file ===================================== client/src/main/assembly/dist/util/generate-id.bat ===================================== @@ -1,2 +1,2 @@ -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --create-id %1 %2 \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --create-id %1 %2 \ No newline at end of file ===================================== client/src/main/assembly/dist/util/generate-id.sh ===================================== @@ -25,4 +25,4 @@ #!/bin/sh # Pour générer des topia ids -java -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --create-id $1 $2 \ No newline at end of file +java -Xmx512M -Xms512M -jar ../observe.jar --create-id $1 $2 \ No newline at end of file View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bed7c052c5a0f7e8bc7b3ac92eee... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/bed7c052c5a0f7e8bc7b3ac92eee... You're receiving this email because of your account on gitlab.com.