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 2011/05/26 21:26:37 UTC
svn commit: r1128053 - in /cxf/branches/2.3.x-fixes: ./
rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Author: dkulp
Date: Thu May 26 19:26:36 2011
New Revision: 1128053
URL: http://svn.apache.org/viewvc?rev=1128053&view=rev
Log:
Merged revisions 1128047 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1128047 | dkulp | 2011-05-26 15:14:13 -0400 (Thu, 26 May 2011) | 1 line
Eclipse pulled in wrong class
........
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java?rev=1128053&r1=1128052&r2=1128053&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java (original)
+++ cxf/branches/2.3.x-fixes/rt/core/src/main/java/org/apache/cxf/wsdl11/WSDLServiceBuilder.java Thu May 26 19:26:36 2011
@@ -53,14 +53,13 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
-import com.sun.org.apache.xml.internal.security.utils.XMLUtils;
-
import org.apache.cxf.Bus;
import org.apache.cxf.BusException;
import org.apache.cxf.binding.BindingFactory;
import org.apache.cxf.common.logging.LogUtils;
import org.apache.cxf.common.xmlschema.SchemaCollection;
import org.apache.cxf.helpers.CastUtils;
+import org.apache.cxf.helpers.DOMUtils;
import org.apache.cxf.service.model.AbstractMessageContainer;
import org.apache.cxf.service.model.AbstractPropertiesHolder;
import org.apache.cxf.service.model.BindingFaultInfo;
@@ -146,7 +145,7 @@ public class WSDLServiceBuilder {
private void copyDocumentation(AbstractPropertiesHolder info, WSDLElement el) {
if (el.getDocumentationElement() != null) {
- String doc = XMLUtils.getFullTextChildrenFromElement(el.getDocumentationElement());
+ String doc = DOMUtils.getContent(el.getDocumentationElement());
info.setDocumentation(doc);
}
}