Author: tchemit Date: 2014-02-04 08:55:31 +0100 (Tue, 04 Feb 2014) New Revision: 2999 Url: http://nuiton.org/projects/topia/repository/revisions/2999 Log: refs #3048: Updates eugene to 2.7.4 refs #3044: updates nuiton-utils to 3.0 refs #3043: Updates I18N to 3.0 fixes #3042: updates commons-collection to 4 Modified: trunk/pom.xml trunk/src/site/site_fr.xml trunk/topia-persistence/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java trunk/topia-service-csv/pom.xml trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/TopiaCsvCommons.java trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java trunk/topia-templates/pom.xml trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/pom.xml 2014-02-04 07:55:31 UTC (rev 2999) @@ -234,11 +234,11 @@ <relativizeDecorationLinks>false</relativizeDecorationLinks> <!-- libs version --> - <eugeneVersion>2.7.3</eugeneVersion> - <nuitonUtilsVersion>3.0-rc-1</nuitonUtilsVersion> + <eugeneVersion>2.7.4-SNAPSHOT</eugeneVersion> + <nuitonUtilsVersion>3.0-SNAPSHOT</nuitonUtilsVersion> <nuitonCsvVersion>3.0-alpha-2</nuitonCsvVersion> <nuitonDecoratorVersion>3.0-alpha-2</nuitonDecoratorVersion> - <nuitonI18nVersion>2.5.2</nuitonI18nVersion> + <nuitonI18nVersion>3.0-SNAPSHOT</nuitonI18nVersion> <processorPluginVersion>1.3</processorPluginVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion> <hibernateVersion>4.2.8.Final</hibernateVersion> Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/src/site/site_fr.xml 2014-02-04 07:55:31 UTC (rev 2999) @@ -69,7 +69,7 @@ name="ReStructuredText" img="${mavenpomSiteCommonResourcesUrl}/images/logos/restructuredtext-logo.png"/> - <logo href="http://maven-site.nuiton.org/jrst" name="JRst" + <logo href="${mavenpomSiteCommonResourcesUrl}/jrst" name="JRst" img="${mavenpomSiteCommonResourcesUrl}/images/logos/jrst-logo.png"/> <logo href="http://argouml.tigris.org/" name="ArgoUML" Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-persistence/pom.xml 2014-02-04 07:55:31 UTC (rev 2999) @@ -59,8 +59,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/HqlAndParametersBuilder.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -28,7 +28,7 @@ import java.util.Map; import java.util.Set; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.text.WordUtils; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaApplicationContextCache.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -29,8 +29,8 @@ import java.util.Map; import java.util.Properties; -import org.apache.commons.collections.map.AbstractReferenceMap; -import org.apache.commons.collections.map.ReferenceMap; +import org.apache.commons.collections4.map.AbstractReferenceMap; +import org.apache.commons.collections4.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -54,8 +54,8 @@ * Cache that contains all some already registered caches */ protected static Map<Properties, TopiaApplicationContext> contextCache = - new ReferenceMap(AbstractReferenceMap.HARD, - AbstractReferenceMap.SOFT); + new ReferenceMap<Properties, TopiaApplicationContext>(AbstractReferenceMap.ReferenceStrength.HARD, + AbstractReferenceMap.ReferenceStrength.SOFT); /** * Static method that can provide an ApplicationContext. If the found context is closed, or if it does not exist, a Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/pager/TopiaPagerBean.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -24,7 +24,7 @@ * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.nuiton.util.PagerBean; import java.util.List; Modified: trunk/topia-service-csv/pom.xml =================================================================== --- trunk/topia-service-csv/pom.xml 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-service-csv/pom.xml 2014-02-04 07:55:31 UTC (rev 2999) @@ -81,8 +81,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> Modified: trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/TopiaCsvCommons.java =================================================================== --- trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/TopiaCsvCommons.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/TopiaCsvCommons.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -25,7 +25,7 @@ */ import com.google.common.collect.Lists; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java =================================================================== --- trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-service-csv/src/main/java/org/nuiton/topia/service/csv/out/ExportEntityVisitor.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntityVisitor; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/model/ReplicationModel.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -24,7 +24,7 @@ * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; Modified: trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java =================================================================== --- trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-service-replication/src/main/java/org/nuiton/topia/replication/operation/Duplicate.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -24,7 +24,7 @@ * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContext; Modified: trunk/topia-templates/pom.xml =================================================================== --- trunk/topia-templates/pom.xml 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-templates/pom.xml 2014-02-04 07:55:31 UTC (rev 2999) @@ -69,8 +69,8 @@ </dependency> <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> </dependency> <dependency> Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/BinderHelperTransformer.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -24,7 +24,7 @@ * #L% */ -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/EntityDaoTransformer.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -29,7 +29,7 @@ import com.google.common.base.Strings; import com.google.common.collect.Sets; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; Modified: trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-02-03 17:13:06 UTC (rev 2998) +++ trunk/topia-templates/src/main/java/org/nuiton/topia/templates/TopiaGeneratorUtil.java 2014-02-04 07:55:31 UTC (rev 2999) @@ -25,7 +25,7 @@ */ import com.google.common.base.Preconditions; -import org.apache.commons.collections.CollectionUtils; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;