You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2008/07/21 22:52:14 UTC
svn commit: r678562 - in /cxf/branches/2.0.x-fixes: ./
rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Author: dkulp
Date: Mon Jul 21 13:52:13 2008
New Revision: 678562
URL: http://svn.apache.org/viewvc?rev=678562&view=rev
Log:
Merged revisions 678559 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r678559 | dkulp | 2008-07-21 16:49:36 -0400 (Mon, 21 Jul 2008) | 2 lines
[CXF-1711] Grab parent types as well.
........
Modified:
cxf/branches/2.0.x-fixes/ (props changed)
cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jul 21 13:52:13 2008
@@ -1 +1 @@
-/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009
+/cxf/trunk:673548,674485,674547,674551,674562,674601,674649,674764,674887,675644,675653,677048,677385,678004,678009,678559
Propchange: cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java?rev=678562&r1=678561&r2=678562&view=diff
==============================================================================
--- cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java (original)
+++ cxf/branches/2.0.x-fixes/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBContextInitializer.java Mon Jul 21 13:52:13 2008
@@ -158,6 +158,12 @@
if (classes.contains(cls)) {
return;
}
+ if (cls.getSuperclass() != null) {
+ //JAXB should do this, but it doesn't always.
+ //in particular, older versions of jaxb don't
+ addClass(cls.getSuperclass());
+ }
+
if (cls.isEnum()) {
// The object factory stuff doesn't work for enums
classes.add(cls);