svn commit: r725364 - in /cxf/trunk: api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

[dkulp]

Author: dkulp
Date: Wed Dec 10 10:26:36 2008
New Revision: 725364

URL: http://svn.apache.org/viewvc?rev=725364&view=rev
Log:
Try to work around some issues where a bad JAXB object model can create schemas 
that confuse things and cause issues with wsdl generation.

Modified:
    
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
    
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java

Modified: 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java?rev=725364&r1=725363&r2=725364&view=diff
==============================================================================
--- 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
(original)
+++ 
cxf/trunk/api/src/main/java/org/apache/cxf/databinding/AbstractDataBinding.java 
Wed Dec 10 10:26:36 2008
@@ -101,6 +101,9 @@
                     e.removeAttribute("schemaLocation");
                     updateSchemaLocation(e);
                 }
+                if (StringUtils.isEmpty(e.getAttribute("namespace"))) {
+                    e.setAttribute("namespace", 
serviceInfo.getInterface().getName().getNamespaceURI());
+                }
             }
             n = n.getNextSibling();
         }

Modified: 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java?rev=725364&r1=725363&r2=725364&view=diff
==============================================================================
--- 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 (original)
+++ 
cxf/trunk/rt/databinding/jaxb/src/main/java/org/apache/cxf/jaxb/JAXBDataBinding.java
 Wed Dec 10 10:26:36 2008
@@ -306,7 +306,7 @@
                 schemas = new HashSet<DOMSource>();
                 try {
                     for (DOMResult r : generateJaxbSchemas()) {
-                        schemas.add(new DOMSource(r.getNode()));
+                        schemas.add(new DOMSource(r.getNode(), 
r.getSystemId()));
                     }
                 } catch (IOException e) {
                     throw new ServiceConstructionException(new 
Message("SCHEMA_GEN_EXC", LOG), e);