You are viewing a plain text version of this content. The canonical link for it is here.
Posted to yoko-commits@incubator.apache.org by en...@apache.org on 2007/05/04 15:40:37 UTC
svn commit: r535294 - in /incubator/yoko/trunk/tools/src:
main/java/org/apache/yoko/tools/common/WSDLCorbaWriterImpl.java
test/resources/idl/expected_LogicalLPT.wsdl
test/resources/idl/expected_LogicalLT.wsdl
test/resources/idl/expected_OptionsSchema.wsdl
Author: enolan
Date: Fri May 4 08:40:36 2007
New Revision: 535294
URL: http://svn.apache.org/viewvc?view=rev&rev=535294
Log:
Yoko-430 - updates.
Modified:
incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLCorbaWriterImpl.java
incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLPT.wsdl
incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLT.wsdl
incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl
Modified: incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLCorbaWriterImpl.java
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLCorbaWriterImpl.java?view=diff&rev=535294&r1=535293&r2=535294
==============================================================================
--- incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLCorbaWriterImpl.java (original)
+++ incubator/yoko/trunk/tools/src/main/java/org/apache/yoko/tools/common/WSDLCorbaWriterImpl.java Fri May 4 08:40:36 2007
@@ -190,7 +190,7 @@
Definition def) throws WSDLException {
Map imports = schemaElement.getImports();
indent(pw, indentCount);
- pw.print("<" + schemaName.getLocalPart() + ">");
+ pw.print("<xsd:" + schemaName.getLocalPart() + ">");
String tagName = "xsd:import";
Iterator importListIterator = imports.values().iterator();
@@ -205,13 +205,13 @@
pw.print("<" + tagName);
DOMUtils.printAttribute(Constants.ATTR_NAMESPACE,
schemaImport.getNamespaceURI(), pw);
- DOMUtils.printAttribute(Constants.ATTR_LOCATION,
+ DOMUtils.printAttribute("schemaLocation",
schemaImport.getSchemaLocationURI(), pw);
pw.println("/>");
}
}
indent(pw, indentCount);
- pw.print("</" + schemaName.getLocalPart() + ">");
+ pw.print("</xsd:" + schemaName.getLocalPart() + ">");
}
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLPT.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLPT.wsdl?view=diff&rev=535294&r1=535293&r2=535294
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLPT.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLPT.wsdl Fri May 4 08:40:36 2007
@@ -19,9 +19,9 @@
-->
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLPT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLPT" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
- <schema>
- <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLPT" location="expected_SchemaLPT.xsd"/>
- </schema>
+ <xsd:schema>
+ <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLPT" schemaLocation="expected_SchemaLPT.xsd"/>
+ </xsd:schema>
</wsdl:types>
<wsdl:message name="getEmployee">
<wsdl:part name="inparameter" element="tns:getEmployee">
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLT.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLT.wsdl?view=diff&rev=535294&r1=535293&r2=535294
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLT.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_LogicalLT.wsdl Fri May 4 08:40:36 2007
@@ -19,9 +19,9 @@
-->
<wsdl:definitions targetNamespace="http://schemas.apache.org/yoko/idl/OptionsLT" xmlns:tns="http://schemas.apache.org/yoko/idl/OptionsLT" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
<wsdl:types>
- <schema>
- <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLT" location="expected_SchemaLT.xsd"/>
- </schema>
+ <xsd:schema>
+ <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsLT" schemaLocation="expected_SchemaLT.xsd"/>
+ </xsd:schema>
</wsdl:types>
<wsdl:message name="getEmployeeResponse">
<wsdl:part name="outparameter" element="tns:getEmployeeResponse">
@@ -39,4 +39,4 @@
</wsdl:output>
</wsdl:operation>
</wsdl:portType>
-</wsdl:definitions>
+</wsdl:definitions>
\ No newline at end of file
Modified: incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl
URL: http://svn.apache.org/viewvc/incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl?view=diff&rev=535294&r1=535293&r2=535294
==============================================================================
--- incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl (original)
+++ incubator/yoko/trunk/tools/src/test/resources/idl/expected_OptionsSchema.wsdl Fri May 4 08:40:36 2007
@@ -25,9 +25,9 @@
</corba:struct>
</corba:typeMapping>
<wsdl:types>
- <schema>
- <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsSchema" location="expected_Schema.xsd"/>
- </schema>
+ <xsd:schema>
+ <xsd:import namespace="http://schemas.apache.org/yoko/idl/OptionsSchema" schemaLocation="expected_Schema.xsd"/>
+ </xsd:schema>
</wsdl:types>
<wsdl:message name="getEmployee">
<wsdl:part name="inparameter" element="tns:getEmployee">