- Tutti-commits - mailman.cloud.codelutin.com

r1179 - in trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches: . benthos benthos/frequency species species/frequency
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 23:21:22 +0200 (Tue, 17 Sep 2013) New Revision: 1179 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1179 Log: fixes #3267: [ESPECE] Ajout du contexte d'un lot sur l'?\195?\169cran de cat?\195?\169gorisation Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -32,9 +32,11 @@ import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.frequency.BenthosFrequencyUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.split.SplitBenthosBatchUI; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyCellComponent; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.frequency.SpeciesFrequencyUI; +import fr.ifremer.tutti.ui.swing.content.operation.catches.species.split.SplitSpeciesBatchUI; import fr.ifremer.tutti.ui.swing.util.AbstractTuttiTabContainerUIHandler; import fr.ifremer.tutti.ui.swing.util.TabHandler; import fr.ifremer.tutti.ui.swing.util.TuttiBeanMonitor; @@ -313,6 +315,30 @@ ui.getSpeciesTabFrequencyEditorReminderLabel().setTitle(title.toString()); } + public void splitSpeciesBatch(SpeciesBatchRowModel editRow, + SplitSpeciesBatchUI splitBatchEditor) { + + splitBatchEditor.getHandler().editBatch(editRow); + + // open split editor + setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + + // update title + StringBuilder title = new StringBuilder(ui.getSpeciesTabFishingOperationReminderLabel().getTitle()); + + title.append(" - ").append(decorate(editRow.getSpecies())); + + for (SampleCategory<?> sampleCategory : editRow) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(_("tutti.splitSpeciesBatch.title")); + ui.getSpeciesTabSplitBatchReminderLabel().setTitle(title.toString()); + } + public void setSpeciesSelectedCard(String card) { JPanel panel = ui.getSpeciesTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); @@ -337,13 +363,9 @@ } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabSplitBatch(); - titlePanel = ui.getSpeciesTabSplitBatchReminderLabel(); - title = n_("tutti.splitSpeciesBatch.title"); } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getSpeciesTabFrequencyEditor(); -// titlePanel = ui.getSpeciesTabFrequencyEditorReminderLabel(); -// title = _("tutti.editSpeciesFrequencies.title"); } if (tuttiUi != null) { @@ -382,6 +404,31 @@ ui.getBenthosTabFrequencyEditorReminderLabel().setTitle(title.toString()); } + public void splitBenthosBAtch(BenthosBatchRowModel editRow, + SplitBenthosBatchUI splitBatchEditor) { + + + splitBatchEditor.getHandler().editBatch(editRow); + + // open split editor + setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + + // update title + StringBuilder title = new StringBuilder(ui.getBenthosTabFishingOperationReminderLabel().getTitle()); + + title.append(" - ").append(decorate(editRow.getSpecies())); + + for (SampleCategory<?> sampleCategory : editRow) { + if (sampleCategory.getCategoryValue() != null) { + title.append(" - "); + title.append(decorate(sampleCategory.getCategoryValue())); + } + } + + title.append(" - ").append(_("tutti.splitBenthosBatch.title")); + ui.getBenthosTabSplitBatchReminderLabel().setTitle(title.toString()); + } + public void setBenthosSelectedCard(String card) { JPanel panel = ui.getBenthosTabPanel(); CardLayout2Ext layout = (CardLayout2Ext) panel.getLayout(); @@ -406,13 +453,10 @@ } else if (SPLIT_BATCH_CARD.equals(card)) { tuttiUi = ui.getBenthosTabSplitBatch(); - titlePanel = ui.getBenthosTabSplitBatchReminderLabel(); - title = n_("tutti.splitBenthosBatch.title"); } else if (EDIT_FREQUENCY_CARD.equals(card)) { tuttiUi = ui.getBenthosTabFrequencyEditor(); -// titlePanel = ui.getBenthosTabFrequencyEditorReminderLabel(); -// title = n_("tutti.editBenthosFrequencies.title"); + } if (tuttiUi != null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -720,8 +720,9 @@ EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); SplitBenthosBatchUI splitBatchEditor = parent.getBenthosTabSplitBatch(); - splitBatchEditor.getHandler().editBatch(parentBatch); - parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); +// splitBatchEditor.getHandler().editBatch(parentBatch); +// parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + parent.getHandler().splitBenthosBAtch(parentBatch, splitBatchEditor); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyCellComponent.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -158,13 +158,6 @@ SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getHandler().editBenthosFrequencies(editRow, this); - -// BenthosFrequencyUI frequencyEditor = parent.getBenthosTabFrequencyEditor(); -// -// frequencyEditor.getHandler().editBatch(editRow, this); -// -// // open frequency editor -// parent.getHandler().setBenthosSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(BenthosFrequencyUIModel frequencyModel) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -722,8 +722,9 @@ EditCatchesUI parent = SwingUtil.getParentContainer(ui, EditCatchesUI.class); SplitSpeciesBatchUI splitBatchEditor = parent.getSpeciesTabSplitBatch(); - splitBatchEditor.getHandler().editBatch(parentBatch); - parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); +// splitBatchEditor.getHandler().editBatch(parentBatch); +// parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.SPLIT_BATCH_CARD); + parent.getHandler().splitSpeciesBatch(parentBatch, splitBatchEditor); } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-09-17 21:02:26 UTC (rev 1178) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyCellComponent.java 2013-09-17 21:21:22 UTC (rev 1179) @@ -158,13 +158,6 @@ SwingUtil.getParentContainer(ui, EditCatchesUI.class); parent.getHandler().editSpeciesFrequencies(editRow, this); - -// SpeciesFrequencyUI frequencyEditor = parent.getSpeciesTabFrequencyEditor(); -// -// frequencyEditor.getHandler().editBatch(editRow, this); -// -// // open frequency editor -// parent.getHandler().setSpeciesSelectedCard(EditCatchesUIHandler.EDIT_FREQUENCY_CARD); } public void validateEdition(SpeciesFrequencyUIModel frequencyModel) {

1 0

r1178 - in trunk/tutti-ui-swing/src/main: java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create resources/i18n
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 23:02:26 +0200 (Tue, 17 Sep 2013) New Revision: 1178 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1178 Log: fixes #3264: [ESPECE] Sur l'?\195?\169cran de cr?\195?\169ation d'un lot, libell?\195?\169 manquant + hors-vrac s?\195?\169lectionn?\195?\169 au lieu de vrac Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-17 10:24:35 UTC (rev 1177) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.TuttiPersistence; @@ -78,7 +79,18 @@ SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); - sortedValue = caracteristic.getCaracteristic().getQualitativeValue(0); + Integer vracId = this.persistenceService.getEnumerationFile().QUALITATIVE_VRAC_ID; + + CaracteristicQualitativeValue vracValue = null; + for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { + + if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { + vracValue = caracteristicQualitativeValue; + break; + } + } + Preconditions.checkNotNull(vracValue, "Could not found vrac qualitative value"); + sortedValue = vracValue; } //------------------------------------------------------------------------// @@ -117,8 +129,8 @@ (CreateBenthosBatchUIModel) evt.getSource(); Species newValue = (Species) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New Selected species " + (newValue == null ? null : newValue.getRefTaxCode())); + if (log.isDebugEnabled()) { + log.debug("New Selected species " + (newValue == null ? null : decorate(newValue))); } if (newValue == null || source.getSpeciesUsed() == null) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-17 10:24:35 UTC (rev 1177) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUIHandler.java 2013-09-17 21:02:26 UTC (rev 1178) @@ -24,6 +24,7 @@ * #L% */ +import com.google.common.base.Preconditions; import com.google.common.collect.Lists; import com.google.common.collect.Multimap; import fr.ifremer.tutti.persistence.TuttiPersistence; @@ -78,7 +79,18 @@ SampleCategoryModelEntry caracteristic = sampleCategoryModel.getCategoryById(sampleCategoryModel.getFirstCategoryId()); - sortedValue = caracteristic.getCaracteristic().getQualitativeValue(0); + Integer vracId = this.persistenceService.getEnumerationFile().QUALITATIVE_VRAC_ID; + + CaracteristicQualitativeValue vracValue = null; + for (CaracteristicQualitativeValue caracteristicQualitativeValue : caracteristic.getCaracteristic().getQualitativeValue()) { + + if (vracId.equals(caracteristicQualitativeValue.getIdAsInt())) { + vracValue = caracteristicQualitativeValue; + break; + } + } + Preconditions.checkNotNull(vracValue,"Could not found vrac qualitative value"); + sortedValue = vracValue; } //------------------------------------------------------------------------// @@ -117,8 +129,8 @@ (CreateSpeciesBatchUIModel) evt.getSource(); Species newValue = (Species) evt.getNewValue(); - if (log.isInfoEnabled()) { - log.info("New Selected species " + (newValue == null ? null : newValue.getRefTaxCode())); + if (log.isDebugEnabled()) { + log.debug("New Selected species " + (newValue == null ? null : decorate(newValue))); } if (newValue == null || source.getSpeciesUsed() == null) { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 10:24:35 UTC (rev 1177) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 21:02:26 UTC (rev 1178) @@ -163,8 +163,8 @@ tutti.createBenthosBatch.action.save.tip=Enregistrer la création du lot espèce tutti.createBenthosBatch.field.batchWeight=Poids du lot (kg) tutti.createBenthosBatch.field.batchWeight.tip=Poids du lot (kg) -tutti.createBenthosBatch.field.sampleCategory= -tutti.createBenthosBatch.field.sampleCategory.tip= +tutti.createBenthosBatch.field.sampleCategory=V / HV +tutti.createBenthosBatch.field.sampleCategory.tip=Catégorie Vrac / Hors Vrac tutti.createBenthosBatch.field.species=Espèce du lot tutti.createBenthosBatch.field.species.tip=Espèce du lot tutti.createBenthosBatch.title=Créer un lot @@ -215,8 +215,8 @@ tutti.createSpeciesBatch.action.save.tip=Enregistrer la création du lot espèce tutti.createSpeciesBatch.field.batchWeight=Poids du lot (kg) tutti.createSpeciesBatch.field.batchWeight.tip=Poids du lot (non obligatoire à ce stade) -tutti.createSpeciesBatch.field.sampleCategory= -tutti.createSpeciesBatch.field.sampleCategory.tip= +tutti.createSpeciesBatch.field.sampleCategory=V / HV +tutti.createSpeciesBatch.field.sampleCategory.tip=Catégorie Vrac / Hors Vrac tutti.createSpeciesBatch.field.species=Espèce du lot tutti.createSpeciesBatch.field.species.tip=Code campagne ou Code Rubin – Nom scientifique du lot à créer tutti.createSpeciesBatch.title=Créer un lot @@ -407,8 +407,6 @@ tutti.editBenthosFrequencies.action.save=Enregistrer tutti.editBenthosFrequencies.action.save.mnemonic=E tutti.editBenthosFrequencies.action.save.tip=Enregistrer les mensurations -tutti.editBenthosFrequencies.batchCategory=Catégorie -tutti.editBenthosFrequencies.batchSpecies=Espèce tutti.editBenthosFrequencies.error.length.doublon=La classe de taille <strong>%s</strong> est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne <strong>%s</strong>), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations. tutti.editBenthosFrequencies.field.lengthStepCaracteristic=Type de mesure tutti.editBenthosFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus @@ -928,8 +926,6 @@ tutti.editSpeciesFrequencies.action.save=Enregistrer tutti.editSpeciesFrequencies.action.save.mnemonic=E tutti.editSpeciesFrequencies.action.save.tip=Enregistrer les mensurations -tutti.editSpeciesFrequencies.batchCategory=Catégorie -tutti.editSpeciesFrequencies.batchSpecies=Espèce tutti.editSpeciesFrequencies.error.length.doublon=La classe de taille <strong>%s</strong> est utilisée plusieurs fois (deuxième occurrence trouvée à la ligne <strong>%s</strong>), ce qui n'est pas autorisé.<hr/>Veuillez corriger cela pour pouvoir enregistrer les mensurations. tutti.editSpeciesFrequencies.field.lengthStepCaracteristic=Type de mesure tutti.editSpeciesFrequencies.field.lengthStepCaracteristic.tip=Méthode de mensuration des individus

1 0

[ANN] - Tutti 2.4 released
by forge.codelutin.com Release Notification Sept. 17, 2013

Sept. 17, 2013

The Tutti team is pleased to announce the tutti-2.4 release! Outil de saisie de données d'opérations et de captures au cours des campagnes halieutiques. Documentation of the project can be found here: http://forge.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o Amélioration de la barre de progression des actions Issue: 3104. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Faciliter l'import d'une nouvelle base Issue: 3106. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] Utiliser deux fichiers de configuration pour les mises à jour (applicatif / base de données) Issue: 3259. Thanks to Tony Chemit. Resolved by tchemit. o [TECH] - Prise en compte de nouvelles catégories dans l'applicatif Issue: 2889. Thanks to Tony Chemit. Resolved by tchemit. o [MENSURATION] manque information sur l'espèce en cours de saisie Issue: 3213. Thanks to Tony Chemit. Resolved by tchemit. Fixed Bugs: o [MENSURATION] problèmes en mode génération de classe Issue: 2895. Thanks to Vincent BADTS. Resolved by vbadts. o [IMPORT-EXPORT MULTIPOSTE] Problème de transaction lors d'une erreur Issue: 3004. Thanks to Tony Chemit. Resolved by tchemit. o [RAPPORT] erreur poids total trié Issue: 2901. Thanks to Vincent BADTS. Resolved by tchemit. Changes: o [TECH] - Vérification de la version utilisée par rapport à la BDD Issue: 2890. Thanks to Tony Chemit. Resolved by tchemit. o [EXPORT GENERIQUE] changer nom d'un champ et écriture Male Issue: 2905. Thanks to Vincent BADTS. Resolved by tchemit. o Mise à jour jre en 1.7u40 Issue: 3219. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- No release file deployed. (all files are deployed in the maven repository) Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1177 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 12:24:35 +0200 (Tue, 17 Sep 2013) New Revision: 1177 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1177 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/tutti-persistence/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/tutti-service/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-17 10:24:26 UTC (rev 1176) +++ trunk/tutti-ui-swing/pom.xml 2013-09-17 10:24:35 UTC (rev 1177) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4</version> + <version>2.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1176 - tags
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 12:24:26 +0200 (Tue, 17 Sep 2013) New Revision: 1176 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1176 Log: [maven-release-plugin] copy for tag tutti-2.4 Added: tags/tutti-2.4/

1 0

r1175 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: maven-release Date: 2013-09-17 12:24:18 +0200 (Tue, 17 Sep 2013) New Revision: 1175 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1175 Log: [maven-release-plugin] prepare release tutti-2.4 Modified: trunk/pom.xml trunk/tutti-persistence/pom.xml trunk/tutti-service/pom.xml trunk/tutti-ui-swing/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> <packaging>pom</packaging> <name>Tutti</name> @@ -86,12 +86,12 @@ </modules> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-2.4 </developerConnection> </scm> <distributionManagement> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/tutti-persistence/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/tutti-service/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) +++ trunk/tutti-ui-swing/pom.xml 2013-09-17 10:24:18 UTC (rev 1175) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.4-SNAPSHOT</version> + <version>2.4</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1174 - trunk
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 12:21:38 +0200 (Tue, 17 Sep 2013) New Revision: 1174 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1174 Log: fix misnamed property jdkVersion to jreVersion Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 10:18:49 UTC (rev 1173) +++ trunk/pom.xml 2013-09-17 10:21:38 UTC (rev 1174) @@ -549,8 +549,8 @@ <configuration> <rules> <requireProperty> - <property>jdkVersion</property> - <message>You must set a jdkVersion property!</message> + <property>jreVersion</property> + <message>You must set a jreVersion property!</message> </requireProperty> <requireProperty> <property>dbVersion</property>

1 0

r1173 - in trunk: src/update tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 12:18:49 +0200 (Tue, 17 Sep 2013) New Revision: 1173 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1173 Log: add missing license headers = svn properties refs #3259: [TECH] Utiliser deux fichiers de configuration pour les mises ?\195?\160 jour (applicatif / base de donn?\195?\169es) (do it on showAbout screen) Modified: trunk/src/update/tutti-db.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/src/update/tutti-db.properties =================================================================== --- trunk/src/update/tutti-db.properties 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/src/update/tutti-db.properties 2013-09-17 10:18:49 UTC (rev 1173) @@ -2,7 +2,7 @@ # #%L # Tutti # $Id$ -# $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/src/update/tutti-application… $ +# $HeadURL$ # %% # Copyright (C) 2012 - 2013 Ifremer # %% Property changes on: trunk/src/update/tutti-db.properties ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -194,15 +194,16 @@ protected void addUpdateTab(TuttiApplicationConfig config) { File current = config.getTuttiBasedir(); - String url = config.getUpdateApplicationUrl(); + String urlApplication = config.getUpdateApplicationUrl(); + String urlDb = config.getUpdateDbUrl(); ApplicationUpdater up = new ApplicationUpdater(); // get application updates - Map<String, ApplicationInfo> applicationVersions = up.getVersions(url, current); + Map<String, ApplicationInfo> applicationVersions = up.getVersions(urlApplication, current); // get db updates - Map<String, ApplicationInfo> dbVersions = up.getVersions(url, config.getDataDirectory()); + Map<String, ApplicationInfo> dbVersions = up.getVersions(urlDb, config.getDataDirectory()); // create final update map final Map<String, ApplicationInfo> versions = Maps.newTreeMap(); @@ -242,7 +243,7 @@ params.add(_("tutti.about.update.app.up.detail", appLabel, oldVersion, newVersion, appName)); } } - String updateText = _("tutti.about.update.content", url, Joiner.on("\n").join(params)); + String updateText = _("tutti.about.update.content", urlApplication, urlDb, Joiner.on("\n").join(params)); updateArea.setText(updateText); updatePane.getViewport().add(updateArea); updateArea.addHyperlinkListener(new HyperlinkListener() { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.ui.swing.content.db.ImportDbAction; import fr.ifremer.tutti.ui.swing.content.db.InstallDbAction; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/StartAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.db; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ImportOrReimportDbAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java 2013-09-17 10:18:49 UTC (rev 1173) @@ -1,5 +1,29 @@ package fr.ifremer.tutti.ui.swing.content.db; +/* + * #%L + * Tutti :: UI + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2012 - 2013 Ifremer + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; Property changes on: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallOrReinstallDbAction.java ___________________________________________________________________ Modified: svn:keywords - Author Date Id Revision + Author Date Id Revision HeadURL Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 10:14:56 UTC (rev 1172) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 10:18:49 UTC (rev 1173) @@ -11,7 +11,7 @@ tutti.about.translate.title=Traduire Tutti tutti.about.update.app.noup.detail=<tr><td>%1$s</td><td>%2$s</td><td>%2$s<td><td></td></tr> tutti.about.update.app.up.detail=<tr><td>%1$s</td><td>%2$s</td><td><strong>%3$s</strong></td><td><a href\="%4$s">Mettre à jour</a><td></tr> -tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <a href\="%1$s">%1$s</a></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%2$s</table> +tutti.about.update.content=<h2>Mise à jour de Tutti</h2><p>Fichier des mises à jour \: <ul><li>Applicatif \: <a href\="%1$s">%1$s</a></li><li>Base de données \: <a href\="%2$s">%2$s</a></li></ul></p><br/><hr/><br/><table><CAPTION><EM>Mises à jour des modules</EM></CAPTION><tr><th>Module</th><th>Version installée</th><th>Dernière version</th><th></th></tr>%3$s</table> tutti.about.update.title=Mise à jour Tutti tutti.action.create.error=Erreur à l'instanciation de l'action %s tutti.applicationUpdater.prepareFirstDB.copyDirectory.error=Erreur lors de la copie du contenu du dossier %1s vers %2s

1 0

r1172 - trunk
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 12:14:56 +0200 (Tue, 17 Sep 2013) New Revision: 1172 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1172 Log: add default build goals to some profiles Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-17 09:25:46 UTC (rev 1171) +++ trunk/pom.xml 2013-09-17 10:14:56 UTC (rev 1172) @@ -618,6 +618,7 @@ </activation> <build> + <defaultGoal>deploy</defaultGoal> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId> @@ -686,6 +687,7 @@ </activation> <build> + <defaultGoal>deploy</defaultGoal> <plugins> <plugin> <artifactId>maven-antrun-plugin</artifactId>

1 0

r1171 - in trunk: . src/update tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com Sept. 17, 2013

Sept. 17, 2013

Author: tchemit Date: 2013-09-17 11:25:46 +0200 (Tue, 17 Sep 2013) New Revision: 1171 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1171 Log: fixes #3259: [TECH] Utiliser deux fichiers de configuration pour les mises ?\195?\160 jour (applicatif / base de donn?\195?\169es) Added: trunk/src/update/tutti-application.properties trunk/src/update/tutti-db.properties Removed: trunk/src/update/update-tutti.properties Modified: trunk/README.txt trunk/pom.xml trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/README.txt =================================================================== --- trunk/README.txt 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/README.txt 2013-09-17 09:25:46 UTC (rev 1171) @@ -1,16 +1,21 @@ -Faire une nouvelle version --------------------------- +Faire une nouvelle version mineure +---------------------------------- -Fournir la version de la base à utiliser, renseigner la propriété *dbVersion* +Cette release va juste déployer sur le dépot nexus les artifacts + mettre à jour +le fichier de mises à jour sur http://appup.forge.codelutin.com/tutti. -mvn release:prepare -Darguments="-DdbVersion=2013.08.22" -mvn release:perform -Darguments="-DdbVersion=2013.08.22" +mvn release:prepare +mvn release:perform -Pour préparer une release complête, lancer la commande : +Faire une nouvelle version majeure +---------------------------------- -mvn release:prepare -Darguments="-DperformFullRelease -DdbVersion=2013.08.22" -mvn release:perform -Darguments="-DperformFullRelease -DdbVersion=2013.08.22" +Cette release va en plus générer et deployer sur forge.codelutin.com les zip +incluant la jre + l'application. +mvn release:prepare -Darguments="-DperformFullRelease" +mvn release:perform -Darguments="-DperformFullRelease" + Historique des versions de base ------------------------------- @@ -19,5 +24,7 @@ +=====================+============+===========================+ + 2.3 + 2013.06.04 + 3.2.1.01 + +---------------------+------------+---------------------------+ -+ 2.4 + 2013.08.22 + 3.2.3 + ++ 2.4 + 2013.06.04 + 3.2.3 + +---------------------+------------+---------------------------+ ++ 2.5 + 2013.08.22 + 3.2.3 + ++---------------------+------------+---------------------------+ Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/pom.xml 2013-09-17 09:25:46 UTC (rev 1171) @@ -164,8 +164,10 @@ <jreVersion>1.7.40</jreVersion>  + <dbVersion>2013.06.04</dbVersion> +   - + </properties> <repositories> @@ -547,6 +549,10 @@ <configuration> <rules> <requireProperty> + <property>jdkVersion</property> + <message>You must set a jdkVersion property!</message> + </requireProperty> + <requireProperty> <property>dbVersion</property> <message>You must set a dbVersion property!</message> </requireProperty> @@ -603,7 +609,7 @@ </profile> <profile> - <id>deploy-update</id> + <id>deploy-tutti-application-update</id> <activation> <property> <name>performRelease</name> @@ -617,20 +623,86 @@ <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> - <id>copy update-properties to site</id> + <id>copy tutti-application.properties to site</id> <phase>package</phase> <inherited>false</inherited> <configuration> <tasks> - <echo message="Copy model to site" /> + <echo message="copy tutti-application.properties to site" /> <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> <filterset> <filter value="${project.version}" token="projectVersion" /> <filter value="${jreVersion}" token="jreVersion" /> + </filterset> + <fileset dir="${basedir}/src/update/"> + <include name="tutti-application.properties" /> + </fileset> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>wagon-maven-plugin</artifactId> + <version>1.0-beta-4</version> + <executions> + <execution> + <phase>deploy</phase> + <inherited>false</inherited> + <goals> + <goal>upload-single</goal> + </goals> + <configuration> + <serverId>forge.codelutin.com</serverId> + <fromFile> + ${project.build.directory}/update/tutti-application.properties + </fromFile> + <url> + scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti + </url> + </configuration> + </execution> + </executions> + + </plugin> + </plugins> + </build> + + </profile> + + <profile> + <id>deploy-tutti-db-update</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>copy tutti-db.properties to site</id> + <phase>package</phase> + <inherited>false</inherited> + <configuration> + <tasks> + <echo message="copy tutti-db.properties to site" /> + <copy verbose="true" failonerror="false" overwrite="true" filtering="true" todir="${project.build.directory}/update"> + <filterset> <filter value="${dbVersion}" token="dbVersion" /> </filterset> <fileset dir="${basedir}/src/update/"> - <include name="update-tutti.properties" /> + <include name="tutti-db.properties" /> </fileset> </copy> </tasks> @@ -656,7 +728,7 @@ <configuration> <serverId>forge.codelutin.com</serverId> <fromFile> - ${project.build.directory}/update/update-tutti.properties + ${project.build.directory}/update/tutti-db.properties </fromFile> <url> scpexe://forge.codelutin.com/var/www/ApplicationUpdate/http/tutti Copied: trunk/src/update/tutti-application.properties (from rev 1169, trunk/src/update/update-tutti.properties) =================================================================== --- trunk/src/update/tutti-application.properties (rev 0) +++ trunk/src/update/tutti-application.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -0,0 +1,55 @@ +### +# #%L +# Tutti +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +################################################################################ +### JRE Updates ################################################################ +################################################################################ + +jre.version=@jreVersion@ +linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip +windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip +#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip +#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip + +################################################################################ +### Tutti Updates ############################################################## +################################################################################ + +tutti.version=@projectVersion@ +tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip + +################################################################################ +### I18n Updates ############################################################### +################################################################################ + +i18n.version=@projectVersion@ +i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip + +################################################################################ +### Help Updates ############################################################### +################################################################################ + +help.version=@projectVersion@ +help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip Added: trunk/src/update/tutti-db.properties =================================================================== --- trunk/src/update/tutti-db.properties (rev 0) +++ trunk/src/update/tutti-db.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -0,0 +1,31 @@ +### +# #%L +# Tutti +# $Id$ +# $HeadURL: http://svn.forge.codelutin.com/svn/tutti/trunk/src/update/tutti-application… $ +# %% +# Copyright (C) 2012 - 2013 Ifremer +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public +# License along with this program. If not, see +# <http://www.gnu.org/licenses/gpl-3.0.html>. +# #L% +### + +################################################################################ +### DB Updates ################################################################# +################################################################################ + +db.version=@dbVersion@ +db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip +db.auth=true \ No newline at end of file Property changes on: trunk/src/update/tutti-db.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Deleted: trunk/src/update/update-tutti.properties =================================================================== --- trunk/src/update/update-tutti.properties 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/src/update/update-tutti.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -1,63 +0,0 @@ -### -# #%L -# Tutti -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2012 - 2013 Ifremer -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -################################################################################ -### JRE Updates ################################################################ -################################################################################ - -jre.version=@jreVersion@ -linux.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-i586.zip -windows.i386.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip -windows.x86.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-i586.zip -#linux.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-linux-x64.zip -#windows.amd64.jre.url=zip:http://nexus.nuiton.org/nexus/content/repositories/jvm/com/oracle/jre/@jreVersion@/jre-@jreVersion@-windows-x64.zip - -################################################################################ -### Tutti Updates ############################################################## -################################################################################ - -tutti.version=@projectVersion@ -tutti.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-standalone.zip - -################################################################################ -### I18n Updates ############################################################### -################################################################################ - -i18n.version=@projectVersion@ -i18n.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-i18n.zip - -################################################################################ -### Help Updates ############################################################### -################################################################################ - -help.version=@projectVersion@ -help.url=zip:http://nexus.nuiton.org/nexus/content/repositories/other-releases/fr/ifremer/tutti/tutti-ui-swing/@projectVersion@/tutti-ui-swing-@projectVersion@-help.zip - -################################################################################ -### DB Updates ################################################################# -################################################################################ - -db.version=@dbVersion@ -db.url=zip:http://appup.nuiton.org/tutti/auth/tutti-db-@dbVersion@.zip -db.auth=true \ No newline at end of file Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/RunTutti.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -24,14 +24,12 @@ * #L% */ -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; import fr.ifremer.tutti.ui.swing.content.StartAction; import fr.ifremer.tutti.ui.swing.content.UpdateApplicationAction; import fr.ifremer.tutti.ui.swing.util.TuttiExceptionHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import jaxx.runtime.SwingUtil; import org.apache.commons.logging.Log; @@ -43,8 +41,6 @@ import java.awt.Color; import java.util.Arrays; -import static org.nuiton.i18n.I18n.n_; - /** * To start Tutti application. * @@ -104,16 +100,17 @@ log.info("Full launch mode, try to update."); } - boolean canUpdate = true; - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - config.getUpdateUrl(), - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - canUpdate = false; - } + // check application url is reachable + boolean canUpdate = context.checkUpdateApplicationReachable(); +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// config.getUpdateApplicationUrl(), +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// canUpdate = false; +// } if (canUpdate) { // try to update jre - i18n - application - help and exit if so Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -28,6 +28,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.tutti.PropagatePropertyChangeListener; +import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.TuttiTechnicalException; import fr.ifremer.tutti.persistence.RessourceClassLoader; @@ -87,6 +88,7 @@ import java.util.Set; import static org.nuiton.i18n.I18n._; +import static org.nuiton.i18n.I18n.n_; /** * UI application context. @@ -867,4 +869,44 @@ setScreen(TuttiScreen.MANAGE_DB); } } + + public boolean checkUpdateApplicationReachable() { + + boolean result = true; + TuttiApplicationConfig config = getConfig(); + String url = config.getUpdateApplicationUrl(); + + try { + TuttiUIUtil.tryToConnectToUpdateUrl( + url, + n_("tutti.error.update.bad.url.syntax"), + n_("tutti.error.update.could.not.reach.url"), + n_("tutti.error.update.could.not.found.url") + ); + } catch (TuttiBusinessException e) { + TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); + result = false; + } + return result; + } + + public boolean checkUpdateDbReachable() { + + boolean result = true; + TuttiApplicationConfig config = getConfig(); + String url = config.getUpdateDbUrl(); + + try { + TuttiUIUtil.tryToConnectToUpdateUrl( + url, + n_("tutti.error.update.bad.url.syntax"), + n_("tutti.error.update.could.not.reach.url"), + n_("tutti.error.update.could.not.found.url") + ); + } catch (TuttiBusinessException e) { + TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); + result = false; + } + return result; + } } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfig.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -347,10 +347,14 @@ return serviceConfig.getBasedir(); } - public String getUpdateUrl() { - return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_URL.getKey()); + public String getUpdateApplicationUrl() { + return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_APPLICATION_URL.getKey()); } + public String getUpdateDbUrl() { + return applicationConfig.getOption(TuttiApplicationConfigOption.TUTTI_UPDATE_DB_URL.getKey()); + } + public String getAdminPassword() { return applicationConfig.getOption(TuttiApplicationConfigOption.ADMIN_PASSWORD.getKey()); } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiApplicationConfigOption.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -84,12 +84,18 @@ Locale.class ), - TUTTI_UPDATE_URL( + TUTTI_UPDATE_APPLICATION_URL( "tutti.update.application.url", - n_("tutti.config.option.update.url.description"), - "http://appup.forge.codelutin.com/tutti/update-tutti.properties", + n_("tutti.config.option.update.application.url.description"), + "http://appup.forge.codelutin.com/tutti/tutti-application.properties", String.class ), + TUTTI_UPDATE_DB_URL( + "tutti.update.db.url", + n_("tutti.config.option.update.db.url.description"), + "http://appup.forge.codelutin.com/tutti/tutti-db.properties", + String.class + ), UI_CONFIG_FILE( "tutti.ui.config.file", Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/ShowAboutAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -27,7 +27,6 @@ import com.google.common.base.Joiner; import com.google.common.collect.Lists; import com.google.common.collect.Maps; -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; @@ -51,7 +50,6 @@ import java.util.Map; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To show about panel. @@ -74,21 +72,27 @@ @Override public boolean prepareAction() throws Exception { - TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); + boolean doAction = super.prepareAction(); - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.about.could.not.reach.url")); - canUpdate = true; - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - canUpdate = false; + if (doAction) { + // check db url is reachable + TuttiUIContext context = getContext(); + canUpdate = context.checkUpdateApplicationReachable(); } +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateApplicationUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.about.could.not.reach.url")); +// canUpdate = true; +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// canUpdate = false; +// } - return super.prepareAction(); + return doAction; } @Override @@ -190,7 +194,7 @@ protected void addUpdateTab(TuttiApplicationConfig config) { File current = config.getTuttiBasedir(); - String url = config.getUpdateUrl(); + String url = config.getUpdateApplicationUrl(); ApplicationUpdater up = new ApplicationUpdater(); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateApplicationAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -24,13 +24,11 @@ * #L% */ -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.AbstractTuttiAction; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.apache.commons.logging.Log; @@ -40,7 +38,6 @@ import java.io.File; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To update jre / i18n or tutti using the {@link ApplicationUpdater} mecanism. @@ -73,21 +70,26 @@ @Override public boolean prepareAction() throws Exception { - TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); + boolean doAction = super.prepareAction(); - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - return false; + if (doAction) { + // check application url is reachable + TuttiUIContext context = getContext(); + doAction = context.checkUpdateApplicationReachable(); +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateApplicationUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } - - return super.prepareAction(); + return doAction; } @Override @@ -113,7 +115,7 @@ } } else { - String url = config.getUpdateUrl(); + String url = config.getUpdateApplicationUrl(); File dest = new File(config.getTuttiBasedir(), "NEW"); if (log.isInfoEnabled()) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/UpdateDbAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -24,13 +24,11 @@ * #L% */ -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.db.OpenDbAction; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,7 +37,6 @@ import java.io.File; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To update - install database. @@ -63,19 +60,21 @@ boolean doAction = super.prepareAction(); if (doAction) { + // check db url is reachable TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); - - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - return false; - } + doAction = context.checkUpdateDbReachable(); +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateDbUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } return doAction; @@ -87,7 +86,7 @@ TuttiApplicationConfig config = context.getConfig(); File current = config.getDataDirectory(); - String url = config.getUpdateUrl(); + String url = config.getUpdateDbUrl(); if (log.isInfoEnabled()) { log.info(String.format("Try to install / update db (current data location: %s), using update url: %s", current, url)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -173,7 +173,8 @@ .addOption(TuttiPersistenceConfigOption.DB_ENUMERATION_PATH) .addOption(TuttiPersistenceConfigOption.JDBC_URL) .addOption(TuttiServiceConfigOption.SITE_URL) - .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_URL); + .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_APPLICATION_URL) + .addOption(TuttiApplicationConfigOption.TUTTI_UPDATE_DB_URL); helper.setFinalizer(new MainCallBackFinalizer(CALLBACK_APPLICATION)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/InstallDbAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -25,14 +25,12 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.ui.swing.TuttiApplicationUpdaterCallBack; import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import fr.ifremer.tutti.ui.swing.util.action.TuttiActionHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -41,7 +39,6 @@ import java.io.File; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To install (or reinstall) a db from last network one. @@ -71,19 +68,23 @@ boolean doAction = super.prepareAction(); if (doAction) { + + // check db url is reachable TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); + doAction = context.checkUpdateDbReachable(); - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - doAction = false; - } +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateDbUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } if (doAction) { @@ -108,7 +109,7 @@ TuttiApplicationConfig config = context.getConfig(); File current = config.getDataDirectory(); - String url = config.getUpdateUrl(); + String url = config.getUpdateDbUrl(); if (log.isInfoEnabled()) { log.info(String.format("Try to install / update db (current data location: %s), using update url: %s", current, url)); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/db/ReinstallDbAction.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -25,16 +25,13 @@ */ import com.google.common.base.Preconditions; -import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiIOUtil; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.config.TuttiPersistenceConfig; import fr.ifremer.tutti.ui.swing.RunTutti; import fr.ifremer.tutti.ui.swing.TuttiUIContext; -import fr.ifremer.tutti.ui.swing.config.TuttiApplicationConfig; import fr.ifremer.tutti.ui.swing.content.AbstractMainUITuttiAction; import fr.ifremer.tutti.ui.swing.content.MainUIHandler; -import fr.ifremer.tutti.ui.swing.util.TuttiUIUtil; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -42,7 +39,6 @@ import java.util.Date; import static org.nuiton.i18n.I18n._; -import static org.nuiton.i18n.I18n.n_; /** * To install (or reinstall) a db from last network one. @@ -73,19 +69,21 @@ // check we can connect to remote install server + // check db url is reachable TuttiUIContext context = getContext(); - TuttiApplicationConfig config = context.getConfig(); - String url = config.getUpdateUrl(); - - try { - TuttiUIUtil.tryToConnectToUpdateUrl( - url, - n_("tutti.error.update.could.not.reach.url") - ); - } catch (TuttiBusinessException e) { - TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); - doAction = false; - } + doAction = context.checkUpdateDbReachable(); +// TuttiApplicationConfig config = context.getConfig(); +// String url = config.getUpdateApplicationUrl(); +// +// try { +// TuttiUIUtil.tryToConnectToUpdateUrl( +// url, +// n_("tutti.error.update.could.not.reach.url") +// ); +// } catch (TuttiBusinessException e) { +// TuttiUIContext.getErrorHelper().showWarningDialog(e.getMessage()); +// doAction = false; +// } } if (doAction) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/TuttiUIUtil.java 2013-09-17 09:25:46 UTC (rev 1171) @@ -28,6 +28,7 @@ import fr.ifremer.tutti.TuttiBusinessException; import fr.ifremer.tutti.TuttiTechnicalException; import org.apache.commons.beanutils.PropertyUtils; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.jdesktop.swingx.decorator.HighlightPredicate; @@ -35,6 +36,8 @@ import java.awt.Color; import java.awt.Desktop; +import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -226,18 +229,49 @@ } } - public static void tryToConnectToUpdateUrl(String url, String i18nKey) { + public static void tryToConnectToUpdateUrl(String urlAsString, + String badUrlFormatI18nKey, + String notReachI18nKey, + String notFoundI18nKey) { + URL url; + // get url try { - URLConnection urlConnection = new URL(url).openConnection(); + url = new URL(urlAsString); + } catch (MalformedURLException e) { + if (log.isDebugEnabled()) { + log.debug("Bad url syntax at " + urlAsString, e); + } + throw new TuttiBusinessException(_(badUrlFormatI18nKey, urlAsString)); + } + + URLConnection urlConnection; + // try to connect (fail if network or remote host does not exists) + try { + urlConnection = url.openConnection(); urlConnection.setConnectTimeout(10000); urlConnection.connect(); } catch (Exception e) { - if (log.isErrorEnabled()) { - log.error("Could not connect to " + url, e); + if (log.isDebugEnabled()) { + log.debug("Could not connect to " + urlAsString, e); } - // could not connect to - throw new TuttiBusinessException(_(i18nKey, url)); + throw new TuttiBusinessException(_(notReachI18nKey, urlAsString)); } + + // try to open the resource (fail if resources does not exist) + try { + urlConnection.setReadTimeout(1000); + InputStream inputStream = null; + try { + inputStream = urlConnection.getInputStream(); + } finally { + IOUtils.closeQuietly(inputStream); + } + } catch (Exception e) { + if (log.isDebugEnabled()) { + log.debug("Could not found file at to " + urlAsString, e); + } + throw new TuttiBusinessException(_(notFoundI18nKey, urlAsString)); + } } public static float getRoundedLengthStep(float lengthStep, boolean aroundUp) { Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -128,6 +128,8 @@ tutti.config.option.ui.dateFormat.description= tutti.config.option.ui.shortcut.closePopup.description= tutti.config.option.ui.showNumberEditorButton.description= +tutti.config.option.update.application.url.description= +tutti.config.option.update.db.url.description= tutti.config.option.update.url.description= tutti.config.option.weights.rate.difference.totalAndSorted.description= tutti.config.parse.error= @@ -980,6 +982,8 @@ tutti.error.ui.business.error= tutti.error.ui.business.warning= tutti.error.ui.other.error= +tutti.error.update.bad.url.syntax= +tutti.error.update.could.not.found.url= tutti.error.update.could.not.reach.url= tutti.error.write.startActionFile=could not write action content to file %s tutti.exportCruise.action.success= Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-13 16:21:34 UTC (rev 1170) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-17 09:25:46 UTC (rev 1171) @@ -124,7 +124,8 @@ tutti.config.option.ui.dateFormat.description=Format de dates tutti.config.option.ui.shortcut.closePopup.description=Fermer une popup tutti.config.option.ui.showNumberEditorButton.description=Afficher le pavé numérique de saisie -tutti.config.option.update.url.description=URL de mise à jour +tutti.config.option.update.application.url.description=URL de mise à jour des applicatifs +tutti.config.option.update.db.url.description=URL de mise à jour de la base de données tutti.config.option.weights.rate.difference.totalAndSorted.description=Pourcentage de différence entre les Poids totaux VRAC triés et les poids totaux VRAC en dessous duquel on demande confirmation sur la saisie tutti.config.parse.error=Erreur de parsing du fichier de configuration tutti.config.sampleOrder.title=Catégorie d'échantillonnage @@ -968,6 +969,8 @@ tutti.error.ui.business.error=Erreur tutti.error.ui.business.warning=Avertissement tutti.error.ui.other.error=Erreur +tutti.error.update.bad.url.syntax=Mise à jour impossible (le format de l'url <strong>%s</strong> n'est pas valide) +tutti.error.update.could.not.found.url=Mise à jour impossible (l'url <strong>%s</strong> n'existe pas) tutti.error.update.could.not.reach.url=Mise à jour impossible (l'url <strong>%s</strong> n'est pas joignable) tutti.error.write.startActionFile=impossible d'écrire dans le fichier %s tutti.exportCruise.action.success=La campagne <strong>%s</strong> a été exportée dans le fichier <strong>%s</strong>.

1 0