schema/ListedLicense: Punt license and exception text into <text>

As it stands, there's not an easy way to extract the license text from
the XML format without removing <crossRefs>, <notes>,
<standardLicenseHeader>, and other siblings.  With this change (which,
if accepted, I still have to propagate into src/) we collect it in
<text>, just like we already collect the header text in
<standardLicenseHeader>.

Also use <all> instead of <choice> for <LicenseType> children.  With
that, <crossRefs> could have occured multiple times, etc.  With this
change, it can only occur once, although the children can still appear
in any order (we'd use <sequence> if we cared about child order).

Author: wking

schema/ListedLicense.xsd

@@ -17,38 +17,24 @@
 		</choice>
 	</complexType>
 	<complexType name="ExceptionType" mixed="true">
-		<choice minOccurs="1" maxOccurs="unbounded">
+		<all>
 			<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
 			<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
-			<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
-			<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
-			<element name="bullet" type="string"/>
-			<element name="list" type="tns:listType"/>
-			<element name="p" type="tns:formattedAltTextType"/>
-			<element name="optional" type="tns:optionalType"/>
-			<element name="alt" type="tns:altType"/>
-			<element name="br" type="tns:emptyType"/>
-		</choice>
+			<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
+		</all>
 		<attribute name="licenseId" type="string"/>
 		<attribute name="isDeprecated" type="boolean"/>
 		<attribute name="name" type="string"/>
 		<attribute name="listVersionAdded" type="string"/>
 		<attribute name="deprecatedVersion" type="string"/>
 	</complexType>
 	<complexType name="LicenseType" mixed="true">
-		<choice minOccurs="1" maxOccurs="unbounded">
+		<all>
 			<element name="crossRefs" type="tns:crossRefsType" minOccurs="0" maxOccurs="1"/>
 			<element name="notes" type="tns:formattedFixedTextType" minOccurs="0" maxOccurs="1"/>
 			<element name="standardLicenseHeader" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
-			<element name="titleText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
-			<element name="copyrightText" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
-			<element name="bullet" type="string"/>
-			<element name="list" type="tns:listType"/>
-			<element name="p" type="tns:formattedAltTextType"/>
-			<element name="optional" type="tns:optionalType"/>
-			<element name="alt" type="tns:altType"/>
-			<element name="br" type="tns:emptyType"/>
-		</choice>
+			<element name="text" type="tns:formattedAltTextType" minOccurs="0" maxOccurs="1"/>
+		</all>
 		<attribute name="licenseId" type="string"/>
 		<attribute name="isOsiApproved" type="boolean"/>
 		<attribute name="isFsfLibre" type="boolean"/>