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-serv8071/src/test/java/org/xdoclet/plugin/hibernate/pojo
Modified Files:
ComponentMapping.java CompositeMapKeyMapping.java
CompositeMapping.java Simple.java
Log Message:
(XDP-89) Fix bug with incorrect property accumulation on inherited interfaces
Index: Simple.java
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-hibernate/src/test/java/org/xdoclet/plugin/hibernate/pojo/Simple.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** Simple.java 10 Aug 2005 15:42:05 -0000 1.26
--- Simple.java 15 Aug 2005 14:33:51 -0000 1.27
***************
*** 25,29 ****
private Object _fullBlown;
private String _name;
-
/**
* property defined on field level
--- 25,28 ----
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.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ComponentMapping.java 10 Aug 2005 15:42:05 -0000 1.17
--- ComponentMapping.java 15 Aug 2005 14:33:51 -0000 1.18
***************
*** 18,29 ****
--- 18,32 ----
*/
public AnotherClass classComponent;
+
/**
* @hibernate.component
*/
public Simple field;
+
/**
* @hibernate.id generator-class="native"
*/
private Long id;
+
/**
* @hibernate.component prefix="xpref_"
***************
*** 66,74 ****
*/
private ComponentMapping xyz;
/**
* @hibernate.property column="col" access="field"
*/
private String foo;
-
/**
* @hibernate.component prefix="nested_"
--- 69,77 ----
*/
private ComponentMapping xyz;
+
/**
* @hibernate.property column="col" access="field"
*/
private String foo;
/**
* @hibernate.component prefix="nested_"
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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CompositeMapKeyMapping.java 10 Aug 2005 15:42:05 -0000 1.7
--- CompositeMapKeyMapping.java 15 Aug 2005 14:33:51 -0000 1.8
***************
*** 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: 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.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CompositeMapping.java 10 Aug 2005 15:42:05 -0000 1.7
--- CompositeMapping.java 15 Aug 2005 14:33:51 -0000 1.8
***************
*** 22,26 ****
*/
private List emailAddresses;
-
/**
* @hibernate.list
--- 22,25 ----
***************
*** 30,38 ****
*/
private List permissions;
-
/**
* @hibernate.id generator-class="native"
*/
private Long userName;
/**
* @hibernate.map
--- 29,37 ----
*/
private List permissions;
/**
* @hibernate.id generator-class="native"
*/
private Long userName;
+
/**
* @hibernate.map
***************
*** 58,62 ****
*/
private Date parent;
-
/**
* @hibernate.property column="permissionType"
--- 57,60 ----
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
