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-serv20382/src/test/java/org/xdoclet/plugin/hibernate/pojo
Modified Files:
AnyMapping.java ComponentMapping.hbm.xml ComponentMapping.java
CompositeMapKeyMapping.hbm.xml CompositeMapKeyMapping.java
CompositeMapping.hbm.xml CompositeMapping.java
PrimitiveArrayMapping.hbm.xml PrimitiveArrayMapping.java
Simple.hbm.xml Timestamp.java Version.java
Log Message:
(XDP-68) Implemented correct support for 'access' property
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.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Simple.hbm.xml 3 Jun 2005 07:26:05 -0000 1.17
--- Simple.hbm.xml 22 Jun 2005 15:54:08 -0000 1.18
***************
*** 31,35 ****
</type>
</property>
! <property name="blurge" access="field" index="blam">
<meta inherit="true" attribute="attribute">blurge</meta>
</property>
--- 31,35 ----
</type>
</property>
! <property name="blurge" index="blam">
<meta inherit="true" attribute="attribute">blurge</meta>
</property>
Index: PrimitiveArrayMapping.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/PrimitiveArrayMapping.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrimitiveArrayMapping.java 26 Apr 2005 07:00:17 -0000 1.1
--- PrimitiveArrayMapping.java 22 Jun 2005 15:54:08 -0000 1.2
***************
*** 18,22 ****
/**
! * @hibernate.primitive-array table="int_array"
* @hibernate.key
* @hibernate.key-column name="id" length="16"
--- 18,22 ----
/**
! * @hibernate.primitive-array table="int_array" access="method"
* @hibernate.key
* @hibernate.key-column name="id" length="16"
Index: CompositeMapKeyMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/CompositeMapKeyMapping.hbm.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompositeMapKeyMapping.hbm.xml 23 May 2005 14:49:20 -0000 1.3
--- CompositeMapKeyMapping.hbm.xml 22 Jun 2005 15:54:08 -0000 1.4
***************
*** 7,12 ****
<key/>
<composite-map-key
class="org.xdoclet.plugin.hibernate.pojo.CompositeMapKeyMapping$CompositeMapKey">
! <key-property access="field" name="keyField"/>
! <key-property access="field" name="keySN"/>
<key-many-to-one name="simple"/>
</composite-map-key>
--- 7,12 ----
<key/>
<composite-map-key
class="org.xdoclet.plugin.hibernate.pojo.CompositeMapKeyMapping$CompositeMapKey">
! <key-property name="keyField"/>
! <key-property name="keySN"/>
<key-many-to-one name="simple"/>
</composite-map-key>
Index: ComponentMapping.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/ComponentMapping.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** ComponentMapping.java 15 Jun 2005 12:56:07 -0000 1.12
--- ComponentMapping.java 22 Jun 2005 15:54:08 -0000 1.13
***************
*** 63,67 ****
ComponentMapping xyz;
/**
! * @hibernate.property column="col"
*/
String foo;
--- 63,67 ----
ComponentMapping xyz;
/**
! * @hibernate.property column="col" access="field"
*/
String foo;
Index: Timestamp.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Timestamp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Timestamp.java 26 Apr 2005 07:00:17 -0000 1.2
--- Timestamp.java 22 Jun 2005 15:54:08 -0000 1.3
***************
*** 13,17 ****
public class Timestamp {
/**
! * @hibernate.timestamp column="blurge" unsaved-value="null"
* @hibernate.meta attribute="blam" value="glem"
*/
--- 13,17 ----
public class Timestamp {
/**
! * @hibernate.timestamp column="blurge" unsaved-value="null"
access="field"
* @hibernate.meta attribute="blam" value="glem"
*/
Index: CompositeMapKeyMapping.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/CompositeMapKeyMapping.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompositeMapKeyMapping.java 17 May 2005 12:42:54 -0000 1.2
--- CompositeMapKeyMapping.java 22 Jun 2005 15:54:08 -0000 1.3
***************
*** 14,18 ****
public class CompositeMapKeyMapping {
/**
! * @hibernate.map
* @hibernate.composite-map-key
class="org.xdoclet.plugin.hibernate.pojo.CompositeMapKeyMapping$CompositeMapKey"
* @hibernate.element column="attributeValue" type="serializable"
not-null="true"
--- 14,18 ----
public class CompositeMapKeyMapping {
/**
! * @hibernate.map access="field"
* @hibernate.composite-map-key
class="org.xdoclet.plugin.hibernate.pojo.CompositeMapKeyMapping$CompositeMapKey"
* @hibernate.element column="attributeValue" type="serializable"
not-null="true"
***************
*** 25,33 ****
*/
private Long keyField;
/**
* @hibernate.key-property
*/
private Long keySN;
-
/**
* @hibernate.key-many-to-one
--- 25,33 ----
*/
private Long keyField;
+
/**
* @hibernate.key-property
*/
private Long keySN;
/**
* @hibernate.key-many-to-one
Index: AnyMapping.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/AnyMapping.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AnyMapping.java 2 Jun 2005 13:34:18 -0000 1.6
--- AnyMapping.java 22 Jun 2005 15:54:08 -0000 1.7
***************
*** 13,20 ****
public class AnyMapping {
/**
! * @hibernate.any id-type="string" meta-type="ProductClass"
* @hibernate.any-column name="glum"
*/
! Object field;
private Object _any;
--- 13,20 ----
public class AnyMapping {
/**
! * @hibernate.any id-type="string" meta-type="ProductClass" access="field"
* @hibernate.any-column name="glum"
*/
! private Object field;
private Object _any;
Index: CompositeMapping.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/CompositeMapping.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompositeMapping.java 16 May 2005 17:56:45 -0000 1.2
--- CompositeMapping.java 22 Jun 2005 15:54:08 -0000 1.3
***************
*** 16,20 ****
public class CompositeMapping {
/**
! * @hibernate.list fetch="join"
* @hibernate.key column="userName"
* @hibernate.list-index column="displayOrder" base="1"
--- 16,20 ----
public class CompositeMapping {
/**
! * @hibernate.list fetch="join" access="field"
* @hibernate.key column="userName"
* @hibernate.list-index column="displayOrder" base="1"
***************
*** 22,25 ****
--- 22,26 ----
*/
private List emailAddresses;
+
/**
* @hibernate.list
***************
*** 29,37 ****
*/
private List permissions;
/**
* @hibernate.id generator-class="native"
*/
private Long userName;
-
/**
* @hibernate.map
--- 30,38 ----
*/
private List permissions;
+
/**
* @hibernate.id generator-class="native"
*/
private Long userName;
/**
* @hibernate.map
***************
*** 44,48 ****
public class Email {
/**
! * @hibernate.property
*/
private String address;
--- 45,49 ----
public class Email {
/**
! * @hibernate.property access="field"
*/
private String address;
***************
*** 57,60 ****
--- 58,62 ----
*/
private Date parent;
+
/**
* @hibernate.property column="permissionType"
Index: PrimitiveArrayMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/PrimitiveArrayMapping.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** PrimitiveArrayMapping.hbm.xml 26 Apr 2005 07:00:17 -0000 1.1
--- PrimitiveArrayMapping.hbm.xml 22 Jun 2005 15:54:08 -0000 1.2
***************
*** 4,8 ****
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.PrimitiveArrayMapping"
table="array_table">
! <primitive-array name="intArray" table="int_array">
<key>
<column name="id" length="16"/>
--- 4,8 ----
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.PrimitiveArrayMapping"
table="array_table">
! <primitive-array name="intArray" table="int_array" access="method">
<key>
<column name="id" length="16"/>
Index: Version.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Version.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Version.java 26 Apr 2005 07:00:17 -0000 1.2
--- Version.java 22 Jun 2005 15:54:08 -0000 1.3
***************
*** 13,17 ****
public class Version {
/**
! * @hibernate.version column="blurge" unsaved-value="negative"
* @hibernate.meta attribute="blam" value="glem"
*/
--- 13,17 ----
public class Version {
/**
! * @hibernate.version column="blurge" unsaved-value="negative"
access="field"
* @hibernate.meta attribute="blam" value="glem"
*/
Index: CompositeMapping.hbm.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/CompositeMapping.hbm.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompositeMapping.hbm.xml 23 May 2005 14:49:21 -0000 1.2
--- CompositeMapping.hbm.xml 22 Jun 2005 15:54:08 -0000 1.3
***************
*** 4,8 ****
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.CompositeMapping"
table="`CompositeMapping`">
! <id access="field" name="userName">
<generator class="native"/>
</id>
--- 4,8 ----
<hibernate-mapping>
<class name="org.xdoclet.plugin.hibernate.pojo.CompositeMapping"
table="`CompositeMapping`">
! <id name="userName">
<generator class="native"/>
</id>
***************
*** 14,18 ****
</composite-element>
</list>
! <list access="field" name="permissions">
<key column="userName"/>
<list-index column="displayOrder" base="1"/>
--- 14,18 ----
</composite-element>
</list>
! <list name="permissions">
<key column="userName"/>
<list-index column="displayOrder" base="1"/>
***************
*** 20,27 ****
<meta attribute="meta" inherit="false"/>
<parent name="parent"/>
! <property name="type" column="permissionType" access="field"/>
</composite-element>
</list>
! <map access="field" name="sessionData">
<key column="userName"/>
<map-key column="attributeName" type="string"/>
--- 20,27 ----
<meta attribute="meta" inherit="false"/>
<parent name="parent"/>
! <property name="type" column="permissionType"/>
</composite-element>
</list>
! <map name="sessionData">
<key column="userName"/>
<map-key column="attributeName" type="string"/>
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.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ComponentMapping.hbm.xml 1 Jun 2005 14:52:57 -0000 1.9
--- ComponentMapping.hbm.xml 22 Jun 2005 15:54:08 -0000 1.10
***************
*** 3,7 ****
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.ComponentMapping"
table="component-table">
! <id access="field" name="id">
<generator class="native"/>
</id>
--- 3,7 ----
<hibernate-mapping default-cascade="none" auto-import="true">
<class name="org.xdoclet.plugin.hibernate.pojo.ComponentMapping"
table="component-table">
! <id name="id">
<generator class="native"/>
</id>
***************
*** 9,15 ****
<meta inherit="true" attribute="blurge">bang</meta>
<parent name="xyz"/>
! <property name="foo" access="field" column="col"/>
! <component name="nested" access="field">
! <property name="go" access="field" column="nested_col"/>
</component>
</component>
--- 9,15 ----
<meta inherit="true" attribute="blurge">bang</meta>
<parent name="xyz"/>
! <property name="foo" column="col" access="field"/>
! <component name="nested">
! <property name="go" column="nested_col"/>
</component>
</component>
***************
*** 17,35 ****
<parent name="xyz"/>
<property name="foo" column="prfx_col" access="field"/>
! <component name="nested" access="field">
! <property name="go" access="field" column="prfx_nested_col"/>
</component>
</component>
<property name="removedDttm" column="removed_dttm" not-null="true"/>
! <component name="classComponent" access="field">
! <property name="stringField" access="field">
<column name="pone"/>
</property>
</component>
! <component access="field" name="field">
<parent name="xyz"/>
! <property name="foo" access="field" column="col"/>
! <component name="nested" access="field">
! <property name="go" access="field" column="nested_col"/>
</component>
</component>
--- 17,35 ----
<parent name="xyz"/>
<property name="foo" column="prfx_col" access="field"/>
! <component name="nested">
! <property name="go" column="prfx_nested_col"/>
</component>
</component>
<property name="removedDttm" column="removed_dttm" not-null="true"/>
! <component name="classComponent">
! <property name="stringField">
<column name="pone"/>
</property>
</component>
! <component name="field">
<parent name="xyz"/>
! <property name="foo" column="col" access="field"/>
! <component name="nested">
! <property name="go" column="nested_col"/>
</component>
</component>
-------------------------------------------------------
SF.Net email is sponsored by: Discover Easy Linux Migration Strategies
from IBM. Find simple to follow Roadmaps, straightforward articles,
informative Webcasts and more! Get everything you need to get up to
speed, fast. http://ads.osdn.com/?ad_id=7477&alloc_id=16492&op=click
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
