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

r1711 - in trunk: tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service tutti-ui-swing/src/main/filtered-resources tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise tutti-ui-swing/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com April 19, 2014

April 19, 2014

Author: tchemit Date: 2014-04-19 15:25:21 +0200 (Sat, 19 Apr 2014) New Revision: 1711 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1711 Log: fixes #4957 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 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/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-04-19 13:24:36 UTC (rev 1710) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java 2014-04-19 13:25:21 UTC (rev 1711) @@ -58,7 +58,6 @@ import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueDao; import fr.ifremer.adagio.core.dao.referential.pmfm.QualitativeValueImpl; import fr.ifremer.adagio.core.dao.technical.synchronization.SynchronizationStatus; -import org.nuiton.jaxx.application.ApplicationBusinessException; import fr.ifremer.tutti.persistence.dao.GearPhysicalFeaturesDaoTutti; import fr.ifremer.tutti.persistence.entities.CaracteristicMap; import fr.ifremer.tutti.persistence.entities.TuttiEntities; @@ -76,11 +75,13 @@ import fr.ifremer.tutti.persistence.entities.referential.Vessel; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.type.IntegerType; import org.hibernate.type.ShortType; import org.hibernate.type.StringType; +import org.nuiton.jaxx.application.ApplicationBusinessException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.dao.DataRetrievalFailureException; import org.springframework.stereotype.Service; @@ -613,8 +614,16 @@ Location returnLocation = load(LocationImpl.class, Integer.valueOf(source.getReturnLocation().getId())); fishingTrip.setReturnLocation(returnLocation); - setSurveyMeasurement(fishingTrip, enumeration.PMFM_ID_SURVEY_PART, null, source.getSurveyPart(), null); + if (StringUtils.isEmpty(source.getSurveyPart())) { + // remove surveyMeasurement if exists + removeSurveyMeasurement(fishingTrip, enumeration.PMFM_ID_SURVEY_PART); + } else { + + // update it or create it + setSurveyMeasurement(fishingTrip, enumeration.PMFM_ID_SURVEY_PART, null, source.getSurveyPart(), null); + } + // Gear if (source.isGearEmpty() && fishingTrip.getGearPhysicalFeatures() != null) { fishingTrip.getGearPhysicalFeatures().clear(); @@ -746,9 +755,8 @@ fishingTrip.getVesselPersonFeatures().addAll(vesselPersonFeaturesMap.values()); } - // adapt to surveyMeasurement - protected SurveyMeasurement getOrCreateSurveyMeasurement(FishingTrip fishingTrip, - Integer pmfmId) { + protected SurveyMeasurement getSurveyMeasurement(FishingTrip fishingTrip, + Integer pmfmId) { SurveyMeasurement result = null; for (SurveyMeasurement vum : fishingTrip.getSurveyMeasurements()) { @@ -758,25 +766,39 @@ } } - if (result == null) { + return result; + } - // create new measurement - result = SurveyMeasurement.Factory.newInstance(); - result.setQualityFlag(load(QualityFlagImpl.class, enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED)); - result.setDepartment(fishingTrip.getRecorderDepartment()); - Pmfm pmfm = load(PmfmImpl.class, pmfmId); - result.setPmfm(pmfm); - result.setFishingTrip(fishingTrip); + protected SurveyMeasurement createSurveyMeasurement(FishingTrip fishingTrip, + Integer pmfmId, + Float numericalValue, + String alphanumericalValue, + Integer qualitativevalueId) { - // add it to fishingTrip - if (fishingTrip.getSurveyMeasurements() == null) { + SurveyMeasurement result = SurveyMeasurement.Factory.newInstance(); + result.setQualityFlag(load(QualityFlagImpl.class, enumeration.QUALITY_FLAG_CODE_NOT_QUALIFIED)); + result.setDepartment(fishingTrip.getRecorderDepartment()); + Pmfm pmfm = load(PmfmImpl.class, pmfmId); + result.setPmfm(pmfm); + result.setFishingTrip(fishingTrip); - //create new set of measurements - fishingTrip.setSurveyMeasurements(Sets.<SurveyMeasurement>newHashSet()); - } + if (alphanumericalValue != null) { + result.setAlphanumericalValue(alphanumericalValue); + } else if (numericalValue != null) { + result.setNumericalValue(numericalValue); + } else if (qualitativevalueId != null) { + result.setQualitativeValue(load(QualitativeValueImpl.class, qualitativevalueId)); + } - fishingTrip.getSurveyMeasurements().add(result); + // add it to fishingTrip + if (fishingTrip.getSurveyMeasurements() == null) { + + //create new set of measurements + fishingTrip.setSurveyMeasurements(Sets.<SurveyMeasurement>newHashSet()); } + + fishingTrip.getSurveyMeasurements().add(result); + return result; } @@ -785,16 +807,30 @@ Float numericalValue, String alphanumericalValue, Integer qualitativevalueId) { - SurveyMeasurement result = getOrCreateSurveyMeasurement(fishingTrip, pmfmId); + SurveyMeasurement result = getSurveyMeasurement(fishingTrip, pmfmId); - if (alphanumericalValue != null) { - result.setAlphanumericalValue(alphanumericalValue); - } else if (numericalValue != null) { - result.setNumericalValue(numericalValue); - } else if (qualitativevalueId != null) { - result.setQualitativeValue(load(QualitativeValueImpl.class, qualitativevalueId)); + if (result == null) { + result = createSurveyMeasurement(fishingTrip, + pmfmId, + numericalValue, + alphanumericalValue, + qualitativevalueId); } return result; } + + protected SurveyMeasurement removeSurveyMeasurement(FishingTrip fishingTrip, + Integer pmfmId) { + SurveyMeasurement result = getSurveyMeasurement(fishingTrip, pmfmId); + + if (result != null) { + + // measurement found, remove it + result.setFishingTrip(null); + fishingTrip.getSurveyMeasurements().remove(result); + } + + return result; + } } Modified: trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties =================================================================== --- trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2014-04-19 13:24:36 UTC (rev 1710) +++ trunk/tutti-ui-swing/src/main/filtered-resources/tutti-help-fr.properties 2014-04-19 13:25:21 UTC (rev 1711) @@ -1,5 +1,5 @@ #Generated by org.nuiton.jaxx.plugin.GenerateHelpIdsMojo -#Fri Apr 18 09:21:37 CEST 2014 +#Sat Apr 19 15:02:16 CEST 2014 tutti.config.help=config.html tutti.createAccidentalBatch.action.cancel.help=editFishingOperation.html\#captureCapturesAccidentellesActions tutti.createAccidentalBatch.action.saveAndClose.help=editFishingOperation.html\#captureCapturesAccidentellesActions @@ -143,6 +143,7 @@ tutti.editCruise.action.close.help=editCruise.html\#actions tutti.editCruise.action.editGearCaracteristics.help=editCruise.html\#actions tutti.editCruise.action.generateName.help=editCruise.html\#actions +tutti.editCruise.action.resetSurveyPart.help=editCruise.html\#actions tutti.editCruise.action.save.help=editCruise.html\#actions tutti.editCruise.action.viewGearCaracteristics.help= tutti.editCruise.field.beginDate.help=editCruise.html\#fields Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2014-04-19 13:24:36 UTC (rev 1710) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.css 2014-04-19 13:25:21 UTC (rev 1711) @@ -22,6 +22,12 @@ * #L% */ +JToolBar { + floatable: false; + opaque: false; + borderPainted: false; +} + BeanFilterableComboBox { showReset: true; bean: {model}; @@ -284,6 +290,13 @@ _validatorLabel: {t("tutti.editCruise.field.comment")}; } +#surveyPartResetButton { + actionIcon: reset; + toolTipText: "tutti.editCruise.action.resetSurveyPart.tip"; + i18nMnemonic: "tutti.editCruise.action.resetSurveyPart.mnemonic"; + _help: {"tutti.editCruise.action.resetSurveyPart.help"}; +} + #saveButton { actionIcon: save; text: "tutti.editCruise.action.saveCruise"; Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2014-04-19 13:24:36 UTC (rev 1710) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/EditCruiseUI.jaxx 2014-04-19 13:25:21 UTC (rev 1711) @@ -113,8 +113,14 @@ <JLabel id='surveyPartLabel'/> </cell> <cell> - <JTextField id='surveyPartField' - onKeyReleased='handler.setText(event, "surveyPart")'/> + <JPanel layout="{new BorderLayout()}"> + <JToolBar constraints="BorderLayout.WEST"> + <JButton id='surveyPartResetButton' + onActionPerformed="model.setSurveyPart(null)"/> + </JToolBar> + <JTextField id='surveyPartField' constraints="BorderLayout.CENTER" + onKeyReleased='handler.setText(event, "surveyPart")'/> + </JPanel> </cell> </row> @@ -133,8 +139,8 @@ </cell> <cell> <JPanel layout="{new BorderLayout()}"> - <JXDatePicker id='beginDateField' constraints="BorderLayout.CENTER" - onActionPerformed='handler.setDate(event, "beginDate")'/> + <JXDatePicker id='beginDateField' constraints="BorderLayout.CENTER" + onActionPerformed='handler.setDate(event, "beginDate")'/> <SimpleTimeEditor id='beginTimeField' constraints="BorderLayout.EAST" constructorParams='this'/> </JPanel> 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 2014-04-19 13:24:36 UTC (rev 1710) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties 2014-04-19 13:25:21 UTC (rev 1711) @@ -600,6 +600,8 @@ tutti.editCruise.action.generateCampaignName= tutti.editCruise.action.generateCampaignName.mnemonic= tutti.editCruise.action.generateName.tip= +tutti.editCruise.action.resetSurveyPart.mnemonic=S +tutti.editCruise.action.resetSurveyPart.tip=Reset survey part tutti.editCruise.action.save.gearChanged.help= tutti.editCruise.action.save.gearChanged.message= tutti.editCruise.action.save.gearChanged.title= 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 2014-04-19 13:24:36 UTC (rev 1710) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2014-04-19 13:25:21 UTC (rev 1711) @@ -591,6 +591,8 @@ tutti.editCruise.action.generateCampaignName=Générer le nom tutti.editCruise.action.generateCampaignName.mnemonic=G tutti.editCruise.action.generateName.tip=Générer le nom normalisé de la campagne +tutti.editCruise.action.resetSurveyPart.mnemonic=S +tutti.editCruise.action.resetSurveyPart.tip=Réinitialiser la série partielle tutti.editCruise.action.save.gearChanged.help=Les engins des traits de la campagne vont également être modifiés.<ul><li><strong>Annuler</strong> pour ne pas enregistrer les modifications de la campagne ni les traits</li><li><strong>OK</strong> pour enregistrer la campagne et modifier les engins des traits</li></ul>. tutti.editCruise.action.save.gearChanged.message=Les engins de la campagne ont été modifiés. tutti.editCruise.action.save.gearChanged.title=Engin(s) modifié(s)

1 0

r1710 - trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro
by tchemit＠users.forge.codelutin.com April 19, 2014

April 19, 2014

Author: tchemit Date: 2014-04-19 15:24:36 +0200 (Sat, 19 Apr 2014) New Revision: 1710 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1710 Log: refs-90 #4977 Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-04-18 15:37:53 UTC (rev 1709) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroServiceImpl.java 2014-04-19 13:24:36 UTC (rev 1710) @@ -294,6 +294,9 @@ } catch (SQLException e1) { // ignore the rolback error + if (log.isErrorEnabled()) { + log.error(e1); + } } result.setError(e); } finally { @@ -533,11 +536,11 @@ * </ul> * In that way we will only perform some insert queries. * - * @param dbMetas + * @param dbMetas metas of the db to synch * @param localDao connection on the local db * @param remoteDao connection on the local db * @param incomingData data to update from the remote db - * @param extraTask + * @param extraTask extra task to perform while synchronizing the table * @param result where to store operation results @throws SQLException if any sql errors */ protected void updateBigTable(ReferentialSynchroDatabaseMetadata dbMetas, Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-18 15:37:53 UTC (rev 1709) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-19 13:24:36 UTC (rev 1710) @@ -112,6 +112,27 @@ //ORDER ORDER_ITEM, + //PROGRAM (since 3.3.5) + PROGRAM, + PROGRAM2LOCATION, + PROGRAM2LOCATION_CLASSIF, + + //STRATEGY (since 3.5) + ACQUISITION_LEVEL, + PROGRAM_PRIVILEGE, + PROGRAM2DEPARTMENT, + PROGRAM2PERSON_EXCEPTION, + PROGRAM2PERSON, + STRATEGY, + STRATEGY2MANAGER_PERSON, + PMFM_APPLIED_STRATEGY, + APPLIED_STRATEGY, + PMFM_STRATEGY, + REFERENCE_TAXON_STRATEGY, + STRATEGY2GEAR, + //FIXME-tchemit-2014-04-19 This table fails to update +// APPLIED_PERIOD, + //OTHER PRECISION_TYPE, NUMERICAL_PRECISION,

1 0

[ANN] - Tutti 3.3.5 released
by codelutin.com Release Notification April 18, 2014

April 18, 2014

The Tutti team is pleased to announce the tutti-3.3.5 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: https://doc.codelutin.com/projects/tutti Changes ------- Changes in this version include: New features: o [Référentiel] Contenu de la table Program non synchronisé Issue: 4975. Thanks to Tony Chemit. Resolved by tchemit. Downloads --------- For a manual installation, you can download files here: http://forge.codelutin.com/projects/tutti/files * tutti-ichtyometer-3.3.5-tools.zip - http://forge.codelutin.com/attachments/download/1752 Maven artifacts --------------- Artifacts are deployed in nuiton maven repository http://maven.nuiton.org/other-releases/ Have fun! -Tutti team

1 0

r1709 - in branches/tutti-3.3.x: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 17:37:53 +0200 (Fri, 18 Apr 2014) New Revision: 1709 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1709 Log: [maven-release-plugin] prepare for next development iteration Modified: branches/tutti-3.3.x/pom.xml branches/tutti-3.3.x/tutti-ichtyometer/pom.xml branches/tutti-3.3.x/tutti-persistence/pom.xml branches/tutti-3.3.x/tutti-service/pom.xml branches/tutti-3.3.x/tutti-ui-swing/pom.xml Modified: branches/tutti-3.3.x/pom.xml =================================================================== --- branches/tutti-3.3.x/pom.xml 2014-04-18 15:37:45 UTC (rev 1708) +++ branches/tutti-3.3.x/pom.xml 2014-04-18 15:37:53 UTC (rev 1709) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5</version> + <version>3.3.6-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.5 + https://forge.codelutin.com/projects/tutti/repository/branches/tutti-3.3.x </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.5 + scm:svn:http://svn.codelutin.com/tutti/branches/tutti-3.3.x </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.5 + scm:svn:https://svn.codelutin.com/tutti/branches/tutti-3.3.x </developerConnection> </scm> <distributionManagement> Modified: branches/tutti-3.3.x/tutti-ichtyometer/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-ichtyometer/pom.xml 2014-04-18 15:37:45 UTC (rev 1708) +++ branches/tutti-3.3.x/tutti-ichtyometer/pom.xml 2014-04-18 15:37:53 UTC (rev 1709) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5</version> + <version>3.3.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-persistence/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-persistence/pom.xml 2014-04-18 15:37:45 UTC (rev 1708) +++ branches/tutti-3.3.x/tutti-persistence/pom.xml 2014-04-18 15:37:53 UTC (rev 1709) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5</version> + <version>3.3.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-service/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-service/pom.xml 2014-04-18 15:37:45 UTC (rev 1708) +++ branches/tutti-3.3.x/tutti-service/pom.xml 2014-04-18 15:37:53 UTC (rev 1709) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5</version> + <version>3.3.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-ui-swing/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-ui-swing/pom.xml 2014-04-18 15:37:45 UTC (rev 1708) +++ branches/tutti-3.3.x/tutti-ui-swing/pom.xml 2014-04-18 15:37:53 UTC (rev 1709) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5</version> + <version>3.3.6-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1708 - tags
by maven-release＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 17:37:45 +0200 (Fri, 18 Apr 2014) New Revision: 1708 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1708 Log: [maven-release-plugin] copy for tag tutti-3.3.5 Added: tags/tutti-3.3.5/

1 0

r1707 - in branches/tutti-3.3.x: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 17:37:38 +0200 (Fri, 18 Apr 2014) New Revision: 1707 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1707 Log: [maven-release-plugin] prepare release tutti-3.3.5 Modified: branches/tutti-3.3.x/pom.xml branches/tutti-3.3.x/tutti-ichtyometer/pom.xml branches/tutti-3.3.x/tutti-persistence/pom.xml branches/tutti-3.3.x/tutti-service/pom.xml branches/tutti-3.3.x/tutti-ui-swing/pom.xml Modified: branches/tutti-3.3.x/pom.xml =================================================================== --- branches/tutti-3.3.x/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) +++ branches/tutti-3.3.x/pom.xml 2014-04-18 15:37:38 UTC (rev 1707) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5-SNAPSHOT</version> + <version>3.3.5</version> <packaging>pom</packaging> <name>Tutti</name> @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/branches/tutti-3.3.x + https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.5 </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/branches/tutti-3.3.x + scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.5 </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/branches/tutti-3.3.x + scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.5 </developerConnection> </scm> <distributionManagement> Modified: branches/tutti-3.3.x/tutti-ichtyometer/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-ichtyometer/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) +++ branches/tutti-3.3.x/tutti-ichtyometer/pom.xml 2014-04-18 15:37:38 UTC (rev 1707) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5-SNAPSHOT</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-persistence/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-persistence/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) +++ branches/tutti-3.3.x/tutti-persistence/pom.xml 2014-04-18 15:37:38 UTC (rev 1707) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5-SNAPSHOT</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-service/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-service/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) +++ branches/tutti-3.3.x/tutti-service/pom.xml 2014-04-18 15:37:38 UTC (rev 1707) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5-SNAPSHOT</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-ui-swing/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-ui-swing/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) +++ branches/tutti-3.3.x/tutti-ui-swing/pom.xml 2014-04-18 15:37:38 UTC (rev 1707) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.5-SNAPSHOT</version> + <version>3.3.5</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1706 - in branches/tutti-3.3.x: . tutti-ichtyometer tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 17:33:37 +0200 (Fri, 18 Apr 2014) New Revision: 1706 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1706 Log: use snapshot version for release Modified: branches/tutti-3.3.x/pom.xml branches/tutti-3.3.x/tutti-ichtyometer/pom.xml branches/tutti-3.3.x/tutti-persistence/pom.xml branches/tutti-3.3.x/tutti-service/pom.xml branches/tutti-3.3.x/tutti-ui-swing/pom.xml Modified: branches/tutti-3.3.x/pom.xml =================================================================== --- branches/tutti-3.3.x/pom.xml 2014-04-18 15:32:04 UTC (rev 1705) +++ branches/tutti-3.3.x/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) @@ -32,7 +32,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.4</version> + <version>3.3.5-SNAPSHOT</version> <packaging>pom</packaging> <name>Tutti</name> Modified: branches/tutti-3.3.x/tutti-ichtyometer/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-ichtyometer/pom.xml 2014-04-18 15:32:04 UTC (rev 1705) +++ branches/tutti-3.3.x/tutti-ichtyometer/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.4</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-persistence/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-persistence/pom.xml 2014-04-18 15:32:04 UTC (rev 1705) +++ branches/tutti-3.3.x/tutti-persistence/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.4</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-service/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-service/pom.xml 2014-04-18 15:32:04 UTC (rev 1705) +++ branches/tutti-3.3.x/tutti-service/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.4</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: branches/tutti-3.3.x/tutti-ui-swing/pom.xml =================================================================== --- branches/tutti-3.3.x/tutti-ui-swing/pom.xml 2014-04-18 15:32:04 UTC (rev 1705) +++ branches/tutti-3.3.x/tutti-ui-swing/pom.xml 2014-04-18 15:33:37 UTC (rev 1706) @@ -27,7 +27,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>3.3.4</version> + <version>3.3.5-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r1705 - in branches/tutti-3.3.x: . tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro
by maven-release＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: maven-release Date: 2014-04-18 17:32:04 +0200 (Fri, 18 Apr 2014) New Revision: 1705 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1705 Log: fix scm + add comment (refs #4975) Modified: branches/tutti-3.3.x/pom.xml branches/tutti-3.3.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java Modified: branches/tutti-3.3.x/pom.xml =================================================================== --- branches/tutti-3.3.x/pom.xml 2014-04-18 15:29:35 UTC (rev 1704) +++ branches/tutti-3.3.x/pom.xml 2014-04-18 15:32:04 UTC (rev 1705) @@ -99,13 +99,13 @@ <scm> <url> - https://forge.codelutin.com/projects/tutti/repository/tags/tutti-3.3.4 + https://forge.codelutin.com/projects/tutti/repository/branches/tutti-3.3.x </url> <connection> - scm:svn:http://svn.codelutin.com/tutti/tags/tutti-3.3.4 + scm:svn:http://svn.codelutin.com/tutti/branches/tutti-3.3.x </connection> <developerConnection> - scm:svn:https://svn.codelutin.com/tutti/tags/tutti-3.3.4 + scm:svn:https://svn.codelutin.com/tutti/branches/tutti-3.3.x </developerConnection> </scm> <distributionManagement> Modified: branches/tutti-3.3.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java =================================================================== --- branches/tutti-3.3.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-18 15:29:35 UTC (rev 1704) +++ branches/tutti-3.3.x/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-18 15:32:04 UTC (rev 1705) @@ -112,7 +112,7 @@ //ORDER ORDER_ITEM, - //PROGRAM + //PROGRAM (since 3.3.5) PROGRAM, PROGRAM2LOCATION, PROGRAM2LOCATION_CLASSIF,

1 0

r1704 - tags/tutti-3.3.4/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro
by tchemit＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: tchemit Date: 2014-04-18 17:29:35 +0200 (Fri, 18 Apr 2014) New Revision: 1704 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1704 Log: refs remove from tag Modified: tags/tutti-3.3.4/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java Modified: tags/tutti-3.3.4/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java =================================================================== --- tags/tutti-3.3.4/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-18 15:28:37 UTC (rev 1703) +++ tags/tutti-3.3.4/tutti-persistence/src/main/java/fr/ifremer/adagio/core/service/technical/synchro/ReferentialSynchroTable.java 2014-04-18 15:29:35 UTC (rev 1704) @@ -112,11 +112,6 @@ //ORDER ORDER_ITEM, - //PROGRAM - PROGRAM, - PROGRAM2LOCATION, - PROGRAM2LOCATION_CLASSIF, - //OTHER PRECISION_TYPE, NUMERICAL_PRECISION,

1 0

r1703 - branches
by tchemit＠users.forge.codelutin.com April 18, 2014

April 18, 2014

Author: tchemit Date: 2014-04-18 17:28:37 +0200 (Fri, 18 Apr 2014) New Revision: 1703 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1703 Log: 3.3.x maintain branche Added: branches/tutti-3.3.x/

1 0