Author: rfeng
Date: Mon Jul 28 10:59:40 2008
New Revision: 680425
URL: http://svn.apache.org/viewvc?rev=680425&view=rev
Log:
Merge the fix for TUSCANY-2498 from trunk into 1.3 branch
Modified:
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
Modified:
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
URL:
http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java?rev=680425&r1=680424&r2=680425&view=diff
==============================================================================
---
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
(original)
+++
tuscany/branches/sca-java-1.3/modules/databinding-jaxb/src/main/java/org/apache/tuscany/sca/databinding/jaxb/JAXBTypeHelper.java
Mon Jul 28 10:59:40 2008
@@ -155,7 +155,9 @@
@Override
public Result createOutput(String ns, String file) throws IOException {
DOMResult result = new DOMResult();
- result.setSystemId(ns + file);
+ // TUSCANY-2498: Set the system id to "" so that the xsd:import
doesn't produce
+ // an illegal schemaLocation attr
+ result.setSystemId("");
results.put(ns, result);
return result;
}