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

[tutti] branch develop updated (0fc43c7 -> cf6871e)
by codelutin.com scm 23 Aug '14

23 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 0fc43c7 Merge branch 'feature/5175' into develop new cf6871e fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cf6871e9c126957fb7cb78367f4f78f71237692b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 16:06:49 2014 +0200 fixes #5127: [BIGFIN] si mesure au mm, les mesures du big fin sont importées en cm sur le tableau Tutti Summary of changes: .../frequency/SpeciesFrequencyUIHandler.java | 33 ++++++++++++++++++---- .../species/frequency/SpeciesFrequencyUIModel.java | 8 ++++++ 2 files changed, 36 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 1

[tutti] branch develop updated (af10d2f -> 0fc43c7)
by codelutin.com scm 23 Aug '14

23 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from af10d2f Merge branch 'feature/updatesLibs' into develop new cb004aa updates libs (nuiton-converter) new f4198e8 fixes #5656: Les engins d'une campagne ne sont plus remontés new bbb6d03 fixes #5175: [EXPORT GENERIQUE] la numérotation des lots Hors vrac dans Num_Ordre_V_HV_H2 à partir de 1001 n'est pas active new 0fc43c7 Merge branch 'feature/5175' into develop The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0fc43c7d54add1d8934a2d287f1ecb77fa9f1e36 Merge: af10d2f bbb6d03 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 15:48:14 2014 +0200 Merge branch 'feature/5175' into develop commit bbb6d034e3b104e4eb4acb9297cee3fec93523bb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 15:42:50 2014 +0200 fixes #5175: [EXPORT GENERIQUE] la numérotation des lots Hors vrac dans Num_Ordre_V_HV_H2 à partir de 1001 n'est pas active commit f4198e89d2a276c6d85b3b1afd2486251dd769f4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 15:42:24 2014 +0200 fixes #5656: Les engins d'une campagne ne sont plus remontés commit cb004aaef6d2e8a5f052cb394041706d7981553b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 15:41:48 2014 +0200 updates libs (nuiton-converter) Summary of changes: pom.xml | 6 +++ tutti-persistence/pom.xml | 4 ++ .../data/SampleCategoryModelConverter.java | 7 ++- .../service/CruisePersistenceServiceImpl.java | 42 ++++++++--------- .../tutti/persistence/test/DatabaseResource.java | 3 +- ...verter => org.nuiton.converter.NuitonConverter} | 0 tutti-service/pom.xml | 4 ++ .../service/export/generic/CatchExportModel.java | 55 +++++++++++++++------- tutti-ui-swing/pom.xml | 4 ++ 9 files changed, 79 insertions(+), 46 deletions(-) rename tutti-persistence/src/main/resources/META-INF/services/{org.apache.commons.beanutils.Converter => org.nuiton.converter.NuitonConverter} (100%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3

[tutti] 01/04: updates libs (nuiton-converter)
by codelutin.com scm 23 Aug '14

23 Aug '14

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit cb004aaef6d2e8a5f052cb394041706d7981553b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 15:41:48 2014 +0200 updates libs (nuiton-converter) --- pom.xml | 6 ++++++ tutti-persistence/pom.xml | 4 ++++ .../persistence/entities/data/SampleCategoryModelConverter.java | 7 +++---- .../java/fr/ifremer/tutti/persistence/test/DatabaseResource.java | 3 +-- ...ns.beanutils.Converter => org.nuiton.converter.NuitonConverter} | 0 tutti-service/pom.xml | 4 ++++ tutti-ui-swing/pom.xml | 4 ++++ 7 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index 85cde34..fbf725a 100644 --- a/pom.xml +++ b/pom.xml @@ -140,6 +140,7 @@ <swingXVersion>1.6.4</swingXVersion> <slf4jVersion>1.7.6</slf4jVersion> <adagioVersion>3.6.2-SNAPSHOT</adagioVersion> +  <bluecoveVersion>2.1.0</bluecoveVersion> <hibernateVersion>4.3.1.Final</hibernateVersion> <springVersion>4.0.1.RELEASE</springVersion> @@ -250,6 +251,11 @@ <version>3.0-rc-4</version> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + <version>1.0</version> + </dependency> + <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> <version>${nuitonI18nVersion}</version> diff --git a/tutti-persistence/pom.xml b/tutti-persistence/pom.xml index 6f37fa4..696e622 100644 --- a/tutti-persistence/pom.xml +++ b/tutti-persistence/pom.xml @@ -100,6 +100,10 @@ <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency>  <dependency> diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java index d649000..3215d14 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/entities/data/SampleCategoryModelConverter.java @@ -24,11 +24,9 @@ package fr.ifremer.tutti.persistence.entities.data; import com.google.common.base.Preconditions; import com.google.common.collect.Lists; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModel; -import fr.ifremer.tutti.persistence.entities.data.SampleCategoryModelEntry; import org.apache.commons.beanutils.ConversionException; -import org.apache.commons.beanutils.Converter; import org.apache.commons.lang3.StringUtils; +import org.nuiton.converter.NuitonConverter; import java.util.List; @@ -42,7 +40,7 @@ import static org.nuiton.i18n.I18n.t; * @author tchemit <chemit(a)codelutin.com> * @since 2.4 */ -public class SampleCategoryModelConverter implements Converter { +public class SampleCategoryModelConverter implements NuitonConverter { @Override public Object convert(Class aClass, Object value) { @@ -86,6 +84,7 @@ public class SampleCategoryModelConverter implements Converter { return SampleCategoryModel.class.equals(aClass); } + @Override public Class<?> getType() { return SampleCategoryModel.class; } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java index 855c9cc..b96c6e6 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/test/DatabaseResource.java @@ -30,7 +30,6 @@ import com.google.common.collect.Sets; import com.google.common.io.Files; import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.TuttiConfigurationOption; -import fr.ifremer.tutti.persistence.TuttiPersistence; import fr.ifremer.tutti.persistence.entities.TuttiEntities; import fr.ifremer.tutti.persistence.service.TuttiPersistenceServiceLocator; import org.apache.commons.io.FileUtils; @@ -44,8 +43,8 @@ import org.junit.runner.Description; import org.junit.runner.notification.Failure; import org.junit.runners.model.Statement; import org.nuiton.config.ApplicationConfig; +import org.nuiton.converter.ConverterUtil; import org.nuiton.util.FileUtil; -import org.nuiton.util.converter.ConverterUtil; import java.io.BufferedReader; import java.io.BufferedWriter; diff --git a/tutti-persistence/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter b/tutti-persistence/src/main/resources/META-INF/services/org.nuiton.converter.NuitonConverter similarity index 100% rename from tutti-persistence/src/main/resources/META-INF/services/org.apache.commons.beanutils.Converter rename to tutti-persistence/src/main/resources/META-INF/services/org.nuiton.converter.NuitonConverter diff --git a/tutti-service/pom.xml b/tutti-service/pom.xml index 287987c..099a866 100644 --- a/tutti-service/pom.xml +++ b/tutti-service/pom.xml @@ -85,6 +85,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency>  <dependency> diff --git a/tutti-ui-swing/pom.xml b/tutti-ui-swing/pom.xml index 9e2e246..361eb76 100644 --- a/tutti-ui-swing/pom.xml +++ b/tutti-ui-swing/pom.xml @@ -146,6 +146,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-validator</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-converter</artifactId> + </dependency>  <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

[tutti] branch develop updated (4cfd7b8 -> af10d2f)
by codelutin.com scm 23 Aug '14

23 Aug '14

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 4cfd7b8 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 2559339 updates nuiton-config to 3.0-rc-1 updates nuiton-utils to 3.0-rc-5 updates adagio to 3.6.2-SNAPSHOT updates jaxx to 2.11-SNAPSHOT use new Version and Jaxx API new 7de707e use nuiton-updater, nuiton-utils snapshot + fix some deprecated codes new af10d2f Merge branch 'feature/updatesLibs' into develop The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit af10d2f5d5c2ac78d20b6f956524400eeae92bd8 Merge: 4cfd7b8 7de707e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 13:24:58 2014 +0200 Merge branch 'feature/updatesLibs' into develop commit 7de707e6a6054e0f7e4212d2fc47c87e081bb9eb Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 13:23:01 2014 +0200 use nuiton-updater, nuiton-utils snapshot + fix some deprecated codes commit 2559339caf4114a5714d2b2e1745d8cfec1a18b7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Aug 23 09:50:08 2014 +0200 updates nuiton-config to 3.0-rc-1 updates nuiton-utils to 3.0-rc-5 updates adagio to 3.6.2-SNAPSHOT updates jaxx to 2.11-SNAPSHOT use new Version and Jaxx API Summary of changes: pom.xml | 16 ++++++++-------- tutti-persistence/pom.xml | 1 + .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 2 +- .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../ifremer/tutti/persistence/TuttiPersistenceImpl.java | 2 +- .../tutti/persistence/TuttiPersistenceNoDbImpl.java | 2 +- .../service/AccidentalBatchPersistenceServiceImpl.java | 2 +- ...IndividualObservationBatchPersistenceServiceImpl.java | 2 +- .../service/ReferentialPersistenceServiceImpl.java | 2 +- .../persistence/service/TechnicalPersistenceService.java | 2 +- .../service/TechnicalPersistenceServiceImpl.java | 8 ++++---- .../service/util/MeasurementPersistenceHelper.java | 2 +- .../ifremer/tutti/persistence/test/DatabaseFixtures.java | 8 ++++---- .../src/main/xmi/tutti-persistence.properties | 7 +------ .../tutti/persistence/TuttiPersistenceWriteTest.java | 2 +- .../persistence/config/TuttiPersistenceConfigTest.java | 2 +- .../fr/ifremer/tutti/service/PersistenceService.java | 2 +- .../fr/ifremer/tutti/service/AbstractServiceTest.java | 3 +-- .../java/fr/ifremer/tutti/service/UpdateSchemaTest.java | 2 +- tutti-ui-swing/pom.xml | 7 ++++--- .../java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/ImportDbAction.java | 2 +- .../fr/ifremer/tutti/ui/swing/action/OpenDbAction.java | 2 +- .../tutti/ui/swing/content/db/DbManagerUIHandler.java | 2 +- .../tutti/ui/swing/content/home/SelectCruiseUI.css | 8 ++++---- 25 files changed, 44 insertions(+), 48 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 3