Author: scheu Date: Mon May 3 19:42:13 2010 New Revision: 940584 URL: http://svn.apache.org/viewvc?rev=940584&view=rev Log: AXIS2-4700 Contributor:Rich Scheuerle Slight change to the algorithm to give classes in a jaxws package (i.e. wrapper classes) slightly more precedence.
Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBContextFromClasses.java Modified: axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBContextFromClasses.java URL: http://svn.apache.org/viewvc/axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBContextFromClasses.java?rev=940584&r1=940583&r2=940584&view=diff ============================================================================== --- axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBContextFromClasses.java (original) +++ axis/axis2/java/core/trunk/modules/jaxws/src/org/apache/axis2/jaxws/message/databinding/JAXBContextFromClasses.java Mon May 3 19:42:13 2010 @@ -165,13 +165,31 @@ public class JAXBContextFromClasses { log.debug("This looks like a JAXB class. Adding it to primary list:" + cls.getName()); } - primary.add(cls); // This looks like a JAXB class...add it + Package pkg = cls.getPackage(); + if (pkg != null && pkg.getName().endsWith(".jaxws")) { + if (log.isDebugEnabled()) { + log.debug("This looks like a jaxws generated Class. Adding it to the front of the primary list:" + + cls.getName()); + } + primary.add(0,cls); // Add to the front of the list + } else { + primary.add(cls); // This looks like a JAXB class...add it + } } else { if (log.isDebugEnabled()) { log.debug("This may not be a JAXB class. Adding it to secondary list:" + cls.getName()); } - secondary.add(cls); // This looks like it might be something else... + Package pkg = cls.getPackage(); + if (pkg != null && pkg.getName().endsWith(".jaxws")) { + if (log.isDebugEnabled()) { + log.debug("This looks like a jaxws generated Class. Adding it to the front of the secondary list:" + + cls.getName()); + } + secondary.add(0,cls); // Add to the front of the list + } else { + secondary.add(cls); // This looks like it might be something else...not JAXB + } } } }