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

r2048 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 30 Jun '10

30 Jun '10

Author: fdesbois Date: 2010-06-30 10:47:37 +0200 (Wed, 30 Jun 2010) New Revision: 2048 Url: http://nuiton.org/repositories/revision/topia/2048 Log: Change log level Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2010-06-30 08:37:15 UTC (rev 2047) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-30 08:47:37 UTC (rev 2048) @@ -344,8 +344,8 @@ ObjectModelModifier visibility = ObjectModelModifier.toValue(operation.getVisibility()); - if (isVerbose()) { - log.info("Extra operation for : " + input.getQualifiedName() + + if (log.isDebugEnabled()) { + log.debug("Extra operation for : " + input.getQualifiedName() + " - method : " + opName + " - returnType : " + opType + " - visibility : " + visibility); @@ -424,8 +424,8 @@ protected void generatePropertyConstant(ObjectModelAttribute attribute) { String attrName = getPropertyName(attribute); - if (isVerbose()) { - log.info("Generate constant for property : " + attrName); + if (log.isDebugEnabled()) { + log.debug("Generate constant for property : " + attrName); } addAttribute(outputInterface, getConstantName(attrName), String.class, @@ -563,8 +563,8 @@ String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); - if (isVerbose()) { - log.info("Generate single 'set' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate single 'set' operation for property : " + attrName + " [" + attrType + "]"); } @@ -608,8 +608,8 @@ operationPrefix = TopiaGeneratorUtil.OPERATION_GETTER_DEFAULT_PREFIX; } - if (isVerbose()) { - log.info("Generate single '" + operationPrefix + "' operation for property : " + if (log.isDebugEnabled()) { + log.debug("Generate single '" + operationPrefix + "' operation for property : " + attrName + " [" + attrType + "]"); } @@ -651,8 +651,8 @@ String attrType = getPropertyType(attribute); ObjectModelAttribute reverse = attribute.getReverseAttribute(); - if (isVerbose()) { - log.info("Generate multiple 'add' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'add' operation for property : " + attrName + " [" + attrType + "]"); } @@ -721,8 +721,8 @@ String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); - if (isVerbose()) { - log.info("Generate multiple 'addAll' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'addAll' operation for property : " + attrName + " [" + attrType + "]"); } @@ -762,8 +762,8 @@ String referenceType = getPropertyType(attribute); String attrType = collectionInterface + "<" + referenceType + ">"; - if (isVerbose()) { - log.info("Generate multiple 'set' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'set' operation for property : " + attrName + " [" + attrType + "]"); } @@ -795,8 +795,8 @@ String attrType = getPropertyType(attribute); ObjectModelAttribute reverse = attribute.getReverseAttribute(); - if (isVerbose()) { - log.info("Generate 'remove' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate 'remove' operation for property : " + attrName + " [" + attrType + "]"); } @@ -863,8 +863,8 @@ String attrType = getPropertyType(attribute); ObjectModelAttribute reverse = attribute.getReverseAttribute(); - if (isVerbose()) { - log.info("Generate multiple 'clear' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'clear' operation for property : " + attrName + " [" + attrType + "]"); } @@ -931,8 +931,8 @@ String attrName = getPropertyName(attribute); String attrType = collectionInterface + "<" + getPropertyType(attribute) + ">"; - if (isVerbose()) { - log.info("Generate multiple 'get' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'get' operation for property : " + attrName + " [" + attrType + "]"); } @@ -959,8 +959,8 @@ String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); - if (isVerbose()) { - log.info("Generate multiple 'getByTopiaId' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'getByTopiaId' operation for property : " + attrName + " [" + attrType + "]"); } @@ -998,8 +998,8 @@ String attrName = getPropertyName(attribute); String attrType = getPropertyType(attribute); - if (isVerbose()) { - log.info("Generate multiple 'getFromEntity' operation for property : " + attrName + + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'getFromEntity' operation for property : " + attrName + " [" + attrType + "]"); } @@ -1037,8 +1037,8 @@ String attrName = getPropertyName(attribute); - if (isVerbose()) { - log.info("Generate multiple 'size' operation for property : " + attrName); + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'size' operation for property : " + attrName); } // Interface operation @@ -1066,8 +1066,8 @@ String attrName = getPropertyName(attribute); - if (isVerbose()) { - log.info("Generate multiple 'isEmpty' operation for property : " + attrName); + if (log.isDebugEnabled()) { + log.debug("Generate multiple 'isEmpty' operation for property : " + attrName); } // Interface operation

1 0

r2047 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 30 Jun '10

30 Jun '10

Author: fdesbois Date: 2010-06-30 10:37:15 +0200 (Wed, 30 Jun 2010) New Revision: 2047 Url: http://nuiton.org/repositories/revision/topia/2047 Log: Missing plexus component declaration Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 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 2010-06-29 13:51:13 UTC (rev 2046) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2010-06-30 08:37:15 UTC (rev 2047) @@ -27,6 +27,8 @@ * * @author fdesbois <fdesbois(a)codelutin.com> * @version $Id$ + * @since 2.3.5 + * @plexus.component role="org.nuiton.eugene.Template" role-hint="org.nuiton.topia.generator.QueryHelperTransformer" */ public class QueryHelperTransformer extends ObjectModelTransformerToJava {

1 0

r2046 - in trunk: topia-persistence/src/license topia-service-migration/src/license topia-service-replication/src/license topia-service-security/src/license
by tchemit＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: tchemit Date: 2010-06-29 15:51:13 +0200 (Tue, 29 Jun 2010) New Revision: 2046 Url: http://nuiton.org/repositories/revision/topia/2046 Log: regenerate missing files to obtain all licenses of the project Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties trunk/topia-service-migration/src/license/THIRD-PARTY.properties trunk/topia-service-replication/src/license/THIRD-PARTY.properties trunk/topia-service-security/src/license/THIRD-PARTY.properties Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-persistence/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) +++ trunk/topia-persistence/src/license/THIRD-PARTY.properties 2010-06-29 13:51:13 UTC (rev 2046) @@ -1,14 +1,14 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - BSD +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Lesser General Public License # - LGPL # - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 # - MIT License -# - Sun ??? # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 # - http://jaxen.codehaus.org/license.html @@ -16,7 +16,7 @@ # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:53:14 CEST 2010 +#Tue Jun 29 15:50:25 CEST 2010 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/topia-service-migration/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) +++ trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2010-06-29 13:51:13 UTC (rev 2046) @@ -1,16 +1,20 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - MIT License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:55:19 CEST 2010 +#Tue Jun 29 15:50:27 CEST 2010 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/topia-service-replication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) +++ trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2010-06-29 13:51:13 UTC (rev 2046) @@ -1,16 +1,20 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - MIT License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 09:54:15 CEST 2010 +#Tue Jun 29 15:50:27 CEST 2010 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License Modified: trunk/topia-service-security/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-security/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) +++ trunk/topia-service-security/src/license/THIRD-PARTY.properties 2010-06-29 13:51:13 UTC (rev 2046) @@ -1,16 +1,20 @@ # Generated by org.nuiton.license.plugin.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : +# - BSD License +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 # - Common Public License Version 1.0 # - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 2.1 # - Lesser General Public License (LGPL) v 3.0 +# - MIT License # - The Apache Software License, Version 2.0 # - The H2 License, Version 1.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Mon Jun 28 10:04:35 CEST 2010 +#Tue Jun 29 15:50:31 CEST 2010 antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 dom4j--dom4j--1.6.1=BSD License

1 0

r2045 - in trunk: topia-persistence/src/license topia-service-migration/src/license topia-service-replication/src/license topia-service-security/src/license
by tchemit＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: tchemit Date: 2010-06-29 15:48:27 +0200 (Tue, 29 Jun 2010) New Revision: 2045 Url: http://nuiton.org/repositories/revision/topia/2045 Log: fix THIRD-PARTY Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties trunk/topia-service-migration/src/license/THIRD-PARTY.properties trunk/topia-service-replication/src/license/THIRD-PARTY.properties trunk/topia-service-security/src/license/THIRD-PARTY.properties Modified: trunk/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-persistence/src/license/THIRD-PARTY.properties 2010-06-29 12:40:46 UTC (rev 2044) +++ trunk/topia-persistence/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) @@ -17,11 +17,11 @@ # # #Mon Jun 28 09:53:14 CEST 2010 -antlr--antlr--2.7.6=BSD +antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD +dom4j--dom4j--1.6.1=BSD License javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html jdom--jdom--1.0=The Apache Software License, Version 2.0 org.slf4j--slf4j-api--1.5.8=MIT License Modified: trunk/topia-service-migration/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2010-06-29 12:40:46 UTC (rev 2044) +++ trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) @@ -11,10 +11,10 @@ # # #Mon Jun 28 09:55:19 CEST 2010 -antlr--antlr--2.7.6=BSD +antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD +dom4j--dom4j--1.6.1=BSD License javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.slf4j--slf4j-api--1.5.8=MIT License org.slf4j--slf4j-log4j12--1.5.8=MIT License Modified: trunk/topia-service-replication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2010-06-29 12:40:46 UTC (rev 2044) +++ trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) @@ -11,10 +11,10 @@ # # #Mon Jun 28 09:54:15 CEST 2010 -antlr--antlr--2.7.6=BSD +antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD +dom4j--dom4j--1.6.1=BSD License javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.slf4j--slf4j-api--1.5.8=MIT License org.slf4j--slf4j-log4j12--1.5.8=MIT License Modified: trunk/topia-service-security/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-security/src/license/THIRD-PARTY.properties 2010-06-29 12:40:46 UTC (rev 2044) +++ trunk/topia-service-security/src/license/THIRD-PARTY.properties 2010-06-29 13:48:27 UTC (rev 2045) @@ -11,10 +11,10 @@ # # #Mon Jun 28 10:04:35 CEST 2010 -antlr--antlr--2.7.6=BSD +antlr--antlr--2.7.6=BSD License commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD +dom4j--dom4j--1.6.1=BSD License javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 -javax.transaction--jta--1.1=Sun ??? +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 org.slf4j--slf4j-api--1.5.8=MIT License org.slf4j--slf4j-log4j12--1.5.8=MIT License

1 0

r2044 - trunk
by tchemit＠users.nuiton.org 29 Jun '10

29 Jun '10

Author: tchemit Date: 2010-06-29 14:40:46 +0200 (Tue, 29 Jun 2010) New Revision: 2044 Url: http://nuiton.org/repositories/revision/topia/2044 Log: Evolution #741: Use mavenpom 2.2.2 Evolution #742: Use i18n 1.2.3 Evolution #743: Use nuiton-utils 1.3.2 Evolution #744: Use processor 1.0.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-06-28 17:19:16 UTC (rev 2043) +++ trunk/pom.xml 2010-06-29 12:40:46 UTC (rev 2044) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>2.2.1</version> + <version>2.2.2-SNAPSHOT</version> </parent> <artifactId>topia</artifactId> @@ -231,9 +231,9 @@  <eugene.version>2.0.3-SNAPSHOT</eugene.version> - <lutinutil.version>1.3.1</lutinutil.version> - <processor.version>1.0.3</processor.version> - <i18n.version>1.2.2</i18n.version> + <lutinutil.version>1.3.2-SNAPSHOT</lutinutil.version> + <processor.version>1.0.4-SNAPSHOT</processor.version> + <i18n.version>1.2.3-SNAPSHOT</i18n.version> <xmlrpc.version>3.1.2</xmlrpc.version> <hibernate.version>3.3.2.GA</hibernate.version> </properties>

1 0

r2043 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 28 Jun '10

28 Jun '10

Author: fdesbois Date: 2010-06-28 19:19:16 +0200 (Mon, 28 Jun 2010) New Revision: 2043 Url: http://nuiton.org/repositories/revision/topia/2043 Log: Do not generate some code for association class case Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2010-06-28 08:06:10 UTC (rev 2042) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-28 17:19:16 UTC (rev 2043) @@ -695,8 +695,8 @@ <%=attrName%>.set<%=reverseAttrName%>(this); }*/ ); - // WARN-fdesbois-2010-06-25 : in previous code no else for association class - } else { + // Don't manage reverse attribute add if attribute has associationClass + } else if (!attribute.hasAssociationClass()) { body.append("" /*{ if (<%=attrName%>.get<%=reverseAttrName%>() == null) { @@ -838,8 +838,8 @@ <%=attrName%>.set<%=reverseAttrName%>(null); }*/ ); - // WARN-fdesbois-2010-06-25 : in previous code no else for association class - } else { + // Don't manage reverse attribute remove if attribute has associationClass + } else if (!attribute.hasAssociationClass()) { body.append("" /*{ <%=attrName%>.get<%=reverseAttrName%>().remove(this); @@ -903,8 +903,8 @@ /*{ item.set<%=reverseAttrName%>(null); }*/ ); - // WARN-fdesbois-2010-06-25 : in previous code no else for association class - } else { + // Don't manage reverse attribute remove if attribute has associationClass + } else if (!attribute.hasAssociationClass()) { body.append("" /*{ item.get<%=reverseAttrName%>().remove(this); }*/

1 0

r2042 - in trunk: topia-persistence/src topia-persistence/src/license topia-service-migration/src topia-service-migration/src/license topia-service-replication/src topia-service-replication/src/license topia-service-security/src topia-service-security/src/license
by tchemit＠users.nuiton.org 28 Jun '10

28 Jun '10

Author: tchemit Date: 2010-06-28 10:06:10 +0200 (Mon, 28 Jun 2010) New Revision: 2042 Url: http://nuiton.org/repositories/revision/topia/2042 Log: consolidate THIRD-PARTY Added: trunk/topia-persistence/src/license/ trunk/topia-persistence/src/license/THIRD-PARTY.properties trunk/topia-service-migration/src/license/ trunk/topia-service-migration/src/license/THIRD-PARTY.properties trunk/topia-service-replication/src/license/ trunk/topia-service-replication/src/license/THIRD-PARTY.properties trunk/topia-service-security/src/license/ trunk/topia-service-security/src/license/THIRD-PARTY.properties Added: trunk/topia-persistence/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-persistence/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-persistence/src/license/THIRD-PARTY.properties 2010-06-28 08:06:10 UTC (rev 2042) @@ -0,0 +1,29 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - BSD +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - LGPL +# - Lesser General Public License (LGPL) v 2.1 +# - Lesser General Public License (LGPL) v 3.0 +# - MIT License +# - Sun ??? +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - http://jaxen.codehaus.org/license.html +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 09:53:14 CEST 2010 +antlr--antlr--2.7.6=BSD +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1=Sun ??? +jaxen--jaxen--1.1.1=http\://jaxen.codehaus.org/license.html +jdom--jdom--1.0=The Apache Software License, Version 2.0 +org.slf4j--slf4j-api--1.5.8=MIT License +org.slf4j--slf4j-log4j12--1.5.8=MIT License +xalan--xalan--2.6.0=The Apache Software License, Version 2.0 Property changes on: trunk/topia-persistence/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/topia-service-migration/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-migration/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-service-migration/src/license/THIRD-PARTY.properties 2010-06-28 08:06:10 UTC (rev 2042) @@ -0,0 +1,20 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 3.0 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 09:55:19 CEST 2010 +antlr--antlr--2.7.6=BSD +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1=Sun ??? +org.slf4j--slf4j-api--1.5.8=MIT License +org.slf4j--slf4j-log4j12--1.5.8=MIT License Property changes on: trunk/topia-service-migration/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/topia-service-replication/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-replication/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-service-replication/src/license/THIRD-PARTY.properties 2010-06-28 08:06:10 UTC (rev 2042) @@ -0,0 +1,20 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 3.0 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 09:54:15 CEST 2010 +antlr--antlr--2.7.6=BSD +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1=Sun ??? +org.slf4j--slf4j-api--1.5.8=MIT License +org.slf4j--slf4j-log4j12--1.5.8=MIT License Property changes on: trunk/topia-service-replication/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/topia-service-security/src/license/THIRD-PARTY.properties =================================================================== --- trunk/topia-service-security/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/topia-service-security/src/license/THIRD-PARTY.properties 2010-06-28 08:06:10 UTC (rev 2042) @@ -0,0 +1,20 @@ +# Generated by org.nuiton.license.plugin.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Common Public License Version 1.0 +# - GNU Lesser General Public License +# - Lesser General Public License (LGPL) v 3.0 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Mon Jun 28 10:04:35 CEST 2010 +antlr--antlr--2.7.6=BSD +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD +javassist--javassist--3.8.0.GA=Lesser General Public License (LGPL) v 2.1 +javax.transaction--jta--1.1=Sun ??? +org.slf4j--slf4j-api--1.5.8=MIT License +org.slf4j--slf4j-log4j12--1.5.8=MIT License Property changes on: trunk/topia-service-security/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2041 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: fdesbois Date: 2010-06-27 16:29:18 +0200 (Sun, 27 Jun 2010) New Revision: 2041 Url: http://nuiton.org/repositories/revision/topia/2041 Log: Evo #609 : Remove old code. Refactor is done (same generation as before). Note that some generated code is strange (for i18n block that contains keys for entity N relations... Accept and attribute needed for visitor with no navigable association on association class...) Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2010-06-27 14:12:49 UTC (rev 2040) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-27 14:29:18 UTC (rev 2041) @@ -1150,101 +1150,6 @@ " " : acceptOperationBody.toString()); } - @Deprecated - protected void generateAcceptMethod(ObjectModelClass input) { - - ObjectModelOperation operation = - addOperation(outputAbstract, "accept", void.class); - - addException(operation, TopiaException.class); - addAnnotation(outputAbstract, operation, Override.class.getSimpleName()); - setDocumentation(operation, - "Envoi via les methodes du visitor l'ensemble des " + - "champs de l'entity\n" + - "avec leur nom, type et valeur."); - - ObjectModelParameter param = - addParameter(operation, EntityVisitor.class, "visitor"); - setDocumentation(param, "le visiteur de l'entite."); - - StringBuilder body = new StringBuilder("" -/*{ - visitor.start(this); -}*/ - ); - for (ObjectModelAttribute attr : input.getAttributes()) { - ObjectModelAttribute reverse = attr.getReverseAttribute(); - - // pour les asso quoi qu'il arrive il faut les lier des 2 cotes - // pour pouvoir supprimer en cascade l'asso lors de la suppression - // d'un des cotes - if (!(attr.isNavigable() - || hasUnidirectionalRelationOnAbstractType(reverse, model) - || attr.hasAssociationClass())) { - continue; - } - - if (!attr.hasAssociationClass()) { - String attrType = TopiaGeneratorUtil.getSimpleName(attr.getType()); - String attrName = attr.getName(); - if (!GeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } else { - String collectionType = TopiaGeneratorUtil.getSimpleName( - TopiaGeneratorUtil.getNMultiplicityInterfaceType( - attr)); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=collectionType%>.class, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } - } else { - String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - assocAttrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - String assocClassFQN = TopiaGeneratorUtil.getSimpleName( - attr.getAssociationClass().getQualifiedName()); - if (!GeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=assocClassFQN%>.class, <%=assocAttrName%>); -}*/ - ); - } else { - String collectionType = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=collectionType%>.class, <%=assocClassFQN%>.class, <%=assocAttrName%>); -}*/ - ); - } - } - } - - //Déclaration des attributs d'une classe d'associations - if (input instanceof ObjectModelAssociationClass) { - ObjectModelAssociationClass assoc = (ObjectModelAssociationClass) input; - for (ObjectModelAttribute attr : assoc.getParticipantsAttributes()) { - if (attr != null) { - String attrType = TopiaGeneratorUtil.getSimpleName( - attr.getType()); - String attrName = attr.getName(); - attrName = GeneratorUtil.toLowerCaseFirstLetter(attrName); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } - } - } - body.append("" -/*{ visitor.end(this); -}*/ - ); - - setOperationBody(operation, body.length() == 0 ? " " : body.toString()); - } - protected void generateToStringOperation(ObjectModelClass input) { if (log.isDebugEnabled()) { @@ -1483,34 +1388,6 @@ buffer.append("\");"); } - /** - * Generate entity methods which have not a public visibility. In this case, they will not be - * generated in the EntityInterface, so they will be generated here, in the EntityAbstract - * with abstract modifier to keep consistency with the model. - * @param output ObjectModelClass result corresponding to the EntityAbstract - * @param input ObjectModelClass source from ObjectModel - */ - @Deprecated - private void generateAbstractMethods(ObjectModelClass output, - ObjectModelClass input) { - for (ObjectModelOperation op : input.getOperations()) { - if (log.isDebugEnabled()) { - log.debug("clazz : " + input.getQualifiedName() + - " - method : " + op.getName() + - " - visibility : " + op.getVisibility()); - } - String visibility = op.getVisibility(); - ObjectModelModifier visibilityModifier = ObjectModelModifier.toValue(visibility); - if (!visibilityModifier.equals(ObjectModelModifier.PUBLIC)) { - addOperation(output, - op.getName(), - op.getReturnType(), - visibilityModifier, - ObjectModelModifier.ABSTRACT); - } - } - } - // ------------------------------------------------------------------------- // Helpers // -------------------------------------------------------------------------

1 0

r2040 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: fdesbois Date: 2010-06-27 16:12:49 +0200 (Sun, 27 Jun 2010) New Revision: 2040 Url: http://nuiton.org/repositories/revision/topia/2040 Log: Evo #609 : Clean last refactors Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2010-06-27 14:01:18 UTC (rev 2039) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-27 14:12:49 UTC (rev 2040) @@ -133,7 +133,13 @@ // Create Entity Abstract class and its header createEntityAbstractClass(input); - // Create accept operation, will be updated during attribute route + // Generate i18n block + String i18nPrefix = TopiaGeneratorUtil.getI18nPrefix(input, model); + if (!StringUtils.isEmpty(i18nPrefix)) { + generateI18nBlock(input, i18nPrefix); + } + + // Create accept operation, will be updated during property generation createAcceptOperation(); // Add constant, attribute and operations for each property @@ -150,20 +156,23 @@ closeAcceptOperation(); - // Add util operations : accept, aggregate, composite, toString, i18n block - generateUtilOperations(input); - // Add extra constants (from uml dependency) generateExtraConstants(input); // Add extra operations (defined on the entity) generateExtraOperations(input); - boolean generateImpl = isGenerateImpl(input, input.getOperations()); + // Implement aggregate and composite operations + generateAggregateOperation(input); + generateCompositeOperation(input); - if (generateImpl) { + // Implement toString operation + if (TopiaGeneratorUtil.generateToString(input, model)) { + generateToStringOperation(input); + } - // generate impl + // Generate Entity Implementation class + if (isGenerateImpl(input, input.getOperations())) { generateImpl(input); } @@ -313,17 +322,6 @@ setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); } - protected void generateUtilOperations(ObjectModelClass input) { - - generateI18nBlock(input); - - generateAggregateMethod(input); - - generateCompositeMethod(input); - - generateToStringMethod(input); - } - /** * Generate extra constants if {@code input} has dependencies on * enum used as constant injector. @@ -1247,12 +1245,8 @@ setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } - protected void generateToStringMethod(ObjectModelClass input) { + protected void generateToStringOperation(ObjectModelClass input) { - if (!TopiaGeneratorUtil.generateToString(input, model)) { - return; - } - if (log.isDebugEnabled()) { log.debug("generate toString method for entity " + outputInterface.getQualifiedName()); @@ -1301,7 +1295,7 @@ } - protected void generateCompositeMethod(ObjectModelClass input) { + protected void generateCompositeOperation(ObjectModelClass input) { ObjectModelOperation operation = addOperation(outputAbstract, "getComposite", @@ -1407,7 +1401,7 @@ setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } - protected void generateAggregateMethod(ObjectModelClass input) { + protected void generateAggregateOperation(ObjectModelClass input) { ObjectModelOperation operation = addOperation(outputAbstract, "getAggregate", @@ -1465,13 +1459,8 @@ setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } - protected void generateI18nBlock(ObjectModelClass input) { + protected void generateI18nBlock(ObjectModelClass input, String i18nPrefix) { - String i18nPrefix = TopiaGeneratorUtil.getI18nPrefix(input, model); - if (StringUtils.isEmpty(i18nPrefix)) { - return; - } - ObjectModelOperation block = addBlock(outputAbstract, ObjectModelModifier.STATIC);

1 0

r2039 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by fdesbois＠users.nuiton.org 27 Jun '10

27 Jun '10

Author: fdesbois Date: 2010-06-27 16:01:18 +0200 (Sun, 27 Jun 2010) New Revision: 2039 Url: http://nuiton.org/repositories/revision/topia/2039 Log: Evo #609 : Revert aggregate and composite refactor, only accept methods contains same condition for entity properties. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 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 2010-06-27 12:51:25 UTC (rev 2038) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2010-06-27 14:01:18 UTC (rev 2039) @@ -133,8 +133,8 @@ // Create Entity Abstract class and its header createEntityAbstractClass(input); - // Start util operations : create operations : accept, aggregate, composite, toString - startGenerateUtilOperations(input); + // Create accept operation, will be updated during attribute route + createAcceptOperation(); // Add constant, attribute and operations for each property generateProperties(input.getAttributes()); @@ -148,9 +148,11 @@ associationClass = false; } - // Stop util operations : set each operation body - stopGenerateUtilOperations(); + closeAcceptOperation(); + // Add util operations : accept, aggregate, composite, toString, i18n block + generateUtilOperations(input); + // Add extra constants (from uml dependency) generateExtraConstants(input); @@ -204,10 +206,6 @@ outputAbstract = createAbstractClass(input.getName() + "Abstract", input.getPackageName()); - // These import will be removed (will be automatically added if needed) -// addImport(output, TopiaEntity.class); - addImport(outputAbstract, TopiaContextImplementor.class); - // Documentation StringBuilder doc = new StringBuilder(); doc.append("Implantation POJO pour l'entité {@link "); @@ -315,41 +313,17 @@ setSuperClass(outputImpl, input.getQualifiedName() + "Abstract"); } - protected void startGenerateUtilOperations(ObjectModelClass input) { + protected void generateUtilOperations(ObjectModelClass input) { - createAcceptOperation(); + generateI18nBlock(input); - // Imports needed for aggregate and composite operations - addImport(outputAbstract, ArrayList.class); - addImport(outputAbstract, List.class); + generateAggregateMethod(input); - createAggregateOperation(); + generateCompositeMethod(input); - createCompositeOperation(); - - boolean doGenerateToString = TopiaGeneratorUtil.generateToString(input, - model); - if (doGenerateToString) { - addImport(outputAbstract, ToStringBuilder.class); - generateToStringMethod(outputAbstract, input); - } - - String i18nPrefix = TopiaGeneratorUtil.getI18nPrefix(input, model); - if (!StringUtils.isEmpty(i18nPrefix)) { - // generate i18n prefix - generateI18n(outputAbstract, i18nPrefix, input); - } + generateToStringMethod(input); } - protected void stopGenerateUtilOperations() { - - closeAcceptOperation(); - - closeAggregateOperation(); - - closeCompositeOperation(); - } - /** * Generate extra constants if {@code input} has dependencies on * enum used as constant injector. @@ -414,6 +388,8 @@ generatePropertyConstant(attribute); generatePropertyAttribute(attribute); + + updateAcceptOperation(attribute); } if (!attribute.isNavigable() && @@ -431,6 +407,9 @@ // operations generatePropertyOperations(attribute); + + // update accept body + updateAcceptOperation(attribute); } } @@ -493,11 +472,6 @@ //TODO tchemit 20100513 Test it still works addAnnotation(outputAbstract, property, annotation); } - - // Update util operations body - updateAcceptOperation(attribute); - updateAggregateOperation(attribute); - updateCompositeOperation(attribute); } /** @@ -1125,34 +1099,23 @@ private StringBuilder acceptOperationBody; - private ObjectModelOperation aggregateOperation; - - private StringBuilder aggregateOperationBody; - - private ObjectModelOperation compositeOperation; - - private StringBuilder compositeOperationBody; - protected void createAcceptOperation() { - // Interface operation - ObjectModelOperation interfaceOperation = - addOperation(outputInterface, "accept", void.class); + + // Declaration + acceptOperation = addOperation(outputAbstract, "accept", void.class); ObjectModelParameter param = - addParameter(interfaceOperation, EntityVisitor.class, "visitor"); + addParameter(acceptOperation, EntityVisitor.class, "visitor"); - addException(interfaceOperation, TopiaException.class); + addException(acceptOperation, TopiaException.class); // Documentation - setDocumentation(interfaceOperation, "Envoi via les methodes du visitor l'ensemble des " + + setDocumentation(acceptOperation, "Envoi via les methodes du visitor l'ensemble des " + "champs de l'entity\n" + "avec leur nom, type et valeur."); setDocumentation(param, "le visiteur de l'entite."); - // Implementation - acceptOperation = createImplOperation(interfaceOperation); - - acceptOperationBody = new StringBuilder(); - acceptOperationBody.append("" + // Body init + acceptOperationBody = new StringBuilder("" /*{ visitor.start(this); }*/ @@ -1189,207 +1152,136 @@ " " : acceptOperationBody.toString()); } - protected void createAggregateOperation() { + @Deprecated + protected void generateAcceptMethod(ObjectModelClass input) { - // Interface operation - ObjectModelOperation interfaceOperation = - addOperation(outputInterface, "getAggregate", - List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); + ObjectModelOperation operation = + addOperation(outputAbstract, "accept", void.class); - addException(interfaceOperation, TopiaException.class); + addException(operation, TopiaException.class); + addAnnotation(outputAbstract, operation, Override.class.getSimpleName()); + setDocumentation(operation, + "Envoi via les methodes du visitor l'ensemble des " + + "champs de l'entity\n" + + "avec leur nom, type et valeur."); - // Implementation - aggregateOperation = createImplOperation(interfaceOperation); + ObjectModelParameter param = + addParameter(operation, EntityVisitor.class, "visitor"); + setDocumentation(param, "le visiteur de l'entite."); - aggregateOperationBody = new StringBuilder("" + StringBuilder body = new StringBuilder("" /*{ - List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); - - // pour tous les attributs rechecher les composites et les class d'asso - // on les ajoute dans tmp + visitor.start(this); }*/ ); - } + for (ObjectModelAttribute attr : input.getAttributes()) { + ObjectModelAttribute reverse = attr.getReverseAttribute(); - protected void updateAggregateOperation(ObjectModelAttribute attribute) { - if (attribute.isAggregate() && - attribute.referenceClassifier() && - attribute.getClassifier().hasStereotype(STEREOTYPE_ENTITY)) { - - String attrName = attribute.getName(); - String getterName = "get" + StringUtils.capitalize(attrName); - if (GeneratorUtil.isNMultiplicity(attribute)) { - aggregateOperationBody.append("" -/*{ tmp.addAll(<%=getterName%>()); -}*/ - ); - } else { - aggregateOperationBody.append("" -/*{ tmp.add(<%=getterName%>()); -}*/ - ); + // pour les asso quoi qu'il arrive il faut les lier des 2 cotes + // pour pouvoir supprimer en cascade l'asso lors de la suppression + // d'un des cotes + if (!(attr.isNavigable() + || hasUnidirectionalRelationOnAbstractType(reverse, model) + || attr.hasAssociationClass())) { + continue; } - } - } - protected void closeAggregateOperation() { - aggregateOperationBody.append("" -/*{ - // on refait un tour sur chaque entity de tmp pour recuperer leur - // composite - List<TopiaEntity> result = new ArrayList<TopiaEntity>(); - for (TopiaEntity entity : tmp) { - result.add(entity); - result.addAll(entity.getAggregate()); - } - - return result; + if (!attr.hasAssociationClass()) { + String attrType = TopiaGeneratorUtil.getSimpleName(attr.getType()); + String attrName = attr.getName(); + if (!GeneratorUtil.isNMultiplicity(attr)) { + body.append("" +/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); }*/ - ); - setOperationBody(aggregateOperation, aggregateOperationBody.length() == 0 ? - " " : aggregateOperationBody.toString()); - } - - protected void createCompositeOperation() { - - // Interface operation - ObjectModelOperation interfaceOperation = - addOperation(outputInterface, "getComposite", - List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); - - addException(interfaceOperation, TopiaException.class); - - // Implementation - compositeOperation = createImplOperation(interfaceOperation); - - compositeOperationBody = new StringBuilder("" -/*{ - List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); - - // pour tous les attributs rechecher les composites et les class d'asso - // on les ajoute dans tmp -}*/ - ); - } - - protected void updateCompositeOperation(ObjectModelAttribute attribute) { - if (attribute.referenceClassifier() && - attribute.getClassifier().hasStereotype(STEREOTYPE_ENTITY)) { - if (attribute.isComposite()) { - String attrName = attribute.getName(); - String getterName = "get" + StringUtils.capitalize(attrName); - if (GeneratorUtil.isNMultiplicity(attribute)) { - compositeOperationBody.append("" -/*{ if (<%=getterName%>() != null) { - tmp.addAll(<%=getterName%>()); - } -}*/ ); } else { - compositeOperationBody.append("" -/*{ tmp.add(<%=getterName%>()); + String collectionType = TopiaGeneratorUtil.getSimpleName( + TopiaGeneratorUtil.getNMultiplicityInterfaceType( + attr)); + body.append("" +/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=collectionType%>.class, <%=attrType%>.class, <%=attrName%>); }*/ ); } - } else if (attribute.hasAssociationClass()) { - String assocAttrName = GeneratorUtil.getAssocAttrName( - attribute); + } else { + String assocAttrName = GeneratorUtil.getAssocAttrName(attr); + assocAttrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); String assocClassFQN = TopiaGeneratorUtil.getSimpleName( - attribute.getAssociationClass().getQualifiedName()); - String ref = "this." + GeneratorUtil.toLowerCaseFirstLetter( - assocAttrName); - if (!GeneratorUtil.isNMultiplicity(attribute)) { - compositeOperationBody.append("" -/*{ - if (<%=ref%> != null) { - tmp.add(<%=ref%>); - } + attr.getAssociationClass().getQualifiedName()); + if (!GeneratorUtil.isNMultiplicity(attr)) { + body.append("" +/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=assocClassFQN%>.class, <%=assocAttrName%>); }*/ ); } else { - ObjectModelAttribute reverse = attribute.getReverseAttribute(); - String reverseAttrName = reverse.getName(); - // On utilise pas l'attribut car il est potentiellement - // pas a jour, car pour les asso avec cardinalité - // personne ne fait de add. Ce qui est normal, mais - // pour pouvoir faire tout de meme des delete en cascade - // sur les asso, le champs est dans le mapping - // hibernate et donc il le faut aussi dans la classe - // sinon hibernate rale lorsqu'il charge l'objet -// if (<%=ref%> != null) { -// tmp.addAll(<%=ref%>); -// } - compositeOperationBody.append("" -/*{ - { - org.nuiton.topia.persistence.TopiaDAO<<%=assocClassFQN%>> dao = ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=assocClassFQN%>.class); - List<<%=assocClassFQN%>> findAllByProperties = dao.findAllByProperties("<%=reverseAttrName%>", this); - if (findAllByProperties != null) { - tmp.addAll(findAllByProperties); - } - } + String collectionType = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); + body.append("" +/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=collectionType%>.class, <%=assocClassFQN%>.class, <%=assocAttrName%>); }*/ ); } } } - } - protected void closeCompositeOperation() { - compositeOperationBody.append("" -/*{ - // on refait un tour sur chaque entity de tmp pour recuperer leur - // composite - List<TopiaEntity> result = new ArrayList<TopiaEntity>(); - for (TopiaEntity entity : tmp) { - if (entity != null) { - result.add(entity); - result.addAll(entity.getComposite()); + //Déclaration des attributs d'une classe d'associations + if (input instanceof ObjectModelAssociationClass) { + ObjectModelAssociationClass assoc = (ObjectModelAssociationClass) input; + for (ObjectModelAttribute attr : assoc.getParticipantsAttributes()) { + if (attr != null) { + String attrType = TopiaGeneratorUtil.getSimpleName( + attr.getType()); + String attrName = attr.getName(); + attrName = GeneratorUtil.toLowerCaseFirstLetter(attrName); + body.append("" +/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); +}*/ + ); + } } } - - return result; - }*/ + body.append("" +/*{ visitor.end(this); +}*/ ); - setOperationBody(compositeOperation, compositeOperationBody.length() == 0 ? - " " : compositeOperationBody.toString()); + setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } + protected void generateToStringMethod(ObjectModelClass input) { - ///////////////////////////////// OLD + if (!TopiaGeneratorUtil.generateToString(input, model)) { + return; + } - // ------------------------------------------------------------------------- - // Abstract generation - // ------------------------------------------------------------------------- - - protected void generateToStringMethod(ObjectModelClass output, - ObjectModelClass clazz) { if (log.isDebugEnabled()) { - log.debug("generate toString method for clazz " + - clazz.getQualifiedName()); + log.debug("generate toString method for entity " + + outputInterface.getQualifiedName()); } - ObjectModelOperation op = addOperation(output, - "toString", - String.class, - ObjectModelModifier.PUBLIC); - addAnnotation(output, op, Override.class.getSimpleName()); - StringBuilder body = new StringBuilder(); + ObjectModelOperation operation = + addOperation(outputAbstract, "toString", String.class); + addAnnotation(outputAbstract, operation, Override.class.getSimpleName()); - body.append("" + addImport(outputAbstract, ToStringBuilder.class); + + StringBuilder body = new StringBuilder("" /*{ String result = new ToStringBuilder(this). }*/ ); - for (ObjectModelAttribute attr : clazz.getAttributes()) { + for (ObjectModelAttribute attr : input.getAttributes()) { + //FIXME possibilité de boucles (non directes) + ObjectModelClass attrEntity = null; + if (model.hasClass(attr.getType())) { attrEntity = model.getClass(attr.getType()); } + boolean isEntity = attrEntity != null && attrEntity.hasStereotype(STEREOTYPE_ENTITY); + ObjectModelAttribute reverse = attr.getReverseAttribute(); if (isEntity && (reverse == null || !reverse.isNavigable()) && !attr.hasAssociationClass() || !isEntity) { @@ -1405,22 +1297,23 @@ return result; }*/ ); - setOperationBody(op, body.length() == 0 ? " " : body.toString()); + setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } - @Deprecated - protected void generateCompositeMethod(ObjectModelClass output, - ObjectModelClass clazz) { + protected void generateCompositeMethod(ObjectModelClass input) { - ObjectModelOperation op = addOperation(output, - "getComposite", - List.class.getName() + '<' + TopiaEntity.class.getName() + '>', - ObjectModelModifier.PUBLIC); - addException(op, TopiaException.class); - addAnnotation(output, op, Override.class.getSimpleName()); - StringBuilder body = new StringBuilder(); - body.append("" + ObjectModelOperation operation = + addOperation(outputAbstract, "getComposite", + List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); + + addException(operation, TopiaException.class); + addAnnotation(outputAbstract, operation, Override.class.getSimpleName()); + + addImport(outputAbstract, ArrayList.class); + addImport(outputAbstract, List.class); + + StringBuilder body = new StringBuilder("" /*{ List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -1428,10 +1321,12 @@ // on les ajoute dans tmp }*/ ); - for (ObjectModelAttribute attr : clazz.getAttributes()) { + for (ObjectModelAttribute attr : input.getAttributes()) { + if (attr.referenceClassifier() && attr.getClassifier().hasStereotype( STEREOTYPE_ENTITY)) { + if (attr.isComposite()) { String attrName = attr.getName(); String getterName = "get" + StringUtils.capitalize(attrName); @@ -1476,6 +1371,8 @@ // if (<%=ref%> != null) { // tmp.addAll(<%=ref%>); // } + + addImport(outputAbstract, TopiaContextImplementor.class); body.append("" /*{ { @@ -1507,21 +1404,22 @@ }*/ ); - setOperationBody(op, body.length() == 0 ? " " : body.toString()); + setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } - @Deprecated - protected void generateAggregateMethod(ObjectModelClass output, - ObjectModelClass clazz) { + protected void generateAggregateMethod(ObjectModelClass input) { - ObjectModelOperation op = addOperation(output, - "getAggregate", - List.class.getName() + '<' + TopiaEntity.class.getName() + '>', - ObjectModelModifier.PUBLIC); - addException(op, TopiaException.class); - addAnnotation(output, op, Override.class.getSimpleName()); - StringBuilder body = new StringBuilder(); - body.append("" + ObjectModelOperation operation = + addOperation(outputAbstract, "getAggregate", + List.class.getName() + '<' + TopiaEntity.class.getName() + '>'); + + addException(operation, TopiaException.class); + addAnnotation(outputAbstract, operation, Override.class.getSimpleName()); + + addImport(outputAbstract, ArrayList.class); + addImport(outputAbstract, List.class); + + StringBuilder body = new StringBuilder("" /*{ List<TopiaEntity> tmp = new ArrayList<TopiaEntity>(); @@ -1529,24 +1427,24 @@ // on les ajoute dans tmp }*/ ); - for (ObjectModelAttribute attr : clazz.getAttributes()) { + for (ObjectModelAttribute attr : input.getAttributes()) { + if (attr.referenceClassifier() && - attr.getClassifier().hasStereotype( - STEREOTYPE_ENTITY)) { - if (attr.isAggregate()) { - String attrName = attr.getName(); - String getterName = "get" + StringUtils.capitalize(attrName); - if (GeneratorUtil.isNMultiplicity(attr)) { - body.append("" + attr.getClassifier().hasStereotype(STEREOTYPE_ENTITY) && + attr.isAggregate()) { + + String attrName = attr.getName(); + String getterName = "get" + StringUtils.capitalize(attrName); + if (GeneratorUtil.isNMultiplicity(attr)) { + body.append("" /*{ tmp.addAll(<%=getterName%>()); }*/ - ); - } else { - body.append("" + ); + } else { + body.append("" /*{ tmp.add(<%=getterName%>()); }*/ - ); - } + ); } } } @@ -1564,104 +1462,36 @@ }*/ ); - setOperationBody(op, body.length() == 0 ? " " : body.toString()); + setOperationBody(operation, body.length() == 0 ? " " : body.toString()); } - @Deprecated - protected void generateAcceptMethod(ObjectModelClass output, - ObjectModelClass clazz) { + protected void generateI18nBlock(ObjectModelClass input) { - ObjectModelOperation op = addOperation(output, - "accept", - "void", - ObjectModelModifier.PUBLIC); - addException(op, TopiaException.class); - addAnnotation(output, op, Override.class.getSimpleName()); - setDocumentation(op, "Envoi via les methodes du visitor l'ensemble des " + - "champs de l'entity\n" + - "avec leur nom, type et valeur."); - { - ObjectModelParameter attr = addParameter(op, EntityVisitor.class, - "visitor"); - setDocumentation(attr, "le visiteur de l'entite."); + String i18nPrefix = TopiaGeneratorUtil.getI18nPrefix(input, model); + if (StringUtils.isEmpty(i18nPrefix)) { + return; } - StringBuilder body = new StringBuilder(); - body.append("" -/*{ - visitor.start(this); -}*/ - ); - for (ObjectModelAttribute attr : clazz.getAttributes()) { - ObjectModelAttribute reverse = attr.getReverseAttribute(); - // pour les asso quoi qu'il arrive il faut les lier des 2 cotes - // pour pouvoir supprimer en cascade l'asso lors de la suppression - // d'un des cotes - if (!(attr.isNavigable() - || hasUnidirectionalRelationOnAbstractType(reverse, model) - || attr.hasAssociationClass())) { - continue; - } + ObjectModelOperation block = + addBlock(outputAbstract, ObjectModelModifier.STATIC); - if (!attr.hasAssociationClass()) { - String attrType = TopiaGeneratorUtil.getSimpleName(attr.getType()); - String attrName = attr.getName(); - if (!GeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } else { - String collectionType = TopiaGeneratorUtil.getSimpleName( - TopiaGeneratorUtil.getNMultiplicityInterfaceType( - attr)); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=collectionType%>.class, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } - } else { - String assocAttrName = GeneratorUtil.getAssocAttrName(attr); - assocAttrName = GeneratorUtil.toLowerCaseFirstLetter(assocAttrName); - String assocClassFQN = TopiaGeneratorUtil.getSimpleName( - attr.getAssociationClass().getQualifiedName()); - if (!GeneratorUtil.isNMultiplicity(attr)) { - body.append("" -/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=assocClassFQN%>.class, <%=assocAttrName%>); -}*/ - ); - } else { - String collectionType = TopiaGeneratorUtil.getNMultiplicityInterfaceType(attr); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(assocAttrName)%>, <%=collectionType%>.class, <%=assocClassFQN%>.class, <%=assocAttrName%>); -}*/ - ); - } + StringBuilder buffer = new StringBuilder(300); + addI18n(buffer, i18nPrefix, Introspector.decapitalize(input.getName())); + for (ObjectModelAttribute attr : input.getAttributes()) { + //TC-20100225 only treate navigable relations + if (attr.isNavigable()) { + addI18n(buffer, i18nPrefix, Introspector.decapitalize(attr.getName())); } } + setOperationBody(block, buffer.toString()); + } - //Déclaration des attributs d'une classe d'associations - if (clazz instanceof ObjectModelAssociationClass) { - ObjectModelAssociationClass assoc = (ObjectModelAssociationClass) clazz; - for (ObjectModelAttribute attr : assoc.getParticipantsAttributes()) { - if (attr != null) { - String attrType = TopiaGeneratorUtil.getSimpleName( - attr.getType()); - String attrName = attr.getName(); - attrName = GeneratorUtil.toLowerCaseFirstLetter(attrName); - body.append("" -/*{ visitor.visit(this, <%=getConstantName(attrName)%>, <%=attrType%>.class, <%=attrName%>); -}*/ - ); - } - } - } - body.append("" -/*{ visitor.end(this); -}*/ - ); - - setOperationBody(op, body.length() == 0 ? " " : body.toString()); + protected void addI18n(StringBuilder buffer, String i18nPrefix, + String suffix) { + buffer.append("\n org.nuiton.i18n.I18n.n_(\""); + buffer.append(i18nPrefix); + buffer.append(suffix); + buffer.append("\");"); } /** @@ -1692,30 +1522,6 @@ } } - private void generateI18n(ObjectModelClass result, String i18nPrefix, - ObjectModelClass clazz) { - - ObjectModelOperation block = addBlock(result, ObjectModelModifier.STATIC); - - StringBuilder buffer = new StringBuilder(300); - addI18n(buffer, i18nPrefix, Introspector.decapitalize(clazz.getName())); - for (ObjectModelAttribute attr : clazz.getAttributes()) { - //TC-20100225 only treate navigable relations - if (attr.isNavigable()) { - addI18n(buffer, i18nPrefix, Introspector.decapitalize(attr.getName())); - } - } - setOperationBody(block, buffer.toString()); - } - - private void addI18n(StringBuilder buffer, String i18nPrefix, - String suffix) { - buffer.append("\n org.nuiton.i18n.I18n.n_(\""); - buffer.append(i18nPrefix); - buffer.append(suffix); - buffer.append("\");"); - } - // ------------------------------------------------------------------------- // Helpers // -------------------------------------------------------------------------

1 0