cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1539598 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Date Thu, 07 Nov 2013 11:29:48 GMT
Author: sergeyb
Date: Thu Nov  7 11:29:47 2013
New Revision: 1539598

URL: http://svn.apache.org/r1539598
Log:
Merged revisions 1539595 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1539595 | sergeyb | 2013-11-07 11:10:07 +0000 (Thu, 07 Nov 2013) | 1 line
  
  [CXF-5355] Allowing for XMLRootElement when checking XmlSeeAlso if the class is abstract
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1539595

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java?rev=1539598&r1=1539597&r2=1539598&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
(original)
+++ cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/model/wadl/WadlGenerator.java
Thu Nov  7 11:29:47 2013
@@ -400,7 +400,7 @@ public class WadlGenerator implements Re
         }
         List<Class<?>> extraClasses = new LinkedList<Class<?>>();
         for (Class<?> cls : resourceTypes.getAllTypes().keySet()) {
-            if (!isXmlRoot(cls)) {
+            if (!isXmlRoot(cls) || Modifier.isAbstract(cls.getModifiers())) {
                 XmlSeeAlso seeAlsoAnn = cls.getAnnotation(XmlSeeAlso.class);
                 if (seeAlsoAnn != null) {
                     List<Class<?>> seeAlsoList = CastUtils.cast(Arrays.asList(seeAlsoAnn.value()));



Mime
View raw message