Author: athimel Date: 2014-07-11 15:27:33 +0200 (Fri, 11 Jul 2014) New Revision: 3851 Url: http://forge.chorem.org/projects/lima/repository/revisions/3851 Log: upgrade versions (mavenpom, eugene, topia, openEJB, pdfbox, nuiton-csv) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java trunk/pom.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2014-07-11 13:19:35 UTC (rev 3850) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/DatabaseMigrationClass.java 2014-07-11 13:27:33 UTC (rev 3851) @@ -24,20 +24,13 @@ */ package org.chorem.lima.business.migration; -import org.chorem.lima.entity.LimaCallaoTopiaPersistenceContext; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; -import org.nuiton.topia.persistence.TopiaApplicationContext; -import org.nuiton.topia.persistence.TopiaMigrationService; -import org.nuiton.topia.persistence.TopiaMigrationServiceException; -import org.nuiton.topia.persistence.TopiaService; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.Version; import java.util.List; -import java.util.Map; import java.util.Set; -public class DatabaseMigrationClass extends TopiaMigrationCallbackByClassNG<LimaCallaoTopiaPersistenceContext> { +public class DatabaseMigrationClass extends TopiaMigrationCallbackByClassNG { protected static final Version VERSION_0_5 = new Version("0.5"); protected static final Version VERSION_0_6 = new Version("0.6"); @@ -53,11 +46,6 @@ return false; } - @Override - protected TopiaSqlSupport getSqlSupport(LimaCallaoTopiaPersistenceContext limaCallaoTopiaPersistenceContext) { - return null; - } - static class MigrationResolver implements MigrationCallBackForVersionResolver { @Override Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2014-07-11 13:19:35 UTC (rev 3850) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0V0_5.java 2014-07-11 13:27:33 UTC (rev 3851) @@ -26,7 +26,7 @@ import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG.MigrationCallBackForVersion; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.Version; import java.util.List; @@ -37,7 +37,7 @@ } @Override - protected void prepareMigrationScript(TopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List queries, boolean showSql, boolean showProgression) throws TopiaException { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2014-07-11 13:19:35 UTC (rev 3850) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_6.java 2014-07-11 13:27:33 UTC (rev 3851) @@ -27,10 +27,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.Version; @@ -52,7 +51,7 @@ } @Override - protected void prepareMigrationScript(TopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List queries, boolean showSql, boolean showProgression) throws TopiaException { Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java 2014-07-11 13:19:35 UTC (rev 3850) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/migration/MigrationV0_8.java 2014-07-11 13:27:33 UTC (rev 3851) @@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.migration.TopiaMigrationCallbackByClassNG; import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.persistence.TopiaPersistenceContext; +import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.Version; import java.util.List; @@ -47,7 +47,7 @@ } @Override - protected void prepareMigrationScript(TopiaPersistenceContext tx, + protected void prepareMigrationScript(TopiaSqlSupport sqlSupport, List queries, boolean showSql, boolean showProgression) throws TopiaException { Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java 2014-07-11 13:19:35 UTC (rev 3850) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/LimaCallaoTopiaPersistenceContext.java 2014-07-11 13:27:33 UTC (rev 3851) @@ -28,8 +28,8 @@ import org.nuiton.topia.persistence.TopiaIdFactory; import org.nuiton.topia.persistence.internal.HibernateProvider; import org.nuiton.topia.persistence.internal.TopiaHibernateSessionRegistry; +import org.nuiton.topia.persistence.internal.support.TopiaFiresSupport; import org.nuiton.topia.persistence.support.TopiaHibernateSupport; -import org.nuiton.topia.persistence.support.TopiaListenableSupport; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.topia.persistence.support.TopiaSqlWork; @@ -38,8 +38,8 @@ public class LimaCallaoTopiaPersistenceContext extends AbstractLimaCallaoTopiaPersistenceContext implements TopiaHibernateSupport, TopiaSqlSupport { - public LimaCallaoTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaListenableSupport listenableSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { - super(hibernateProvider, listenableSupport, topiaIdFactory, sessionRegistry); + public LimaCallaoTopiaPersistenceContext(HibernateProvider hibernateProvider, TopiaFiresSupport applicationFiresSupport, TopiaIdFactory topiaIdFactory, TopiaHibernateSessionRegistry sessionRegistry) { + super(hibernateProvider, applicationFiresSupport, topiaIdFactory, sessionRegistry); } @Override Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-07-11 13:19:35 UTC (rev 3850) +++ trunk/pom.xml 2014-07-11 13:27:33 UTC (rev 3851) @@ -5,7 +5,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>5.0.7</version> + <version>5.0.9</version> </parent> <groupId>org.chorem</groupId> @@ -176,15 +176,15 @@ <nuitonConfigVersion>3.0-alpha-2</nuitonConfigVersion> <nuitonDecoratorVersion>3.0-alpha-3</nuitonDecoratorVersion> <nuitonProfilingVersion>2.7.1</nuitonProfilingVersion> - <nuitonCsvVersion>3.0-rc-1</nuitonCsvVersion> - <eugeneVersion>2.10</eugeneVersion> + <nuitonCsvVersion>3.0-rc-2</nuitonCsvVersion> + <eugeneVersion>2.12-SNAPSHOT</eugeneVersion> <nuitonI18nVersion>3.1</nuitonI18nVersion> - <topiaVersion>3.0-beta-5</topiaVersion> + <topiaVersion>3.0-SNAPSHOT</topiaVersion> <swinglabsVersion>3.0.4</swinglabsVersion> <h2Version>1.3.176</h2Version> <hibernateVersion>4.3.5.Final</hibernateVersion> - <openejbJavaeeApiVersion>6.0-5</openejbJavaeeApiVersion> + <openejbJavaeeApiVersion>6.0-6</openejbJavaeeApiVersion> <dom4jVersion>1.6.1</dom4jVersion> <jdomVersion>2.0.2</jdomVersion> <openCsvVersion>2.3</openCsvVersion> @@ -195,7 +195,7 @@ <openEjbVersion>4.6.0.2</openEjbVersion> <slf4jVersion>1.7.7</slf4jVersion> <swingxVersion>1.6.5-1</swingxVersion> - <pdfboxVersion>1.8.5</pdfboxVersion> + <pdfboxVersion>1.8.6</pdfboxVersion> <jbossTransactionVersion>1.0.0.Final</jbossTransactionVersion> <commonsCodecVersion>1.9</commonsCodecVersion>