Tony CHEMIT pushed to branch master at ultreia.io / ird-observe Commits: df095a2f by Tony CHEMIT at 2017-03-08T18:29:54+01:00 [jgitflow-maven-plugin]updating poms for 6.0-RC-2-SNAPSHOT development - - - - - 61733edf by Tony CHEMIT at 2017-03-08T18:36:59+01:00 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts - - - - - 41648bab by Tony CHEMIT at 2017-03-08T18:37:00+01:00 [jgitflow-maven-plugin]merging 'master' into 'develop' - - - - - 725a1253 by Tony CHEMIT at 2017-03-08T18:37:01+01:00 [jgitflow-maven-plugin]Updating develop poms back to pre merge state - - - - - 0568e640 by Tony CHEMIT at 2017-03-08T20:43:11+01:00 update changelog - - - - - 2656e427 by Tony CHEMIT at 2017-03-08T20:43:26+01:00 improve release script - - - - - 890f2bde by Tony CHEMIT at 2017-03-08T20:45:41+01:00 remove conf - - - - - cc336ced by Tony CHEMIT at 2017-03-09T22:19:14+01:00 improve maven resources managment - - - - - aced284b by Tony CHEMIT at 2017-03-09T23:57:44+01:00 prepare release 6.0-RC-1 - - - - - d53abacc by Tony CHEMIT at 2017-03-09T23:59:53+01:00 [jgitflow-maven-plugin]updating poms for branch'release/6.0-RC-1' with non-snapshot versions - - - - - 1357f34b by Tony CHEMIT at 2017-03-10T00:13:08+01:00 [jgitflow-maven-plugin]merging 'release/6.0-RC-1' into 'master' - - - - - 23 changed files: - CHANGELOG.md - application-swing-configuration/pom.xml - application-swing-configuration/src/main/resources/observeSwing.conf → application-swing-configuration/src/main/filtered-resources/observeSwing.conf - application-swing-validation/pom.xml - application-swing-validators/pom.xml - application-swing/pom.xml - application-swing/src/main/filters/observe-application.properties → application-swing/src/main/filtered-resources/observe-application.properties - application-swing/src/main/filters/observe-ui.properties → application-swing/src/main/resources/observe-ui.properties - application-web-configuration/pom.xml - application-web-configuration/src/main/resources/observeweb.conf → application-web-configuration/src/main/filtered-resources/observeweb.conf - application-web/pom.xml - application-web/src/main/resources/mapping → application-web/src/main/filtered-resources/mapping - bin/stage_create.sh - persistence/pom.xml - pom.xml - services-validation/pom.xml - services/pom.xml - services/src/main/filters/observe-reports.properties → services/src/main/resources/observe-reports.properties - src/site/markdown/install-serverPG.md - src/site/site_fr.xml - test/pom.xml - test/src/main/resources/observetest.properties → test/src/main/filtered-resources/observetest.properties - toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java Changes: ===================================== CHANGELOG.md ===================================== --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,60 @@ # ObServe changelog * Author [Tony Chemit](mailto:dev@tchemit.fr) - * Last generated at 2017-03-08 17:52. + * Last generated at 2017-03-08 20:41. + +## Version [6.0-RC-1](https://gitlab.com/ultreia.io/ird-observe/milestones/85) + +Status: **_Staging_** + +### Download +* [Application (observe-6.0-RC-1.zip)](https://oss.sonatype.org/content/repositories/frirdobserve-1007/fr/ird/obser...) +* [Serveur (observe-6.0-RC-1.war)](https://oss.sonatype.org/content/repositories/frirdobserve-1007/fr/ird/obser...) + +### Issues + * [[Anomalie 529]](https://gitlab.com/ultreia.io/ird-observe/issues/529) **[LL] Problème sur l'ordre des sections/baskets dans le schéma de palangre selon le tri** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 547]](https://gitlab.com/ultreia.io/ird-observe/issues/547) **[PS] Les écrans captures enregistrent parfois des captures sans code espèce associé** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 646]](https://gitlab.com/ultreia.io/ird-observe/issues/646) **La fonctionnalité «Accéder à la marée» (ou route ou activité) ne fonctionne plus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 647]](https://gitlab.com/ultreia.io/ird-observe/issues/647) **La session ouverte n'est pas sauvegardée dans la configuration** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 648]](https://gitlab.com/ultreia.io/ird-observe/issues/648) **L'action «Annuler» sur l'édition d'un référentiel affiche un formulaire vide et non pas le formulaire du réferentiel en cours d'édition** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 649]](https://gitlab.com/ultreia.io/ird-observe/issues/649) **Mauvaise resitution de l'information «observé» ou «calculé» sur l'écran des échantillons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 696]](https://gitlab.com/ultreia.io/ird-observe/issues/696) **La boîte Informations sur la source n'affiche plus l'URL de la base** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Anomalie 708]](https://gitlab.com/ultreia.io/ird-observe/issues/708) **le calendrier reste en anglais** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 67]](https://gitlab.com/ultreia.io/ird-observe/issues/67) **Réglage par défaut des proportions des volets de la fenêtre** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 81]](https://gitlab.com/ultreia.io/ird-observe/issues/81) **Action/calculer les données : sélection de la marée par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 299]](https://gitlab.com/ultreia.io/ird-observe/issues/299) **[LL] Formulaire Captures : Tableaux tailles et poids - ajouter des fonctions clic droit** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 306]](https://gitlab.com/ultreia.io/ird-observe/issues/306) **[LL] Ajout d'un champs sur l'écran Composition > Onglet Avançons** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 352]](https://gitlab.com/ultreia.io/ird-observe/issues/352) **Permettre la MAJ du référentiel à partir d'un sql.gz** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 353]](https://gitlab.com/ultreia.io/ird-observe/issues/353) **[PS] Supprimer le champ floattingobject.supportvesselname** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 354]](https://gitlab.com/ultreia.io/ird-observe/issues/354) **[PS] Ajouter un champ "Numéro de cuve", sur le formulaire des captures accessoires** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 357]](https://gitlab.com/ultreia.io/ird-observe/issues/357) **[PS] Améliorer le contrôle des tailles/poids min/max d'espèces (doubler le warning d'une erreur)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 412]](https://gitlab.com/ultreia.io/ird-observe/issues/412) **[ObServeLL] Classement des listes déroulantes section/panier/avançon du formulaire capture** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 442]](https://gitlab.com/ultreia.io/ird-observe/issues/442) **Dans les listes d'espèces, ne plus montrer l'ancien code** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 443]](https://gitlab.com/ultreia.io/ird-observe/issues/443) **[PS] Unicité des enregistrements des rejets de thons à modifier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 515]](https://gitlab.com/ultreia.io/ird-observe/issues/515) **[LL][PS] Possibilité de saisie directe au clavier des dates/heures sans passer par le calendrier** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 516]](https://gitlab.com/ultreia.io/ird-observe/issues/516) **[WIDGET POSITIONS] absence de message d'erreur quand horodatage erronné (certains cas)** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 520]](https://gitlab.com/ultreia.io/ird-observe/issues/520) **[LL] Nombre de coupures inconnu : cas problématique** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 523]](https://gitlab.com/ultreia.io/ird-observe/issues/523) **[LL] numérotation des captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 531]](https://gitlab.com/ultreia.io/ird-observe/issues/531) **Rajouter un champ Armateur** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 535]](https://gitlab.com/ultreia.io/ird-observe/issues/535) **Lors d'un import sql.gz vers la base centrale, possibilité d'ajouter dans la base centrale les références manquantes** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 551]](https://gitlab.com/ultreia.io/ird-observe/issues/551) **[REFERENTIEL] Relations taille-poids - Ajout d'un champ texte 'source'** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 557]](https://gitlab.com/ultreia.io/ird-observe/issues/557) **Retirer le champ relatif à l'utilisation du sonar pendant la calée** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 558]](https://gitlab.com/ultreia.io/ird-observe/issues/558) **[PS] Ajout d'un champ sur les captures** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 559]](https://gitlab.com/ultreia.io/ird-observe/issues/559) **[PS] Limiter l'usage du formulaire DCP** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 560]](https://gitlab.com/ultreia.io/ird-observe/issues/560) **[PS] Gestion plus intelligente des champs Devenir et Raison du rejet** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 569]](https://gitlab.com/ultreia.io/ird-observe/issues/569) **[PS] Renommer 2 champs dans nontargetlength** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 570]](https://gitlab.com/ultreia.io/ird-observe/issues/570) **[PS] Saisie des échantillons de cible : modification de la gestion des types de taille** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 571]](https://gitlab.com/ultreia.io/ird-observe/issues/571) **[REFERENTIEL] Référentiel Espèces - gestion du type de mesure par défaut** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 575]](https://gitlab.com/ultreia.io/ird-observe/issues/575) **[TABLEAUX DE SYNTHESE] Nouvelle requête sur les équipements bateau** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 581]](https://gitlab.com/ultreia.io/ird-observe/issues/581) **Gestion plus perfectionnée des calculs taille-poids** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 584]](https://gitlab.com/ultreia.io/ird-observe/issues/584) **Améliorer la gestion du focus et ajouter des racourcis clavier** (Thanks to Pascal Cauquil) (Reported by Tony CHEMIT) + * [[Evolution 587]](https://gitlab.com/ultreia.io/ird-observe/issues/587) **[REFERENTIEL] Ajouter des colonnes dans Vessel** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 631]](https://gitlab.com/ultreia.io/ird-observe/issues/631) **Ajout de champs liés au marquage d'individus** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 632]](https://gitlab.com/ultreia.io/ird-observe/issues/632) **Ajout du champ Sexe sur les échantillons de cible** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 637]](https://gitlab.com/ultreia.io/ird-observe/issues/637) **[PS] Sur les échantillons de non cible, ajouter un champ Devenir** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 653]](https://gitlab.com/ultreia.io/ird-observe/issues/653) **Ajout d'un clic droit/ajouter sur le tableau LL de définition des templates de section** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 695]](https://gitlab.com/ultreia.io/ird-observe/issues/695) **Ajout d'une information visuelle sur les écrans de gestion avancée du référentiel et des données** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) + * [[Evolution 742]](https://gitlab.com/ultreia.io/ird-observe/issues/742) **Report from version 5.x** (Thanks to Tony CHEMIT) (Reported by Tony CHEMIT) ## Version [5.3.2](https://gitlab.com/ultreia.io/ird-observe/milestones/84) *(from redmine: created on 2017-02-04)* ===================================== application-swing-configuration/pom.xml ===================================== --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -101,17 +101,17 @@ <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <includes> - <include>observeSwing.conf</include> + <include>**/*</include> </includes> <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>observeSwing.conf</exclude> - </excludes> + <includes> + <include>**/*</include> + </includes> </resource> </resources> ===================================== application-swing-configuration/src/main/resources/observeSwing.conf → application-swing-configuration/src/main/filtered-resources/observeSwing.conf ===================================== --- a/application-swing-configuration/src/main/resources/observeSwing.conf +++ b/application-swing-configuration/src/main/filtered-resources/observeSwing.conf ===================================== application-swing-validation/pom.xml ===================================== --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -93,14 +93,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <plugins> ===================================== application-swing-validators/pom.xml ===================================== --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -123,15 +123,6 @@ </dependencies> <build> - <resources> - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> - <plugins> <plugin> ===================================== application-swing/pom.xml ===================================== --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -615,31 +615,16 @@ <resources> <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> - <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <filtering>true</filtering> <includes> <include>**/*</include> </includes> - <!-- on ne filtre pas les fichiers template de generation de text pour éviter - les conflit entre les varibles du pom et les variable du model du template --> - <excludes> - <exclude>ftl/*.ftl</exclude> - </excludes> </resource> <resource> <directory>src/main/resources</directory> - <!-- on ne filtre pas les fichiers template de generation de text pour éviter - les conflit entre les varibles du pom et les variable du model du template --> - <filtering>false</filtering> <includes> - <include>ftl/*.ftl</include> + <include>**/*</include> </includes> </resource> </resources> ===================================== application-swing/src/main/filters/observe-application.properties → application-swing/src/main/filtered-resources/observe-application.properties ===================================== --- a/application-swing/src/main/filters/observe-application.properties +++ b/application-swing/src/main/filtered-resources/observe-application.properties @@ -22,7 +22,7 @@ observe.devMode=${devMode} application.name=ObServe application.version=${project.version} -application.site.url=http://maven-site.forge.codelutin.com/observe +application.site.url=http://observe.ultreia.io application.organisation.name=${project.organization.name} application.organisation.url=${project.organization.url} ===================================== application-swing/src/main/filters/observe-ui.properties → application-swing/src/main/resources/observe-ui.properties ===================================== --- a/application-swing/src/main/filters/observe-ui.properties +++ b/application-swing/src/main/resources/observe-ui.properties ===================================== application-web-configuration/pom.xml ===================================== --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -104,17 +104,17 @@ <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <includes> - <include>observeweb.conf</include> + <include>**/*</include> </includes> <filtering>true</filtering> </resource> <resource> <directory>src/main/resources</directory> - <excludes> - <exclude>observeweb.conf</exclude> - </excludes> + <includes> + <include>**/*</include> + </includes> </resource> </resources> ===================================== application-web-configuration/src/main/resources/observeweb.conf → application-web-configuration/src/main/filtered-resources/observeweb.conf ===================================== --- a/application-web-configuration/src/main/resources/observeweb.conf +++ b/application-web-configuration/src/main/filtered-resources/observeweb.conf ===================================== application-web/pom.xml ===================================== --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -176,10 +176,10 @@ <resources> <resource> - <directory>${project.basedir}/src/main/resources</directory> + <directory>${project.basedir}/src/main/filtered-resources</directory> <filtering>true</filtering> <includes> - <include>mapping</include> + <include>**/*</include> </includes> </resource> ===================================== application-web/src/main/resources/mapping → application-web/src/main/filtered-resources/mapping ===================================== --- a/application-web/src/main/resources/mapping +++ b/application-web/src/main/filtered-resources/mapping ===================================== bin/stage_create.sh ===================================== --- a/bin/stage_create.sh +++ b/bin/stage_create.sh @@ -37,20 +37,14 @@ if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git checkout ${MASTER} -echo "Generate site: ($LOG_DIR/release-site.log)" -mvn verify site-deploy -DskipTests -DperformRelease --log-file ${LOG_DIR}/release-site.log -if [ ! "$?" == "0" ]; then - echo "Error" - exit 1 -fi -echo "Deploy demo: ($LOG_DIR/release-demo.log)" -mvn install -am -pl application-web -DskipTests -DperformRelease -Pdeploy-demo --log-file ${LOG_DIR}/release-demo.log +echo "Update changelog: $STAGE_ID ($LOG_DIR/release-changelog.log)" +rm -rf target/gitlab_cache + +mvn -N -Pupdate-staging-changelog -Dgitlab.stagingUrl=https://oss.sonatype.org/content/repositories/${STAGE}-${STAGE_ID} -Dgitlab.milestone=${VERSION} --log-file ${LOG_DIR}/release-changelog.log if [ ! "$?" == "0" ]; then echo "Error" exit 1 fi -git stash -git checkout ${DEVELOP} \ No newline at end of file +git commit -m"Update changelog for staging version $VERSION" CHANGELOG.md ===================================== persistence/pom.xml ===================================== --- a/persistence/pom.xml +++ b/persistence/pom.xml @@ -151,6 +151,12 @@ <include>*.objectmodel-ext</include> </includes> </resource> + <resource> + <directory>${project.basedir}/src/main/resources</directory> + <includes> + <include>**/*</include> + </includes> + </resource> </resources> <pluginManagement> ===================================== pom.xml ===================================== --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2</version> + <version>4</version> </parent> <groupId>fr.ird.observe</groupId> @@ -158,8 +158,6 @@ <organizationId>ultreia.io</organizationId> <projectId>ird-observe</projectId> - <gitlabPluginVersion>1.0.4</gitlabPluginVersion> - <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> <jaxxVersion>3.0-alpha-5</jaxxVersion> @@ -207,7 +205,7 @@ <gitlab.changesTitle>ObServe changelog</gitlab.changesTitle> <gitlab.changesAuthor>Tony Chemit</gitlab.changesAuthor> <gitlab.changesAuthorEmail>dev@tchemit.fr</gitlab.changesAuthorEmail> - <gitlab.trackers>Anomalie,Evolution,Tache</gitlab.trackers> + <gitlab.trackers>Anomalie,Evolution,Tâche</gitlab.trackers> <maven.build.timestamp.format>dd/MM/yyyy HH:mm z</maven.build.timestamp.format> <buildDate>${maven.build.timestamp}</buildDate> @@ -796,6 +794,11 @@ <artifactId>nuiton-version</artifactId> <version>${nuitonVersionVersion}</version> </dependency> + <dependency> + <groupId>org.apache.velocity</groupId> + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> </dependencies> </plugin> @@ -898,6 +901,9 @@ <modules> <module>observe</module> </modules> + <properties> + <devMode>false</devMode> + </properties> </profile> <profile> ===================================== services-validation/pom.xml ===================================== --- a/services-validation/pom.xml +++ b/services-validation/pom.xml @@ -105,15 +105,6 @@ </dependencies> <build> - <resources> - - <resource> - <directory>src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - </resources> <plugins> ===================================== services/pom.xml ===================================== --- a/services/pom.xml +++ b/services/pom.xml @@ -138,22 +138,7 @@ <include>**/*</include> </includes> </resource> - <resource> - <directory>src/main/filters</directory> - <filtering>true</filtering> - <includes> - <include>*.properties</include> - </includes> - </resource> </resources> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <includes> - <include>**/*</include> - </includes> - </testResource> - </testResources> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> ===================================== services/src/main/filters/observe-reports.properties → services/src/main/resources/observe-reports.properties ===================================== --- a/services/src/main/filters/observe-reports.properties +++ b/services/src/main/resources/observe-reports.properties ===================================== src/site/markdown/install-serverPG.md ===================================== --- a/src/site/markdown/install-serverPG.md +++ b/src/site/markdown/install-serverPG.md @@ -133,6 +133,7 @@ le raccourci suivant : (cd obstuna-admin ; ./create-obstuna.sh) ``` ou + ``` ./obstuna-admin/create-obstuna.bat ``` @@ -145,9 +146,7 @@ de la base d'import de référentiel et des rôles de sécurité : - remplir le référentiel à partir de celui d'une autre base obstuna à jour (topia-service-migration) - appliquer la sécurité sur les rôles de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin create** +Note : le script appelle l'application avec l'action **--obstuna-admin create** ## Mise à jour d'une base obstuna @@ -159,6 +158,7 @@ raccourci suivant : (cd obstuna-admin ; ./update-obstuna.sh) ``` ou + ``` ./obstuna-admin/update-obstuna.bat ``` @@ -168,9 +168,7 @@ cible et des rôles de sécurité : - mettre à jour le schéma et les données via le service de migration intégré (topia) - appliquer la sécurité sur les rôles de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin update** +Note : le script appelle l'application avec l'action **--obstuna-admin update** ## Mise à jour de la sécurité @@ -189,6 +187,7 @@ suivant : (cd obstuna-admin ; ./update-security-obstuna.sh) ``` ou + ``` ./obstuna-admin/update-security-obstuna.bat ``` @@ -197,9 +196,7 @@ cible et des rôles de sécurité : - appliquer la sécurité sur les rôles de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin security** +Note : le script appelle l'application avec l'action **--obstuna-admin security** ## Vider une base obstuna @@ -210,6 +207,7 @@ lancer ObServe en mode *suppression obstuna* via le raccourci suivant : (cd obstuna-admin ; ./drop-obstuna.sh) ``` ou + ``` ./obstuna-admin/drop-obstuna.bat ``` @@ -218,9 +216,7 @@ cible : - supprimer toutes les tables gérer de la base -Note:: - - Le script appelle l'application avec l'action **--obstuna-admin drop** +Note : le script appelle l'application avec l'action **--obstuna-admin drop** ## Appliquer des scripts sql supplémentaires ===================================== src/site/site_fr.xml ===================================== --- a/src/site/site_fr.xml +++ b/src/site/site_fr.xml @@ -22,14 +22,14 @@ --> <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.7.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.7.0 http://maven.apache.org/xsd/decoration-1.7.0.xsd"> <skin> <groupId>org.apache.maven.skins</groupId> <artifactId>maven-fluido-skin</artifactId> - <version>1.4</version> + <version>1.6</version> </skin> <custom> @@ -67,10 +67,7 @@ <body> - <head> - <script type="text/javascript" src="site.js"> </script> - <link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/> - </head> + <head> <![CDATA[ <script type="text/javascript" src="site.js"> </script><link rel="stylesheet" type="text/css" href="http://common.nuiton.org/dev/css/mavenpom-site.css"/>]]> </head> <links> <item name="Forge" href="https://gitlab.com/ultreia.io/ird-observe"/> @@ -88,7 +85,7 @@ <item name="Administration Obstuna" href="install-serverPG.html"/> <item name="Administration Web" href="administration-web.html"/> <item name="Téléchargement" href="https://gitlab.com/ultreia.io/observe/wikis/releases"/> - <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/master/changelog.md"/> + <item name="Historique des versions" href="https://gitlab.com/ultreia.io/ird-observe/blob/develop/CHANGELOG.md"/> <item name="Configuration" href="./config-report.html"/> </menu> @@ -101,14 +98,7 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' - projectId='${project.projectId}' - version='${project.siteDeployClassifier}' - sourcesType='md' - scmwebeditor_skipFiles=',config-report,' - scmwebeditor_vmFiles=",index,"/> - </footer> + <footer> <![CDATA[<div id='mavenProjectProperties' locale='fr' projectId='${project.projectId}' version='${project.siteDeployClassifier}' sourcesType='md' scmwebeditor_skipFiles=',config-report,' scmwebeditor_vmFiles=",index,"/>]]> </footer> </body> </project> ===================================== test/pom.xml ===================================== --- a/test/pom.xml +++ b/test/pom.xml @@ -70,10 +70,10 @@ <build> <resources> <resource> - <directory>src/main/resources</directory> + <directory>src/main/filtered-resources</directory> <filtering>true</filtering> <includes> - <include>*.properties</include> + <include>**/*</include> </includes> </resource> <resource> @@ -81,10 +81,6 @@ <includes> <include>**/*</include> </includes> - <excludes> - <exclude>*.properties</exclude> - </excludes> - <filtering>false</filtering> </resource> </resources> ===================================== test/src/main/resources/observetest.properties → test/src/main/filtered-resources/observetest.properties ===================================== --- a/test/src/main/resources/observetest.properties +++ b/test/src/main/filtered-resources/observetest.properties ===================================== toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java ===================================== --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateWebmotionMappingMojo.java @@ -87,7 +87,7 @@ public class GenerateWebmotionMappingMojo extends ToolboxMojoSupport { /** * The root directory where to generated. */ - @Parameter(property = "generateWebmotionMapping.mappingFile", defaultValue = "${project.basedir}/src/main/resources/mapping", required = true) + @Parameter(property = "generateWebmotionMapping.mappingFile", defaultValue = "${project.basedir}/src/main/filtered-resources/mapping", required = true) private File mappingFile; private Map<Class<?>, String> translationMap; View it on GitLab: https://gitlab.com/ultreia.io/ird-observe/compare/00104105b1ce302ef1449a3bc5...
participants (1)
-
Tony CHEMIT