November 2011 - Topia-commits - mailman.cloud.codelutin.com

r2384 - trunk
by maven-release＠users.nuiton.org Nov. 28, 2011

Nov. 28, 2011

Author: maven-release Date: 2011-11-28 23:21:56 +0100 (Mon, 28 Nov 2011) New Revision: 2384 Url: http://nuiton.org/repositories/revision/topia/2384 Log: Update mavenpom4redmineAndCentral to 3.0.6. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 16:18:07 UTC (rev 2383) +++ trunk/pom.xml 2011-11-28 22:21:56 UTC (rev 2384) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.5</version> + <version>3.0.6</version> </parent> <artifactId>topia</artifactId>

1 0

r2383 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org Nov. 13, 2011

Nov. 13, 2011

Author: maven-release Date: 2011-11-13 17:18:07 +0100 (Sun, 13 Nov 2011) New Revision: 2383 Url: http://nuiton.org/repositories/revision/topia/2383 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 16:18:06 UTC (rev 2382) +++ trunk/pom.xml 2011-11-13 16:18:07 UTC (rev 2383) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.4</version> + <version>2.6.5-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.4</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.4</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.4</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-11-13 16:18:06 UTC (rev 2382) +++ trunk/topia-persistence/pom.xml 2011-11-13 16:18:07 UTC (rev 2383) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4</version> + <version>2.6.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-11-13 16:18:06 UTC (rev 2382) +++ trunk/topia-service-migration/pom.xml 2011-11-13 16:18:07 UTC (rev 2383) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4</version> + <version>2.6.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-11-13 16:18:06 UTC (rev 2382) +++ trunk/topia-service-replication/pom.xml 2011-11-13 16:18:07 UTC (rev 2383) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4</version> + <version>2.6.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-11-13 16:18:06 UTC (rev 2382) +++ trunk/topia-service-security/pom.xml 2011-11-13 16:18:07 UTC (rev 2383) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4</version> + <version>2.6.5-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2382 - in tags: . topia-2.6.4
by maven-release＠users.nuiton.org Nov. 13, 2011

Nov. 13, 2011

Author: maven-release Date: 2011-11-13 17:18:06 +0100 (Sun, 13 Nov 2011) New Revision: 2382 Url: http://nuiton.org/repositories/revision/topia/2382 Log: [maven-release-plugin] copy for tag topia-2.6.4 Added: tags/topia-2.6.4/ Property changes on: tags/topia-2.6.4 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2381 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org Nov. 13, 2011

Nov. 13, 2011

Author: maven-release Date: 2011-11-13 17:18:04 +0100 (Sun, 13 Nov 2011) New Revision: 2381 Url: http://nuiton.org/repositories/revision/topia/2381 Log: [maven-release-plugin] prepare release topia-2.6.4 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 16:12:50 UTC (rev 2380) +++ trunk/pom.xml 2011-11-13 16:18:04 UTC (rev 2381) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.4-SNAPSHOT</version> + <version>2.6.4</version> <modules> <module>topia-persistence</module> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.4</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.4</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.4</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-11-13 16:12:50 UTC (rev 2380) +++ trunk/topia-persistence/pom.xml 2011-11-13 16:18:04 UTC (rev 2381) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4-SNAPSHOT</version> + <version>2.6.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-11-13 16:12:50 UTC (rev 2380) +++ trunk/topia-service-migration/pom.xml 2011-11-13 16:18:04 UTC (rev 2381) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4-SNAPSHOT</version> + <version>2.6.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-11-13 16:12:50 UTC (rev 2380) +++ trunk/topia-service-replication/pom.xml 2011-11-13 16:18:04 UTC (rev 2381) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4-SNAPSHOT</version> + <version>2.6.4</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-11-13 16:12:50 UTC (rev 2380) +++ trunk/topia-service-security/pom.xml 2011-11-13 16:18:04 UTC (rev 2381) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.4-SNAPSHOT</version> + <version>2.6.4</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2380 - trunk
by tchemit＠users.nuiton.org Nov. 13, 2011

Nov. 13, 2011

Author: tchemit Date: 2011-11-13 17:12:50 +0100 (Sun, 13 Nov 2011) New Revision: 2380 Url: http://nuiton.org/repositories/revision/topia/2380 Log: Evolution #1806: Updates to nuiton-utils 2.3.1 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-11-13 16:10:34 UTC (rev 2379) +++ trunk/pom.xml 2011-11-13 16:12:50 UTC (rev 2380) @@ -68,7 +68,7 @@  <eugeneVersion>2.4.1</eugeneVersion> - <nuitonUtilsVersion>2.3</nuitonUtilsVersion> + <nuitonUtilsVersion>2.3.1</nuitonUtilsVersion> <processorPluginVersion>1.2.1</processorPluginVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion>

1 0

r2379 - in trunk: topia-persistence topia-persistence/src/main/java/org/nuiton/topia/framework topia-persistence/src/main/java/org/nuiton/topia/generator topia-persistence/src/main/java/org/nuiton/topia/persistence/util topia-service-migration topia-service-migration/src/main/java/org/nuiton/topia/migration topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings topia-service-replication topia-service-security topia-service-security/src/main/java/org/nuiton/topia/taas
by tchemit＠users.nuiton.org Nov. 13, 2011

Nov. 13, 2011

Author: tchemit Date: 2011-11-13 17:10:34 +0100 (Sun, 13 Nov 2011) New Revision: 2379 Url: http://nuiton.org/repositories/revision/topia/2379 Log: Evolution #1804: Updates to org.apache.commons.lang3 Modified: trunk/topia-persistence/pom.xml trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java trunk/topia-service-migration/pom.xml trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/pom.xml 2011-11-13 16:10:34 UTC (rev 2379) @@ -74,8 +74,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.topia.framework; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.dom4j.Document; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -24,7 +24,7 @@ */ package org.nuiton.topia.framework; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaNotFoundException; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaQuery.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -27,9 +27,9 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.ObjectUtils; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.ObjectUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -26,7 +26,7 @@ package org.nuiton.topia.generator; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.topia.generator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DTOTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,8 +25,8 @@ package org.nuiton.topia.generator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -28,7 +28,7 @@ /*{generator option: writeString = +}*/ import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDTOTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,8 +25,8 @@ package org.nuiton.topia.generator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.nuiton.eugene.GeneratorUtil; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.*; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -42,8 +42,8 @@ package org.nuiton.topia.generator; -import org.apache.commons.lang.BooleanUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.BooleanUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -24,8 +24,8 @@ */ package org.nuiton.topia.generator; -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.builder.ToStringBuilder; +import org.apache.commons.lang3.StringUtils; +import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.EugeneTagValues; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -24,8 +24,8 @@ */ package org.nuiton.topia.generator; -import org.apache.commons.lang.RandomStringUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.RandomStringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/ServiceTransformer.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.topia.generator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.GeneratorUtil; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -26,7 +26,7 @@ package org.nuiton.topia.generator; import org.apache.commons.collections.CollectionUtils; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.AbstractGenerator; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaJavaValidator.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.topia.generator; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.eugene.models.object.ObjectModel; import org.nuiton.eugene.models.object.ObjectModelAttribute; import org.nuiton.eugene.models.object.ObjectModelClass; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityListUpdator.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -26,7 +26,7 @@ package org.nuiton.topia.persistence.util; import org.apache.commons.beanutils.PropertyUtilsBean; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/EntityOperator.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.topia.persistence.util; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-service-migration/pom.xml 2011-11-13 16:10:34 UTC (rev 2379) @@ -70,8 +70,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationEngine.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.topia.migration; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.cfg.Configuration; Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/mappings/TMSVersion.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -25,7 +25,7 @@ package org.nuiton.topia.migration.mappings; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.util.Version; import org.nuiton.util.VersionUtil; Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-service-replication/pom.xml 2011-11-13 16:10:34 UTC (rev 2379) @@ -86,8 +86,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> <scope>test</scope> </dependency> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-service-security/pom.xml 2011-11-13 16:10:34 UTC (rev 2379) @@ -68,8 +68,8 @@ </dependency> <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> </dependency> <dependency> Modified: trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java =================================================================== --- trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2011-11-12 19:21:01 UTC (rev 2378) +++ trunk/topia-service-security/src/main/java/org/nuiton/topia/taas/TaasUtil.java 2011-11-13 16:10:34 UTC (rev 2379) @@ -46,7 +46,7 @@ import javax.security.auth.Subject; -import org.apache.commons.lang.ArrayUtils; +import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;

1 0

r2378 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/framework test/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org Nov. 12, 2011

Nov. 12, 2011

Author: tchemit Date: 2011-11-12 20:21:01 +0100 (Sat, 12 Nov 2011) New Revision: 2378 Url: http://nuiton.org/repositories/revision/topia/2378 Log: Evolution #1801: Open TopiaSQLQuery api Evolution #1802: Add methods to avoid expose hibernate api Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-28 21:25:50 UTC (rev 2377) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-11-12 19:21:01 UTC (rev 2378) @@ -1405,8 +1405,7 @@ checkClosed(_( "topia.persistence.error.unsupported.operation.on.closed.context", "replicateEntity")); - boolean result = TopiaUtil.isSchemaExist(hibernateConfiguration, - clazz.getName()); + boolean result = TopiaUtil.isSchemaExist(this, clazz.getName()); return result; } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2011-10-28 21:25:50 UTC (rev 2377) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2011-11-12 19:21:01 UTC (rev 2378) @@ -31,9 +31,12 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; /** * An executor of sql query which permits to obtain a single result via @@ -83,12 +86,8 @@ try { ResultSet set = ps.executeQuery(); - if (set.next()) { - O singleResult = prepareResult(set); - if (singleResult != null) { - result.add(singleResult); - } - } + findSingleResult(result, set); + } catch (Exception e) { throw new TopiaRuntimeException("Could not execute query", e); } finally { @@ -118,13 +117,8 @@ try { ResultSet set = ps.executeQuery(); - while (set.next()) { - O singleResult = prepareResult(set); + findMultipleResult(result, set); - if (singleResult != null) { - result.add(singleResult); - } - } } catch (Exception e) { throw new TopiaRuntimeException("Could not execute query", e); } finally { @@ -135,4 +129,121 @@ return result; } + /** + * A hook to obtain the result set just after the query execute. + * + * @param set the result set just obtained + * @throws SQLException if any prob + * @since 2.6.4 + */ + protected void afterExecuteQuery(ResultSet set) throws SQLException { + // by default do nothing + } + + /** + * Obtain a single result given the result set and push in in the result list. + * + * @param result the result list + * @param set the set of the executed sql query + * @throws SQLException if any pb + * @since 2.6.4 + */ + protected void findSingleResult(List<O> result, + ResultSet set) throws SQLException { + + afterExecuteQuery(set); + + if (set.next()) { + O singleResult = prepareResult(set); + if (singleResult != null) { + result.add(singleResult); + } + } + } + + /** + * Obtain a multi result given the result set and push in in the result list. + * + * @param result the result list + * @param set the set of the executed sql query + * @throws SQLException if any pb + * @since 2.6.4 + */ + protected void findMultipleResult(List<O> result, + ResultSet set) throws SQLException { + + afterExecuteQuery(set); + + while (set.next()) { + O singleResult = prepareResult(set); + + if (singleResult != null) { + result.add(singleResult); + } + } + } + + /** + * Obtain the column names of a given result set using his metadata. + * + * @param set the result set to inspect + * @return the column names of the result set + * @throws SQLException if any pb + * @since 2.6.4 + */ + protected String[] getColumnNames(ResultSet set) throws SQLException { + ResultSetMetaData metaData = set.getMetaData(); + int columnCount = metaData.getColumnCount(); + String[] result = new String[columnCount]; + for (int i = 0; i < columnCount; i++) { + result[i] = metaData.getColumnName(i + 1); + } + return result; + } + + /** + * From a given result set, let's count his number of row. + * <p/> + * <strong>Note:</strong> the result set must be scrollable to go back to + * before first row. + * + * @param set the result set to inspect + * @return the number of row of the given result set + * @throws SQLException if any pb + * @since 2.6.4 + */ + protected int getNbRows(ResultSet set) throws SQLException { + + int nbRows = 0; + while (set.next()) { + nbRows++; + } + // go back before first row (be ware the resultset must be scrollable) + set.beforeFirst(); + return nbRows; + } + + /** + * Given the column names of the result set, transform the row of the + * result set to a map with column name as key. + * + * @param columnNames column names of the result set + * @param set the set to inspect + * @return the map for the given row of the result set + * @throws SQLException if any pb + * @since 2.6.4 + */ + protected Map<String, Object> getRowAsMap(String[] columnNames, + ResultSet set) throws SQLException { + + Map<String, Object> result = new LinkedHashMap<String, Object>(); + int length = columnNames.length; + for (int i = 0; i < length; i++) { + String name = columnNames[i]; + Object value = set.getObject(i + 1); + result.put(name, value); + } + return result; + } + } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-10-28 21:25:50 UTC (rev 2377) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaUtil.java 2011-11-12 19:21:01 UTC (rev 2378) @@ -34,6 +34,7 @@ import org.hibernate.mapping.Table; import org.hibernate.tool.hbm2ddl.DatabaseMetadata; import org.hibernate.tool.hbm2ddl.TableMetadata; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaNotFoundException; import org.nuiton.topia.persistence.TopiaEntity; @@ -163,6 +164,76 @@ * Test si une entite donnee correspondant a une configuration existe en * base. * + * @param tx la session topia + * @param entityName le nom de l'entite a tester + * @return <tt>true</tt> si le schema de la table existe + * @since 2.6.4 + */ + public static boolean isSchemaExist(TopiaContext tx, + String entityName) { + + boolean exist = false; + + try { + Configuration configuration = + ((TopiaContextImplementor) tx).getHibernateConfiguration(); + PersistentClass classMapping = + configuration.getClassMapping(entityName); + if (classMapping == null) { + if (log.isInfoEnabled()) { + Iterator<?> itr = configuration.getClassMappings(); + while (itr.hasNext()) { + log.info("available mapping " + itr.next()); + } + } + throw new IllegalArgumentException( + "could not find entity with name " + entityName); + } + Table testTable = classMapping.getTable(); + + if (testTable == null) { + throw new IllegalArgumentException( + "could not find entity with name " + entityName); + } + ConnectionProvider connectionProvider = + ConnectionProviderFactory.newConnectionProvider( + configuration.getProperties()); + + Dialect dialect = Dialect.getDialect(configuration.getProperties()); + + Connection connection = null; + try { + connection = connectionProvider.getConnection(); + + DatabaseMetadata meta = new DatabaseMetadata(connection, dialect); + + TableMetadata tmd = meta.getTableMetadata( + testTable.getName(), testTable.getSchema(), + testTable.getCatalog(), testTable.isQuoted()); + + if (tmd != null) { + //table exist + exist = true; + } + } finally { + if (connection != null) { + connection.close(); + } + } + + } catch (SQLException e) { + log.error("Cant connect to database", e); + } catch (TopiaNotFoundException e) { + log.error("Cant connect to database", e); + } + + return exist; + } + + /** + * Test si une entite donnee correspondant a une configuration existe en + * base. + * * @param configuration la configuration hibernate * @param entityName le nom de l'entite a tester * @return <tt>true</tt> si le schema de la table existe Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2011-10-28 21:25:50 UTC (rev 2377) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/framework/TopiaUtilTest.java 2011-11-12 19:21:01 UTC (rev 2378) @@ -25,9 +25,6 @@ package org.nuiton.topia.framework; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.cfg.Configuration; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; @@ -61,8 +58,6 @@ private static TopiaContext rootContext; - private static final Log log = LogFactory.getLog(TopiaUtilTest.class); - @BeforeClass public static void setUpClass() throws Exception { @@ -114,21 +109,20 @@ @Test(expected = IllegalArgumentException.class) public void testIsSchemaExistFailed() throws Exception { - Configuration conf = ((TopiaContextImplementor) rootContext).getHibernateConfiguration(); - TopiaUtil.isSchemaExist(conf, "fake"); + TopiaUtil.isSchemaExist(rootContext, "fake"); } @Test public void testIsSchemaExist() throws Exception { - Configuration conf = ((TopiaContextImplementor) rootContext).getHibernateConfiguration(); - boolean actual = TopiaUtil.isSchemaExist(conf, PersonImpl.class.getName()); + boolean actual = TopiaUtil.isSchemaExist(rootContext, + PersonImpl.class.getName()); assertFalse(actual); TopiaContext tx = rootContext.beginTransaction(); try { tx.createSchema(); - actual = TopiaUtil.isSchemaExist(conf, PersonImpl.class.getName()); + actual = TopiaUtil.isSchemaExist(rootContext, PersonImpl.class.getName()); assertTrue(actual); } finally {

1 0