commit ea0da97d44d1f9e367303c66cc55e825ed419260
author BCG <bgould@users.noreply.github.com> Thu Apr 28 10:54:13 2016 -0400
committer Jens Geyer <jensg@apache.org> Fri Apr 29 23:29:29 2016 +0200
tree db82ac55d5837da32bfcf69ba836347c014f95d1
parent ad3714ac3d7b9220d16f3a68503c261b8d22c8ee

THRIFT-3803 - Remove file attribute from include elements in XML generator
Client: XML/XSD
Patch: Benjamin Gould <bgould@users.noreply.github.com>

This closes #996

compiler/cpp/src/generate/t_xml_generator.cc

diff --git a/compiler/cpp/src/generate/t_xml_generator.cc b/compiler/cpp/src/generate/t_xml_generator.cc
index 4a166c8..5465b49 100644
--- a/compiler/cpp/src/generate/t_xml_generator.cc
+++ b/compiler/cpp/src/generate/t_xml_generator.cc
@@ -310,10 +310,8 @@
   const vector<t_program*> includes = program->get_includes();
   vector<t_program*>::const_iterator inc_it;
   for (inc_it = includes.begin(); inc_it != includes.end(); ++inc_it) {
-    const string include_path = (*inc_it)->get_path();
     write_element_start("include");
     write_attribute("name", (*inc_it)->get_name());
-    write_attribute("file", include_path);
     write_element_end();
   }
 

lib/xml/thrift-idl.xsd

diff --git a/lib/xml/thrift-idl.xsd b/lib/xml/thrift-idl.xsd
index 7a5248a..09dd695 100644
--- a/lib/xml/thrift-idl.xsd
+++ b/lib/xml/thrift-idl.xsd
@@ -47,14 +47,14 @@
         <element name="enum" type="tns:Enum" />
       </choice>
     </sequence>
-    <attribute name="name" type="string" />
-    <attribute name="targetNamespace" type="anyURI" />
-    <attribute name="doc" type="string" />
+    <attribute name="name" type="string" use="required" />
+    <attribute name="targetNamespace" type="anyURI" use="optional" />
+    <attribute name="doc" type="string" use="optional" />
   </complexType>
 
   <complexType name="Include">
-    <attribute name="file" type="string" />
-    <attribute name="name" type="string" />
+    <attribute name="file" type="string" use="optional" />
+    <attribute name="name" type="string" use="required" />
   </complexType>
 
   <complexType name="Namespace">
@@ -62,9 +62,9 @@
       <element name="annotation" type="tns:Annotation" 
                minOccurs="0" maxOccurs="unbounded" />
     </sequence>
-    <attribute name="name" type="string" />
-    <attribute name="value" type="string" />
-    <attribute name="doc" type="string" />
+    <attribute name="name" type="string" use="required" />
+    <attribute name="value" type="string" use="required" />
+    <attribute name="doc" type="string" use="optional" />
   </complexType>
 
   <group name="AbstractStruct">
@@ -77,8 +77,8 @@
   </group>
 
   <attributeGroup name="StructAttributes">
-    <attribute name="name" type="string" />
-    <attribute name="doc" type="string" />
+    <attribute name="name" type="string" use="required" />
+    <attribute name="doc" type="string" use="optional" />
   </attributeGroup>
 
   <complexType name="Exception">
@@ -97,7 +97,7 @@
     <attribute name="targetNamespace" type="string" use="required" />
     <attribute name="parent-module" type="string" use="optional" />
     <attribute name="parent-id" type="string" use="optional" /> 
-    <attribute name="doc" type="string" />
+    <attribute name="doc" type="string" use="optional" />
   </complexType>
 
   <complexType name="Method">
@@ -111,8 +111,8 @@
                minOccurs="0" maxOccurs="unbounded" />
     </sequence>
     <attribute name="name" type="string" use="required" />
-    <attribute name="oneway" type="boolean" />
-    <attribute name="doc" type="string" />
+    <attribute name="oneway" type="boolean" use="optional" />
+    <attribute name="doc" type="string" use="optional" />
   </complexType>
 
   <complexType name="Typedef">
@@ -123,7 +123,7 @@
                    minOccurs="0" maxOccurs="unbounded" />
         </sequence>
         <attribute name="name" type="string" use="required" />
-        <attribute name="doc" type="string" />
+        <attribute name="doc" type="string" use="optional" />
       </extension>
     </complexContent>
   </complexType>