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 2009/03/30 16:50:18 UTC
svn commit: r759996 - in /cxf/branches/2.1.x-fixes: ./
common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
Author: dkulp
Date: Mon Mar 30 14:50:17 2009
New Revision: 759996
URL: http://svn.apache.org/viewvc?rev=759996&view=rev
Log:
Merged revisions 759966 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r759966 | dkulp | 2009-03-30 09:39:07 -0400 (Mon, 30 Mar 2009) | 2 lines
Remove class reference to jaxws api jar so jaxws-api jar should really be removable if not using jaxws
........
Modified:
cxf/branches/2.1.x-fixes/ (props changed)
cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 30 14:50:17 2009
@@ -1 +1 @@
-/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963-759964
+/cxf/trunk:743446,753380,753397,753421,754585,755365,757499,757859,757899,757935,757951,758195,758303,758308,758378,758690,759961,759963-759964,759966
Propchange: cxf/branches/2.1.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java?rev=759996&r1=759995&r2=759996&view=diff
==============================================================================
--- cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java (original)
+++ cxf/branches/2.1.x-fixes/common/common/src/main/java/org/apache/cxf/jaxb/JAXBUtils.java Mon Mar 30 14:50:17 2009
@@ -50,7 +50,6 @@
import javax.xml.stream.XMLStreamReader;
import javax.xml.stream.XMLStreamWriter;
import javax.xml.transform.stream.StreamResult;
-import javax.xml.ws.Holder;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -472,7 +471,8 @@
return cls;
}
- if (cls == Object.class || cls == String.class || cls == Holder.class) {
+ if (cls == Object.class || cls == String.class
+ || "javax.xml.ws.Holder".equals(cls.getName())) {
cls = null;
} else if (cls.isPrimitive() || cls.isAnnotation()) {
cls = null;