Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe

Commits:

22 changed files:

Changes:

  • client/pom.xml
    ... ... @@ -859,6 +859,34 @@
    859 859
           <properties>
    
    860 860
             <devMode>false</devMode>
    
    861 861
           </properties>
    
    862
    +
    
    863
    +      <build>
    
    864
    +
    
    865
    +        <plugins>
    
    866
    +
    
    867
    +          <plugin>
    
    868
    +            <artifactId>maven-antrun-plugin</artifactId>
    
    869
    +            <inherited>false</inherited>
    
    870
    +            <executions>
    
    871
    +
    
    872
    +              <execution>
    
    873
    +                <id>Prepare release files</id>
    
    874
    +                <phase>integration-test</phase>
    
    875
    +                <configuration>
    
    876
    +                  <target>
    
    877
    +                    <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.jar" tofile="${project.build.directory}/observe.jar"/>
    
    878
    +                    <copy failonerror="true" overwrite="true" file="${project.build.directory}/${project.build.finalName}.exe" tofile="${project.build.directory}/observe.exe"/>
    
    879
    +                  </target>
    
    880
    +                </configuration>
    
    881
    +                <goals>
    
    882
    +                  <goal>run</goal>
    
    883
    +                </goals>
    
    884
    +              </execution>
    
    885
    +            </executions>
    
    886
    +          </plugin>
    
    887
    +
    
    888
    +        </plugins>
    
    889
    +      </build>
    
    862 890
         </profile>
    
    863 891
     
    
    864 892
         <!-- This profile update license stuff with new goal update-file-header -->
    

  • client/src/main/assembly/bin.xml
    ... ... @@ -33,8 +33,8 @@
    33 33
           <outputDirectory/>
    
    34 34
           <fileMode>0755</fileMode>
    
    35 35
           <includes>
    
    36
    -        <include>${project.build.finalName}.jar</include>
    
    37
    -        <include>${project.build.finalName}.exe</include>
    
    36
    +        <include>observe.jar</include>
    
    37
    +        <include>observe.exe</include>
    
    38 38
           </includes>
    
    39 39
         </fileSet>
    
    40 40
     
    

  • client/src/main/assembly/dist/go.bat
    1
    -java -jar ${project.build.finalName}.jar %1 %2 %3 %4 %5 %6 %7 %8 %9
    \ No newline at end of file
    1
    +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 @@
    24 24
     ###
    
    25 25
     #!/bin/sh
    
    26 26
     
    
    27
    -java -jar ${project.build.finalName}.jar "$@"
    \ No newline at end of file
    27
    +java -jar observe.jar "$@"
    \ No newline at end of file

  • client/src/main/assembly/dist/scripts/postgresql/create.bat
    1 1
     
    
    2
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar  --obstuna-admin create
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli)
    
    27 27
     
    
    28
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin create
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar  --obstuna-admin drop
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour vider une base obstuna (toutes les tables seront supprimées)
    
    27 27
     
    
    28
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin drop
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour mettre à jour la sécurité sur une base postgres
    
    27 27
     
    
    28
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin security
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --obstuna-admin update
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour mettre à jour une base obstuna (le schéma sera mis à jour si nécessaire)
    
    27 27
     
    
    28
    -java  -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar  --obstuna-admin update
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar  --server-admin create
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour créer une nouvelle base obstuna (le schéma sera créer et le référentiel rempli)
    
    27 27
     
    
    28
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin create
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar  --server-admin drop
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour vider une base obstuna (toutes les tables seront supprimées)
    
    27 27
     
    
    28
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin drop
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour mettre à jour la sécurité sur une base postgres
    
    27 27
     
    
    28
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --server-admin security
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx2048M -Xms512M -jar ../${project.build.finalName}.jar --server-admin update
    \ No newline at end of file
    2
    +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 @@
    25 25
     #!/bin/sh
    
    26 26
     # Pour mettre à jour une base server (le schéma sera mis à jour si nécessaire)
    
    27 27
     
    
    28
    -java  -Xmx1536M -Xms512M -jar ../${project.build.finalName}.jar  --server-admin update
    \ No newline at end of file
    28
    +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 1
     
    
    2
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar  --create-id %1 %2
    \ No newline at end of file
    2
    +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 @@
    25 25
     
    
    26 26
     #!/bin/sh
    
    27 27
     # Pour générer des topia ids
    
    28
    -java  -Xmx512M -Xms512M -jar ../${project.build.finalName}.jar --create-id $1 $2
    \ No newline at end of file
    28
    +java  -Xmx512M -Xms512M -jar ../observe.jar --create-id $1 $2
    \ No newline at end of file