X-Account-Key: account2 X-Mozilla-Keys: Return-Path: X-Original-To: thimel@bihar.codelutin.net Delivered-To: thimel@bihar.codelutin.net Received: from localhost (bihar.codelutin.com [79.98.16.206]) by bihar.codelutin.net (Postfix) with ESMTP id C885362B75; Wed, 15 Jul 2009 15:47:29 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bihar.codelutin.net X-Spam-Score: -2.599 X-Spam-Level: X-Spam-Status: No, score=-2.599 tagged_above=-1002 required=6.31 tests=[BAYES_00=-2.599] Received: from bihar.codelutin.net ([79.98.16.206]) by localhost (bihar.codelutin.com [79.98.16.206]) (amavisd-new, port 10024) with ESMTP id O9qu7AGyKIGY; Wed, 15 Jul 2009 15:47:27 +0200 (CEST) Received: from labs.libre-entreprise.org (labs.libre-entreprise.org [212.85.154.93]) by bihar.codelutin.net (Postfix) with ESMTP id 899E462B72; Wed, 15 Jul 2009 15:47:27 +0200 (CEST) Received: from labs.libre-entreprise.org (labs.libre-entreprise.org [212.85.154.93]) by labs.libre-entreprise.org (Postfix) with ESMTP id 96300461707; Wed, 15 Jul 2009 15:47:25 +0200 (CEST) X-Original-To: topia-commits@lists.labs.libre-entreprise.org Delivered-To: topia-commits@lists.labs.libre-entreprise.org Received: from bihar.codelutin.net (bihar.codelutin.com [79.98.16.206]) by labs.libre-entreprise.org (Postfix) with ESMTP id C2B7D461707 for ; Wed, 15 Jul 2009 15:47:24 +0200 (CEST) Received: from localhost (bihar.codelutin.com [79.98.16.206]) by bihar.codelutin.net (Postfix) with ESMTP id 58CE875515 for ; Wed, 15 Jul 2009 15:47:26 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at bihar.codelutin.net Received: from bihar.codelutin.net ([79.98.16.206]) by localhost (bihar.codelutin.com [79.98.16.206]) (amavisd-new, port 10024) with ESMTP id mNQfxWX0IFf7 for ; Wed, 15 Jul 2009 15:47:24 +0200 (CEST) Received: from nuiton.codelutin.com (a209.ip.network-consulting.fr [79.98.16.209]) by bihar.codelutin.net (Postfix) with ESMTP id 7EE4B62B72 for ; Wed, 15 Jul 2009 15:47:24 +0200 (CEST) Received: from localhost.localdomain (localhost [127.0.0.1]) by nuiton.codelutin.com (Postfix) with ESMTP id 661A416596 for ; Wed, 15 Jul 2009 15:47:24 +0200 (CEST) To: topia-commits@lists.labs.libre-entreprise.org From: echatellier@users.labs.libre-entreprise.org Message-Id: <20090715134724.661A416596@nuiton.codelutin.com> Date: Wed, 15 Jul 2009 15:47:24 +0200 (CEST) Subject: [Topia-commits] r1607 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator X-BeenThere: topia-commits@lists.labs.libre-entreprise.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: List-Unsubscribe: , =?utf-8?q?=3Cmailto=3Atopia-commits-request=40lists=2Elabs=2Elibre-entrepri?= =?utf-8?q?se=2Eorg=3Fsubject=3Dunsubscribe=3E?= List-Archive: List-Post: List-Help: List-Subscribe: , =?utf-8?q?=3Cmailto=3Atopia-commits-request=40lists=2Elabs=2Elibre-entrepri?= =?utf-8?q?se=2Eorg=3Fsubject=3Dsubscribe=3E?= MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: topia-commits-bounces@lists.labs.libre-entreprise.org Errors-To: topia-commits-bounces@lists.labs.libre-entreprise.org Author: echatellier Date: 2009-07-15 15:47:24 +0200 (Wed, 15 Jul 2009) New Revision: 1607 Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityA= bstractGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityH= ibernateMappingGenerator.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaGe= neratorUtil.java Log: Merge branche on trunk Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/= EntityAbstractGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/Entity= AbstractGenerator.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/Entity= AbstractGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -377,7 +377,9 @@ String attrName =3D attr.getName(); String getterName =3D "get" + GeneratorUtil.capitaliz= e(attrName); if (GeneratorUtil.isNMultiplicity(attr)) { -/*{ tmp.addAll(<%=3DgetterName%>()); +/*{ if (<%=3DgetterName%>() !=3D null) { + tmp.addAll(<%=3DgetterName%>()); + } }*/ } else { /*{ tmp.add(<%=3DgetterName%>()); @@ -407,9 +409,11 @@ // tmp.addAll(<%=3Dref%>); // } /*{ - tmp.addAll(((TopiaContextImplementor)getTopiaContext()) - .getDAO(<%=3DassocClassFQN%>.class) - .findAllByProperties("<%=3DreverseAttrName%>", this)); + org.codelutin.topia.persistence.TopiaDAO<<%=3DassocClassFQN%>> dao= =3D ((TopiaContextImplementor) getTopiaContext()).getDAO(<%=3DassocClassFQ= N%>.class); + List<<%=3DassocClassFQN%>> findAllByProperties =3D dao.findAllByPr= operties("<%=3DreverseAttrName%>", this); + if (findAllByProperties !=3D null) { + tmp.addAll(findAllByProperties); + } }*/ } } Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/= EntityHibernateMappingGenerator.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/Entity= HibernateMappingGenerator.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/Entity= HibernateMappingGenerator.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -101,12 +101,18 @@ String tableName =3D TopiaGeneratorUtil.getDBName(clazz); String isAbstract =3D clazz.isAbstract()?"true":"false"; String clazzFQN =3D clazz.getQualifiedName(); - + = String optionalAttributes =3D ""; String schema =3D TopiaGeneratorUtil.getSchemaName(clazz, model); if (schema !=3D null) { optionalAttributes +=3D "schema=3D\"" + schema + "\" "; = } + = + //On pr=E9cise au proxy de quelle interface h=E9rite l'objet + String proxyTagValue =3D TopiaGeneratorUtil.findTagValue(TopiaGene= ratorUtil.TAG_PROXY_INTERFACE, clazz, model); + if (proxyTagValue =3D=3D null || !proxyTagValue.equals("none")) { + optionalAttributes +=3D "proxy=3D\"" + clazzFQN + "\" "; + } = if (haveSuper) { ObjectModelClass superClass =3D clazz.getSuperclasses().iterat= or().next(); @@ -115,15 +121,14 @@ log.debug("superClass for " + clazz.getQualifiedName() + " is= " + superClassname); } String superClassDOType =3D TopiaGeneratorUtil.getDOType(super= Classname, model); - //On pr=E9cise au proxy de quelle interface h=E9rite l'objet = -/*{ " extends=3D"<%=3DsuperCl= assDOType%>" table=3D"<%=3DtableName%>" node=3D"<%=3DclazzDOType%>" abstrac= t=3D"<%=3DisAbstract%>" proxy=3D"<%=3DclazzFQN%>" <%=3DoptionalAttributes%>> +/*{ " extends=3D"<%=3DsuperCl= assDOType%>" table=3D"<%=3DtableName%>" node=3D"<%=3DclazzDOType%>" abstrac= t=3D"<%=3DisAbstract%>" <%=3DoptionalAttributes%>> }*/ // FIXME mieux gerer le cas haveSuper noneNaturalAttributes.addAll(clazz.getAttributes()); } else { -/*{ " table=3D"<%=3DtableName%>" node= =3D"<%=3DclazzDOType%>" abstract=3D"<%=3DisAbstract%>" proxy=3D"<%=3DclazzF= QN%>" <%=3DoptionalAttributes%>> +/*{ " table=3D"<%=3DtableName%>" node= =3D"<%=3DclazzDOType%>" abstract=3D"<%=3DisAbstract%>" <%=3DoptionalAttribu= tes%>> }*/ // on detecte les attributs des clef metiers = Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/= TopiaGeneratorUtil.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaG= eneratorUtil.java 2009-07-15 13:28:00 UTC (rev 1606) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/TopiaG= eneratorUtil.java 2009-07-15 13:47:24 UTC (rev 1607) @@ -103,6 +103,15 @@ public static final String TAG_NOT_NULL =3D "notNull"; /** Tag pour sp=E9cifier la caract=E8re embed-xml d'une association */ public static final String TAG_EMBED_XML =3D "embedXml"; + /** + * Tag pour configurer l'interface du proxy sur autre chose que l'impl= ementation par defaut. + * = + * Par defaut : + * null > generere le proxy sur l'interface de l'implementation + * Autre valeur : + * "none" > laisse la configuration par defaut d'hibernate + */ + public static final String TAG_PROXY_INTERFACE =3D "hibernateProxyInte= rface"; /** Tag pour sp=E9cifier le permissions =E0 la cr=E9ation */ public static final String TAG_SECURITY_CREATE =3D "securityCreate"; /** Tag pour sp=E9cifier le permissions au chargement */ _______________________________________________ Topia-commits mailing list Topia-commits@lists.labs.libre-entreprise.org https://lists.labs.libre-entreprise.org/mailman/listinfo/topia-commits