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

r2227 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util
by tchemit＠users.nuiton.org March 17, 2011

March 17, 2011

Author: tchemit Date: 2011-03-17 10:59:22 +0100 (Thu, 17 Mar 2011) New Revision: 2227 Url: http://nuiton.org/repositories/revision/topia/2227 Log: improve TopiaentityMap Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java 2011-03-17 09:56:17 UTC (rev 2226) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/util/TopiaEntityMap.java 2011-03-17 09:59:22 UTC (rev 2227) @@ -63,8 +63,13 @@ * @param e the entity on which to find the key. * @return the key of the given entity. */ - protected abstract K getType(TopiaEntity e); + protected abstract K getType(Class<?> e); + public <T extends V> List<T> get(Class<T> type) { + K key = getType(type); + List<T> vs = (List<T>) get(key); + return vs; + } /** * Adds the given entity to the dictonary only if it does not exists. @@ -97,7 +102,7 @@ @SuppressWarnings({"unchecked"}) protected <T extends V> List<T> getList(T entity) { - K type = getType(entity); + K type = getType(entity.getClass()); List<T> list = (List<T>) get(type); if (list == null) { list = new ArrayList<T>();

1 0

r2226 - trunk
by tchemit＠users.nuiton.org March 17, 2011

March 17, 2011

Author: tchemit Date: 2011-03-17 10:56:17 +0100 (Thu, 17 Mar 2011) New Revision: 2226 Url: http://nuiton.org/repositories/revision/topia/2226 Log: use license-m-p Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-14 13:38:12 UTC (rev 2225) +++ trunk/pom.xml 2011-03-17 09:56:17 UTC (rev 2226) @@ -317,8 +317,8 @@ </plugin> <plugin> - <groupId>org.nuiton</groupId> - <artifactId>maven-license-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>license-maven-plugin</artifactId> <configuration> <extraExtensions> <objectmodel>xml</objectmodel>

1 0

r2225 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence
by echatellier＠users.nuiton.org March 14, 2011

March 14, 2011

Author: echatellier Date: 2011-03-14 14:38:12 +0100 (Mon, 14 Mar 2011) New Revision: 2225 Url: http://nuiton.org/repositories/revision/topia/2225 Log: Add delete operation on entity Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.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 2011-03-14 09:31:25 UTC (rev 2224) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-14 13:38:12 UTC (rev 2225) @@ -289,6 +289,16 @@ ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).update(this); }*/ ); + + op = addOperation(outputAbstract, "delete", "void", ObjectModelModifier.PUBLIC); + addException(op, TopiaException.class); + setDocumentation(op,"@since 2.5.3"); + addAnnotation(outputAbstract, op, Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).delete(this); +}*/ + ); } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-03-14 09:31:25 UTC (rev 2224) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-03-14 13:38:12 UTC (rev 2225) @@ -61,4 +61,11 @@ * @throws TopiaException */ public void update() throws TopiaException; + + /** + * Delete entity in persistence context. + * + * @throws TopiaException + */ + public void delete() throws TopiaException; }

1 0

r2224 - trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence
by echatellier＠users.nuiton.org March 14, 2011

March 14, 2011

Author: echatellier Date: 2011-03-14 10:31:25 +0100 (Mon, 14 Mar 2011) New Revision: 2224 Url: http://nuiton.org/repositories/revision/topia/2224 Log: This should not have been committed Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-12 14:21:55 UTC (rev 2223) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-14 09:31:25 UTC (rev 2224) @@ -56,7 +56,7 @@ protected Date topiaCreateDate = new Date(); - //transient protected TopiaContext topiaContext; + transient protected TopiaContext topiaContext; transient protected VetoableChangeSupport readVetoables; @@ -144,21 +144,21 @@ this.topiaCreateDate = topiaCreateDate; } - /*public TopiaContext getTopiaContext() { + public TopiaContext getTopiaContext() { return topiaContext; - }*/ + } - /* + /** * @param context The context to set. * @throws TopiaException if any pb ? - * + */ public void setTopiaContext(TopiaContext context) throws TopiaException { if (topiaContext == null) { topiaContext = context; } else { throw new TopiaException("Remplacement du contexte interdit"); } - }*/ + } @Override public List<TopiaEntity> getComposite() throws TopiaException {

1 0

r2223 - trunk
by tchemit＠users.nuiton.org March 12, 2011

March 12, 2011

Author: tchemit Date: 2011-03-12 15:21:55 +0100 (Sat, 12 Mar 2011) New Revision: 2223 Url: http://nuiton.org/repositories/revision/topia/2223 Log: Update mavenpom4redmineAndCentral to 2.5.2. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-03-11 17:29:42 UTC (rev 2222) +++ trunk/pom.xml 2011-03-12 14:21:55 UTC (rev 2223) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>2.5.1</version> + <version>2.5.2</version> </parent> <artifactId>topia</artifactId>

1 0

r2222 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: framework generator persistence
by echatellier＠users.nuiton.org March 11, 2011

March 11, 2011

Author: echatellier Date: 2011-03-11 18:29:42 +0100 (Fri, 11 Mar 2011) New Revision: 2222 Url: http://nuiton.org/repositories/revision/topia/2222 Log: #1391 : TopiaContext doit pouvoir ?\195?\170tre accessible depuis l'entit?\195?\169 Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.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 trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImplementor.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -23,17 +23,6 @@ * #L% */ -/* * - * TopiaContextImplementor.java - * - * Created: 3 janv. 2006 21:27:24 - * - * @author poussin <poussin(a)codelutin.com> - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ package org.nuiton.topia.framework; import org.hibernate.Session; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaFilter.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -33,8 +33,6 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; -import java.util.ArrayList; -import java.util.List; /** * Filter Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityTransformer.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -24,6 +24,14 @@ */ package org.nuiton.topia.generator; +import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; + +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.commons.logging.Log; @@ -44,18 +52,11 @@ import org.nuiton.topia.persistence.EntityVisitor; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaEntityAbstract; +import org.nuiton.topia.persistence.TopiaEntityContextable; import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import java.net.URL; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; -import static org.nuiton.topia.generator.TopiaGeneratorUtil.hasUnidirectionalRelationOnAbstractType; - - /*{generator option: parentheses = false}*/ /*{generator option: writeString = +}*/ @@ -204,7 +205,12 @@ // Extends TopiaEntity (only if hasn't parent entity) if (needTopiaEntity) { - addInterface(outputInterface, TopiaEntity.class); + if (TopiaGeneratorUtil.isContextable(input)) { + addInterface(outputInterface, TopiaEntityContextable.class); + } + else { + addInterface(outputInterface, TopiaEntity.class); + } } } @@ -259,8 +265,34 @@ addConstant(outputInterface, "serialVersionUID", long.class, svUID, ObjectModelModifier.PRIVATE); } + + addContextableMethods(input, outputAbstract); } + /** + * Ajout les methodes necessaire à l'interface {@link TopiaEntityContextable} + * si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} est renseigné. + */ + protected void addContextableMethods(ObjectModelClass input, ObjectModelClass outputAbstract) { + + if (TopiaGeneratorUtil.isContextable(input)) { + + addImport(outputAbstract, TopiaContextImplementor.class); + + ObjectModelOperation op = addOperation(outputAbstract, "update", "void", + ObjectModelModifier.PUBLIC); + addException(op, TopiaException.class); + setDocumentation(op,"@since 2.5.3"); + addAnnotation(outputAbstract, op, Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + ((TopiaContextImplementor)getTopiaContext()).getDAO(<%=input.getName()%>.class).update(this); +}*/ + ); + } + + } + protected boolean isGenerateImpl(ObjectModelClass input, Collection<ObjectModelOperation> operations) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGeneratorUtil.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -67,7 +67,6 @@ * @author tchemit <tchemit(a)codelutin.com> * @author fdesbois <fdesbois(a)codelutin.com> * @author chatellier <chatellier(a)codelutin.com> - * @author thimel <thimel(a)codelutin.com> * @version $Id$ */ public class TopiaGeneratorUtil extends JavaGeneratorUtil { @@ -819,6 +818,22 @@ } /** + * Retourne true si le tagValue {@link TopiaTagValues#TAG_CONTEXTABLE} + * à la valeur {@code true}. + * + * @param classifier classifier to test + * @return {@code true} si {@link TopiaTagValues#TAG_CONTEXTABLE} == {@code true} + */ + public static boolean isContextable(ObjectModelClassifier classifier) { + boolean result = false; + String value = classifier.getTagValue(TopiaTagValues.TAG_CONTEXTABLE); + if (StringUtils.equalsIgnoreCase(value, "true")) { + result = true; + } + return result; + } + + /** * Obtain the list of fqn of object involed in the given class. * * @param aClass the clazz to inspect 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 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaTagValues.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -32,6 +32,7 @@ import org.nuiton.eugene.models.object.ObjectModelClassifier; import org.nuiton.eugene.models.object.ObjectModelElement; import org.nuiton.eugene.models.object.ObjectModelOperation; +import org.nuiton.topia.TopiaContext; import org.nuiton.topia.persistence.TopiaEntityEnum; import static org.nuiton.eugene.ModelPropertiesUtil.TagValueDefinition; @@ -65,6 +66,15 @@ String TAG_PERSISTENCE_TYPE = "persistenceType"; /** + * Tag pour que les entités etendent {@link TopiaEntityContextable} et + * se fasse injecter le {@link TopiaContext} par rapport aux autres + * entités qui ne l'ont pas. + * @since 2.5.3 + */ + @TagValueDefinition(target = {ObjectModelClassifier.class}, documentation = "") + String TAG_CONTEXTABLE = "contextable"; + + /** * Tag pour le nom du champ / entité en BD. * * @see TopiaGeneratorUtil#getDbNameTagValue(ObjectModelElement) @@ -362,7 +372,7 @@ * @since 2.3.2 */ @TagValueDefinition(target = {ObjectModel.class}, - documentation = "Sets the fully qualified name of the exeception to generate in Services and QueryHelper") + documentation = "Sets the fully qualified name of the exception to generate in Services and QueryHelper") String TAG_EXCEPTION_CLASS = "exceptionClass"; // ------------------------------------------------------------------------- Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -58,12 +58,9 @@ import java.io.Serializable; import java.lang.reflect.InvocationTargetException; import java.security.Permission; -import java.util.ArrayList; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.logging.Log; Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-07 09:54:50 UTC (rev 2221) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityAbstract.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -23,22 +23,8 @@ * #L% */ -/******************************************************************************* - * TopiaEntityAbstract.java - * - * Created: 28 déc. 2005 22:50:42 - * - * @author poussin <poussin(a)codelutin.com> - * - * @version $Revision$ - * - * Last update: $Date$ by : $Author$ - */ - package org.nuiton.topia.persistence; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; @@ -64,16 +50,13 @@ /** serialVersionUID. */ private static final long serialVersionUID = -7458577454878852241L; - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(TopiaEntityAbstract.class); - protected String topiaId; protected long topiaVersion; protected Date topiaCreateDate = new Date(); - transient protected TopiaContext topiaContext; + //transient protected TopiaContext topiaContext; transient protected VetoableChangeSupport readVetoables; @@ -161,21 +144,21 @@ this.topiaCreateDate = topiaCreateDate; } - public TopiaContext getTopiaContext() { + /*public TopiaContext getTopiaContext() { return topiaContext; - } + }*/ - /** + /* * @param context The context to set. * @throws TopiaException if any pb ? - */ + * public void setTopiaContext(TopiaContext context) throws TopiaException { if (topiaContext == null) { topiaContext = context; } else { throw new TopiaException("Remplacement du contexte interdit"); } - } + }*/ @Override public List<TopiaEntity> getComposite() throws TopiaException { Added: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java (rev 0) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java 2011-03-11 17:29:42 UTC (rev 2222) @@ -0,0 +1,64 @@ +/* + * #%L + * + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2011 Codelutin, Chatellier Eric + * %% + * 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.persistence; + +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; + +/** + * {@link TopiaEntity} with {@link TopiaContext} support (injected by + * {@link TopiaContext} into entities). + * + * @author chatellier + * @version $Revision$ + * + * Last update : $Date$ + * By : $Author$ + */ +public interface TopiaEntityContextable extends TopiaEntity { + + /** + * Set topia context. + * + * @param topiaContext topia context + * @throws TopiaException if current topia entity context is not null + */ + public void setTopiaContext(TopiaContext topiaContext) throws TopiaException; + + /** + * Get topia context. + * + * @return topia context + */ + public TopiaContext getTopiaContext(); + + /** + * Update entity in persistence context. + * + * @throws TopiaException + */ + public void update() throws TopiaException; +} Property changes on: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaEntityContextable.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL

1 0

r2221 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org March 7, 2011

March 7, 2011

Author: tchemit Date: 2011-03-07 10:54:50 +0100 (Mon, 07 Mar 2011) New Revision: 2221 Url: http://nuiton.org/repositories/revision/topia/2221 Log: Anomalie #1382: NPE in generation if DAO stereotype little clean in DAO transformers Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-03-04 08:57:47 UTC (rev 2220) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOAbstractTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) @@ -43,7 +43,6 @@ import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaDAOImpl; import org.nuiton.topia.persistence.TopiaDAOLegacy; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; @@ -143,6 +142,16 @@ ObjectModelDependency dependency = interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + if (dependency == null) { + if (log.isWarnEnabled()) { + log.warn("Could not find dependency " + + TopiaGeneratorUtil.DEPENDENCIES_DAO + + " but DAO stereotype was placed on the interface " + + interfacez.getName()); + + } + return; + } ObjectModelClassifier classifier = dependency.getSupplier(); if (TopiaGeneratorUtil.hasEntityStereotype(classifier)) { @@ -185,11 +194,6 @@ } if (extendClass.length() == 0) { extendClass = daoImplementation.getName() + "<E>"; -// if (extendLegacyDAO) { -// extendClass = TopiaDAOLegacy.class.getName() + "<E>"; -// } else { -// extendClass = TopiaDAOImpl.class.getName() + "<E>"; -// } } if (log.isDebugEnabled()) { log.debug("super class = " + extendClass); @@ -490,7 +494,6 @@ List<<%=attrSimpleType%>> list = getContext() .getDAO(<%=attrSimpleType%>.class) .findAllByProperties(<%=attrSimpleType%>.<%=getConstantName(reverseAttrName)%>, entity); - // .findAllByProperties("<%=reverseAttrName%>", entity); for (<%=attrSimpleType%> item : list) { item.set<%=StringUtils.capitalize(reverseAttrName)%>(null); }*/ Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2011-03-04 08:57:47 UTC (rev 2220) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOImplTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) @@ -25,6 +25,8 @@ package org.nuiton.topia.generator; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.eugene.java.ObjectModelTransformerToJava; import org.nuiton.eugene.models.object.ObjectModelClass; import org.nuiton.eugene.models.object.ObjectModelClassifier; @@ -45,6 +47,9 @@ */ public class DAOImplTransformer extends ObjectModelTransformerToJava { + /** Logger. */ + static Log log = LogFactory.getLog(DAOImplTransformer.class); + /** * Collection used to identify entities full qualified name that have * a dependency for DAO extra operations. So no need to generate the @@ -67,6 +72,16 @@ ObjectModelDependency dependency = interfacez.getDependency(TopiaGeneratorUtil.DEPENDENCIES_DAO); + if (dependency == null) { + if (log.isWarnEnabled()) { + log.warn("Could not find dependency " + + TopiaGeneratorUtil.DEPENDENCIES_DAO + + " but DAO stereotype was placed on the interface " + + interfacez.getName()); + + } + return; + } ObjectModelClassifier classifier = dependency.getSupplier(); if (TopiaGeneratorUtil.hasEntityStereotype(classifier)) { Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2011-03-04 08:57:47 UTC (rev 2220) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOTransformer.java 2011-03-07 09:54:50 UTC (rev 2221) @@ -49,12 +49,12 @@ String clazzName = clazz.getName(); String clazzFQN = clazz.getQualifiedName(); ObjectModelClass result = createClass(clazzName + "DAO", clazz.getPackageName()); - setDocumentation(result,"/**\n" + - " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + - " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + - " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + - " */"); - setSuperClass(result,clazzFQN+"DAOImpl<"+clazzName+">"); + setDocumentation(result, "/**\n" + + " * Cette classe etend le DAOImpl pour parametrer la classe avec le bon type\n" + + " * Cette classe est marque finale car l'heritage entre les DAO se fait\n" + + " * sur les DOAImpl, c-a-d que DAOAbstract peut etendre le DAOImpl\n" + + " */"); + setSuperClass(result, clazzFQN + "DAOImpl<" + clazzName + ">"); }

1 0

r2220 - trunk/topia-persistence/src/main/java/org/nuiton/topia
by tchemit＠users.nuiton.org March 4, 2011

March 4, 2011

Author: tchemit Date: 2011-03-04 09:57:47 +0100 (Fri, 04 Mar 2011) New Revision: 2220 Url: http://nuiton.org/repositories/revision/topia/2220 Log: the cache of context is based on TopiaContext and not TopiaContextImpl... Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-03-04 08:52:50 UTC (rev 2219) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/TopiaContextFactory.java 2011-03-04 08:57:47 UTC (rev 2220) @@ -56,7 +56,7 @@ "TopiaContextImpl.properties"; /** Cache contenant tous les contexts deja créé. */ - protected static Map<Properties, TopiaContextImpl> contextCache = + protected static Map<Properties, TopiaContext> contextCache = new ReferenceMap(AbstractReferenceMap.HARD, AbstractReferenceMap.SOFT); @@ -68,7 +68,7 @@ */ public static List<String> getContextOpened() { List<String> result = new ArrayList<String>(); - for (Entry<Properties, TopiaContextImpl> e : contextCache.entrySet()) { + for (Entry<Properties, TopiaContext> e : contextCache.entrySet()) { // Useless test : will never happened that e.getValue() is null, // not allowed for {@link AbstractReferenceMap#SOFT}. // if (e.getValue() != null) { @@ -97,14 +97,13 @@ // Replaced by more powerful algorithm using iterator to remove context - Iterator<TopiaContextImpl> it = contextCache.values().iterator(); + Iterator<TopiaContext> it = contextCache.values().iterator(); - boolean removed = false; - while (it.hasNext() && !removed) { - TopiaContextImpl curr = it.next(); + while (it.hasNext()) { + TopiaContext curr = it.next(); if (curr == context) { it.remove(); - removed = true; + break; } } } @@ -135,13 +134,13 @@ public static TopiaContext getContext(Properties config) throws TopiaNotFoundException { // Put all properties from a hierarchy in the current properties object. - // Resolve problem with hibernate which used iterator to get properties + // Resolve problem with hibernate which used iterator to get properties // and so only values from the current properties object and not all // hierarchy for (String key : config.stringPropertyNames()) { config.setProperty(key, config.getProperty(key)); } - TopiaContextImpl result = contextCache.get(config); + TopiaContext result = contextCache.get(config); // useless test, context is automatically removed from Factory when closed if (result == null/* || result.isClosed()*/) { result = new TopiaContextImpl(config);

1 0

r2219 - trunk/topia-persistence/src/site
by tchemit＠users.nuiton.org March 4, 2011

March 4, 2011

Author: tchemit Date: 2011-03-04 09:52:50 +0100 (Fri, 04 Mar 2011) New Revision: 2219 Url: http://nuiton.org/repositories/revision/topia/2219 Log: fix doc Modified: trunk/topia-persistence/src/site/site_fr.xml Modified: trunk/topia-persistence/src/site/site_fr.xml =================================================================== --- trunk/topia-persistence/src/site/site_fr.xml 2011-03-03 15:33:12 UTC (rev 2218) +++ trunk/topia-persistence/src/site/site_fr.xml 2011-03-04 08:52:50 UTC (rev 2219) @@ -40,9 +40,9 @@ <menu ref="parent"/> <menu name="Utilisateur" inherit="top"> - <menu name="Presentation" href="index.html" /> - <menu name="Utilisation" href="howto.html" /> - <menu name="Tag values" href="tagvalues.html" /> + <item name="Presentation" href="index.html" /> + <item name="Utilisation" href="howto.html" /> + <item name="Tag values" href="tagvalues.html" /> </menu> <menu name="Developpeur">

1 0

r2218 - trunk/topia-persistence/src/site/rst
by echatellier＠users.nuiton.org March 4, 2011

March 4, 2011

Author: echatellier Date: 2011-03-03 16:33:12 +0100 (Thu, 03 Mar 2011) New Revision: 2218 Url: http://nuiton.org/repositories/revision/topia/2218 Log: Add tag values details page. Added: trunk/topia-persistence/src/site/rst/tagvalues.rst Added: trunk/topia-persistence/src/site/rst/tagvalues.rst =================================================================== --- trunk/topia-persistence/src/site/rst/tagvalues.rst (rev 0) +++ trunk/topia-persistence/src/site/rst/tagvalues.rst 2011-03-03 15:33:12 UTC (rev 2218) @@ -0,0 +1,54 @@ +Tag values +========== + +Topia templates are customizable using tag values. + +Here are current tag values defined in topia. They can be defined in source +model or model property file. + +Topia tag values +---------------- + ++--------------------------+-----------+----------------------------------------------------+ +| Name | Category | Description | ++==========================+===========+====================================================+ +| orderBy | Hibernate | Define order-by attribute in hibernate mapping for | +| | | a specific relation | ++--------------------------+-----------+----------------------------------------------------+ +| dbName | Hibernate | Database table name | ++--------------------------+-----------+----------------------------------------------------+ +| dbSchema | Hibernate | Database schema | ++--------------------------+-----------+----------------------------------------------------+ +| length | Hibernate | Attribute length in database | ++--------------------------+-----------+----------------------------------------------------+ +| annotation | all | Add annotation on attribute | ++--------------------------+-----------+----------------------------------------------------+ +| copyright | all | Generated files header copyright | ++--------------------------+-----------+----------------------------------------------------+ +| access | hibernate | Field access type | ++--------------------------+-----------+----------------------------------------------------+ +| i18n | entity | Generate i18n ??? | ++--------------------------+-----------+----------------------------------------------------+ +| naturalId | hibernate | Generate hibernate naturalId | ++--------------------------+-----------+----------------------------------------------------+ +| naturalIdMutable | hibernate | Tell hibernate if a natural id key is mutable | ++--------------------------+-----------+----------------------------------------------------+ +| inverse | hibernate | To configure with part of a N-N relation is inverse| ++--------------------------+-----------+----------------------------------------------------+ +| lazy | hibernate | Hibernate multiple attribute fetch property | +| | | (default to ''hibernate default value'') | ++--------------------------+-----------+----------------------------------------------------+ +| notNull | hibernate | Hibernate attribute not null property | +| | | (default to ''hibernate default value'') | ++--------------------------+-----------+----------------------------------------------------+ +| hibernateProxyInterface | hibernate | To not generate proxy information in | +| | | hibernate mappings. | ++--------------------------+-----------+----------------------------------------------------+ + + +Eugene tag values +----------------- + +Eugene contains also his tag values. See `eugene documentation`_ for more détails. + +.. _eugene documentation: http://maven-site.nuiton.org/eugene/

2 1