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@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> + <!--<adagioVersion>3.5.5</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> <!-- Commons --> <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@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> <!-- Guava --> <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> <!-- Guava --> <dependency> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.