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

r799 - in trunk: tutti-persistence/src/main/xmi tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation
by kmorin＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: kmorin Date: 2013-04-16 15:10:11 +0200 (Tue, 16 Apr 2013) New Revision: 799 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/799 Log: fixes #2316 [CAPTURES] - Observations individuelles - Erreur lors de la saisie du code de pr?\195?\169l?\195?\168vement pi?\195?\168ce calcifi?\195?\169e Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java Modified: trunk/tutti-persistence/src/main/xmi/tutti-persistence.zargo =================================================================== (Binary files differ) Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/AbstractTuttiBatchUIModel.java 2013-04-16 13:10:11 UTC (rev 799) @@ -45,14 +45,14 @@ private static final long serialVersionUID = 1L; /** - * Fishing Operation to prapagate to catches model. + * Fishing Operation to prapagate to operations model. * * @since 0.3 */ protected final Set<String> propagateProperties; /** - * Editing fishing catches model. + * Editing fishing operations model. * * @since 0.3 */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationAction.java 2013-04-16 13:10:11 UTC (rev 799) @@ -98,7 +98,7 @@ protected SaveFishingOperationAction saveFishingOperationAction; /** - * Delegate action to compute the weight of the catches. + * Delegate action to compute the weight of the operations. * * @since 1.1 */ Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/ComputeWeightsAction.java 2013-04-16 13:10:11 UTC (rev 799) @@ -33,6 +33,7 @@ import fr.ifremer.tutti.persistence.entities.data.MarineLitterBatch; import fr.ifremer.tutti.persistence.entities.data.SortedUnsortedEnum; import fr.ifremer.tutti.persistence.entities.data.SpeciesBatch; +import fr.ifremer.tutti.service.catches.TuttiWeightComputingException; import fr.ifremer.tutti.service.catches.TuttiWeightComputingService; import fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.BenthosBatchRowModel; import fr.ifremer.tutti.ui.swing.content.operation.catches.species.SpeciesBatchRowModel; @@ -65,10 +66,23 @@ tuttiWeightComputingService.getComputedSpeciesBatches(model.getFishingOperation()); Float totalSpeciesSortedWeight = computeSpeciesBatches(computedSpeciesBatches); - BatchContainer<BenthosBatch> computedBenthosBatches = - tuttiWeightComputingService.getComputedBenthosBatches(model.getFishingOperation()); - Float totalBenthosSortedWeight = computeBenthosBatches(computedBenthosBatches); + BatchContainer<BenthosBatch> computedBenthosBatches; + Float totalBenthosSortedWeight; + int rowIndex = 0; + try { + computedBenthosBatches = + tuttiWeightComputingService.getComputedBenthosBatches(model.getFishingOperation()); + totalBenthosSortedWeight = computeBenthosBatches(computedBenthosBatches); + } catch (TuttiWeightComputingException e) { + rowIndex = e.getIndex(); + throw e; + + } finally { + getUI().getTabPane().setSelectedIndex(2); + AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); + } + BatchContainer<MarineLitterBatch> computedMarineLitterBatches = tuttiWeightComputingService.getComputedMarineLitterBatches(model.getFishingOperation()); Float totalMarineLitterWeight = computeMarineLitterBatches(computedMarineLitterBatches); @@ -189,11 +203,6 @@ Float weight = row.getSortedUnsortedCategoryWeight(); if (weight == null) { weight = row.getSortedUnsortedCategoryComputedWeight(); - } - if (weight == null) { - getUI().getTabPane().setSelectedIndex(2); - AbstractSelectTableAction.doSelectCell(getUI().getBenthosTabContent().getTable(), rowIndex, 1); - throw new TuttiBusinessException(_("tutti.editCatchBatch.action.computeWeights.error.noWeight")); } else if (SortedUnsortedEnum.SORTED.matchValue( row.getSortedUnsortedCategoryValue())) { Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-16 10:20:24 UTC (rev 798) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchRowModel.java 2013-04-16 13:10:11 UTC (rev 799) @@ -174,12 +174,12 @@ } @Override - public Integer getCalcifiedPieceSamplingCode() { + public String getCalcifiedPieceSamplingCode() { return editObject.getCalcifiedPieceSamplingCode(); } @Override - public void setCalcifiedPieceSamplingCode(Integer calcifiedPieceSamplingCode) { + public void setCalcifiedPieceSamplingCode(String calcifiedPieceSamplingCode) { Object oldValue = getCalcifiedPieceSamplingCode(); editObject.setCalcifiedPieceSamplingCode(calcifiedPieceSamplingCode); firePropertyChange(PROPERTY_CALCIFIED_PIECE_SAMPLING_CODE, oldValue, calcifiedPieceSamplingCode);

1 0

r798 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: tchemit Date: 2013-04-16 12:20:24 +0200 (Tue, 16 Apr 2013) New Revision: 798 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/798 Log: back to version 2.0-SNAPSHOT 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-04-16 10:03:43 UTC (rev 797) +++ trunk/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> <modules> <module>tutti-persistence</module> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:03:43 UTC (rev 797) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:03:43 UTC (rev 797) +++ trunk/tutti-service/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:43 UTC (rev 797) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:20:24 UTC (rev 798) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.2-SNAPSHOT</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r797 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 12:03:43 +0200 (Tue, 16 Apr 2013) New Revision: 797 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/797 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-04-16 10:03:35 UTC (rev 796) +++ trunk/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:03:35 UTC (rev 796) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:03:35 UTC (rev 796) +++ trunk/tutti-service/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:35 UTC (rev 796) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:43 UTC (rev 797) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1</version> + <version>1.4.2-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r796 - tags
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 12:03:35 +0200 (Tue, 16 Apr 2013) New Revision: 796 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/796 Log: [maven-release-plugin] copy for tag tutti-1.4.1 Added: tags/tutti-1.4.1/

1 0

r795 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 12:03:26 +0200 (Tue, 16 Apr 2013) New Revision: 795 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/795 Log: [maven-release-plugin] prepare release tutti-1.4.1 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-04-16 10:01:51 UTC (rev 794) +++ trunk/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4.1 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:01:51 UTC (rev 794) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:01:51 UTC (rev 794) +++ trunk/tutti-service/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:01:51 UTC (rev 794) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:03:26 UTC (rev 795) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4.1-SNAPSHOT</version> + <version>1.4.1</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r794 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by tchemit＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: tchemit Date: 2013-04-16 12:01:51 +0200 (Tue, 16 Apr 2013) New Revision: 794 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/794 Log: prepare release 1.4.1 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-04-16 10:01:18 UTC (rev 793) +++ trunk/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <modules> <module>tutti-persistence</module> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 10:01:18 UTC (rev 793) +++ trunk/tutti-persistence/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 10:01:18 UTC (rev 793) +++ trunk/tutti-service/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 10:01:18 UTC (rev 793) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 10:01:51 UTC (rev 794) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>2.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r793 - trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service
by tchemit＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: tchemit Date: 2013-04-16 12:01:18 +0200 (Tue, 16 Apr 2013) New Revision: 793 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/793 Log: fixes #2297: [TRAIT] erreur ?\195?\160 la cr?\195?\169ation d'un premier trait sur une nouvelle campagne Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-04-16 07:32:28 UTC (rev 792) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java 2013-04-16 10:01:18 UTC (rev 793) @@ -26,7 +26,6 @@ import com.google.common.base.Preconditions; -import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Sets; import fr.ifremer.adagio.core.dao.data.batch.Batch; @@ -403,7 +402,7 @@ { if (batch.getChildBatchs() == null) { - batch.setChildBatchs(Lists.<Batch>newArrayList()); + batch.setChildBatchs(Sets.<Batch>newHashSet()); } Map<Integer, SortingBatch> batchChilds = getChildsMap(batch, enumeration.PMFM_ID_SORTING_TYPE); @@ -430,7 +429,7 @@ { if (speciesBatch.getChildBatchs() == null) { - speciesBatch.setChildBatchs(Lists.<Batch>newArrayList()); + speciesBatch.setChildBatchs(Sets.<Batch>newHashSet()); } Map<Integer, SortingBatch> speciesBatchChilds = getChildsMap(speciesBatch, enumeration.PMFM_ID_SORTING_TYPE_2); @@ -519,7 +518,7 @@ { if (benthosBatch.getChildBatchs() == null) { - benthosBatch.setChildBatchs(Lists.<Batch>newArrayList()); + benthosBatch.setChildBatchs(Sets.<Batch>newHashSet()); } Map<Integer, SortingBatch> benthosBatchChilds = getChildsMap(benthosBatch, enumeration.PMFM_ID_SORTING_TYPE_2); @@ -610,7 +609,9 @@ { Map<Integer, SortingBatch> batchChilds = getChildsMap(batch, enumeration.PMFM_ID_SORTING_TYPE); - batch.setChildBatchs(Lists.<Batch>newArrayList()); + if (batch.getChildBatchs() == null) { + batch.setChildBatchs(Sets.<Batch>newHashSet()); + } // ----------------------------------------------------------------------------- // Hors Vrac > Species // ----------------------------------------------------------------------------- @@ -619,11 +620,6 @@ if (speciesBatch == null) { speciesBatch = SortingBatch.Factory.newInstance(); batch.getChildBatchs().add(speciesBatch); -// if (batch.getChildBatchs() == null) { -// batch.setChildBatchs(Lists.newArrayList((Batch) speciesBatch)); -// } else { -// batch.getChildBatchs().add(speciesBatch); -// } } beanToEntitySortingBatch(target, batch,

1 0

r792 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 09:32:28 +0200 (Tue, 16 Apr 2013) New Revision: 792 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/792 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-04-16 07:32:19 UTC (rev 791) +++ trunk/pom.xml 2013-04-16 07:32:28 UTC (rev 792) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4</version> + <version>2.0-SNAPSHOT</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4</url> + <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4 + scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 07:32:19 UTC (rev 791) +++ trunk/tutti-persistence/pom.xml 2013-04-16 07:32:28 UTC (rev 792) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 07:32:19 UTC (rev 791) +++ trunk/tutti-service/pom.xml 2013-04-16 07:32:28 UTC (rev 792) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 07:32:19 UTC (rev 791) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 07:32:28 UTC (rev 792) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4</version> + <version>2.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0

r791 - tags
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 09:32:19 +0200 (Tue, 16 Apr 2013) New Revision: 791 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/791 Log: [maven-release-plugin] copy for tag tutti-1.4 Added: tags/tutti-1.4/

1 0

r790 - in trunk: . tutti-persistence tutti-service tutti-ui-swing
by maven-release＠users.forge.codelutin.com 16 Apr '13

16 Apr '13

Author: maven-release Date: 2013-04-16 09:32:10 +0200 (Tue, 16 Apr 2013) New Revision: 790 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/790 Log: [maven-release-plugin] prepare release tutti-1.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-04-16 07:18:56 UTC (rev 789) +++ trunk/pom.xml 2013-04-16 07:32:10 UTC (rev 790) @@ -33,7 +33,7 @@ <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> <modules> <module>tutti-persistence</module> @@ -89,12 +89,12 @@ </developers> <scm> - <url>http://svn.forge.codelutin.com/svn/tutti/trunk</url> + <url>http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/tutti/trunk + scm:svn:http://svn.forge.codelutin.com/svn/tutti/tags/tutti-1.4 </developerConnection> </scm> Modified: trunk/tutti-persistence/pom.xml =================================================================== --- trunk/tutti-persistence/pom.xml 2013-04-16 07:18:56 UTC (rev 789) +++ trunk/tutti-persistence/pom.xml 2013-04-16 07:32:10 UTC (rev 790) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-service/pom.xml =================================================================== --- trunk/tutti-service/pom.xml 2013-04-16 07:18:56 UTC (rev 789) +++ trunk/tutti-service/pom.xml 2013-04-16 07:32:10 UTC (rev 790) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.tutti</groupId> Modified: trunk/tutti-ui-swing/pom.xml =================================================================== --- trunk/tutti-ui-swing/pom.xml 2013-04-16 07:18:56 UTC (rev 789) +++ trunk/tutti-ui-swing/pom.xml 2013-04-16 07:32:10 UTC (rev 790) @@ -28,7 +28,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>tutti</artifactId> - <version>1.4-SNAPSHOT</version> + <version>1.4</version> </parent> <groupId>fr.ifremer.tutti</groupId>

1 0