svn commit: r591390 - in /incubator/cxf/trunk: api/src/main/java/org/apache/cxf/wsdl/ rt/core/src/main/java/org/apache/cxf/databinding/source/ rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/

[dkulp]

Author: dkulp
Date: Fri Nov  2 09:42:15 2007
New Revision: 591390

URL: http://svn.apache.org/viewvc?rev=591390&view=rev
Log:
[CXF-1150] don't remove the import elements, just remove the schemaLocation.
Fix invalid schema generated from TestBean1

Modified:
    
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
    
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java
    
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java

Modified: 
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java?rev=591390&r1=591389&r2=591390&view=diff
==============================================================================
--- 
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
 (original)
+++ 
incubator/cxf/trunk/api/src/main/java/org/apache/cxf/wsdl/EndpointReferenceUtils.java
 Fri Nov  2 09:42:15 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/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java?rev=591390&r1=591389&r2=591390&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java
 (original)
+++ 
incubator/cxf/trunk/rt/core/src/main/java/org/apache/cxf/databinding/source/AbstractDataBinding.java
 Fri Nov  2 09:42:15 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");
                 }
             }
         }

Modified: 
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
URL: 
http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java?rev=591390&r1=591389&r2=591390&view=diff
==============================================================================
--- 
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
 (original)
+++ 
incubator/cxf/trunk/rt/javascript/src/test/java/org/apache/cxf/javascript/fortest/TestBean1.java
 Fri Nov  2 09:42:15 2007
@@ -44,7 +44,7 @@
     public byte[] base64Item;
     @XmlElement(required = false)
     public int optionalIntItem;
-    @XmlElement(defaultValue = "trip", required = false, namespace = 
"uri:org.apache.cxf.javascript.testns2")
+    @XmlElement(required = false, namespace = 
"uri:org.apache.cxf.javascript.testns2")
     public String optionalStringItem;
     @XmlElement(required = false)
     public int[] optionalIntArrayItem;