tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rf...@apache.org
Subject svn commit: r675016 - in /tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen: ./ src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
Date Tue, 08 Jul 2008 22:55:15 GMT
Author: rfeng
Date: Tue Jul  8 15:55:15 2008
New Revision: 675016

URL: http://svn.apache.org/viewvc?rev=675016&view=rev
Log:
Merge one more change from trunk for TUSCANY-2465 (r675013)

Modified:
    tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/   (props changed)
    tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java

Propchange: tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/
------------------------------------------------------------------------------
    svn:mergeinfo = /tuscany/java/sca/modules/binding-ws-wsdlgen:673298,675013

Modified: tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
URL: http://svn.apache.org/viewvc/tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java?rev=675016&r1=675015&r2=675016&view=diff
==============================================================================
--- tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
(original)
+++ tuscany/branches/sca-java-1.3/modules/binding-ws-wsdlgen/src/main/java/org/apache/tuscany/sca/binding/ws/wsdlgen/Interface2WSDLGenerator.java
Tue Jul  8 15:55:15 2008
@@ -20,6 +20,7 @@
 package org.apache.tuscany.sca.binding.ws.wsdlgen;
 
 import java.lang.reflect.Method;
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -266,6 +267,7 @@
         // generate schema elements for wrappers that aren't defined in the schemas
         if (wrappers.size() > 0) {
             int i = 0;
+            int index = 0;
             Map<String, XSDefinition> wrapperXSDs = new HashMap<String, XSDefinition>();
             Map<Element, Map<String, String>> prefixMaps = new HashMap<Element,
Map<String, String>>();
             for (Map.Entry<QName, List<ElementInfo>> entry: wrappers.entrySet())
{
@@ -292,6 +294,9 @@
                     xsDef.setUnresolved(true);
                     xsDef.setNamespace(targetNS);
                     xsDef.setDocument(schemaDoc);
+                    // TUSCANY-2465: Set the system id to avoid schema conflict
+                    xsDef.setLocation(URI.create("xsd_" + index + ".xsd"));
+                    index++;
                     wrapperXSDs.put(targetNS, xsDef);
                 }
                 Element wrapper = schemaDoc.createElementNS(SCHEMA_NS, "xs:element");



Mime
View raw message