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-serv17609/src/test/java/org/xdoclet/plugin/hibernate/pojo
Modified Files:
ComponentMapping.hbm.xml ComponentMapping.java
CompositeMapKeyMapping.java CompositeMapping.java Simple.java
Log Message:
Fixed bug in component. Now component class is calculated not only from
property class but also form 'class' attribute of 'component' tag
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.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** Simple.java 15 Jun 2005 12:56:08 -0000 1.22
--- Simple.java 4 Jul 2005 12:34:15 -0000 1.23
***************
*** 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.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ComponentMapping.java 22 Jun 2005 15:54:08 -0000 1.13
--- ComponentMapping.java 4 Jul 2005 12:34:15 -0000 1.14
***************
*** 18,25 ****
--- 18,27 ----
*/
public AnotherClass classComponent;
+
/**
* @hibernate.component
*/
public Simple field;
+
/**
* @hibernate.id generator-class="native"
***************
*** 28,32 ****
/**
! * @hibernate.component class="foo.bar.Baz" update="false" insert="true"
* @hibernate.meta attribute="blurge" value="bang"
*/
--- 30,34 ----
/**
! * @hibernate.component
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$SimpleImpl"
update="false" insert="true"
* @hibernate.meta attribute="blurge" value="bang"
*/
***************
*** 36,40 ****
/**
! * @hibernate.component class="foo.bar.Baz" prefix="prfx_"
*/
public Simple getPrefixedComponent() {
--- 38,42 ----
/**
! * @hibernate.component
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$SimpleImpl"
prefix="prfx_"
*/
public Simple getPrefixedComponent() {
***************
*** 62,70 ****
*/
ComponentMapping xyz;
/**
* @hibernate.property column="col" access="field"
*/
String foo;
-
/**
* @hibernate.component prefix="nested_"
--- 64,72 ----
*/
ComponentMapping xyz;
+
/**
* @hibernate.property column="col" access="field"
*/
String foo;
/**
* @hibernate.component prefix="nested_"
***************
*** 73,76 ****
--- 75,85 ----
}
+ public class SimpleImpl extends Simple {
+ /**
+ * @hibernate.property
+ */
+ String field;
+ }
+
public class 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompositeMapKeyMapping.java 22 Jun 2005 15:54:08 -0000 1.3
--- CompositeMapKeyMapping.java 4 Jul 2005 12:34:15 -0000 1.4
***************
*** 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.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CompositeMapping.java 22 Jun 2005 15:54:08 -0000 1.3
--- CompositeMapping.java 4 Jul 2005 12:34:15 -0000 1.4
***************
*** 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 ----
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.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ComponentMapping.hbm.xml 22 Jun 2005 15:54:08 -0000 1.10
--- ComponentMapping.hbm.xml 4 Jul 2005 12:34:15 -0000 1.11
***************
*** 6,11 ****
<generator class="native"/>
</id>
! <component name="component" insert="true" class="foo.bar.Baz"
update="false">
<meta inherit="true" attribute="blurge">bang</meta>
<parent name="xyz"/>
<property name="foo" column="col" access="field"/>
--- 6,12 ----
<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 name="field"/>
<parent name="xyz"/>
<property name="foo" column="col" access="field"/>
***************
*** 14,18 ****
</component>
</component>
! <component name="prefixedComponent" class="foo.bar.Baz">
<parent name="xyz"/>
<property name="foo" column="prfx_col" access="field"/>
--- 15,20 ----
</component>
</component>
! <component name="prefixedComponent"
class="org.xdoclet.plugin.hibernate.pojo.ComponentMapping$SimpleImpl">
! <property name="field"/>
<parent name="xyz"/>
<property name="foo" column="prfx_col" access="field"/>
-------------------------------------------------------
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
