Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29391/src/test/java/org/xdoclet/plugin/hibernate/pojo
Modified Files:
AnyMapping.hbm.xml ArrayMapping.hbm.xml BagMapping.hbm.xml
ComponentMapping.hbm.xml IdbagMapping.hbm.xml
ListMapping.hbm.xml MapMapping.hbm.xml Relation.hbm.xml
SetMapping.hbm.xml Simple.hbm.xml
Log Message:
fix for XDP-122. Only explicit access specification is honored, as well as
implicit field
access unless overriden
Index: Simple.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Simple.hbm.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** Simple.hbm.xml 17 Sep 2005 15:57:41 -0000 1.21
--- Simple.hbm.xml 4 Jan 2006 10:20:00 -0000 1.22
***************
*** 17,21 ****
<meta inherit="true" attribute="attribute">blurge</meta>
<comment>This is comment</comment>
! <id unsaved-value="yahoo" name="id" access="method">
<meta inherit="true" attribute="attribute">blurge</meta>
<column name="blurge" sql-type="foobar">
--- 17,21 ----
<meta inherit="true" attribute="attribute">blurge</meta>
<comment>This is comment</comment>
! <id unsaved-value="yahoo" name="id" >
<meta inherit="true" attribute="attribute">blurge</meta>
<column name="blurge" sql-type="foobar">
***************
*** 26,33 ****
</generator>
</id>
! <property name="fullBlown" access="method" length="235"
column="foo-bar" update="false" unique="true" not-null="true"
type="baz.bang.blurge" insert="false" formula="gee"/>
! <property access="method" name="name"/>
! <property access="method" name="typedProperty">
<type name="com.bar.Foo">
<param name="something">whatever</param>
--- 26,33 ----
</generator>
</id>
! <property name="fullBlown" length="235" column="foo-bar"
update="false" unique="true" not-null="true"
type="baz.bang.blurge" insert="false" formula="gee"/>
! <property name="name"/>
! <property name="typedProperty">
<type name="com.bar.Foo">
<param name="something">whatever</param>
Index: Relation.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Relation.hbm.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Relation.hbm.xml 17 Sep 2005 15:57:41 -0000 1.15
--- Relation.hbm.xml 4 Jan 2006 10:20:00 -0000 1.16
***************
*** 5,13 ****
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.Relation">
! <id name="id" unsaved-value="blurge" access="method">
<generator class="native"/>
</id>
<many-to-one name="oneSide"
! access="method"
cascade="none"
column="aclid"
--- 5,13 ----
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.Relation">
! <id name="id" unsaved-value="blurge" >
<generator class="native"/>
</id>
<many-to-one name="oneSide"
!
cascade="none"
column="aclid"
***************
*** 20,28 ****
>
</many-to-one>
! <many-to-one name="oneSideWithMutipleKeys"
class="com.infodesire.infobit.dao.AclImpl" access="method">
<column name="one"/>
<column name="two"/>
</many-to-one>
! <one-to-one name="oneToOne" constrained="false"
property-ref="sysHolderByIdHolder" access="method">
</one-to-one>
</class>
--- 20,28 ----
>
</many-to-one>
! <many-to-one name="oneSideWithMutipleKeys"
class="com.infodesire.infobit.dao.AclImpl" >
<column name="one"/>
<column name="two"/>
</many-to-one>
! <one-to-one name="oneToOne" constrained="false"
property-ref="sysHolderByIdHolder" >
</one-to-one>
</class>
Index: BagMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/BagMapping.hbm.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** BagMapping.hbm.xml 17 Sep 2005 15:57:41 -0000 1.12
--- BagMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.13
***************
*** 3,11 ****
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.BagMapping"
table="bag-table">
! <bag name="element" inverse="true" order-by="blurge" access="method">
<key/>
<element type="string"/>
</bag>
! <bag name="oneToMany" access="method" lazy="true" outer-join="auto"
schema="baz" inverse="false" where="bar" order-by="foo" cascade="all"
table="blurge">
<meta inherit="true" attribute="foo">bar</meta>
<meta inherit="false" attribute="bar">blurge</meta>
--- 3,11 ----
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.BagMapping"
table="bag-table">
! <bag name="element" inverse="true" order-by="blurge" >
<key/>
<element type="string"/>
</bag>
! <bag name="oneToMany" lazy="true" outer-join="auto" schema="baz"
inverse="false" where="bar" order-by="foo" cascade="all" table="blurge">
<meta inherit="true" attribute="foo">bar</meta>
<meta inherit="false" attribute="bar">blurge</meta>
***************
*** 14,18 ****
<one-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</bag>
! <bag name="oneToManyWithMultipleKey" table="blurge" access="method" >
<key>
<column name="column1"/>
--- 14,18 ----
<one-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</bag>
! <bag name="oneToManyWithMultipleKey" table="blurge" >
<key>
<column name="column1"/>
Index: ComponentMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/ComponentMapping.hbm.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** ComponentMapping.hbm.xml 17 Sep 2005 15:57:41 -0000 1.14
--- ComponentMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.15
***************
*** 6,10 ****
<generator class="native"/>
</id>
! <component name="component" access="method" insert="true"
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$SimpleImpl"
update="false">
<meta inherit="true" attribute="blurge">bang</meta>
<property access="field" name="field"/>
--- 6,10 ----
<generator class="native"/>
</id>
! <component name="component" insert="true"
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$SimpleImpl"
update="false">
<meta inherit="true" attribute="blurge">bang</meta>
<property access="field" name="field"/>
***************
*** 15,19 ****
</component>
</component>
! <component name="prefixedComponent" access="method"
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$SimpleImpl">
<property access="field" name="field"/>
<parent name="xyz"/>
--- 15,19 ----
</component>
</component>
! <component name="prefixedComponent"
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$SimpleImpl">
<property access="field" name="field"/>
<parent name="xyz"/>
***************
*** 23,29 ****
</component>
</component>
! <property access="method" name="removedDttm" column="removed_dttm"
not-null="true"/>
! <component access="method" name="componentInterface"
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$ConcreteComponent">
! <property name="property" access="method"/>
</component>
<component access="field" name="classComponent">
--- 23,29 ----
</component>
</component>
! <property name="removedDttm" column="removed_dttm" not-null="true"/>
! <component name="componentInterface"
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$ConcreteComponent">
! <property name="property" />
</component>
<component access="field" name="classComponent">
Index: ListMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/ListMapping.hbm.xml,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ListMapping.hbm.xml 17 Sep 2005 15:57:41 -0000 1.13
--- ListMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.14
***************
*** 3,7 ****
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.ListMapping"
table="bag-table">
! <list name="element" order-by="blurge" access="method">
<key/>
<index/>
--- 3,7 ----
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.ListMapping"
table="bag-table">
! <list name="element" order-by="blurge" >
<key/>
<index/>
***************
*** 13,17 ****
<many-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</list>
! <list name="manyToManyWithMultipleKey" access="method">
<key>
<column name="column1"/>
--- 13,17 ----
<many-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</list>
! <list name="manyToManyWithMultipleKey" >
<key>
<column name="column1"/>
***************
*** 21,25 ****
<many-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</list>
! <list access="method" name="oneToMany" lazy="true" outer-join="auto"
schema="baz" inverse="false" where="bar" order-by="foo" cascade="all"
table="blurge">
<meta inherit="true" attribute="foo">bar</meta>
<meta inherit="false" attribute="bar">blurge</meta>
--- 21,25 ----
<many-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</list>
! <list name="oneToMany" lazy="true" outer-join="auto" schema="baz"
inverse="false" where="bar" order-by="foo" cascade="all" table="blurge">
<meta inherit="true" attribute="foo">bar</meta>
<meta inherit="false" attribute="bar">blurge</meta>
Index: SetMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/SetMapping.hbm.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** SetMapping.hbm.xml 17 Sep 2005 15:57:41 -0000 1.16
--- SetMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.17
***************
*** 3,11 ****
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.SetMapping"
table="set-table">
! <set access="method" name="element" order-by="blurge"
cascade="all-delete-orphan">
<key/>
<element type="string"/>
</set>
! <set name="oneToMany" access="method" lazy="true" outer-join="auto"
schema="baz" inverse="false" where="bar" sort="blabla" order-by="foo"
cascade="all" table="blurge">
<meta inherit="true" attribute="foo">bar</meta>
<meta inherit="false" attribute="bar">blurge</meta>
--- 3,11 ----
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.SetMapping"
table="set-table">
! <set name="element" order-by="blurge" cascade="all-delete-orphan">
<key/>
<element type="string"/>
</set>
! <set name="oneToMany" lazy="true" outer-join="auto" schema="baz"
inverse="false" where="bar" sort="blabla" order-by="foo" cascade="all"
table="blurge">
<meta inherit="true" attribute="foo">bar</meta>
<meta inherit="false" attribute="bar">blurge</meta>
***************
*** 14,18 ****
<one-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</set>
! <set name="oneToManyWithMultipleKey" access="method" table="blurge">
<key>
<column name="column1"/>
--- 14,18 ----
<one-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"/>
</set>
! <set name="oneToManyWithMultipleKey" table="blurge">
<key>
<column name="column1"/>
Index: MapMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/MapMapping.hbm.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MapMapping.hbm.xml 17 Sep 2005 15:57:41 -0000 1.12
--- MapMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.13
***************
*** 4,16 ****
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.MapMapping"
table="map-table">
! <id name="id" unsaved-value="blurge" access="method">
<generator class="native"/>
</id>
! <map name="element" access="method">
<key/>
<index type="baz"/>
<element not-null="false" type="string" column="value"
unique="false"/>
</map>
! <map name="manyToAny" access="method">
<key column="baz"/>
<index-many-to-any id-type="long">
--- 4,16 ----
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.MapMapping"
table="map-table">
! <id name="id" unsaved-value="blurge" >
<generator class="native"/>
</id>
! <map name="element" >
<key/>
<index type="baz"/>
<element not-null="false" type="string" column="value"
unique="false"/>
</map>
! <map name="manyToAny" >
<key column="baz"/>
<index-many-to-any id-type="long">
***************
*** 23,27 ****
</many-to-any>
</map>
! <map access="method" name="oneToMany" lazy="true" outer-join="auto"
schema="baz" inverse="false" where="bar" sort="blabla" order-by="foo"
cascade="all" table="blurge">
<key/>
<index type="blurge">
--- 23,27 ----
</many-to-any>
</map>
! <map name="oneToMany" lazy="true" outer-join="auto" schema="baz"
inverse="false" where="bar" sort="blabla" order-by="foo" cascade="all"
table="blurge">
<key/>
<index type="blurge">
***************
*** 31,35 ****
<one-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"
not-found="exception"/>
</map>
! <map access="method" name="oneToManyWithMultipleKeys" table="blurge">
<key>
<column name="column1"/>
--- 31,35 ----
<one-to-many class="org.xdoclet.plugin.hibernate.pojo.Simple"
not-found="exception"/>
</map>
! <map name="oneToManyWithMultipleKeys" table="blurge">
<key>
<column name="column1"/>
Index: AnyMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/AnyMapping.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AnyMapping.hbm.xml 17 Sep 2005 15:57:41 -0000 1.6
--- AnyMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.7
***************
*** 3,7 ****
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.AnyMapping"
table="any-table">
! <any access="method" id-type="long"
cascade="all-delete-orphan,refresh" index="glum" name="any" insert="true"
update="false" meta-type="string">
<meta inherit="false" attribute="foo">bar</meta>
<meta-value value="glam" class="blurge"/>
--- 3,7 ----
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.AnyMapping"
table="any-table">
! <any id-type="long" cascade="all-delete-orphan,refresh"
index="glum" name="any" insert="true" update="false" meta-type="string">
<meta inherit="false" attribute="foo">bar</meta>
<meta-value value="glam" class="blurge"/>
Index: ArrayMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/ArrayMapping.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ArrayMapping.hbm.xml 17 Sep 2005 15:57:41 -0000 1.3
--- ArrayMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.4
***************
*** 4,8 ****
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.ArrayMapping"
table="array_table">
! <array name="intArray" table="int_array" access="method">
<key>
<column name="item_id" length="16"/>
--- 4,8 ----
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.ArrayMapping"
table="array_table">
! <array name="intArray" table="int_array" >
<key>
<column name="item_id" length="16"/>
***************
*** 13,17 ****
</element>
</array>
! <array name="itemArray" access="method"
element-class="org.xdoclet.plugin.hibernate.pojo.ItemArray"
where="section_where" check="i>=0">
<key>
<column name="id"/>
--- 13,17 ----
</element>
</array>
! <array name="itemArray"
element-class="org.xdoclet.plugin.hibernate.pojo.ItemArray"
where="section_where" check="i>=0">
<key>
<column name="id"/>
***************
*** 22,26 ****
</many-to-many>
</array>
! <array name="timeArray" access="method" table="time_array">
<key>
<column name="array_id" length="16"/>
--- 22,26 ----
</many-to-many>
</array>
! <array name="timeArray" table="time_array">
<key>
<column name="array_id" length="16"/>
Index: IdbagMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/IdbagMapping.hbm.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** IdbagMapping.hbm.xml 29 Dec 2005 15:59:46 -0000 1.6
--- IdbagMapping.hbm.xml 4 Jan 2006 10:20:00 -0000 1.7
***************
*** 4,8 ****
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.IdbagMapping"
table="idbag_table">
! <idbag name="idBag" lazy="true" table="idbag_id" cascade="all"
access="method">
<collection-id column="collection_id" type="long">
<generator class="hilo">
--- 4,8 ----
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.IdbagMapping"
table="idbag_table">
! <idbag name="idBag" lazy="true" table="idbag_id" cascade="all" >
<collection-id column="collection_id" type="long">
<generator class="hilo">
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
