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 2007/11/02 20:56:57 UTC
svn commit: r591435 - in /incubator/cxf/branches/2.0.x-fixes: ./
api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java
Author: dkulp
Date: Fri Nov 2 12:56:57 2007
New Revision: 591435
URL: http://svn.apache.org/viewvc?rev=591435&view=rev
Log:
Merged revisions 591390 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r591390 | dkulp | 2007-11-02 12:42:15 -0400 (Fri, 02 Nov 2007) | 3 lines
[CXF-1150] don't remove the import elements, just remove the schemaLocation.
Fix invalid schema generated from TestBean1
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=591435&r1=591434&r2=591435&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java Fri Nov 2 12:56:57 2007
@@ -476,7 +476,6 @@
LoadingByteArrayOutputStream out = new LoadingByteArrayOutputStream();
sch.write(out);
ins = out.createInputStream();
- System.out.println(out.toString());
}
impl.setByteStream(ins);
return impl;
Modified: incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java
URL: http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java?rev=591435&r1=591434&r2=591435&view=diff
==============================================================================
--- incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java (original)
+++ incubator/cxf/branches/2.0.x-fixes/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java Fri Nov 2 12:56:57 2007
@@ -63,7 +63,7 @@
if (n instanceof Element) {
Element e = (Element) n;
if (e.getLocalName().equals("import")) {
- d.getDocumentElement().removeChild(e);
+ e.removeAttribute("schemaLocation");
}
}
}