Update of
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/expected
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7784/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/expected
Modified Files:
mapping-ae-off.xml mapping.xml mapping-shortname-off.xml
mapping-method-only.xml mapping-field-only.xml
Log Message:
Because of extends usage and castor not supporting forwarding definitions
we must order the list by hierarchy
Index: mapping.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/expected/mapping.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mapping.xml 25 Jun 2005 01:37:02 -0000 1.3
--- mapping.xml 11 Mar 2006 19:47:40 -0000 1.4
***************
*** 4,7 ****
--- 4,30 ----
<!--Generated by XDoclet2 Plugin-->
<mapping>
+ <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
+ <map-to xml="MyRequest"/>
+ <field name="name5" type="java.lang.Integer"/>
+ <field name="name2" type="string"/>
+ <field name="name6" type="java.lang.Integer[]"/>
+ <field name="name4" type="integer"/>
+ <field name="name" type="string">
+ <bind-xml name="TheName"/>
+ </field>
+ <field name="name3" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="name7" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="name10" type="string"/>
+ <field name="name8" type="string"/>
+ <field name="name9" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="obj1" type="other"/>
+ <field name="obj2" type="big-decimal"/>
+ </class>
<class name="org.xdoclet.plugin.castor.complete.AlternateRequest"
extends="alternate-depends"
***************
*** 75,102 ****
</field>
</class>
-
- <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
- <field name="obj1" type="other"/>
- <field name="obj2" type="big-decimal"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
- <field name="name10" type="string"/>
- <field name="name8" type="string"/>
- <field name="name9" type="string"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
- <field name="name7" type="string"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
- <map-to xml="MyRequest"/>
- <field name="name5" type="java.lang.Integer"/>
- <field name="name2" type="string"/>
- <field name="name6" type="java.lang.Integer[]"/>
- <field name="name4" type="integer"/>
- <field name="name" type="string">
- <bind-xml name="TheName"/>
- </field>
- <field name="name3" type="string"/>
- </class>
<class name="depends-test-value">
<field name="fieldName" type="java.lang.String"/>
--- 98,101 ----
Index: mapping-method-only.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/expected/mapping-method-only.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mapping-method-only.xml 25 Jun 2005 01:37:02 -0000 1.3
--- mapping-method-only.xml 11 Mar 2006 19:47:40 -0000 1.4
***************
*** 1,7 ****
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN"
"http://castor.codehaus.org/mapping.dtd";>
-
- <!--Generated by XDoclet2 Plugin-->
<mapping>
<class name="org.xdoclet.plugin.castor.complete.AlternateRequest"
extends="alternate-depends"
--- 1,15 ----
<?xml version="1.0" encoding="ISO-8859-1"?>
<!DOCTYPE mapping PUBLIC "-//EXOLAB/Castor Mapping DTD Version 1.0//EN"
"http://castor.codehaus.org/mapping.dtd";>
<mapping>
+ <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
+ <map-to xml="MyRequest"/>
+ <field name="name3" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ </class>
<class name="org.xdoclet.plugin.castor.complete.AlternateRequest"
extends="alternate-depends"
***************
*** 52,67 ****
/>
</field>
! </class>
!
! <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
! </class>
! <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
! </class>
! <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
! </class>
! <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
! <map-to xml="MyRequest"/>
! <field name="name3" type="string"/>
! </class>
<class name="depends-test-value">
<field name="fieldName" type="java.lang.String"/>
--- 60,64 ----
/>
</field>
! </class>
<class name="depends-test-value">
<field name="fieldName" type="java.lang.String"/>
Index: mapping-ae-off.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/expected/mapping-ae-off.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mapping-ae-off.xml 25 Jun 2005 01:37:02 -0000 1.3
--- mapping-ae-off.xml 11 Mar 2006 19:47:39 -0000 1.4
***************
*** 4,7 ****
--- 4,54 ----
<!--Generated by XDoclet2 Plugin-->
<mapping>
+ <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
+ <map-to xml="MyRequest"/>
+ <field name="name5" type="java.lang.Integer"/>
+ <field name="name2" type="string"/>
+ <field name="name6" type="java.lang.Integer[]"/>
+ <field name="name4" type="integer"/>
+ <field name="name" type="string">
+ <bind-xml name="TheName"/>
+ </field>
+ <field name="name3" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.OtherRequest">
+ <field name="name7" type="string"/>
+ <field name="name5" type="java.lang.Integer"/>
+ <field name="name2" type="string"/>
+ <field name="name6" type="java.lang.Integer[]"/>
+ <field name="name4" type="integer"/>
+ <field name="name" type="string">
+ <bind-xml name="TheName"/>
+ </field>
+ <field name="name3" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping">
+ <field name="name10" type="string"/>
+ <field name="name8" type="string"/>
+ <field name="name9" type="string"/>
+ <field name="name5" type="java.lang.Integer"/>
+ <field name="name2" type="string"/>
+ <field name="name6" type="java.lang.Integer[]"/>
+ <field name="name4" type="integer"/>
+ <field name="name" type="string">
+ <bind-xml name="TheName"/>
+ </field>
+ <field name="name3" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.AnotherRequest">
+ <field name="obj1" type="other"/>
+ <field name="obj2" type="big-decimal"/>
+ <field name="name5" type="java.lang.Integer"/>
+ <field name="name2" type="string"/>
+ <field name="name6" type="java.lang.Integer[]"/>
+ <field name="name4" type="integer"/>
+ <field name="name" type="string">
+ <bind-xml name="TheName"/>
+ </field>
+ <field name="name3" type="string"/>
+ </class>
<class name="org.xdoclet.plugin.castor.complete.AlternateRequest"
extends="alternate-depends"
***************
*** 75,126 ****
</field>
</class>
-
- <class name="org.xdoclet.plugin.castor.complete.AnotherRequest">
- <field name="obj1" type="other"/>
- <field name="obj2" type="big-decimal"/>
- <field name="name5" type="java.lang.Integer"/>
- <field name="name2" type="string"/>
- <field name="name6" type="java.lang.Integer[]"/>
- <field name="name4" type="integer"/>
- <field name="name" type="string">
- <bind-xml name="TheName"/>
- </field>
- <field name="name3" type="string"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping">
- <field name="name10" type="string"/>
- <field name="name8" type="string"/>
- <field name="name9" type="string"/>
- <field name="name5" type="java.lang.Integer"/>
- <field name="name2" type="string"/>
- <field name="name6" type="java.lang.Integer[]"/>
- <field name="name4" type="integer"/>
- <field name="name" type="string">
- <bind-xml name="TheName"/>
- </field>
- <field name="name3" type="string"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.OtherRequest">
- <field name="name7" type="string"/>
- <field name="name5" type="java.lang.Integer"/>
- <field name="name2" type="string"/>
- <field name="name6" type="java.lang.Integer[]"/>
- <field name="name4" type="integer"/>
- <field name="name" type="string">
- <bind-xml name="TheName"/>
- </field>
- <field name="name3" type="string"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
- <map-to xml="MyRequest"/>
- <field name="name5" type="java.lang.Integer"/>
- <field name="name2" type="string"/>
- <field name="name6" type="java.lang.Integer[]"/>
- <field name="name4" type="integer"/>
- <field name="name" type="string">
- <bind-xml name="TheName"/>
- </field>
- <field name="name3" type="string"/>
- </class>
<class name="depends-test-value">
<field name="fieldName" type="java.lang.String"/>
--- 122,125 ----
Index: mapping-shortname-off.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/expected/mapping-shortname-off.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** mapping-shortname-off.xml 25 Jun 2005 01:37:02 -0000 1.3
--- mapping-shortname-off.xml 11 Mar 2006 19:47:40 -0000 1.4
***************
*** 4,7 ****
--- 4,30 ----
<!--Generated by XDoclet2 Plugin-->
<mapping>
+ <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
+ <map-to xml="MyRequest"/>
+ <field name="name5" type="java.lang.Integer"/>
+ <field name="name2" type="string"/>
+ <field name="name6" type="java.lang.Integer[]"/>
+ <field name="name4" type="integer"/>
+ <field name="name" type="string">
+ <bind-xml name="TheName"/>
+ </field>
+ <field name="name3" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="name7" type="java.lang.String"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="name10" type="java.lang.String"/>
+ <field name="name8" type="java.lang.String"/>
+ <field name="name9" type="java.lang.String"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="obj1" type="java.lang.Object"/>
+ <field name="obj2" type="java.math.BigDecimal"/>
+ </class>
<class name="org.xdoclet.plugin.castor.complete.AlternateRequest"
extends="alternate-depends"
***************
*** 75,102 ****
</field>
</class>
-
- <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
- <field name="obj1" type="java.lang.Object"/>
- <field name="obj2" type="java.math.BigDecimal"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
- <field name="name10" type="java.lang.String"/>
- <field name="name8" type="java.lang.String"/>
- <field name="name9" type="java.lang.String"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
- <field name="name7" type="java.lang.String"/>
- </class>
- <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
- <map-to xml="MyRequest"/>
- <field name="name5" type="java.lang.Integer"/>
- <field name="name2" type="string"/>
- <field name="name6" type="java.lang.Integer[]"/>
- <field name="name4" type="integer"/>
- <field name="name" type="string">
- <bind-xml name="TheName"/>
- </field>
- <field name="name3" type="string"/>
- </class>
<class name="depends-test-value">
<field name="fieldName" type="java.lang.String"/>
--- 98,101 ----
Index: mapping-field-only.xml
===================================================================
RCS file:
/cvsroot/xdoclet-plugins/xdoclet-plugins/plugin-castor/src/test/java/org/xdoclet/plugin/castor/complete/expected/mapping-field-only.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mapping-field-only.xml 23 Jun 2005 00:05:20 -0000 1.2
--- mapping-field-only.xml 11 Mar 2006 19:47:40 -0000 1.3
***************
*** 4,7 ****
--- 4,29 ----
<!--Generated by XDoclet2 Plugin-->
<mapping>
+ <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
+ <map-to xml="MyRequest"/>
+ <field name="name5" type="java.lang.Integer"/>
+ <field name="name2" type="string"/>
+ <field name="name6" type="java.lang.Integer[]"/>
+ <field name="name4" type="integer"/>
+ <field name="name" type="string">
+ <bind-xml name="TheName"/>
+ </field>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="name7" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="name10" type="string"/>
+ <field name="name8" type="string"/>
+ <field name="name9" type="string"/>
+ </class>
+ <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
+ <field name="obj1" type="other"/>
+ <field name="obj2" type="big-decimal"/>
+ </class>
<class name="org.xdoclet.plugin.castor.complete.AlternateRequest"
extends="alternate-depends"
***************
*** 45,72 ****
/>
</field>
! </class>
!
! <class name="org.xdoclet.plugin.castor.complete.AnotherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
! <field name="obj1" type="other"/>
! <field name="obj2" type="big-decimal"/>
! </class>
! <class name="org.xdoclet.plugin.castor.complete.ExtendsNoMapping"
extends="org.xdoclet.plugin.castor.complete.Request">
! <field name="name10" type="string"/>
! <field name="name8" type="string"/>
! <field name="name9" type="string"/>
! </class>
! <class name="org.xdoclet.plugin.castor.complete.OtherRequest"
extends="org.xdoclet.plugin.castor.complete.Request">
! <field name="name7" type="string"/>
! </class>
! <class name="org.xdoclet.plugin.castor.complete.Request"
auto-complete="false">
! <map-to xml="MyRequest"/>
! <field name="name5" type="java.lang.Integer"/>
! <field name="name2" type="string"/>
! <field name="name6" type="java.lang.Integer[]"/>
! <field name="name4" type="integer"/>
! <field name="name" type="string">
! <bind-xml name="TheName"/>
! </field>
! </class>
<class name="depends-test-value">
<field name="fieldName" type="java.lang.String"/>
--- 67,71 ----
/>
</field>
! </class>
<class name="depends-test-value">
<field name="fieldName" type="java.lang.String"/>
-------------------------------------------------------
This SF.Net email is sponsored by xPML, a groundbreaking scripting language
that extends applications into web and mobile media. Attend the live webcast
and join the prime developer group breaking into this new coding territory!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=110944&bid=241720&dat=121642
_______________________________________________
xdoclet-plugins-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xdoclet-plugins-commits
