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

r2351 - in trunk/topia-persistence/src/main: java/org/nuiton/topia/generator resources/META-INF resources/META-INF/dtd
by tchemit＠users.nuiton.org 10 Oct '11

10 Oct '11

Author: tchemit Date: 2011-10-10 10:51:23 +0200 (Mon, 10 Oct 2011) New Revision: 2351 Url: http://nuiton.org/repositories/revision/topia/2351 Log: Anomalie #1769: Hibernate mappings fails to load in offline mode Added: trunk/topia-persistence/src/main/resources/META-INF/dtd/ trunk/topia-persistence/src/main/resources/META-INF/dtd/hibernate-mapping-3.0.dtd Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-10-06 23:01:42 UTC (rev 2350) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityHibernateMappingGenerator.java 2011-10-10 08:51:23 UTC (rev 2351) @@ -121,7 +121,7 @@ return; } /*{<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd"> +<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "classpath://META-INF/dtd/hibernate-mapping-3.0.dtd"> <hibernate-mapping default-access="field" auto-import="true" package="<%=input.getPackageName()%>"> }*/ boolean haveSuper = input.getSuperclasses().size() > 0; Added: trunk/topia-persistence/src/main/resources/META-INF/dtd/hibernate-mapping-3.0.dtd =================================================================== --- trunk/topia-persistence/src/main/resources/META-INF/dtd/hibernate-mapping-3.0.dtd (rev 0) +++ trunk/topia-persistence/src/main/resources/META-INF/dtd/hibernate-mapping-3.0.dtd 2011-10-10 08:51:23 UTC (rev 2351) @@ -0,0 +1,1070 @@ + + + + +<!ELEMENT hibernate-mapping ( + meta*, + identifier-generator*, + typedef*, + filter-def*, + import*, + (class|subclass|joined-subclass|union-subclass)*, + resultset*, + (query|sql-query)*, + filter-def*, + fetch-profile*, + database-object* +)> + <!ATTLIST hibernate-mapping schema CDATA #IMPLIED>  + <!ATTLIST hibernate-mapping catalog CDATA #IMPLIED>  + <!ATTLIST hibernate-mapping default-cascade CDATA "none"> + <!ATTLIST hibernate-mapping default-access CDATA "property"> + <!ATTLIST hibernate-mapping default-lazy (true|false) "true"> + <!ATTLIST hibernate-mapping auto-import (true|false) "true"> + <!ATTLIST hibernate-mapping package CDATA #IMPLIED>  + + +<!ELEMENT meta (#PCDATA)> + <!ATTLIST meta attribute CDATA #REQUIRED> + <!ATTLIST meta inherit (true|false) "true"> + + +<!ELEMENT identifier-generator EMPTY> + <!ATTLIST identifier-generator name CDATA #REQUIRED> + <!ATTLIST identifier-generator class CDATA #REQUIRED> + + +<!ELEMENT typedef (param*)> + <!ATTLIST typedef class CDATA #REQUIRED> + <!ATTLIST typedef name CDATA #REQUIRED> + + +<!ELEMENT import EMPTY> + <!ATTLIST import class CDATA #REQUIRED> + <!ATTLIST import rename CDATA #IMPLIED>  + + +<!ELEMENT class ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + tuplizer*, + (id|composite-id), + discriminator?, + natural-id?, + (version|timestamp)?, + (property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*, + ((join*,subclass*)|joined-subclass*|union-subclass*), + loader?,sql-insert?,sql-update?,sql-delete?, + filter*, + fetch-profile*, + resultset*, + (query|sql-query)* +)> + <!ATTLIST class entity-name CDATA #IMPLIED> + <!ATTLIST class name CDATA #IMPLIED>  + <!ATTLIST class proxy CDATA #IMPLIED>  + <!ATTLIST class lazy (true|false) #IMPLIED> + <!ATTLIST class table CDATA #IMPLIED>  + <!ATTLIST class schema CDATA #IMPLIED>  + <!ATTLIST class catalog CDATA #IMPLIED>  + <!ATTLIST class subselect CDATA #IMPLIED> + <!ATTLIST class discriminator-value CDATA #IMPLIED>  + <!ATTLIST class mutable (true|false) "true"> + <!ATTLIST class abstract (true|false) #IMPLIED> + <!ATTLIST class polymorphism (implicit|explicit) "implicit"> + <!ATTLIST class where CDATA #IMPLIED>  + <!ATTLIST class persister CDATA #IMPLIED> + <!ATTLIST class dynamic-update (true|false) "false"> + <!ATTLIST class dynamic-insert (true|false) "false"> + <!ATTLIST class batch-size CDATA #IMPLIED> + <!ATTLIST class select-before-update (true|false) "false"> + <!ATTLIST class optimistic-lock (none|version|dirty|all) "version"> + <!ATTLIST class check CDATA #IMPLIED>  + <!ATTLIST class rowid CDATA #IMPLIED> + <!ATTLIST class node CDATA #IMPLIED> + + +<!ELEMENT tuplizer EMPTY> + <!ATTLIST tuplizer entity-mode (pojo|dom4j|dynamic-map) #IMPLIED>  + <!ATTLIST tuplizer class CDATA #REQUIRED>  + + +<!ELEMENT filter-def (#PCDATA|filter-param)*> + <!ATTLIST filter-def name CDATA #REQUIRED>  + <!ATTLIST filter-def condition CDATA #IMPLIED> + + +<!ELEMENT filter-param EMPTY> + <!ATTLIST filter-param name CDATA #REQUIRED>  + <!ATTLIST filter-param type CDATA #REQUIRED>  + + +<!ELEMENT filter (#PCDATA)> + <!ATTLIST filter name CDATA #REQUIRED> + <!ATTLIST filter condition CDATA #IMPLIED> + + +<!ELEMENT fetch-profile (fetch*)> + <!ATTLIST fetch-profile name CDATA #REQUIRED> + + +<!ELEMENT fetch EMPTY> + <!ATTLIST fetch entity CDATA #IMPLIED>  + <!ATTLIST fetch association CDATA #REQUIRED> + <!ATTLIST fetch style (join|select) "join"> + + + +<!ELEMENT join ( + subselect?, + comment?, + key, + (property|many-to-one|component|dynamic-component|any)*, + sql-insert?,sql-update?,sql-delete? +)> + <!ATTLIST join table CDATA #REQUIRED> + <!ATTLIST join schema CDATA #IMPLIED>  + <!ATTLIST join catalog CDATA #IMPLIED>  + <!ATTLIST join subselect CDATA #IMPLIED> + <!ATTLIST join fetch (join|select) "join"> + <!ATTLIST join inverse (true|false) "false"> + <!ATTLIST join optional (true|false) "false"> + + + +<!ELEMENT natural-id ( (property|many-to-one|component|dynamic-component|any)* )> + <!ATTLIST natural-id mutable (true|false) "false"> + + + +<!ELEMENT id (meta*,column*,type?,generator?)> + <!ATTLIST id name CDATA #IMPLIED> + <!ATTLIST id node CDATA #IMPLIED> + <!ATTLIST id access CDATA #IMPLIED> + <!ATTLIST id column CDATA #IMPLIED> + <!ATTLIST id type CDATA #IMPLIED> + <!ATTLIST id length CDATA #IMPLIED> + <!ATTLIST id unsaved-value CDATA #IMPLIED>  + + + +<!ELEMENT composite-id ( meta*, (key-property|key-many-to-one)+, generator? )> + <!ATTLIST composite-id class CDATA #IMPLIED> + <!ATTLIST composite-id mapped (true|false) "false"> + <!ATTLIST composite-id name CDATA #IMPLIED> + <!ATTLIST composite-id node CDATA #IMPLIED> + <!ATTLIST composite-id access CDATA #IMPLIED> + <!ATTLIST composite-id unsaved-value (undefined|any|none) "undefined"> + + + +<!ELEMENT discriminator ((column|formula)?)> + <!ATTLIST discriminator column CDATA #IMPLIED>  + <!ATTLIST discriminator formula CDATA #IMPLIED> + <!ATTLIST discriminator type CDATA "string"> + <!ATTLIST discriminator not-null (true|false) "true"> + <!ATTLIST discriminator length CDATA #IMPLIED> + <!ATTLIST discriminator force (true|false) "false"> + <!ATTLIST discriminator insert (true|false) "true"> + + + +<!ELEMENT version (meta*,column*)> + <!ATTLIST version name CDATA #REQUIRED> + <!ATTLIST version node CDATA #IMPLIED> + <!ATTLIST version access CDATA #IMPLIED> + <!ATTLIST version column CDATA #IMPLIED> + <!ATTLIST version type CDATA "integer"> + <!ATTLIST version unsaved-value (null|negative|undefined) "undefined"> + <!ATTLIST version generated (never|always) "never"> + <!ATTLIST version insert (true|false) #IMPLIED> + +<!ELEMENT timestamp (meta*)> + <!ATTLIST timestamp name CDATA #REQUIRED> + <!ATTLIST timestamp node CDATA #IMPLIED> + <!ATTLIST timestamp column CDATA #IMPLIED> + <!ATTLIST timestamp access CDATA #IMPLIED> + <!ATTLIST timestamp unsaved-value (null|undefined) "null"> + <!ATTLIST timestamp source (vm|db) "vm"> + <!ATTLIST timestamp generated (never|always) "never"> + + + +<!ELEMENT subclass ( + meta*, + tuplizer*, + synchronize*, + (property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|idbag|array|primitive-array)*, + join*, + subclass*, + loader?,sql-insert?,sql-update?,sql-delete?, + fetch-profile*, + resultset*, + (query|sql-query)* +)> + <!ATTLIST subclass entity-name CDATA #IMPLIED> + <!ATTLIST subclass name CDATA #IMPLIED> + <!ATTLIST subclass proxy CDATA #IMPLIED>  + <!ATTLIST subclass discriminator-value CDATA #IMPLIED>  + <!ATTLIST subclass dynamic-update (true|false) "false"> + <!ATTLIST subclass dynamic-insert (true|false) "false"> + <!ATTLIST subclass select-before-update (true|false) "false"> + <!ATTLIST subclass extends CDATA #IMPLIED>  + <!ATTLIST subclass lazy (true|false) #IMPLIED> + <!ATTLIST subclass abstract (true|false) #IMPLIED> + <!ATTLIST subclass persister CDATA #IMPLIED> + <!ATTLIST subclass batch-size CDATA #IMPLIED> + <!ATTLIST subclass node CDATA #IMPLIED> + + +<!ELEMENT joined-subclass ( + meta*, + subselect?, + synchronize*, + comment?, + tuplizer*, + key, + (property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*, + joined-subclass*, + loader?,sql-insert?,sql-update?,sql-delete?, + fetch-profile*, + resultset*, + (query|sql-query)* +)> + <!ATTLIST joined-subclass entity-name CDATA #IMPLIED> + <!ATTLIST joined-subclass name CDATA #IMPLIED> + <!ATTLIST joined-subclass proxy CDATA #IMPLIED>  + <!ATTLIST joined-subclass table CDATA #IMPLIED>  + <!ATTLIST joined-subclass schema CDATA #IMPLIED> + <!ATTLIST joined-subclass catalog CDATA #IMPLIED> + <!ATTLIST joined-subclass subselect CDATA #IMPLIED> + <!ATTLIST joined-subclass dynamic-update (true|false) "false"> + <!ATTLIST joined-subclass dynamic-insert (true|false) "false"> + <!ATTLIST joined-subclass select-before-update (true|false) "false"> + <!ATTLIST joined-subclass extends CDATA #IMPLIED>  + <!ATTLIST joined-subclass lazy (true|false) #IMPLIED> + <!ATTLIST joined-subclass abstract (true|false) #IMPLIED> + <!ATTLIST joined-subclass persister CDATA #IMPLIED> + <!ATTLIST joined-subclass check CDATA #IMPLIED>  + <!ATTLIST joined-subclass batch-size CDATA #IMPLIED> + <!ATTLIST joined-subclass node CDATA #IMPLIED> + + +<!ELEMENT union-subclass ( + meta*, + subselect?, + synchronize*, + comment?, + tuplizer*, + (property|many-to-one|one-to-one|component|dynamic-component|properties|any|map|set|list|bag|idbag|array|primitive-array)*, + union-subclass*, + loader?,sql-insert?,sql-update?,sql-delete?, + fetch-profile*, + resultset*, + (query|sql-query)* +)> + <!ATTLIST union-subclass entity-name CDATA #IMPLIED> + <!ATTLIST union-subclass name CDATA #IMPLIED> + <!ATTLIST union-subclass proxy CDATA #IMPLIED>  + <!ATTLIST union-subclass table CDATA #IMPLIED>  + <!ATTLIST union-subclass schema CDATA #IMPLIED> + <!ATTLIST union-subclass catalog CDATA #IMPLIED> + <!ATTLIST union-subclass subselect CDATA #IMPLIED> + <!ATTLIST union-subclass dynamic-update (true|false) "false"> + <!ATTLIST union-subclass dynamic-insert (true|false) "false"> + <!ATTLIST union-subclass select-before-update (true|false) "false"> + <!ATTLIST union-subclass extends CDATA #IMPLIED>  + <!ATTLIST union-subclass lazy (true|false) #IMPLIED> + <!ATTLIST union-subclass abstract (true|false) #IMPLIED> + <!ATTLIST union-subclass persister CDATA #IMPLIED> + <!ATTLIST union-subclass check CDATA #IMPLIED>  + <!ATTLIST union-subclass batch-size CDATA #IMPLIED> + <!ATTLIST union-subclass node CDATA #IMPLIED> + + + +<!ELEMENT property (meta*,(column|formula)*,type?)> + <!ATTLIST property name CDATA #REQUIRED> + <!ATTLIST property node CDATA #IMPLIED> + <!ATTLIST property access CDATA #IMPLIED> + <!ATTLIST property type CDATA #IMPLIED> + <!ATTLIST property column CDATA #IMPLIED> + <!ATTLIST property length CDATA #IMPLIED> + <!ATTLIST property precision CDATA #IMPLIED> + <!ATTLIST property scale CDATA #IMPLIED> + <!ATTLIST property not-null (true|false) #IMPLIED> + <!ATTLIST property unique (true|false) "false"> + <!ATTLIST property unique-key CDATA #IMPLIED> + <!ATTLIST property index CDATA #IMPLIED>  + <!ATTLIST property update (true|false) #IMPLIED> + <!ATTLIST property insert (true|false) #IMPLIED> + <!ATTLIST property optimistic-lock (true|false) "true">  + <!ATTLIST property formula CDATA #IMPLIED> + <!ATTLIST property lazy (true|false) "false"> + <!ATTLIST property generated (never|insert|always) "never"> + + +<!ELEMENT type (param*)> + <!ATTLIST type name CDATA #REQUIRED> + + + +<!ELEMENT many-to-one (meta*,(column|formula)*)> + <!ATTLIST many-to-one name CDATA #REQUIRED> + <!ATTLIST many-to-one access CDATA #IMPLIED> + <!ATTLIST many-to-one class CDATA #IMPLIED> + <!ATTLIST many-to-one entity-name CDATA #IMPLIED> + <!ATTLIST many-to-one column CDATA #IMPLIED> + <!ATTLIST many-to-one not-null (true|false) #IMPLIED> + <!ATTLIST many-to-one unique (true|false) "false"> + <!ATTLIST many-to-one unique-key CDATA #IMPLIED> + <!ATTLIST many-to-one index CDATA #IMPLIED> + <!ATTLIST many-to-one cascade CDATA #IMPLIED> + <!ATTLIST many-to-one outer-join (true|false|auto) #IMPLIED> + <!ATTLIST many-to-one fetch (join|select) #IMPLIED> + <!ATTLIST many-to-one update (true|false) "true"> + <!ATTLIST many-to-one insert (true|false) "true"> + <!ATTLIST many-to-one optimistic-lock (true|false) "true">  + <!ATTLIST many-to-one foreign-key CDATA #IMPLIED> + <!ATTLIST many-to-one property-ref CDATA #IMPLIED> + <!ATTLIST many-to-one formula CDATA #IMPLIED> + <!ATTLIST many-to-one lazy (false|proxy|no-proxy) #IMPLIED> + <!ATTLIST many-to-one not-found (exception|ignore) "exception"> + <!ATTLIST many-to-one node CDATA #IMPLIED> + <!ATTLIST many-to-one embed-xml (true|false) "true"> + + + +<!ELEMENT one-to-one (meta*,formula*)> + <!ATTLIST one-to-one name CDATA #REQUIRED> + <!ATTLIST one-to-one formula CDATA #IMPLIED> + <!ATTLIST one-to-one access CDATA #IMPLIED> + <!ATTLIST one-to-one class CDATA #IMPLIED> + <!ATTLIST one-to-one entity-name CDATA #IMPLIED> + <!ATTLIST one-to-one cascade CDATA #IMPLIED> + <!ATTLIST one-to-one outer-join (true|false|auto) #IMPLIED> + <!ATTLIST one-to-one fetch (join|select) #IMPLIED> + <!ATTLIST one-to-one constrained (true|false) "false"> + <!ATTLIST one-to-one foreign-key CDATA #IMPLIED> + <!ATTLIST one-to-one property-ref CDATA #IMPLIED> + <!ATTLIST one-to-one lazy (false|proxy|no-proxy) #IMPLIED> + <!ATTLIST one-to-one node CDATA #IMPLIED> + <!ATTLIST one-to-one embed-xml (true|false) "true"> + + + +<!ELEMENT key-property (meta*,column*,type?)> + <!ATTLIST key-property name CDATA #REQUIRED> + <!ATTLIST key-property access CDATA #IMPLIED> + <!ATTLIST key-property type CDATA #IMPLIED> + <!ATTLIST key-property column CDATA #IMPLIED> + <!ATTLIST key-property length CDATA #IMPLIED> + <!ATTLIST key-property node CDATA #IMPLIED> + + + +<!ELEMENT key-many-to-one (meta*,column*)> + <!ATTLIST key-many-to-one name CDATA #REQUIRED> + <!ATTLIST key-many-to-one access CDATA #IMPLIED> + <!ATTLIST key-many-to-one class CDATA #IMPLIED> + <!ATTLIST key-many-to-one entity-name CDATA #IMPLIED> + <!ATTLIST key-many-to-one column CDATA #IMPLIED> + <!ATTLIST key-many-to-one foreign-key CDATA #IMPLIED> + <!ATTLIST key-many-to-one lazy (false|proxy) #IMPLIED> + + + +<!ELEMENT any (meta*,meta-value*,column,column+)> + <!ATTLIST any id-type CDATA #REQUIRED> + <!ATTLIST any meta-type CDATA #IMPLIED>  + <!ATTLIST any name CDATA #REQUIRED> + <!ATTLIST any access CDATA #IMPLIED> + <!ATTLIST any insert (true|false) "true"> + <!ATTLIST any update (true|false) "true"> + <!ATTLIST any cascade CDATA #IMPLIED> + <!ATTLIST any index CDATA #IMPLIED>  + <!ATTLIST any optimistic-lock (true|false) "true">  + <!ATTLIST any lazy (true|false) "false"> + <!ATTLIST any node CDATA #IMPLIED> + +<!ELEMENT meta-value EMPTY> + <!ATTLIST meta-value value CDATA #REQUIRED> + <!ATTLIST meta-value class CDATA #REQUIRED> + + + +<!ELEMENT component ( + meta*, + tuplizer*, + parent?, + (property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|array|primitive-array)* +)> + <!ATTLIST component class CDATA #IMPLIED> + <!ATTLIST component name CDATA #REQUIRED> + <!ATTLIST component access CDATA #IMPLIED> + <!ATTLIST component unique (true|false) "false"> + <!ATTLIST component update (true|false) "true"> + <!ATTLIST component insert (true|false) "true"> + <!ATTLIST component lazy (true|false) "false"> + <!ATTLIST component optimistic-lock (true|false) "true"> + <!ATTLIST component node CDATA #IMPLIED> + + + +<!ELEMENT dynamic-component ( + (property|many-to-one|one-to-one|component|dynamic-component|any|map|set|list|bag|array|primitive-array)* +)> + <!ATTLIST dynamic-component name CDATA #REQUIRED> + <!ATTLIST dynamic-component access CDATA #IMPLIED> + <!ATTLIST dynamic-component unique (true|false) "false"> + <!ATTLIST dynamic-component update (true|false) "true"> + <!ATTLIST dynamic-component insert (true|false) "true"> + <!ATTLIST dynamic-component optimistic-lock (true|false) "true"> + <!ATTLIST dynamic-component node CDATA #IMPLIED> + + + +<!ELEMENT properties ( + (property|many-to-one|component|dynamic-component)* +)> + <!ATTLIST properties name CDATA #REQUIRED> + <!ATTLIST properties unique (true|false) "false"> + <!ATTLIST properties insert (true|false) "true"> + <!ATTLIST properties update (true|false) "true"> + <!ATTLIST properties optimistic-lock (true|false) "true"> + <!ATTLIST properties node CDATA #IMPLIED> + + + +<!ELEMENT parent EMPTY> + <!ATTLIST parent name CDATA #REQUIRED> + + + +<!ELEMENT map ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + key, + (map-key|composite-map-key|map-key-many-to-many|index|composite-index|index-many-to-many|index-many-to-any), + (element|one-to-many|many-to-many|composite-element|many-to-any), + loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?, + filter* +)> + <!ATTLIST map name CDATA #REQUIRED> + <!ATTLIST map access CDATA #IMPLIED> + <!ATTLIST map table CDATA #IMPLIED>  + <!ATTLIST map schema CDATA #IMPLIED>  + <!ATTLIST map subselect CDATA #IMPLIED> + <!ATTLIST map catalog CDATA #IMPLIED>  + <!ATTLIST map lazy (true|false|extra) #IMPLIED> + <!ATTLIST map mutable (true|false) "true"> + <!ATTLIST map inverse (true|false) "false"> + <!ATTLIST map sort CDATA "unsorted">  + <!ATTLIST map cascade CDATA #IMPLIED> + <!ATTLIST map order-by CDATA #IMPLIED>  + <!ATTLIST map where CDATA #IMPLIED>  + <!ATTLIST map batch-size CDATA #IMPLIED> + <!ATTLIST map outer-join (true|false|auto) #IMPLIED> + <!ATTLIST map fetch (join|select|subselect) #IMPLIED> + <!ATTLIST map check CDATA #IMPLIED>  + <!ATTLIST map persister CDATA #IMPLIED> + <!ATTLIST map collection-type CDATA #IMPLIED> + <!ATTLIST map optimistic-lock (true|false) "true">  + <!ATTLIST map node CDATA #IMPLIED> + <!ATTLIST map embed-xml (true|false) "true"> + +<!ELEMENT set ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + key, + (element|one-to-many|many-to-many|composite-element|many-to-any), + loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?, + filter* +)> + <!ATTLIST set name CDATA #REQUIRED> + <!ATTLIST set access CDATA #IMPLIED> + <!ATTLIST set table CDATA #IMPLIED>  + <!ATTLIST set schema CDATA #IMPLIED>  + <!ATTLIST set catalog CDATA #IMPLIED>  + <!ATTLIST set subselect CDATA #IMPLIED> + <!ATTLIST set lazy (true|false|extra) #IMPLIED> + <!ATTLIST set sort CDATA "unsorted">  + <!ATTLIST set inverse (true|false) "false"> + <!ATTLIST set mutable (true|false) "true"> + <!ATTLIST set cascade CDATA #IMPLIED> + <!ATTLIST set order-by CDATA #IMPLIED>  + <!ATTLIST set where CDATA #IMPLIED>  + <!ATTLIST set batch-size CDATA #IMPLIED> + <!ATTLIST set outer-join (true|false|auto) #IMPLIED> + <!ATTLIST set fetch (join|select|subselect) #IMPLIED> + <!ATTLIST set persister CDATA #IMPLIED> + <!ATTLIST set collection-type CDATA #IMPLIED> + <!ATTLIST set check CDATA #IMPLIED>  + <!ATTLIST set optimistic-lock (true|false) "true">  + <!ATTLIST set node CDATA #IMPLIED> + <!ATTLIST set embed-xml (true|false) "true"> + +<!ELEMENT bag ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + key, + (element|one-to-many|many-to-many|composite-element|many-to-any), + loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?, + filter* +)> + <!ATTLIST bag name CDATA #REQUIRED> + <!ATTLIST bag access CDATA #IMPLIED> + <!ATTLIST bag table CDATA #IMPLIED>  + <!ATTLIST bag schema CDATA #IMPLIED>  + <!ATTLIST bag catalog CDATA #IMPLIED>  + <!ATTLIST bag subselect CDATA #IMPLIED> + <!ATTLIST bag lazy (true|false|extra) #IMPLIED> + <!ATTLIST bag inverse (true|false) "false"> + <!ATTLIST bag mutable (true|false) "true"> + <!ATTLIST bag cascade CDATA #IMPLIED> + <!ATTLIST bag order-by CDATA #IMPLIED>  + <!ATTLIST bag where CDATA #IMPLIED>  + <!ATTLIST bag batch-size CDATA #IMPLIED> + <!ATTLIST bag outer-join (true|false|auto) #IMPLIED> + <!ATTLIST bag fetch (join|select|subselect) #IMPLIED> + <!ATTLIST bag persister CDATA #IMPLIED> + <!ATTLIST bag collection-type CDATA #IMPLIED> + <!ATTLIST bag check CDATA #IMPLIED>  + <!ATTLIST bag optimistic-lock (true|false) "true">  + <!ATTLIST bag node CDATA #IMPLIED> + <!ATTLIST bag embed-xml (true|false) "true"> + +<!ELEMENT idbag ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + collection-id, + key, + (element|many-to-many|composite-element|many-to-any), + loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?, + filter* +)> + <!ATTLIST idbag name CDATA #REQUIRED> + <!ATTLIST idbag access CDATA #IMPLIED> + <!ATTLIST idbag table CDATA #IMPLIED>  + <!ATTLIST idbag schema CDATA #IMPLIED>  + <!ATTLIST idbag catalog CDATA #IMPLIED>  + <!ATTLIST idbag subselect CDATA #IMPLIED> + <!ATTLIST idbag lazy (true|false|extra) #IMPLIED> + <!ATTLIST idbag mutable (true|false) "true"> + <!ATTLIST idbag cascade CDATA #IMPLIED> + <!ATTLIST idbag order-by CDATA #IMPLIED>  + <!ATTLIST idbag where CDATA #IMPLIED>  + <!ATTLIST idbag batch-size CDATA #IMPLIED> + <!ATTLIST idbag outer-join (true|false|auto) #IMPLIED> + <!ATTLIST idbag fetch (join|select|subselect) #IMPLIED> + <!ATTLIST idbag persister CDATA #IMPLIED> + <!ATTLIST idbag collection-type CDATA #IMPLIED> + <!ATTLIST idbag check CDATA #IMPLIED>  + <!ATTLIST idbag optimistic-lock (true|false) "true">  + <!ATTLIST idbag node CDATA #IMPLIED> + <!ATTLIST idbag embed-xml (true|false) "true"> + +<!ELEMENT list ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + key, + (index|list-index), + (element|one-to-many|many-to-many|composite-element|many-to-any), + loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all?, + filter* +)> + <!ATTLIST list name CDATA #REQUIRED> + <!ATTLIST list access CDATA #IMPLIED> + <!ATTLIST list table CDATA #IMPLIED>  + <!ATTLIST list schema CDATA #IMPLIED>  + <!ATTLIST list catalog CDATA #IMPLIED>  + <!ATTLIST list subselect CDATA #IMPLIED> + <!ATTLIST list lazy (true|false|extra) #IMPLIED> + <!ATTLIST list inverse (true|false) "false"> + <!ATTLIST list mutable (true|false) "true"> + <!ATTLIST list cascade CDATA #IMPLIED> + <!ATTLIST list where CDATA #IMPLIED>  + <!ATTLIST list batch-size CDATA #IMPLIED> + <!ATTLIST list outer-join (true|false|auto) #IMPLIED> + <!ATTLIST list fetch (join|select|subselect) #IMPLIED> + <!ATTLIST list persister CDATA #IMPLIED> + <!ATTLIST list collection-type CDATA #IMPLIED> + <!ATTLIST list check CDATA #IMPLIED>  + <!ATTLIST list optimistic-lock (true|false) "true">  + <!ATTLIST list node CDATA #IMPLIED> + <!ATTLIST list embed-xml (true|false) "true"> + +<!ELEMENT array ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + key, + (index|list-index), + (element|one-to-many|many-to-many|composite-element|many-to-any), + loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all? +)> + <!ATTLIST array name CDATA #REQUIRED> + <!ATTLIST array access CDATA #IMPLIED> + <!ATTLIST array table CDATA #IMPLIED>  + <!ATTLIST array schema CDATA #IMPLIED>  + <!ATTLIST array catalog CDATA #IMPLIED>  + <!ATTLIST array subselect CDATA #IMPLIED> + <!ATTLIST array inverse (true|false) "false"> + <!ATTLIST array mutable (true|false) "true"> + <!ATTLIST array element-class CDATA #IMPLIED> + <!ATTLIST array cascade CDATA #IMPLIED> + <!ATTLIST array where CDATA #IMPLIED>  + <!ATTLIST array batch-size CDATA #IMPLIED> + <!ATTLIST array outer-join (true|false|auto) #IMPLIED> + <!ATTLIST array fetch (join|select|subselect) #IMPLIED> + <!ATTLIST array persister CDATA #IMPLIED> + <!ATTLIST array collection-type CDATA #IMPLIED> + <!ATTLIST array check CDATA #IMPLIED>  + <!ATTLIST array optimistic-lock (true|false) "true">  + <!ATTLIST array node CDATA #IMPLIED> + <!ATTLIST array embed-xml (true|false) "true"> + +<!ELEMENT primitive-array ( + meta*, + subselect?, + cache?, + synchronize*, + comment?, + key, + (index|list-index), + element, + loader?,sql-insert?,sql-update?,sql-delete?,sql-delete-all? +)> + <!ATTLIST primitive-array name CDATA #REQUIRED> + <!ATTLIST primitive-array access CDATA #IMPLIED> + <!ATTLIST primitive-array table CDATA #IMPLIED>  + <!ATTLIST primitive-array schema CDATA #IMPLIED>  + <!ATTLIST primitive-array catalog CDATA #IMPLIED>  + <!ATTLIST primitive-array subselect CDATA #IMPLIED> + <!ATTLIST primitive-array mutable (true|false) "true"> + <!ATTLIST primitive-array where CDATA #IMPLIED>  + <!ATTLIST primitive-array batch-size CDATA #IMPLIED> + <!ATTLIST primitive-array outer-join (true|false|auto) #IMPLIED> + <!ATTLIST primitive-array fetch (join|select|subselect) #IMPLIED> + <!ATTLIST primitive-array persister CDATA #IMPLIED> + <!ATTLIST primitive-array collection-type CDATA #IMPLIED> + <!ATTLIST primitive-array check CDATA #IMPLIED>  + <!ATTLIST primitive-array optimistic-lock (true|false) "true">  + <!ATTLIST primitive-array node CDATA #IMPLIED> + <!ATTLIST primitive-array embed-xml (true|false) "true"> + + + +<!ELEMENT element ( (column|formula)*, type? )> + <!ATTLIST element column CDATA #IMPLIED> + <!ATTLIST element node CDATA #IMPLIED> + <!ATTLIST element formula CDATA #IMPLIED> + <!ATTLIST element type CDATA #IMPLIED> + <!ATTLIST element length CDATA #IMPLIED> + <!ATTLIST element precision CDATA #IMPLIED> + <!ATTLIST element scale CDATA #IMPLIED> + <!ATTLIST element not-null (true|false) "false"> + <!ATTLIST element unique (true|false) "false"> + + + +<!ELEMENT one-to-many EMPTY> + <!ATTLIST one-to-many class CDATA #IMPLIED> + <!ATTLIST one-to-many not-found (exception|ignore) "exception"> + <!ATTLIST one-to-many node CDATA #IMPLIED> + <!ATTLIST one-to-many embed-xml (true|false) "true"> + <!ATTLIST one-to-many entity-name CDATA #IMPLIED> +  + + + +<!ELEMENT many-to-many (meta*,(column|formula)*,filter*)> + <!ATTLIST many-to-many class CDATA #IMPLIED> + <!ATTLIST many-to-many node CDATA #IMPLIED> + <!ATTLIST many-to-many embed-xml (true|false) "true"> + <!ATTLIST many-to-many entity-name CDATA #IMPLIED> + <!ATTLIST many-to-many column CDATA #IMPLIED> + <!ATTLIST many-to-many formula CDATA #IMPLIED> + <!ATTLIST many-to-many not-found (exception|ignore) "exception"> + <!ATTLIST many-to-many outer-join (true|false|auto) #IMPLIED> + <!ATTLIST many-to-many fetch (join|select) #IMPLIED> + <!ATTLIST many-to-many lazy (false|proxy) #IMPLIED> + <!ATTLIST many-to-many foreign-key CDATA #IMPLIED> + <!ATTLIST many-to-many unique (true|false) "false"> + <!ATTLIST many-to-many where CDATA #IMPLIED> + <!ATTLIST many-to-many order-by CDATA #IMPLIED> + <!ATTLIST many-to-many property-ref CDATA #IMPLIED> + + + +<!ELEMENT composite-element ( + (meta*), + parent?, + tuplizer*, + (property|many-to-one|any|nested-composite-element)* +)> + <!ATTLIST composite-element class CDATA #REQUIRED> + <!ATTLIST composite-element node CDATA #IMPLIED> + +<!ELEMENT nested-composite-element ( + parent?, + tuplizer*, + (property|many-to-one|any|nested-composite-element)* +)> + <!ATTLIST nested-composite-element class CDATA #REQUIRED> + <!ATTLIST nested-composite-element name CDATA #REQUIRED> + <!ATTLIST nested-composite-element access CDATA #IMPLIED> + <!ATTLIST nested-composite-element node CDATA #IMPLIED> + + + +<!ELEMENT key (column*)> + <!ATTLIST key column CDATA #IMPLIED> + <!ATTLIST key property-ref CDATA #IMPLIED> + <!ATTLIST key foreign-key CDATA #IMPLIED> + <!ATTLIST key on-delete (cascade|noaction) "noaction"> + <!ATTLIST key not-null (true|false) #IMPLIED> + <!ATTLIST key update (true|false) #IMPLIED> + <!ATTLIST key unique (true|false) #IMPLIED> + + + +<!ELEMENT list-index (column?)> + <!ATTLIST list-index column CDATA #IMPLIED> + <!ATTLIST list-index base CDATA "0"> + +<!ELEMENT map-key ((column|formula)*,type?)> + <!ATTLIST map-key column CDATA #IMPLIED> + <!ATTLIST map-key formula CDATA #IMPLIED> + <!ATTLIST map-key type CDATA #IMPLIED> + <!ATTLIST map-key length CDATA #IMPLIED> + <!ATTLIST map-key node CDATA #IMPLIED> + +<!ELEMENT index (column*)> + <!ATTLIST index column CDATA #IMPLIED> + <!ATTLIST index type CDATA #IMPLIED>  + <!ATTLIST index length CDATA #IMPLIED> + + + +<!ELEMENT map-key-many-to-many ((column|formula)*)> + <!ATTLIST map-key-many-to-many class CDATA #IMPLIED> + <!ATTLIST map-key-many-to-many entity-name CDATA #IMPLIED> + <!ATTLIST map-key-many-to-many column CDATA #IMPLIED> + <!ATTLIST map-key-many-to-many formula CDATA #IMPLIED> + <!ATTLIST map-key-many-to-many foreign-key CDATA #IMPLIED> + +<!ELEMENT index-many-to-many (column*)> + <!ATTLIST index-many-to-many class CDATA #REQUIRED> + <!ATTLIST index-many-to-many entity-name CDATA #IMPLIED> + <!ATTLIST index-many-to-many column CDATA #IMPLIED> + <!ATTLIST index-many-to-many foreign-key CDATA #IMPLIED> + + + +<!ELEMENT composite-map-key ( (key-property|key-many-to-one)+ )> + <!ATTLIST composite-map-key class CDATA #REQUIRED> + +<!ELEMENT composite-index ( (key-property|key-many-to-one)+ )> + <!ATTLIST composite-index class CDATA #REQUIRED> + + + +<!ELEMENT many-to-any (meta-value*,column, column+)> + <!ATTLIST many-to-any id-type CDATA #REQUIRED> + <!ATTLIST many-to-any meta-type CDATA #IMPLIED>  + +<!ELEMENT index-many-to-any (column, column+)> + <!ATTLIST index-many-to-any id-type CDATA #REQUIRED> + <!ATTLIST index-many-to-any meta-type CDATA #IMPLIED>  + +<!ELEMENT collection-id (meta*, column*, generator)> + <!ATTLIST collection-id column CDATA #REQUIRED> + <!ATTLIST collection-id type CDATA #REQUIRED> + <!ATTLIST collection-id length CDATA #IMPLIED> + + + +<!ELEMENT generator (param*)> + <!ATTLIST generator class CDATA #REQUIRED> +<!ELEMENT param (#PCDATA)> + <!ATTLIST param name CDATA #REQUIRED> + + + +<!ELEMENT column (comment?)> + <!ATTLIST column name CDATA #REQUIRED> + <!ATTLIST column length CDATA #IMPLIED>  + <!ATTLIST column precision CDATA #IMPLIED> + <!ATTLIST column scale CDATA #IMPLIED> + <!ATTLIST column not-null (true|false) #IMPLIED>  + <!ATTLIST column unique (true|false) #IMPLIED>  + <!ATTLIST column unique-key CDATA #IMPLIED>  + <!ATTLIST column sql-type CDATA #IMPLIED>  + <!ATTLIST column index CDATA #IMPLIED> + <!ATTLIST column check CDATA #IMPLIED>  + <!ATTLIST column default CDATA #IMPLIED>  + <!ATTLIST column read CDATA #IMPLIED>  + <!ATTLIST column write CDATA #IMPLIED>  + + + +<!ELEMENT formula (#PCDATA)> +<!ELEMENT subselect (#PCDATA)> + + +<!ELEMENT cache EMPTY> + <!ATTLIST cache usage (read-only|read-write|nonstrict-read-write|transactional) #REQUIRED> + <!ATTLIST cache region CDATA #IMPLIED>  + <!ATTLIST cache include (all|non-lazy) "all"> + + + +<!ELEMENT comment (#PCDATA)> + + + +<!ELEMENT loader EMPTY> + <!ATTLIST loader query-ref CDATA #REQUIRED> + + + +<!ELEMENT query (#PCDATA|query-param)*> + <!ATTLIST query name CDATA #REQUIRED> + <!ATTLIST query flush-mode (auto|never|always) #IMPLIED> + <!ATTLIST query cacheable (true|false) "false"> + <!ATTLIST query cache-region CDATA #IMPLIED> + <!ATTLIST query fetch-size CDATA #IMPLIED> + <!ATTLIST query timeout CDATA #IMPLIED> + <!ATTLIST query cache-mode (get|ignore|normal|put|refresh) #IMPLIED> + <!ATTLIST query read-only (true|false) #IMPLIED> + <!ATTLIST query comment CDATA #IMPLIED> + + + +<!ELEMENT sql-query (#PCDATA|return-scalar|return|return-join|load-collection|synchronize|query-param)*> + <!ATTLIST sql-query name CDATA #REQUIRED> + <!ATTLIST sql-query resultset-ref CDATA #IMPLIED> + <!ATTLIST sql-query flush-mode (auto|never|always) #IMPLIED> + <!ATTLIST sql-query cacheable (true|false) "false"> + <!ATTLIST sql-query cache-region CDATA #IMPLIED> + <!ATTLIST sql-query fetch-size CDATA #IMPLIED> + <!ATTLIST sql-query timeout CDATA #IMPLIED> + <!ATTLIST sql-query cache-mode (get|ignore|normal|put|refresh) #IMPLIED> + <!ATTLIST sql-query read-only (true|false) #IMPLIED> + <!ATTLIST sql-query comment CDATA #IMPLIED> + <!ATTLIST sql-query callable (true|false) "false"> + + + +<!ELEMENT query-param EMPTY> + <!ATTLIST query-param name CDATA #REQUIRED> + <!ATTLIST query-param type CDATA #REQUIRED> + + +<!ELEMENT resultset (return-scalar|return|return-join|load-collection)*> + <!ATTLIST resultset name CDATA #REQUIRED> + + +<!ELEMENT return (return-discriminator?,return-property)*> + <!ATTLIST return alias CDATA #IMPLIED> + <!ATTLIST return entity-name CDATA #IMPLIED> + <!ATTLIST return class CDATA #IMPLIED> + <!ATTLIST return lock-mode (none|read|upgrade|upgrade-nowait|write) "read"> + +<!ELEMENT return-property (return-column*)> + <!ATTLIST return-property name CDATA #REQUIRED> + <!ATTLIST return-property column CDATA #IMPLIED> + +<!ELEMENT return-column EMPTY> + <!ATTLIST return-column name CDATA #REQUIRED> + +<!ELEMENT return-discriminator EMPTY> + <!ATTLIST return-discriminator column CDATA #REQUIRED> + +<!ELEMENT return-join (return-property)*> + <!ATTLIST return-join alias CDATA #REQUIRED> + <!ATTLIST return-join property CDATA #REQUIRED> + <!ATTLIST return-join lock-mode (none|read|upgrade|upgrade-nowait|write) "read"> + +<!ELEMENT load-collection (return-property)*> + <!ATTLIST load-collection alias CDATA #REQUIRED> + <!ATTLIST load-collection role CDATA #REQUIRED> + <!ATTLIST load-collection lock-mode (none|read|upgrade|upgrade-nowait|write) "read"> + +<!ELEMENT return-scalar EMPTY> + <!ATTLIST return-scalar column CDATA #REQUIRED> + <!ATTLIST return-scalar type CDATA #IMPLIED> + +<!ELEMENT synchronize EMPTY> + <!ATTLIST synchronize table CDATA #REQUIRED> + + +<!ELEMENT sql-insert (#PCDATA)> + <!ATTLIST sql-insert callable (true|false) "false"> + <!ATTLIST sql-insert check (none|rowcount|param) #IMPLIED> + +<!ELEMENT sql-update (#PCDATA)> + <!ATTLIST sql-update callable (true|false) "false"> + <!ATTLIST sql-update check (none|rowcount|param) #IMPLIED> + +<!ELEMENT sql-delete (#PCDATA)> + <!ATTLIST sql-delete callable (true|false) "false"> + <!ATTLIST sql-delete check (none|rowcount|param) #IMPLIED> + +<!ELEMENT sql-delete-all (#PCDATA)> + <!ATTLIST sql-delete-all callable (true|false) "false"> + <!ATTLIST sql-delete-all check (none|rowcount|param) #IMPLIED> + + +<!ELEMENT database-object ( (definition|(create,drop)), dialect-scope* )> + +<!ELEMENT definition EMPTY> + <!ATTLIST definition class CDATA #REQUIRED> + +<!ELEMENT create (#PCDATA)> +<!ELEMENT drop (#PCDATA)> + + +<!ELEMENT dialect-scope (#PCDATA)> + <!ATTLIST dialect-scope name CDATA #REQUIRED> + Property changes on: trunk/topia-persistence/src/main/resources/META-INF/dtd/hibernate-mapping-3.0.dtd ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r2350 - trunk/topia-persistence/src/main/java/org/nuiton/topia/framework
by echatellier＠users.nuiton.org 06 Oct '11

06 Oct '11

Author: echatellier Date: 2011-10-07 01:01:42 +0200 (Fri, 07 Oct 2011) New Revision: 2350 Url: http://nuiton.org/repositories/revision/topia/2350 Log: Add comment Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-04 07:10:47 UTC (rev 2349) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/framework/TopiaContextImpl.java 2011-10-06 23:01:42 UTC (rev 2350) @@ -643,6 +643,14 @@ if (log.isDebugEnabled()) { log.debug("Load persistent class : " + classname); } + + // XXX echatellier 20111007 ce cqui est dommage ici, c'est + // la definition de cette classe ne sert a rien (apart security) + // car pour hibernate hibernateConfiguration.addClass(persistanceClass) + // il ne se sert pas de la classe en fait et fait seulement + // un classname.replace( '.', '/' ) + ".hbm.xml"; + // pour obtenir le mapping et la reinstancier ensuite + Class<?> clazz; try { clazz = Class.forName(classname);

1 0

r2349 - trunk/topia-persistence/src/main/java/org/nuiton/topia/generator
by tchemit＠users.nuiton.org 04 Oct '11

04 Oct '11

Author: tchemit Date: 2011-10-04 09:10:47 +0200 (Tue, 04 Oct 2011) New Revision: 2349 Url: http://nuiton.org/repositories/revision/topia/2349 Log: Evolution #1766: Do not generate DAOImpl if already found in classpath Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-03 16:34:57 UTC (rev 2348) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-04 07:10:47 UTC (rev 2349) @@ -49,6 +49,7 @@ import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.util.StringUtil; +import java.net.URL; import java.security.Permission; import java.util.ArrayList; import java.util.Collection; @@ -228,13 +229,48 @@ // generate DAO generateDAOClass(clazz, clazzName, clazzFQN); - // generate DAOImpl - generateDAOImpl(clazz, clazzName, clazzFQN); + if (isGenerateImpl(clazz)) { + // generate DAOImpl + generateDAOImpl(clazz, clazzName, clazzFQN); + } + // generate DAOAbstract generateDAOAbstract(clazz, clazzName, clazzFQN); } + protected boolean isGenerateImpl(ObjectModelClass input) { + + String fqn = input.getQualifiedName() + "DAOImpl"; + + URL fileLocation = getFileInClassPath(fqn); + + if (fileLocation != null) { + + // there is already a existing file in class-path, skip + + if (isVerbose()) { + + log.info("Will not generate [" + fqn + "], already found in class-path at location : " + fileLocation); + } else { + log.info("Will not generate [" + fqn + "], already found in class-path."); + } + return false; + } + + Collection<ObjectModelOperation> moreOperations = + extraOperations.get(input.getQualifiedName()); + + if (CollectionUtils.isNotEmpty(moreOperations)) { + + // no user operations, can generate it + return false; + } + + // can safely generate the dao impl + return true; + } + protected void generateDAOClass(ObjectModelClass clazz, String clazzName, String clazzFQN) { ObjectModelClass daoClass = createClass(clazzName + "DAO", clazz.getPackageName()); setDocumentation(daoClass, "/**\n" +

1 0

r2348 - in trunk/topia-persistence/src/main/java/org/nuiton/topia: generator persistence
by tchemit＠users.nuiton.org 03 Oct '11

03 Oct '11

Author: tchemit Date: 2011-10-03 18:34:57 +0200 (Mon, 03 Oct 2011) New Revision: 2348 Url: http://nuiton.org/repositories/revision/topia/2348 Log: Evolution #1764: Improve the method TopiaDAOImpl.newInstance() Evolution #1765: Introduce the TopiaEntityEnum into the generated dao Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-09-25 21:42:03 UTC (rev 2347) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/DAOHelperTransformer.java 2011-10-03 16:34:57 UTC (rev 2348) @@ -68,7 +68,7 @@ String packageName = getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); String modelName = model.getName(); String daoHelperClazzName = modelName + "DAOHelper"; - String entityEnumName = modelName+"EntityEnum"; + String entityEnumName = modelName + "EntityEnum"; List<ObjectModelClass> classes = TopiaGeneratorUtil.getEntityClasses(model, true); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-09-25 21:42:03 UTC (rev 2347) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/EntityDAOTransformer.java 2011-10-03 16:34:57 UTC (rev 2348) @@ -51,7 +51,6 @@ import java.security.Permission; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.HashMap; import java.util.HashSet; @@ -94,6 +93,9 @@ */ protected Class<?> daoImplementation; + protected String entityEnumName; + + protected String entityEnumPackage; /** * Map of extra operations for DAO. The key of the map is the qualified * name of the entity relative to the DAO. @@ -104,6 +106,22 @@ @Override public void transformFromModel(ObjectModel model) { + boolean generateStandaloneEnum = + TopiaGeneratorUtil.shouldGenerateStandaloneEnumForDAOHelper(model); + String modelName = model.getName(); + + entityEnumName = modelName + "EntityEnum"; + + String packageName = + getOutputProperties().getProperty(PROP_DEFAULT_PACKAGE); + + if (generateStandaloneEnum) { + entityEnumPackage = packageName+"."+entityEnumName; + } else { + String daoHelperClazzName = modelName + "DAOHelper"; + entityEnumPackage = packageName + "." + daoHelperClazzName + "." + entityEnumName; + } + usages = TopiaGeneratorUtil.searchDirectUsages(model); boolean extendLegacyDAO = Boolean.valueOf(model.getTagValue(TopiaTagValues.TAG_USE_LEGACY_DAO)); @@ -275,7 +293,7 @@ } setSuperClass(daoAbstractClass, extendClass); - addInterface(daoAbstractClass, TopiaDAO.class.getName() + "<E>"); +// addInterface(daoAbstractClass, TopiaDAO.class.getName() + "<E>"); String prefix = getConstantPrefix(clazz, ""); setConstantPrefix(prefix); @@ -292,13 +310,14 @@ addImport(daoAbstractClass, Set.class); } addImport(daoAbstractClass, List.class); - addImport(daoAbstractClass, Arrays.class); +// addImport(daoAbstractClass, Arrays.class); addImport(daoAbstractClass, TopiaException.class); - addImport(daoAbstractClass, TopiaContextImplementor.class); +// addImport(daoAbstractClass, TopiaContextImplementor.class); boolean enableSecurity = TopiaGeneratorUtil.isClassWithSecurity(clazz); if (enableSecurity) { + addImport(daoAbstractClass, TopiaContextImplementor.class); addImport(daoAbstractClass, ArrayList.class); addImport(daoAbstractClass, Permission.class); addImport(daoAbstractClass, "org.nuiton.topia.taas.entities.TaasAuthorizationImpl"); @@ -321,12 +340,26 @@ "getEntityClass", "Class<E>", ObjectModelModifier.PUBLIC); + addAnnotation(daoAbstractClass, op,Override.class.getSimpleName()); setOperationBody(op, "" /*{ return (Class<E>)<%=clazzName%>.class; }*/ ); + // getTopiaEntityEnum + addImport(daoAbstractClass, entityEnumPackage); + op = addOperation(daoAbstractClass, + "getTopiaEntityEnum", + entityEnumName, + ObjectModelModifier.PUBLIC); + addAnnotation(daoAbstractClass, op,Override.class.getSimpleName()); + setOperationBody(op, "" +/*{ + return <%=entityEnumName%>.<%=clazzName%>; + }*/ + ); + generateDAOOperations(daoAbstractClass, DAOoperations); generateDelete(clazz, daoAbstractClass); @@ -458,6 +491,7 @@ ObjectModelClass result) { ObjectModelOperation op; op = addOperation(result, "delete", "void", ObjectModelModifier.PUBLIC); + addAnnotation(result, op,Override.class.getSimpleName()); addException(op, TopiaException.class); addParameter(op, "E", "entity"); StringBuilder body = new StringBuilder(); Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2011-09-25 21:42:03 UTC (rev 2347) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAO.java 2011-10-03 16:34:57 UTC (rev 2348) @@ -69,6 +69,8 @@ */ public interface TopiaDAO<E extends TopiaEntity> { + TopiaEntityEnum getTopiaEntityEnum(); + /** * When TopiaContextImpl create the TopiaDAOHibernate, it must call this * method just after. Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2011-09-25 21:42:03 UTC (rev 2347) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOImpl.java 2011-10-03 16:34:57 UTC (rev 2348) @@ -81,6 +81,12 @@ protected TopiaContextImplementor context; @Override + public TopiaEntityEnum getTopiaEntityEnum() { + throw new UnsupportedOperationException( + "This method must be overided in generated DAO"); + } + + @Override public Class<E> getEntityClass() { throw new UnsupportedOperationException( "This method must be overided in generated DAO"); @@ -149,80 +155,22 @@ @SuppressWarnings("unchecked") @Override public E newInstance() throws TopiaException { - E result = null; if (log.isDebugEnabled()) { log.debug("entityClass = " + entityClass); } - String classname = entityClass.getName(); - try { - // on commence par essayer d'instancier le Impl - result = ((Class<E>) Class.forName(classname + "Impl")) - .newInstance(); - if (log.isDebugEnabled()) { - log.debug("Utilisation de la classe " + classname + "Impl" - + " pour " + classname); - } - } catch (ClassNotFoundException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible de trouver la classe " + classname - + "Impl"); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible d'instancier " + classname + "Impl"); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } + Class<E> implementation = (Class<E>) + getTopiaEntityEnum().getImplementation(); - if (result == null) { - // le impl n'est pas trouvé on essai avec la classe elle meme - try { - result = entityClass.getConstructor().newInstance(); - if (log.isDebugEnabled()) { - log.debug("Utilisation de la classe " + classname - + " pour " + classname); - } - } catch (Exception eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible d'instancier " + classname); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } - } - - if (result == null) { + try { + E result = implementation.newInstance(); + return result; + } catch (Exception e) { throw new TopiaException( "Impossible de trouver ou d'instancier la classe " - + classname); + + implementation); } - - return result; } - /** - * private method because this is hibernate specific method and we don't - * want expose it - * - * @return the meta-data of the entity - * @throws TopiaException if any pb - */ - private ClassMetadata getClassMetadata() throws TopiaException { - ClassMetadata meta = getContext().getHibernateFactory() - .getClassMetadata(entityClass); - if (meta == null) { - meta = getContext().getHibernateFactory().getClassMetadata( - entityClass.getName() + "Impl"); - } - return meta; - } - @Override public <U extends TopiaEntity> List<U> findUsages(Class<U> type, E e) throws TopiaException { @@ -263,16 +211,6 @@ getContext().removeTopiaEntityVetoable(entityClass, vetoable); } - /** - * Renvoie la Session contenue dans le contexte - * - * @return hibernate session - * @throws TopiaException if any pb - */ - private Session getSession() throws TopiaException { - return getContext().getHibernate(); - } - @Override public E create(E entity) throws TopiaException { @@ -645,5 +583,31 @@ } + /** + * Renvoie la Session contenue dans le contexte + * + * @return hibernate session + * @throws TopiaException if any pb + */ + Session getSession() throws TopiaException { + return getContext().getHibernate(); + } + /** + * package locale method because this is hibernate specific method and + * we don't want expose it. + * + * @return the meta-data of the entity + * @throws TopiaException if any pb + */ + ClassMetadata getClassMetadata() throws TopiaException { + ClassMetadata meta = getContext().getHibernateFactory() + .getClassMetadata(entityClass); + if (meta == null) { + meta = getContext().getHibernateFactory().getClassMetadata( + getTopiaEntityEnum().getImplementationFQN()); + } + return meta; + } + } //TopiaDAOImpl 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-09-25 21:42:03 UTC (rev 2347) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/persistence/TopiaDAOLegacy.java 2011-10-03 16:34:57 UTC (rev 2348) @@ -49,32 +49,21 @@ import org.hibernate.Criteria; import org.hibernate.FlushMode; import org.hibernate.HibernateException; -import org.hibernate.Session; import org.hibernate.criterion.Criterion; import org.hibernate.criterion.Order; import org.hibernate.criterion.Restrictions; import org.hibernate.metadata.ClassMetadata; import org.nuiton.topia.TopiaException; -import org.nuiton.topia.event.TopiaEntityListener; -import org.nuiton.topia.event.TopiaEntityVetoable; -import org.nuiton.topia.framework.TopiaContextImplementor; -import java.io.Serializable; import java.lang.reflect.InvocationTargetException; -import java.security.Permission; import java.util.HashMap; import java.util.List; import java.util.Map; /** - * Cette classe permet d'avoir un ensemble de méthode implantée de façon - * standard et plus spécifiquement pour Hibernate. - * - * Certains accès à Hibernate sont tout de même fait ici, car on a pris le - * choix de se baser entièrement sur hibernate pour la persistence, et il - * est ainsi possible d'accèder au meta information hibernate sur les classes - * lorque l'on en a besoin. - * + * Surcharge du {@link TopiaDAOImpl} pour utiliser l'api criteria au lieu du hql + * pour tout ce qui est requétage. + * * Created: 31 déc. 2005 13:10:34 * * @param <E> le type de l'entite @@ -82,148 +71,14 @@ * @author tchemit <chemit(a)codelutin.com> */ -public class TopiaDAOLegacy<E extends TopiaEntity> extends TopiaDAOImpl<E> { // TopiaDAOImpl +public class TopiaDAOLegacy<E extends TopiaEntity> extends TopiaDAOImpl<E> { // TopiaDAOLegacy /** Logger. */ - private static Log log = LogFactory.getLog(TopiaDAOImpl.class); + private static Log log = LogFactory.getLog(TopiaDAOLegacy.class); - protected Class<E> entityClass; - - protected TopiaContextImplementor context; - - @Override - public Class<E> getEntityClass() { - throw new UnsupportedOperationException( - "This method must be overided in generated DAO"); - } - - /** - * Retourne l'id de l'entity - * @param e l'entity - * @return l'id de l'entity ou null si pas trouvé - * @throws TopiaException Si une erreur survient durant la recherche - */ - protected Serializable getId(E e) throws TopiaException { - ClassMetadata meta = getClassMetadata(); - String idPropName = meta.getIdentifierPropertyName(); - - Serializable result; - try { - result = (Serializable) PropertyUtils.getSimpleProperty(e, - idPropName); - } catch (Exception eee) { - throw new TopiaException("Impossible de récuperer l'identifiant " - + idPropName + " de l'entite: " + e); - } - return result; - } - - /** - * Retourne l'id de l'entity representer comme une map - * @param map l'entity en representation map - * @return l'id de l'entity ou null si pas trouvé - * @throws TopiaException Si une erreur survient durant la recherche - */ - protected Serializable getId(Map map) throws TopiaException { - try { - ClassMetadata meta = getClassMetadata(); - String idPropName = meta.getIdentifierPropertyName(); - - Serializable id = (Serializable) map.get(idPropName); - return id; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - /** - * When TopiaContextImpl create the TopiaDAOHibernate, it must call this method just - * after - * - * @param entityClass - */ - public void init(TopiaContextImplementor context, Class<E> entityClass) - throws TopiaException { - log.debug("init dao for " + entityClass.getName()); - this.context = context; - this.entityClass = entityClass; - } - - @Override - public TopiaContextImplementor getContext() { - return context; - } - @SuppressWarnings("unchecked") protected E instanciateNew() throws TopiaException { - E result = null; - if (log.isDebugEnabled()) { - log.debug("entityClass = " + entityClass); - } - String classname = entityClass.getName(); - try { - // on commence par essayer d'instancier le Impl - result = ((Class<E>) Class.forName(classname + "Impl")) - .newInstance(); - if (log.isDebugEnabled()) { - log.debug("Utilisation de la classe " + classname + "Impl" - + " pour " + classname); - } - } catch (InstantiationException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible d'instancier " + classname + "Impl"); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } catch (IllegalAccessException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible d'instancier " + classname + "Impl"); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } catch (ClassNotFoundException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible de trouver la classe " + classname - + "Impl"); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } - - if (result == null) { - // le impl n'est pas trouvé on essai avec la classe elle meme - try { - result = entityClass.newInstance(); - if (log.isDebugEnabled()) { - log.debug("Utilisation de la classe " + classname - + " pour " + classname); - } - } catch (InstantiationException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible d'instancier " + classname); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } catch (IllegalAccessException eee) { - if (log.isWarnEnabled()) { - log.warn("Impossible d'instancier " + classname); - } - if (log.isDebugEnabled()) { - log.debug("StackTrace", eee); - } - } - } - - if (result == null) { - throw new TopiaException( - "Impossible de trouver ou d'instancier la classe " - + classname); - } - + E result = newInstance(); return result; } @@ -272,23 +127,6 @@ } - /** - * private method because this is hibernate specific method and we don't - * want expose it - * - * @return the meta-data of the entity - * @throws TopiaException if any pb - */ - private ClassMetadata getClassMetadata() throws TopiaException { - ClassMetadata meta = getContext().getHibernateFactory() - .getClassMetadata(entityClass); - if (meta == null) { - meta = getContext().getHibernateFactory().getClassMetadata( - entityClass.getName() + "Impl"); - } - return meta; - } - @Override public E findByPrimaryKey(Object... k) throws TopiaException { // TODO pour une meilleur gestion des problemes a la compilation @@ -588,26 +426,6 @@ return Restrictions.or(crit1, crit2); } - @Override - public void addTopiaEntityListener(TopiaEntityListener listener) { - getContext().addTopiaEntityListener(entityClass,listener); - } - - @Override - public void addTopiaEntityVetoable(TopiaEntityVetoable vetoable) { - getContext().addTopiaEntityVetoable(entityClass,vetoable); - } - - @Override - public void removeTopiaEntityListener(TopiaEntityListener listener) { - getContext().removeTopiaEntityListener(entityClass, listener); - } - - @Override - public void removeTopiaEntityVetoable(TopiaEntityVetoable vetoable) { - getContext().removeTopiaEntityVetoable(entityClass, vetoable); - } - /** * Cette methode appelle fireVetoableCreate et fireOnCreated * Si vous la surchargé, faites attention a appeler le super @@ -652,27 +470,6 @@ } @Override - public E update(E e) throws TopiaException { - try { - getSession().saveOrUpdate(e); - getContext().getFiresSupport().warnOnUpdateEntity(e); - return e; - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - @Override - public void delete(E e) throws TopiaException { - try { - getSession().delete(e); - getContext().getFiresSupport().warnOnDeleteEntity(e); - } catch (HibernateException eee) { - throw new TopiaException(eee); - } - } - - @Override public E findByTopiaId(String k) throws TopiaException { return query(Restrictions.idEq(k)); } @@ -692,7 +489,8 @@ @Override public List<String> findAllIds() throws TopiaException { - List<String> find = context.find("select src.topiaId from " + entityClass.getSimpleName() + "Impl src"); +// List<String> find = context.find("select src.topiaId from " + entityClass.getSimpleName() + "Impl src"); + List<String> find = context.find("select src.topiaId from " + getEntityClass() + " src"); return find; } @@ -824,20 +622,4 @@ return criteria; } - /** - * Renvoie la Session contenue dans le contexte - * @return hibernate session - * @throws TopiaException if any pb - */ - private Session getSession() throws TopiaException { - return getContext().getHibernate(); - } - - @Override - public List<Permission> getRequestPermission(String topiaId, int actions) - throws TopiaException { - return null; - } - - -} //TopiaDAOImpl +} //TopiaDAOLegacy

1 0

r2347 - in trunk/topia-persistence/src: main/java/org/nuiton/topia/generator test/xmi
by fdesbois＠users.nuiton.org 25 Sep '11

25 Sep '11

Author: fdesbois Date: 2011-09-25 23:42:03 +0200 (Sun, 25 Sep 2011) New Revision: 2347 Url: http://nuiton.org/repositories/revision/topia/2347 Log: #1760 : ignore enumeration as object property in QueryHelperTransformer Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java trunk/topia-persistence/src/test/xmi/topiatest.zargo Modified: trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java =================================================================== --- trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-09-22 17:28:22 UTC (rev 2346) +++ trunk/topia-persistence/src/main/java/org/nuiton/topia/generator/QueryHelperTransformer.java 2011-09-25 21:42:03 UTC (rev 2347) @@ -485,8 +485,9 @@ ObjectModelClassifier referenceClass = getReferenceAttributeClassifier(attrReference); - // No reference, can add method to getPropertyObject - if (referenceClass == null) { + // No reference, can't add method to getPropertyObject + // ANO-#1648: Enum are ignored here, they will be used as simple property + if (referenceClass == null || referenceClass.isEnum()) { return null; } Modified: trunk/topia-persistence/src/test/xmi/topiatest.zargo =================================================================== (Binary files differ)

1 0

r2346 - trunk
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 19:28:22 +0200 (Thu, 22 Sep 2011) New Revision: 2346 Url: http://nuiton.org/repositories/revision/topia/2346 Log: Update mavenpom4redmineAndCentral to 3.0.4. Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) +++ trunk/pom.xml 2011-09-22 17:28:22 UTC (rev 2346) @@ -33,7 +33,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmineAndCentral</artifactId> - <version>3.0.3</version> + <version>3.0.4</version> </parent> <artifactId>topia</artifactId>

1 0

r2345 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:07:00 +0200 (Thu, 22 Sep 2011) New Revision: 2345 Url: http://nuiton.org/repositories/revision/topia/2345 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> <modules> <module>topia-persistence</module> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.2</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-persistence/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-service-migration/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-service-replication/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-09-22 12:06:58 UTC (rev 2344) +++ trunk/topia-service-security/pom.xml 2011-09-22 12:07:00 UTC (rev 2345) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2</version> + <version>2.6.3-SNAPSHOT</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2344 - in tags: . topia-2.6.2
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:06:58 +0200 (Thu, 22 Sep 2011) New Revision: 2344 Url: http://nuiton.org/repositories/revision/topia/2344 Log: [maven-release-plugin] copy for tag topia-2.6.2 Added: tags/topia-2.6.2/ Property changes on: tags/topia-2.6.2 ___________________________________________________________________ Added: svn:ignore + *.ipr *.iws .classpath *.iml .project target .settings Added: svn:mergeinfo + /branches/from2.2.2-eugene2-beta:1662-1714 /branches/topia-2.6.x:2293-2300

1 0

r2343 - in trunk: . topia-persistence topia-service-migration topia-service-replication topia-service-security
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:06:57 +0200 (Thu, 22 Sep 2011) New Revision: 2343 Url: http://nuiton.org/repositories/revision/topia/2343 Log: [maven-release-plugin] prepare release topia-2.6.2 Modified: trunk/pom.xml trunk/topia-persistence/pom.xml trunk/topia-service-migration/pom.xml trunk/topia-service-replication/pom.xml trunk/topia-service-security/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -37,7 +37,7 @@ </parent> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> <modules> <module>topia-persistence</module> @@ -356,12 +356,12 @@ </configuration> </plugin> - <plugin> +  </plugins> </pluginManagement> @@ -409,9 +409,9 @@  <scm> - <connection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</connection> - <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/trunk</developerConnection> - <url>http://www.nuiton.org/repositories/browse/topia/trunk</url> + <connection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</connection> + <developerConnection>scm:svn:http://svn.nuiton.org/svn/topia/tags/topia-2.6.2</developerConnection> + <url>http://www.nuiton.org/repositories/browse/topia/tags/topia-2.6.2</url> </scm> <distributionManagement> Modified: trunk/topia-persistence/pom.xml =================================================================== --- trunk/topia-persistence/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-persistence/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-migration/pom.xml =================================================================== --- trunk/topia-service-migration/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-service-migration/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-replication/pom.xml =================================================================== --- trunk/topia-service-replication/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-service-replication/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId> Modified: trunk/topia-service-security/pom.xml =================================================================== --- trunk/topia-service-security/pom.xml 2011-09-22 12:03:23 UTC (rev 2342) +++ trunk/topia-service-security/pom.xml 2011-09-22 12:06:57 UTC (rev 2343) @@ -35,7 +35,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>topia</artifactId> - <version>2.6.2-SNAPSHOT</version> + <version>2.6.2</version> </parent> <groupId>org.nuiton.topia</groupId>

1 0

r2342 - trunk/topia-persistence/src/test/java/org/nuiton/topiatest
by maven-release＠users.nuiton.org 22 Sep '11

22 Sep '11

Author: maven-release Date: 2011-09-22 14:03:23 +0200 (Thu, 22 Sep 2011) New Revision: 2342 Url: http://nuiton.org/repositories/revision/topia/2342 Log: add license header Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java Modified: trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java =================================================================== --- trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java 2011-09-22 11:55:49 UTC (rev 2341) +++ trunk/topia-persistence/src/test/java/org/nuiton/topiatest/Title.java 2011-09-22 12:03:23 UTC (rev 2342) @@ -1,3 +1,27 @@ +/* + * #%L + * ToPIA :: Persistence + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2004 - 2011 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ package org.nuiton.topiatest; /**

1 0