December 2010 - Topia-commits - mailman.cloud.codelutin.com

r2179 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 30 Dec '10

30 Dec '10

Author: tchemit Date: 2010-12-30 14:39:58 +0100 (Thu, 30 Dec 2010) New Revision: 2179 Url: http://nuiton.org/repositories/revision/topia/2179 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 2010-12-30 13:39:56 UTC (rev 2178) +++ trunk/pom.xml 2010-12-30 13:39:58 UTC (rev 2179) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5</version> + <version>3.0-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -356,9 +356,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.5</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> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-12-30 13:39:56 UTC (rev 2178) +++ trunk/topia-persistence/pom.xml 2010-12-30 13:39:58 UTC (rev 2179) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-12-30 13:39:56 UTC (rev 2178) +++ trunk/topia-service-migration/pom.xml 2010-12-30 13:39:58 UTC (rev 2179) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-12-30 13:39:56 UTC (rev 2178) +++ trunk/topia-service-replication/pom.xml 2010-12-30 13:39:58 UTC (rev 2179) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-12-30 13:39:56 UTC (rev 2178) +++ trunk/topia-service-security/pom.xml 2010-12-30 13:39:58 UTC (rev 2179) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5</version> + <version>3.0-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2178 - in tags: . topia-2.5
by tchemit＠users.nuiton.org 30 Dec '10

30 Dec '10

Author: tchemit Date: 2010-12-30 14:39:56 +0100 (Thu, 30 Dec 2010) New Revision: 2178 Url: http://nuiton.org/repositories/revision/topia/2178 Log: [maven-release-plugin] copy for tag topia-2.5 Added: tags/topia-2.5/ Property changes on: tags/topia-2.5 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714

1 0

r2177 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by tchemit＠users.nuiton.org 30 Dec '10

30 Dec '10

Author: tchemit Date: 2010-12-30 14:39:53 +0100 (Thu, 30 Dec 2010) New Revision: 2177 Url: http://nuiton.org/repositories/revision/topia/2177 Log: [maven-release-plugin] prepare release topia-2.5 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 2010-12-30 13:36:39 UTC (rev 2176) +++ trunk/pom.xml 2010-12-30 13:39:53 UTC (rev 2177) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> <modules> <module>topia-persistence</module> @@ -356,9 +356,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.5</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.5</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.5</url> </scm> </project> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2010-12-30 13:36:39 UTC (rev 2176) +++ trunk/topia-persistence/pom.xml 2010-12-30 13:39:53 UTC (rev 2177) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2010-12-30 13:36:39 UTC (rev 2176) +++ trunk/topia-service-migration/pom.xml 2010-12-30 13:39:53 UTC (rev 2177) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2010-12-30 13:36:39 UTC (rev 2176) +++ trunk/topia-service-replication/pom.xml 2010-12-30 13:39:53 UTC (rev 2177) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-12-30 13:36:39 UTC (rev 2176) +++ trunk/topia-service-security/pom.xml 2010-12-30 13:39:53 UTC (rev 2177) @@ -24,9 +24,7 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -37,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.5-SNAPSHOT</version> + <version>2.5</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2176 - in trunk: topia-persistence/src/main/java/org/nuiton/topia/framework topia-service-security
by tchemit＠users.nuiton.org 30 Dec '10

30 Dec '10

Author: tchemit Date: 2010-12-30 14:36:39 +0100 (Thu, 30 Dec 2010) New Revision: 2176 Url: http://nuiton.org/repositories/revision/topia/2176 Log: optimize dependencies Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java trunk/topia-service-security/pom.xml 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 2010-12-29 19:37:50 UTC (rev 2175) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaSQLQuery.java 2010-12-30 13:36:39 UTC (rev 2176) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.topia.framework; import org.hibernate.jdbc.Work; Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2010-12-29 19:37:50 UTC (rev 2175) +++ trunk/topia-service-security/pom.xml 2010-12-30 13:36:39 UTC (rev 2176) @@ -65,6 +65,11 @@ </dependency> <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency>

1 0

r2175 - trunk
by tchemit＠users.nuiton.org 29 Dec '10

29 Dec '10

Author: tchemit Date: 2010-12-29 20:37:50 +0100 (Wed, 29 Dec 2010) New Revision: 2175 Url: http://nuiton.org/repositories/revision/topia/2175 Log: use stable version of nuiton-utils Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-29 16:13:06 UTC (rev 2174) +++ trunk/pom.xml 2010-12-29 19:37:50 UTC (rev 2175) @@ -267,7 +267,7 @@  <eugeneVersion>2.3</eugeneVersion> - <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.3</nuitonUtilsVersion> <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonI18nVersion>2.0.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion>

1 0

r2174 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org 29 Dec '10

29 Dec '10

Author: tchemit Date: 2010-12-29 17:13:06 +0100 (Wed, 29 Dec 2010) New Revision: 2174 Url: http://nuiton.org/repositories/revision/topia/2174 Log: Evolution #1181: Refactor BinderHelper to use new nuiton-utils Binder api (BE WARE, api has changed and is not compatible with previous) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 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 2010-12-29 15:31:30 UTC (rev 2173) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/BinderHelperTransformer.java 2010-12-29 16:13:06 UTC (rev 2174) @@ -35,8 +35,8 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.util.TopiaEntityBinder; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import org.nuiton.util.beans.BinderBuilder; -import org.nuiton.util.beans.BinderProvider; +import org.nuiton.util.beans.BinderModelBuilder; +import org.nuiton.util.beans.BinderFactory; import java.util.ArrayList; import java.util.Iterator; @@ -80,13 +80,13 @@ resultClass = createClass(binderHelperClazzName, packageName); - setSuperClass(resultClass, BinderProvider.class); + setSuperClass(resultClass, BinderFactory.class); addImport(resultClass, TopiaEntityBinder.class); addImport(resultClass, TopiaEntityHelper.class); addImport(resultClass, TopiaEntity.class); - addImport(resultClass, BinderBuilder.class); + addImport(resultClass, BinderModelBuilder.class); ObjectModelOperation op; @@ -99,7 +99,7 @@ addParameter(op, "String", "contextName"); setOperationBody(op, "" /*{ - return (TopiaEntityBinder<E>) getBinder(entityClass, contextName); + return (TopiaEntityBinder<E>) newBinder(entityClass, entityClass, contextName, TopiaEntityBinder.class); }*/ ); @@ -120,11 +120,11 @@ "void", ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); - addParameter(op, "BinderBuilder", "builder"); + addParameter(op, "BinderModelBuilder", "builder"); addParameter(op, "String", "contextName"); setOperationBody(op, "" /*{ - BinderProvider.registerBinder(builder, TopiaEntityBinder.class, contextName); + registerBinderModel(builder, contextName); }*/ ); @@ -134,11 +134,11 @@ ObjectModelModifier.PUBLIC, ObjectModelModifier.STATIC); addParameter(op, "Class<E>", "entityClass"); - addParameter(op, "BinderBuilder", "builder"); + addParameter(op, "BinderModelBuilder", "builder"); addParameter(op, "String", "contextName"); setOperationBody(op, "" /*{ - BinderProvider.registerBinder(builder, TopiaEntityBinder.class, contextName); + registerBinderModel(builder, contextName); return getTopiaBinder(entityClass, contextName); }*/ ); @@ -184,11 +184,6 @@ StringBuilder initCode = new StringBuilder(); - initCode.append("" -/*{ - BinderBuilder builder = new BinderBuilder(); -}*/ - ); for (ObjectModelClass clazz : classes) { String prefix = getConstantPrefix(clazz, ""); @@ -218,7 +213,10 @@ ); } - protected void generateBinder(String modelName, ObjectModelClass clazz, ObjectModelClass resultClass, StringBuilder initCode) { + protected void generateBinder(String modelName, + ObjectModelClass clazz, + ObjectModelClass resultClass, + StringBuilder initCode) { List<ObjectModelAttribute> list = new ArrayList<ObjectModelAttribute>(); for (ObjectModelAttribute attr : clazz.getAttributes()) { @@ -245,15 +243,15 @@ return; } - if (log.isDebugEnabled()) { log.debug("generate simple binder for " + clazzName); } addImport(resultClass, clazz); initCode.append("" /*{ - builder.createBinderModel(<%=clazzName%>.class); - builder.addSimpleProperties( + BinderModelBuilder<<%=clazzName%>, <%=clazzName%>> builder<%=clazzName%> = + BinderModelBuilder.newEmptyBuilder(<%=clazzName%>.class); + builder<%=clazzName%>.addSimpleProperties( }*/ ); Iterator<ObjectModelAttribute> itr = list.iterator(); @@ -268,7 +266,7 @@ initCode.append("" /*{ ); - registerTopiaBinder(builder, "<%=modelName%>"); + registerTopiaBinder(builder<%=clazzName%>, "<%=modelName%>"); }*/ ); } Modified: trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2010-12-29 15:31:30 UTC (rev 2173) +++ trunk/topia-persistence/src/test/java/org/nuiton/topia/persistence/util/TopiaEntityBinderTest.java 2010-12-29 16:13:06 UTC (rev 2174) @@ -25,6 +25,7 @@ package org.nuiton.topia.persistence.util; +import org.junit.AfterClass; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; @@ -34,8 +35,8 @@ import org.nuiton.topia.persistence.TopiaEntityEnum; import org.nuiton.topiatest.Company; import org.nuiton.util.beans.Binder; -import org.nuiton.util.beans.BinderBuilder; -import org.nuiton.util.beans.BinderProvider; +import org.nuiton.util.beans.BinderFactory; +import org.nuiton.util.beans.BinderModelBuilder; public class TopiaEntityBinderTest { @@ -81,20 +82,24 @@ @Before public void setUp() { - BinderProvider.clear(); + BinderFactory.clear(); } + @AfterClass + public static void afterClass() { + BinderFactory.clear(); + } + @Test public void testBinder() { - BinderBuilder builder = new BinderBuilder(); - builder.createBinderModel(Company.class, CompanyDTO.class); + BinderModelBuilder<Company, CompanyDTO> builder = BinderModelBuilder.newEmptyBuilder(Company.class, CompanyDTO.class); builder.addSimpleProperties(Company.PROPERTY_NAME, Company.PROPERTY_SIRET); builder.addProperties(TopiaEntity.TOPIA_ID, "id"); - BinderProvider.registerBinder(builder); + BinderFactory.registerBinderModel(builder); Binder<Company, CompanyDTO> binder = - BinderProvider.getBinder(Company.class, CompanyDTO.class); + BinderFactory.newBinder(Company.class, CompanyDTO.class); Assert.assertNotNull(binder); } }

1 0

r2173 - trunk
by tchemit＠users.nuiton.org 29 Dec '10

29 Dec '10

Author: tchemit Date: 2010-12-29 16:31:30 +0100 (Wed, 29 Dec 2010) New Revision: 2173 Url: http://nuiton.org/repositories/revision/topia/2173 Log: Evolution #893: Update nuiton-utils to 1.5.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-12-29 15:31:14 UTC (rev 2172) +++ trunk/pom.xml 2010-12-29 15:31:30 UTC (rev 2173) @@ -267,7 +267,7 @@  <eugeneVersion>2.3</eugeneVersion> - <nuitonUtilsVersion>1.5.2</nuitonUtilsVersion> + <nuitonUtilsVersion>1.5.3-SNAPSHOT</nuitonUtilsVersion> <processorPluginVersion>1.0.4</processorPluginVersion> <nuitonI18nVersion>2.0.1</nuitonI18nVersion> <xmlrpcVersion>3.1.2</xmlrpcVersion>

1 0

r2172 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 29 Dec '10

29 Dec '10

Author: tchemit Date: 2010-12-29 16:31:14 +0100 (Wed, 29 Dec 2010) New Revision: 2172 Url: http://nuiton.org/repositories/revision/topia/2172 Log: Evolution #1176: Introduce the tag-value sqlType to specify the sql-type to use in a hibernate mapping Evolution #1177: Improve Hibernate mapping generator Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 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 2010-12-27 12:16:41 UTC (rev 2171) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2010-12-29 15:31:14 UTC (rev 2172) @@ -60,6 +60,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; + import org.apache.commons.lang.BooleanUtils; /** @@ -77,6 +79,12 @@ private static final Log log = LogFactory .getLog(EntityHibernateMappingGenerator.class); + private static final String HIBERNATE_ATTRIBUTE_DEFAULT = "default"; + + private static final String HIBERNATE_ATTRIBUTE_SQL_TYPE = "sql-type"; + + private static final String HIBERNATE_ATTRIBUTE_NAME = "name"; + private Map<String, String[]> columnNamesMap = new HashMap<String, String[]>(); public static final String HIBERNATE_ATTRIBUTE_LAZY = "lazy"; @@ -96,7 +104,8 @@ } @Override - public void generateFromClass(Writer output, ObjectModelClass input) throws IOException { + public void generateFromClass(Writer output, + ObjectModelClass input) throws IOException { String persistenceType = TopiaGeneratorUtil.getPersistenceType(input); if (!TopiaGeneratorUtil.hasEntityStereotype(input) && TopiaGeneratorUtil.PERSISTENCE_TYPE_HIBERNATE.equals(persistenceType)) { @@ -187,7 +196,10 @@ }*/ } - protected void generateAttributes(Writer output, ObjectModelClass clazz, List<ObjectModelAttribute> attributes, String prefix) throws IOException { + protected void generateAttributes(Writer output, + ObjectModelClass clazz, + List<ObjectModelAttribute> attributes, + String prefix) throws IOException { for (ObjectModelAttribute attr : attributes) { ObjectModelAttribute reverse = attr.getReverseAttribute(); @@ -289,7 +301,7 @@ // tag value detected of the model - //TODO TChemit 20100507 Explain What todes it do ? Dont understand the story of columnNamesMap + //TODO tchemit 20100507 Explain What todes it do ? Dont understand the story of columnNamesMap int bracketIndex = modelType.indexOf('('); if (bracketIndex != -1) { type = modelType.substring(0, bracketIndex); @@ -312,7 +324,9 @@ return TopiaGeneratorUtil.getDOType(type, model); } - protected void generateHibernateProperty(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { + protected void generateHibernateProperty(Writer output, + ObjectModelAttribute attr, + String prefix) throws IOException { String attrType = getType(attr); String accessField = "field"; @@ -350,38 +364,81 @@ String indexName = tableName + "_idx"; optionalAttributes += "index=\"" + indexName + "\""; } + if (TopiaGeneratorUtil.hasUniqueStereotype(attr)) { // the trim method is called on optionalAttributes after this set to suppress unusual space if no index is set on this attribute optionalAttributes += " unique=\"true\""; } optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_NOT_NULL, TopiaGeneratorUtil.getNotNullTagValue(attr)); -/*{<%=prefix%> <property name="<%=attrName%>" type="<%=attrType%>" access="<%=accessField%>" }*/ +/*{<%=prefix%> <property name="<%=attrName%>" type="<%=attrType%>" access="<%=accessField%>"}*/ optionalAttributes = optionalAttributes.trim(); String[] columnNames = columnNamesMap.get(attrType); - if (columnNames == null || columnNames.length == 0) { - optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_LENGTH, TopiaGeneratorUtil.getLengthTagValue(attr)); + + // contains all required attributes for a column node + Map<String,String> columnAttributes = new TreeMap<String, String>(); + if (StringUtils.isNotEmpty(attr.getDefaultValue())) { + //TC-20100129 with a default value we must use the column child tag + + String defaultValue = attr.getDefaultValue().trim(); + columnAttributes.put(HIBERNATE_ATTRIBUTE_DEFAULT, defaultValue); + } + String sqlType = TopiaGeneratorUtil.getSqlTypeTagValue(attr); + if (!StringUtils.isEmpty(sqlType)) { + + // an specific sql type was specified for the attribute, use it + columnAttributes.put(HIBERNATE_ATTRIBUTE_SQL_TYPE, sqlType); + } + + // add length attribute if required + String lengthTagValue = TopiaGeneratorUtil.getLengthTagValue(attr); + if (!StringUtils.isEmpty(lengthTagValue)) { + + optionalAttributes += generateFromTagValue(HIBERNATE_ATTRIBUTE_LENGTH, lengthTagValue); + } + + optionalAttributes = optionalAttributes.trim(); + if (!optionalAttributes.isEmpty()) { + optionalAttributes = " " + optionalAttributes; + } + + // to know if specific column name mapping is given + boolean noSpecifiedColumn = columnNames == null || columnNames.length == 0; + + if (noSpecifiedColumn) { + String attrColumn = TopiaGeneratorUtil.getDbName(attr); - optionalAttributes = optionalAttributes.trim(); - if (!optionalAttributes.isEmpty()) { - optionalAttributes = " " + optionalAttributes; - } - if (StringUtils.isNotEmpty(attr.getDefaultValue())) { - //TC-20100129 with a default value we must use the column child tag - String defaultValue = attr.getDefaultValue().trim(); + if (columnAttributes.isEmpty()) { + + // simple case with no column node to generate + +/*{ column="<%=attrColumn%>" node="<%=attrName%>"<%=optionalAttributes%>/> +}*/ + } else { + + // there is some attributes to write for the column node + + columnAttributes.put(HIBERNATE_ATTRIBUTE_NAME, attrColumn); + + String columnAttributesAsString =""; + for (Map.Entry<String, String> entry : + columnAttributes.entrySet()) { + String name = entry.getKey(); + String value = entry.getValue(); + columnAttributesAsString += generateFromTagValue(name, value, null); + } + columnAttributesAsString = " " + columnAttributesAsString.trim(); /*{<%=optionalAttributes%>> -<%=prefix%> <column name="<%=attrColumn%>" default="<%=defaultValue%>"/> +<%=prefix%> <column<%=columnAttributesAsString%>/> <%=prefix%> </property> }*/ - + } } else { -/*{column="<%=attrColumn%>" node="<%=attrName%>"<%=optionalAttributes%>/> -}*/ - } - } else { + + // there is a colum name mapping specified, must use it + //FIXME tchemit 2010-12-29 Really don't know how to apply columnAttributes for multi-columns... /*{<%=optionalAttributes%>> }*/ - //TC-20100129 : should we deal default value in such case ? for (String columnName : columnNames) { columnName = attrName + "_" + columnName.trim(); /*{<%=prefix%> <column name="<%=columnName%>"/> @@ -393,7 +450,9 @@ } } - protected void generateHibernateOneToOne(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { + protected void generateHibernateOneToOne(Writer output, + ObjectModelAttribute attr, + String prefix) throws IOException { // boolean accessField = hasUnidirectionalRelationOnAbstractType(attr.getReverseAttribute(), model); /// *{ <one-to-one name="<%=getName(attr)%>" class="<%=getType(attr)%>"<%=(TopiaGeneratorUtil.notEmpty(attr.getTagValue(GeneratorUtil.TAG_LENGTH))?(" length=\"" + attr.getTagValue(GeneratorUtil.TAG_LENGTH) + "\""):"")%><%=((attr.isComposite() || attr.hasAssociationClass())?" cascade=\"delete\"":"")%><%=((accessField)?" access=\"field\"":"")%> node="<%=getName(attr)%>/@topiaId" embed-xml="false"/> //} */ @@ -406,7 +465,9 @@ } - protected void generateHibernateOneToMany(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { + protected void generateHibernateOneToMany(Writer output, + ObjectModelAttribute attr, + String prefix) throws IOException { boolean needsIndex = JavaGeneratorUtil.hasIndexedStereotype(attr); boolean isInverse = attr.getReverseAttribute().isNavigable(); isInverse |= hasUnidirectionalRelationOnAbstractType(attr, model); @@ -464,7 +525,7 @@ String result = ""; if (StringUtils.isNotEmpty(tagValue)) { result+= attributeName + "=\"" + tagValue+"\" "; - } else if (defaultValue !=null) { + } else if (defaultValue != null) { result+= attributeName + "=\"" + defaultValue +"\" "; } // if (attr.hasTagValue(tagName) || defaultValue != null) { @@ -479,7 +540,9 @@ return result; } - protected void generateHibernateMany(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { + protected void generateHibernateMany(Writer output, + ObjectModelAttribute attr, + String prefix) throws IOException { boolean needsIndex = JavaGeneratorUtil.hasIndexedStereotype(attr); String attrName = getName(attr); String attrType = getType(attr); @@ -499,11 +562,16 @@ }*/ } - protected void generateHibernateManyToOne(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { + protected void generateHibernateManyToOne(Writer output, + ObjectModelAttribute attr, + String prefix) throws IOException { generateHibernateManyToOne(output, attr, false, prefix); } - protected void generateHibernateManyToOne(Writer output, ObjectModelAttribute attr, boolean isUnique, String prefix) throws IOException { + protected void generateHibernateManyToOne(Writer output, + ObjectModelAttribute attr, + boolean isUnique, + String prefix) throws IOException { String attrName = getName(attr); String attrType = getType(attr); String attrColumn = TopiaGeneratorUtil.getDbName(attr); @@ -531,7 +599,9 @@ }*/ } - protected void generateHibernateManyToMany(Writer output, ObjectModelAttribute attr, String prefix) throws IOException { + protected void generateHibernateManyToMany(Writer output, + ObjectModelAttribute attr, + String prefix) throws IOException { // On ne met le inverse="true" uniquement pour un seul coté de la relation. // Dans le cas contraire, les modifications dans la relation ne seront // pas sauvegardées. Ceci n'est vrai que si les deux coté sont navigable 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 2010-12-27 12:16:41 UTC (rev 2171) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2010-12-29 15:31:14 UTC (rev 2172) @@ -1576,6 +1576,21 @@ } /** + * Obtain the value of the {@link TopiaTagValues#TAG_SQL_TYPE} + * tag value on the given attribute. + * <p/> + * + * @param attribute attribute to seek + * @return the none empty value of the found tag value or {@code null} if not found nor empty. + * @see TopiaTagValues#TAG_TYPE + * @since 2.5 + */ + public static String getSqlTypeTagValue(ObjectModelAttribute attribute) { + String value = findTagValue(TopiaTagValues.TAG_SQL_TYPE, attribute, null); + return value; + } + + /** * Obtain the value of the {@link TopiaTagValues#TAG_EXCEPTION_CLASS} * tag value on the given interface. * <p/> Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2010-12-27 12:16:41 UTC (rev 2171) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2010-12-29 15:31:14 UTC (rev 2172) @@ -291,6 +291,14 @@ String TAG_TYPE = "type"; /** + * Tag pour spécifier le type sql d'une propriété dans le mapping hibernate. + * + * @see TopiaGeneratorUtil#getSqlTypeTagValue(ObjectModelAttribute) + * @since 2.5 + */ + @TagValueDefinition(target = {ObjectModelAttribute.class}) + String TAG_SQL_TYPE = "sqlType"; + /** * To use the legacy DAO generation. * * @see TopiaGeneratorUtil#getTypeTagValue(ObjectModelAttribute)

1 0

r2171 - trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration
by tchemit＠users.nuiton.org 27 Dec '10

27 Dec '10

Author: tchemit Date: 2010-12-27 13:16:41 +0100 (Mon, 27 Dec 2010) New Revision: 2171 Url: http://nuiton.org/repositories/revision/topia/2171 Log: introduce a resolver of migration class by version Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java Modified: trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java =================================================================== --- trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java 2010-12-27 10:08:51 UTC (rev 2170) +++ trunk/topia-service-migration/src/main/java/org/nuiton/topia/migration/TopiaMigrationCallbackByClass.java 2010-12-27 12:16:41 UTC (rev 2171) @@ -39,7 +39,7 @@ * <p/> * You must fill in the constructor the mapping for each version of * {@link #getAvailableVersions()} a matching migrator for version which - * extends {@link AbstractMigrationCallBackForVersion}. + * extends {@link MigrationCallBackForVersion}. * <p/> * Use the callback when you have a lot of version to migrate and the * {@link TopiaMigrationCallbackByMethod} begins to be messy. @@ -50,15 +50,16 @@ */ public abstract class TopiaMigrationCallbackByClass extends AbstractTopiaMigrationCallback { - protected Map<Version, Class<? extends AbstractMigrationCallBackForVersion>> versionMigrationMapping; + protected MigrationCallBackForVersionResolver callBackResolver; - protected TopiaMigrationCallbackByClass(Map<Version, Class<? extends AbstractMigrationCallBackForVersion>> versionMigrationMapping) { + protected TopiaMigrationCallbackByClass(MigrationCallBackForVersionResolver callBackResolver) { - this.versionMigrationMapping = versionMigrationMapping; + this.callBackResolver = callBackResolver; // check for each version of migration we have a migrator for (Version version : getAvailableVersions()) { - if (!this.versionMigrationMapping.containsKey(version)) { + Class<? extends MigrationCallBackForVersion> callBack = this.callBackResolver.getCallBack(version); + if (callBack == null) { throw new IllegalStateException("It misses a migration class for version " + version); } } @@ -69,10 +70,11 @@ TopiaContextImplementor tx, boolean showSql, boolean showProgression) throws Exception { - Class<? extends AbstractMigrationCallBackForVersion> migratorClass = versionMigrationMapping.get(version); - AbstractMigrationCallBackForVersion migrator = ObjectUtil.newInstance(migratorClass, Arrays.asList(this), true); + Class<? extends MigrationCallBackForVersion> migratorClass = callBackResolver.getCallBack(version); + MigrationCallBackForVersion migrator = ObjectUtil.newInstance(migratorClass, Arrays.asList(this), true); + String[] queries = migrator.prepareMigration(tx, showSql, showProgression); executeSQL(tx, showSql, showProgression, queries); @@ -80,19 +82,19 @@ } /** - * La classe de base pour chaque migration de version. + * Call back for a given version. * * @author tchemit <chemit(a)codelutin.com> * @since 2.5 */ - public abstract static class AbstractMigrationCallBackForVersion { + public abstract static class MigrationCallBackForVersion { protected final Version version; protected final TopiaMigrationCallbackByClass callBack; - public AbstractMigrationCallBackForVersion(Version version, - TopiaMigrationCallbackByClass callBack) { + public MigrationCallBackForVersion(Version version, + TopiaMigrationCallbackByClass callBack) { this.version = version; this.callBack = callBack; @@ -114,6 +116,48 @@ boolean showSql, boolean showProgression) throws TopiaException; + public void executeSQL(TopiaContextImplementor tx, + String... sqls) throws TopiaException { + callBack.executeSQL(tx, sqls); + } + public void executeSQL(TopiaContextImplementor tx, + boolean showSql, + boolean showProgression, + String... sqls) throws TopiaException { + callBack.executeSQL(tx, showSql, showProgression, sqls); + } + } + + /** + * Resolver to obtain the correct migration class for a given version. + * + * @since 2.5 + */ + public interface MigrationCallBackForVersionResolver { + + Class<? extends MigrationCallBackForVersion> getCallBack(Version version); + + } + + /** + * A simple call back resolver via a constant map. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 2.5 + */ + public static class MigrationCallBackForVersionResolverByMap implements MigrationCallBackForVersionResolver { + + protected final Map<Version, Class<? extends MigrationCallBackForVersion>> versionMigrationMapping; + + public MigrationCallBackForVersionResolverByMap(Map<Version, Class<? extends MigrationCallBackForVersion>> versionMigrationMapping) { + this.versionMigrationMapping = versionMigrationMapping; + } + + @Override + public Class<? extends MigrationCallBackForVersion> getCallBack(Version version) { + return versionMigrationMapping.get(version); + } + } } \ No newline at end of file

1 0

r2170 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by tchemit＠users.nuiton.org 27 Dec '10

27 Dec '10

Author: tchemit Date: 2010-12-27 11:08:51 +0100 (Mon, 27 Dec 2010) New Revision: 2170 Url: http://nuiton.org/repositories/revision/topia/2170 Log: remove (non-Javadoc) comment Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.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 2010-12-27 10:07:33 UTC (rev 2169) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2010-12-27 10:08:51 UTC (rev 2170) @@ -805,12 +805,6 @@ } } - /* - * (non-Javadoc) - * - * @see TopiaContext#rollbackTransaction() - */ - @Override public void rollbackTransaction() throws TopiaException { if (equals(getRootContext())) { @@ -1027,10 +1021,6 @@ } } - /* (non-Javadoc) - * @see org.nuiton.topia.TopiaContext#add(org.nuiton.topia.persistence.TopiaEntity) - */ - @Override public void add(TopiaEntity e) throws TopiaException { checkClosed(I18n._(

1 0