preparing the old code for the merge

1 files changed, 392 insertions, 259 deletions

diff --git a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
index bea3d03f1..ee46caf60 100644
--- a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
+++ b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" 
-	xmlns:gd="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-		targetNamespace="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" 
-		elementFormDefault="qualified" 
-		attributeFormDefault="unqualified" version="1.1">
-		
-	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
-	
+<xs:schema xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
+	xmlns:gd="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma"
+	xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma"
+	elementFormDefault="qualified" attributeFormDefault="unqualified"
+	version="1.1">
+
+	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#"
+		schemaLocation="xmldsig-core-schema.xsd" />
+
 	<xs:simpleType name="AcademicYearType">
-		<xs:restriction base="xs:string"/>
+		<xs:restriction base="xs:string" />
 	</xs:simpleType>
-	
+
 	<xs:simpleType name="CountryType">
 		<xs:restriction base="xs:string">
 			<xs:enumeration value="AD">
@@ -412,14 +412,14 @@
 	</xs:simpleType>
 	<xs:simpleType name="CourseUnitTypeType">
 		<xs:restriction base="xs:string">
-		 <xs:enumeration value="Compulsory">
+			<xs:enumeration value="Compulsory">
 			</xs:enumeration>
 			<xs:enumeration value="Optional">
 			</xs:enumeration>
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="DateType">
-		<xs:restriction base="xs:date"/>
+		<xs:restriction base="xs:date" />
 	</xs:simpleType>
 	<xs:simpleType name="ECTSGradingScaleType">
 		<xs:restriction base="xs:string">
@@ -440,7 +440,7 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="EmailAddressType">
-		<xs:restriction base="xs:string"/>
+		<xs:restriction base="xs:string" />
 	</xs:simpleType>
 	<xs:simpleType name="EHEAFrameworkType">
 		<xs:restriction base="xs:string">
@@ -454,7 +454,7 @@
 	</xs:simpleType>
 	<xs:simpleType name="EmptyType">
 		<xs:restriction base="xs:string">
-			<xs:maxLength value="0"/>
+			<xs:maxLength value="0" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="GenderType">
@@ -764,27 +764,27 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="NFQType">
-		<xs:restriction base="xs:string"/>
+		<xs:restriction base="xs:string" />
 	</xs:simpleType>
 	<xs:simpleType name="PlainTextType">
 		<xs:restriction base="xs:string">
-			<xs:minLength value="1"/>
+			<xs:minLength value="1" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="PercentType">
 		<xs:restriction base="xs:decimal">
-			<xs:maxInclusive value="100"/>
-			<xs:minInclusive value="0"/>
+			<xs:maxInclusive value="100" />
+			<xs:minInclusive value="0" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="PositiveDecimalType">
 		<xs:restriction base="xs:decimal">
-			<xs:minInclusive value="0"/>
+			<xs:minInclusive value="0" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="PositiveIntegerType">
 		<xs:restriction base="xs:int">
-			<xs:minInclusive value="0"/>
+			<xs:minInclusive value="0" />
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="SourceGradeType">
@@ -798,49 +798,54 @@
 		</xs:restriction>
 	</xs:simpleType>
 	<xs:simpleType name="URLType">
-		<xs:restriction base="xs:anyURI"/>
+		<xs:restriction base="xs:anyURI" />
 	</xs:simpleType>
- 
- 
- 
- 
- <!-- Complex types -->
-  
- <xs:complexType name="CountryTextCodeType">
-   <xs:simpleContent>
-     <xs:extension base="gd:PlainTextType">
-       <xs:attribute name="country" type="gd:CountryType" use="optional">
-       </xs:attribute>
-     </xs:extension>
-   </xs:simpleContent>
- </xs:complexType>
- 
- 
-	<xs:complexType name="AdditionalInformationType"> 
+
+
+
+
+	<!-- Complex types -->
+
+	<xs:complexType name="CountryTextCodeType">
+		<xs:simpleContent>
+			<xs:extension base="gd:PlainTextType">
+				<xs:attribute name="country" type="gd:CountryType" use="optional">
+				</xs:attribute>
+			</xs:extension>
+		</xs:simpleContent>
+	</xs:complexType>
+
+
+	<xs:complexType name="AdditionalInformationType">
 		<xs:sequence>
-			<xs:element name="SpecificInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="SpecificInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="OtherSources" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="OtherSources" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
+
+
 	<xs:complexType name="AddressType">
 		<xs:sequence>
 			<xs:element name="Line" type="gd:PlainTextType" maxOccurs="unbounded">
 			</xs:element>
 			<xs:element name="City" type="gd:PlainTextType" minOccurs="0">
 			</xs:element>
-			<xs:element name="StateOrRegion" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="StateOrRegion" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="PostalCode" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="PostalCode" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="Country" type="gd:CountryTextCodeType" minOccurs="0">
+			<xs:element name="Country" type="gd:CountryTextCodeType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
+
 
 	<xs:complexType name="AttachedFileDataType">
 		<xs:sequence>
@@ -852,8 +857,8 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
+
+
 	<xs:complexType name="AttachedFileURLType">
 		<xs:sequence>
 			<xs:element name="Description" type="gd:PlainTextType">
@@ -864,8 +869,8 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
+
+
 	<xs:complexType name="AttachedImageDataType">
 		<xs:sequence>
 			<xs:element name="Description" type="gd:PlainTextType">
@@ -876,8 +881,8 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
+
+
 	<xs:complexType name="AttachedImageURLType">
 		<xs:sequence>
 			<xs:element name="Description" type="gd:PlainTextType">
@@ -888,8 +893,8 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
+
+
 	<xs:complexType name="AttachedType">
 		<xs:choice>
 			<xs:element name="FileData" type="gd:AttachedFileDataType">
@@ -904,23 +909,27 @@
 		<xs:attribute name="attachedID" type="xs:ID" use="required">
 		</xs:attribute>
 	</xs:complexType>
- 
- 
+
+
 	<xs:complexType name="AttachmentsType">
 		<xs:sequence>
-			<xs:element name="Attached" type="gd:AttachedType" maxOccurs="unbounded">
+			<xs:element name="Attached" type="gd:AttachedType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
+
+
 	<xs:complexType name="CertificationOfTheSupplementType">
 		<xs:sequence>
-			<xs:element name="CertificationDate" type="gd:DateType" minOccurs="0">
+			<xs:element name="CertificationDate" type="gd:DateType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="OfficialsCertifying" type="gd:OfficialsCertifyingType" minOccurs="0">
+			<xs:element name="OfficialsCertifying" type="gd:OfficialsCertifyingType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="OfficialStamp" type="gd:OfficialStampType" minOccurs="0">
+			<xs:element name="OfficialStamp" type="gd:OfficialStampType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -928,21 +937,27 @@
 
 	<xs:complexType name="ContactInformationType">
 		<xs:sequence>
-			<xs:element name="Address" type="gd:AddressType" minOccurs="0">
+			<xs:element name="Address" type="gd:AddressType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="PhoneNumber" type="gd:PlainTextType" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="PhoneNumber" type="gd:PlainTextType"
+				minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
-			<xs:element name="Email" type="gd:EmailAddressType" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="Email" type="gd:EmailAddressType"
+				minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
-			<xs:element name="WebSite" type="gd:URLType" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="WebSite" type="gd:URLType" minOccurs="0"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 
 
-	<xs:complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
+	<xs:complexType
+		name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
 		<xs:sequence>
-			<xs:element name="MobilityProgramme" type="gd:MobilityProgrammeType" maxOccurs="unbounded">
+			<xs:element name="MobilityProgramme" type="gd:MobilityProgrammeType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -950,9 +965,11 @@
 
 	<xs:complexType name="CourseStructureDiagramType">
 		<xs:sequence>
-			<xs:element name="CoursesGroups" type="gd:CoursesGroupsType" minOccurs="0">
+			<xs:element name="CoursesGroups" type="gd:CoursesGroupsType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="CoursesUnits" type="gd:CoursesUnitsType" minOccurs="0">
+			<xs:element name="CoursesUnits" type="gd:CoursesUnitsType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -960,7 +977,8 @@
 
 	<xs:complexType name="CoursesUnitsType">
 		<xs:sequence>
-			<xs:element name="CourseUnit" type="gd:CourseUnitType" maxOccurs="unbounded">
+			<xs:element name="CourseUnit" type="gd:CourseUnitType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -968,7 +986,8 @@
 
 	<xs:complexType name="CourseUnitLanguagesOfInstructionType">
 		<xs:sequence>
-			<xs:element name="Language" type="gd:CourseUnitLanguageOfInstructionType" maxOccurs="unbounded">
+			<xs:element name="Language" type="gd:CourseUnitLanguageOfInstructionType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -978,30 +997,35 @@
 		<xs:sequence>
 			<xs:element name="LocalGrade" type="gd:LocalGradeType">
 			</xs:element>
-			<xs:element name="ECTSGrade" type="gd:ECTSGradingScaleType" minOccurs="0">
+			<xs:element name="ECTSGrade" type="gd:ECTSGradingScaleType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
- 
 
- 
+
+
+
+
 	<xs:complexType name="CourseUnitType">
 		<xs:sequence>
-    <!--I've marked the course code as optional. Therefore, I had to remove the key that was defined for this field-->
+			<!--I've marked the course code as optional. Therefore, I had to remove 
+				the key that was defined for this field -->
 			<xs:element name="Code" type="gd:PlainTextType" minOccurs="0">
 			</xs:element>
-			<xs:element name="ScientificArea" type="gd:PlainTextType" minOccurs="0"/>
+			<xs:element name="ScientificArea" type="gd:PlainTextType"
+				minOccurs="0" />
 			<xs:element name="Title" type="gd:PlainTextType">
 			</xs:element>
-			<xs:element name="Theme" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="Theme" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
 			<xs:element name="Type" minOccurs="0">
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="type" type="gd:CourseUnitTypeType" use="optional">
+							<xs:attribute name="type" type="gd:CourseUnitTypeType"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:simpleContent>
@@ -1011,7 +1035,8 @@
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="year" type="gd:PositiveDecimalType" use="optional">
+							<xs:attribute name="year" type="gd:PositiveDecimalType"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:simpleContent>
@@ -1021,152 +1046,189 @@
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType" use="optional">
+							<xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="ECTSCredits" type="gd:PositiveDecimalType" minOccurs="0">
+			<xs:element name="ECTSCredits" type="gd:PositiveDecimalType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="LocalCredits" type="gd:PositiveDecimalType" minOccurs="0">
+			<xs:element name="LocalCredits" type="gd:PositiveDecimalType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="Hours" type="gd:PositiveDecimalType" minOccurs="0">
+			<xs:element name="Hours" type="gd:PositiveDecimalType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="LanguagesOfInstruction" type="gd:CourseUnitLanguagesOfInstructionType" minOccurs="0">
+			<xs:element name="LanguagesOfInstruction" type="gd:CourseUnitLanguagesOfInstructionType"
+				minOccurs="0">
 				<xs:unique name="LanguagesOfInstructionUQ">
-					<xs:selector xpath="gd:Language"/>
-					<xs:field xpath="@language"/>
+					<xs:selector xpath="gd:Language" />
+					<xs:field xpath="@language" />
 				</xs:unique>
 			</xs:element>
 			<xs:element name="ModeOfDelivery" minOccurs="0">
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="modeOfDelivery" type="gd:ModeOfDeliveryType" use="optional">
+							<xs:attribute name="modeOfDelivery" type="gd:ModeOfDeliveryType"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="WorkPlacements" type="gd:CourseUnitWorkPlacementsType" minOccurs="0">
+			<xs:element name="WorkPlacements" type="gd:CourseUnitWorkPlacementsType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="StudentPerformance" type="gd:CourseUnitStudentPerformanceType" minOccurs="0">
+			<xs:element name="StudentPerformance" type="gd:CourseUnitStudentPerformanceType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="NameOfLecturers" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="NameOfLecturers" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="LearningOutcomes" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="LearningOutcomes" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="PrerequisitesAndCorequisites" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="PrerequisitesAndCorequisites" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="PrerequisitesScholarshipLevel" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="PrerequisitesScholarshipLevel" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="PrerequisitesOtherTitles" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="PrerequisitesOtherTitles" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="RecomendedOptionalProgrammeComponents" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="RecomendedOptionalProgrammeComponents"
+				type="gd:RichTextTagType" minOccurs="0">
 			</xs:element>
-			<xs:element name="CourseContents" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="CourseContents" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="RecomendedOrRequiredReading" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="RecomendedOrRequiredReading" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="PlanedLearningActivitiesAndTeachingMethod" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="PlanedLearningActivitiesAndTeachingMethod"
+				type="gd:RichTextTagType" minOccurs="0">
 			</xs:element>
-			<xs:element name="AssesmentMethodsAndCriteria" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="AssesmentMethodsAndCriteria" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="Observations" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="Observations" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 		<xs:attribute name="groupID" type="xs:string" use="optional">
 		</xs:attribute>
-		<xs:attribute name="institutionAdministeringStudiesID" type="xs:string" use="optional" default="DEF-IAS">
+		<xs:attribute name="institutionAdministeringStudiesID"
+			type="xs:string" use="optional" default="DEF-IAS">
 		</xs:attribute>
-		<xs:attribute name="isRequiredByTheProgramme" type="xs:boolean" default="true">
+		<xs:attribute name="isRequiredByTheProgramme" type="xs:boolean"
+			default="true">
 		</xs:attribute>
- </xs:complexType>
- 
- 
- 
- 
- 
+	</xs:complexType>
+
+
+
+
+
 	<xs:complexType name="CourseUnitWorkPlacementsType">
 		<xs:sequence>
-    <xs:element name="WorkPlacement" type="gd:CourseUnitWorkPlacementType" maxOccurs="unbounded">
-    </xs:element>
+			<xs:element name="WorkPlacement" type="gd:CourseUnitWorkPlacementType"
+				maxOccurs="unbounded">
+			</xs:element>
+		</xs:sequence>
+	</xs:complexType>
+
+	<xs:complexType name="CourseUnitWorkPlacementType">
+		<xs:sequence>
+			<xs:element name="CollaboratingInstitution" type="gd:PlainTextType">
+			</xs:element>
+			<xs:element name="DateFrom" type="gd:DateType" minOccurs="0">
+			</xs:element>
+			<xs:element name="DateTo" type="gd:DateType" minOccurs="0">
+			</xs:element>
+			<xs:element name="TrainingHours" type="gd:PositiveDecimalType"
+				minOccurs="0">
+			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- <xs:complexType name="CourseUnitWorkPlacementType">
-   <xs:sequence>
-     <xs:element name="CollaboratingInstitution" type="gd:PlainTextType">
-     </xs:element>
-     <xs:element name="DateFrom" type="gd:DateType" minOccurs="0">
-     </xs:element>
-     <xs:element name="DateTo" type="gd:DateType" minOccurs="0">
-     </xs:element>
-     <xs:element name="TrainingHours" type="gd:PositiveDecimalType" minOccurs="0">
-     </xs:element>
-   </xs:sequence>
- </xs:complexType>
- 
- 
- 
+
+
+
 	<xs:complexType name="CourseUnitLanguageOfInstructionType">
 		<xs:simpleContent>
 			<xs:extension base="gd:PlainTextType">
-				<xs:attribute name="language" type="gd:LanguageType" use="required">
+				<xs:attribute name="language" type="gd:LanguageType"
+					use="required">
 				</xs:attribute>
 			</xs:extension>
 		</xs:simpleContent>
 	</xs:complexType>
 
 
- <!-- Root element type: GeneralDiploma -->
+	<!-- Root element type: GeneralDiploma -->
 
 	<xs:complexType name="GeneralDiplomaType">
 		<xs:sequence>
-			<xs:element name="InformationIdentifyingTheHolderOfTheQualification" type="gd:InformationIdentifyingTheHolderOfTheQualificationType">
+			<xs:element name="InformationIdentifyingTheHolderOfTheQualification"
+				type="gd:InformationIdentifyingTheHolderOfTheQualificationType">
 			</xs:element>
-			<xs:element name="InformationIdentifyingTheQualification" type="gd:InformationIdentifyingTheQualificationType">
+			<xs:element name="InformationIdentifyingTheQualification"
+				type="gd:InformationIdentifyingTheQualificationType">
 			</xs:element>
-			<xs:element name="InformationOnTheLevelOfTheQualification" type="gd:InformationOnTheLevelOfTheQualificationType" minOccurs="0">
+			<xs:element name="InformationOnTheLevelOfTheQualification"
+				type="gd:InformationOnTheLevelOfTheQualificationType" minOccurs="0">
 			</xs:element>
-   <!--Course and per-course qualifications information. We set it to optional to allow representing diplomas without course info-->
-			<xs:element name="InformationOnTheContentsAndResultsGained" type="gd:InformationOnTheContentsAndResultsGainedType" minOccurs="0">
+			<!--Course and per-course qualifications information. We set it to optional 
+				to allow representing diplomas without course info -->
+			<xs:element name="InformationOnTheContentsAndResultsGained"
+				type="gd:InformationOnTheContentsAndResultsGainedType" minOccurs="0">
 			</xs:element>
-			<xs:element name="InformationOnTheFunctionOfTheQualification" type="gd:InformationOnTheFunctionOfTheQualificationType" minOccurs="0">
+			<xs:element name="InformationOnTheFunctionOfTheQualification"
+				type="gd:InformationOnTheFunctionOfTheQualificationType" minOccurs="0">
 			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:AdditionalInformationType" minOccurs="0">
+			<xs:element name="AdditionalInformation" type="gd:AdditionalInformationType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="CertificationOfTheSupplement" type="gd:CertificationOfTheSupplementType" minOccurs="0">
+			<xs:element name="CertificationOfTheSupplement" type="gd:CertificationOfTheSupplementType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="InformationOnTheNationalHigherEducationSystem" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="InformationOnTheNationalHigherEducationSystem"
+				type="gd:RichTextTagType" minOccurs="0">
 			</xs:element>
-			<xs:element name="Attachments" type="gd:AttachmentsType" minOccurs="0">
+			<xs:element name="Attachments" type="gd:AttachmentsType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="ExtensionContent" type="gd:ExtensionContentType" minOccurs="0" maxOccurs="unbounded"> 
+			<xs:element name="ExtensionContent" type="gd:ExtensionContentType"
+				minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
 			<xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 		<xs:attribute name="language" type="gd:LanguageType" use="required">
 		</xs:attribute>
-		<xs:attribute name="isTheOriginalLanguage" type="xs:boolean" use="required">
+		<xs:attribute name="isTheOriginalLanguage" type="xs:boolean"
+			use="required">
 		</xs:attribute>
 	</xs:complexType>
- 
- 
- <!-- Can hold anything as extension -->
+
+
+	<!-- Can hold anything as extension -->
 	<xs:complexType name="ExtensionContentType" mixed="true">
 		<xs:sequence minOccurs="0" maxOccurs="unbounded">
-			<xs:any namespace="##any" processContents="lax"/>
+			<xs:any namespace="##any" processContents="lax" />
 		</xs:sequence>
-		<xs:attribute name="id" type="xs:string" use="optional"/>
+		<xs:attribute name="id" type="xs:string" use="optional" />
 	</xs:complexType>
 
 
 	<xs:complexType name="FamilyNameType">
 		<xs:sequence>
-			<xs:element name="Surname" type="gd:PlainTextType" maxOccurs="unbounded">
+			<xs:element name="Surname" type="gd:PlainTextType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -1184,7 +1246,8 @@
 		<xs:sequence>
 			<xs:element name="GradingScheme" type="gd:RichTextTagType">
 			</xs:element>
-			<xs:element name="GradeDistributionGuidance" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="GradeDistributionGuidance" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -1194,32 +1257,39 @@
 		<xs:sequence>
 			<xs:element name="Name" type="gd:PlainTextType" minOccurs="0">
 			</xs:element>
-			<xs:element name="HeaderInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="HeaderInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="CoursesGroup" type="gd:CoursesGroupType" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="CoursesGroup" type="gd:CoursesGroupType"
+				minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
-			<xs:element name="FooterInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="FooterInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 
- <!--Allows a hierarchy of course groups, but each ID must be unique regardless the level it is defined-->
+	<!--Allows a hierarchy of course groups, but each ID must be unique regardless 
+		the level it is defined -->
 	<xs:complexType name="CoursesGroupType">
 		<xs:sequence>
 			<xs:element name="Name" type="gd:PlainTextType">
 			</xs:element>
-			<xs:element name="HeaderInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="HeaderInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="CoursesGroup" type="gd:CoursesGroupType" minOccurs="0" maxOccurs="unbounded">
+			<xs:element name="CoursesGroup" type="gd:CoursesGroupType"
+				minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
-			<xs:element name="FooterInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="FooterInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 		<xs:attribute name="groupID" type="xs:string" use="required">
 		</xs:attribute>
 	</xs:complexType>
 
- 
+
 
 	<xs:complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
 		<xs:sequence>
@@ -1227,19 +1297,24 @@
 			</xs:element>
 			<xs:element name="GivenName" type="gd:GivenNameType">
 			</xs:element>
-			<xs:element name="DateOfBirth" type="gd:DateType" minOccurs="0">
+			<xs:element name="DateOfBirth" type="gd:DateType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="StudentIdentificationNumber" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="StudentIdentificationNumber" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="CountryOfBirth" type="gd:CountryTextCodeType" minOccurs="0">
+			<xs:element name="CountryOfBirth" type="gd:CountryTextCodeType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="PlaceOfBirth" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="PlaceOfBirth" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
 			<xs:element name="Gender" minOccurs="0">
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="gender" type="gd:GenderType" use="required">
+							<xs:attribute name="gender" type="gd:GenderType"
+								use="required">
 							</xs:attribute>
 						</xs:extension>
 					</xs:simpleContent>
@@ -1248,24 +1323,30 @@
 		</xs:sequence>
 	</xs:complexType>
 
- 
- <!--Required at least the name of the awarding institution, institution administering studies and the name of the qualification-->
+
+	<!--Required at least the name of the awarding institution, institution 
+		administering studies and the name of the qualification -->
 	<xs:complexType name="InformationIdentifyingTheQualificationType">
 		<xs:sequence>
 			<xs:element name="Qualification" type="gd:QualificationType">
 			</xs:element>
-			<xs:element name="TitleConferred" type="gd:TitleConferredType" minOccurs="0">
+			<xs:element name="TitleConferred" type="gd:TitleConferredType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="MainFieldsOfStudy" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="MainFieldsOfStudy" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="NameAndStatusOfAwardingInstitution" type="gd:NameAndStatusOfAwardingInstitutionType">
+			<xs:element name="NameAndStatusOfAwardingInstitution"
+				type="gd:NameAndStatusOfAwardingInstitutionType">
 			</xs:element>
-			<xs:element name="NameAndStatusOfInstitutionAdministeringStudies" type="gd:NameAndStatusOfInstitutionAdministeringStudiesType">
+			<xs:element name="NameAndStatusOfInstitutionAdministeringStudies"
+				type="gd:NameAndStatusOfInstitutionAdministeringStudiesType">
 			</xs:element>
-			<xs:element name="LanguagesOfInstructionAndExamination" type="gd:LanguagesOfInstructionAndExaminationType" minOccurs="0">
+			<xs:element name="LanguagesOfInstructionAndExamination"
+				type="gd:LanguagesOfInstructionAndExaminationType" minOccurs="0">
 				<xs:unique name="LanguageOfInstructionAndExaminationUQ">
-					<xs:selector xpath="gd:Language"/>
-					<xs:field xpath="@language"/>
+					<xs:selector xpath="gd:Language" />
+					<xs:field xpath="@language" />
 				</xs:unique>
 			</xs:element>
 		</xs:sequence>
@@ -1279,19 +1360,24 @@
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="modeOfStudy" type="gd:ModeOfStudyType" use="optional">
+							<xs:attribute name="modeOfStudy" type="gd:ModeOfStudyType"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:complexContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="ProgrammeRequirements" type="gd:ProgrammeRequirementsType" minOccurs="0">
+			<xs:element name="ProgrammeRequirements" type="gd:ProgrammeRequirementsType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="ProgrammeDetails" type="gd:ProgrammeDetailsType" minOccurs="0">
+			<xs:element name="ProgrammeDetails" type="gd:ProgrammeDetailsType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="GradingSchemeAndGradeDistributionGuidance" type="gd:GradingSchemeAndGradeDistributionGuidanceType" minOccurs="0">
+			<xs:element name="GradingSchemeAndGradeDistributionGuidance"
+				type="gd:GradingSchemeAndGradeDistributionGuidanceType" minOccurs="0">
 			</xs:element>
-			<xs:element name="OverallClassificationOfTheQualification" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="OverallClassificationOfTheQualification"
+				type="gd:RichTextTagType" minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -1300,13 +1386,15 @@
 
 	<xs:complexType name="InformationOnTheFunctionOfTheQualificationType">
 		<xs:sequence>
-			<xs:element name="AccessToFurtherStudy" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="AccessToFurtherStudy" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 			<xs:element name="ProfessionalStatus" minOccurs="0">
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="isRegulatedProfession" type="xs:boolean" use="optional">
+							<xs:attribute name="isRegulatedProfession" type="xs:boolean"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:complexContent>
@@ -1323,11 +1411,14 @@
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="isced1997" type="gd:ISCED1997Type" use="optional">
+							<xs:attribute name="isced1997" type="gd:ISCED1997Type"
+								use="optional">
 							</xs:attribute>
-							<xs:attribute name="isced2011" type="gd:ISCED2011Type" use="optional">
+							<xs:attribute name="isced2011" type="gd:ISCED2011Type"
+								use="optional">
 							</xs:attribute>
-							<xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType" use="optional">
+							<xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType"
+								use="optional">
 							</xs:attribute>
 							<xs:attribute name="nfq" type="gd:NFQType" use="optional">
 							</xs:attribute>
@@ -1339,34 +1430,42 @@
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="ectsCredits" type="gd:PositiveDecimalType" use="optional">
+							<xs:attribute name="ectsCredits" type="gd:PositiveDecimalType"
+								use="optional">
 							</xs:attribute>
-							<xs:attribute name="years" type="gd:PositiveDecimalType" use="optional">
+							<xs:attribute name="years" type="gd:PositiveDecimalType"
+								use="optional">
 							</xs:attribute>
-							<xs:attribute name="semesters" type="gd:PositiveIntegerType" use="optional">
+							<xs:attribute name="semesters" type="gd:PositiveIntegerType"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:complexContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="AccessRequirements" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="AccessRequirements" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
- 
+
+
+
 	<xs:complexType name="InstitutionType">
 		<xs:sequence>
 			<xs:element name="Name" type="gd:PlainTextType">
 			</xs:element>
-			<xs:element name="Status" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="Status" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="Country" type="gd:CountryTextCodeType" minOccurs="0">
+			<xs:element name="Country" type="gd:CountryTextCodeType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="AdditionalInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="ContactInformation" type="gd:ContactInformationType" minOccurs="0">
+			<xs:element name="ContactInformation" type="gd:ContactInformationType"
+				minOccurs="0">
 			</xs:element>
 			<xs:element name="AttachedImageRef" minOccurs="0">
 				<xs:complexType>
@@ -1379,27 +1478,34 @@
 				</xs:complexType>
 			</xs:element>
 		</xs:sequence>
-		<xs:attribute name="nationalID" type="gd:PlainTextType" use="optional">
+		<xs:attribute name="nationalID" type="gd:PlainTextType"
+			use="optional">
 		</xs:attribute>
-		<xs:attribute name="erasmusID" type="gd:PlainTextType" use="optional">
+		<xs:attribute name="erasmusID" type="gd:PlainTextType"
+			use="optional">
 		</xs:attribute>
 	</xs:complexType>
 
 
- <!-- Added optional boolean values to differentiate languages used for instruction and evaluation-->
+	<!-- Added optional boolean values to differentiate languages used for instruction 
+		and evaluation -->
 	<xs:complexType name="LanguagesOfInstructionAndExaminationType">
 		<xs:sequence>
 			<xs:element name="Language" maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="language" type="gd:LanguageType" use="required">
+							<xs:attribute name="language" type="gd:LanguageType"
+								use="required">
 							</xs:attribute>
-							<xs:attribute name="percent" type="gd:PercentType" use="optional">
+							<xs:attribute name="percent" type="gd:PercentType"
+								use="optional">
 							</xs:attribute>
-							<xs:attribute name="instruction"  type="xs:boolean" default="true">
+							<xs:attribute name="instruction" type="xs:boolean"
+								default="true">
 							</xs:attribute>
-							<xs:attribute name="examination"  type="xs:boolean" use="optional">
+							<xs:attribute name="examination" type="xs:boolean"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:complexContent>
@@ -1412,9 +1518,11 @@
 
 	<xs:complexType name="LocalGradeType">
 		<xs:sequence>
-			<xs:element name="AcademicYear" type="gd:AcademicYearType" minOccurs="0">
+			<xs:element name="AcademicYear" type="gd:AcademicYearType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="DateIssued" type="gd:DateType" minOccurs="0">
+			<xs:element name="DateIssued" type="gd:DateType"
+				minOccurs="0">
 			</xs:element>
 			<xs:element name="Grade" type="gd:PlainTextType">
 			</xs:element>
@@ -1422,7 +1530,8 @@
 				<xs:complexType>
 					<xs:simpleContent>
 						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="source" type="gd:SourceGradeType" use="optional">
+							<xs:attribute name="source" type="gd:SourceGradeType"
+								use="optional">
 							</xs:attribute>
 						</xs:extension>
 					</xs:simpleContent>
@@ -1435,7 +1544,8 @@
 
 	<xs:complexType name="MobilityProgrammeCoursesUnitsType">
 		<xs:sequence>
-			<xs:element name="CourseUnit" type="gd:MobilityProgrammeCourseUnitType" maxOccurs="unbounded">
+			<xs:element name="CourseUnit" type="gd:MobilityProgrammeCourseUnitType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -1455,28 +1565,33 @@
 					</xs:simpleContent>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="ECTSCredits" type="gd:PositiveDecimalType" minOccurs="0">
+			<xs:element name="ECTSCredits" type="gd:PositiveDecimalType"
+				minOccurs="0">
 			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="AdditionalInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
-		<xs:attribute name="isInTheLearningAgreement" type="xs:boolean" default="true">
+		<xs:attribute name="isInTheLearningAgreement" type="xs:boolean"
+			default="true">
 		</xs:attribute>
 	</xs:complexType>
- 
- 
- 
+
+
+
 	<xs:complexType name="MobilityProgrammeType">
 		<xs:sequence>
 			<xs:element name="Type" type="gd:PlainTextType" minOccurs="0">
 			</xs:element>
-			<xs:element name="FieldOfStudy" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="FieldOfStudy" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
 			<xs:element name="Country" type="gd:CountryTextCodeType">
 			</xs:element>
 			<xs:element name="ReceivingInstitutionName" type="gd:PlainTextType">
 			</xs:element>
-			<xs:element name="AcademicYear" type="gd:AcademicYearType" minOccurs="0">
+			<xs:element name="AcademicYear" type="gd:AcademicYearType"
+				minOccurs="0">
 			</xs:element>
 			<xs:element name="DateFrom" type="gd:DateType" minOccurs="0">
 			</xs:element>
@@ -1489,26 +1604,28 @@
 
 
 
- <!-- Root element type: MultilingualGeneralDiploma -->
+	<!-- Root element type: MultilingualGeneralDiploma -->
 
 	<xs:complexType name="MultilingualGeneralDiplomaType">
 		<xs:sequence>
-			<xs:element ref="gd:GeneralDiploma" minOccurs="1" maxOccurs="unbounded">
+			<xs:element ref="gd:GeneralDiploma" minOccurs="1"
+				maxOccurs="unbounded">
 			</xs:element>
 			<xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 
- <!-- awardingInstitutionID has a default value if only one is added.
-      Schema won't validate if two are added without this attr being set-->
+	<!-- awardingInstitutionID has a default value if only one is added. Schema 
+		won't validate if two are added without this attr being set -->
 	<xs:complexType name="NameAndStatusOfAwardingInstitutionType">
 		<xs:sequence>
 			<xs:element name="AwardingInstitution" maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="gd:InstitutionType">
-							<xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
+							<xs:attribute name="awardingInstitutionID" type="xs:string"
+								use="optional" default="DEF-IAW">
 							</xs:attribute>
 						</xs:extension>
 					</xs:complexContent>
@@ -1517,15 +1634,17 @@
 		</xs:sequence>
 	</xs:complexType>
 
- <!-- institutionAdministeringStudiesID has a default value if only one is added.
-      Schema won't validate if two are added without this attr being set-->
+	<!-- institutionAdministeringStudiesID has a default value if only one is 
+		added. Schema won't validate if two are added without this attr being set -->
 	<xs:complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
 		<xs:sequence>
-			<xs:element name="InstitutionAdministeringStudies" maxOccurs="unbounded">
+			<xs:element name="InstitutionAdministeringStudies"
+				maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:complexContent>
 						<xs:extension base="gd:InstitutionType">
-							<xs:attribute name="institutionAdministeringStudiesID" type="xs:string" use="optional" default="DEF-IAS">
+							<xs:attribute name="institutionAdministeringStudiesID"
+								type="xs:string" use="optional" default="DEF-IAS">
 							</xs:attribute>
 						</xs:extension>
 					</xs:complexContent>
@@ -1541,29 +1660,34 @@
 			</xs:element>
 			<xs:element name="GivenName" type="gd:GivenNameType">
 			</xs:element>
-			<xs:element name="Capacity" type="gd:PlainTextType" minOccurs="0">
+			<xs:element name="Capacity" type="gd:PlainTextType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
-		<xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
+		<xs:attribute name="awardingInstitutionID" type="xs:string"
+			use="optional" default="DEF-IAW">
 		</xs:attribute>
 	</xs:complexType>
 
 
 	<xs:complexType name="OfficialsCertifyingType">
 		<xs:sequence>
-			<xs:element name="OfficialCertifying" type="gd:OfficialCertifyingType" maxOccurs="unbounded">
+			<xs:element name="OfficialCertifying" type="gd:OfficialCertifyingType"
+				maxOccurs="unbounded">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
 
 
- <!--This is intended for printed out diplomas, to set up an area where the document can be physically stamped-->
+	<!--This is intended for printed out diplomas, to set up an area where the 
+		document can be physically stamped -->
 	<xs:complexType name="OfficialStampType">
 		<xs:sequence>
 			<xs:element name="Description" type="gd:PlainTextType">
 			</xs:element>
 		</xs:sequence>
-		<xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
+		<xs:attribute name="awardingInstitutionID" type="xs:string"
+			use="optional" default="DEF-IAW">
 		</xs:attribute>
 	</xs:complexType>
 
@@ -1572,7 +1696,9 @@
 		<xs:sequence>
 			<xs:element name="CourseStructureDiagram" type="gd:CourseStructureDiagramType">
 			</xs:element>
-			<xs:element name="CoursesAttendedInOtherInstitutionInMobilityPrograms" type="gd:CoursesAttendedInOtherInstitutionInMobilityProgramsType" minOccurs="0">
+			<xs:element name="CoursesAttendedInOtherInstitutionInMobilityPrograms"
+				type="gd:CoursesAttendedInOtherInstitutionInMobilityProgramsType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -1582,7 +1708,8 @@
 		<xs:sequence>
 			<xs:element name="Requirements" type="gd:RichTextTagType">
 			</xs:element>
-			<xs:element name="KeyLearningOutcomes" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="KeyLearningOutcomes" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
@@ -1592,12 +1719,14 @@
 		<xs:sequence>
 			<xs:element name="Name" type="gd:PlainTextType">
 			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
+			<xs:element name="AdditionalInformation" type="gd:RichTextTagType"
+				minOccurs="0">
 			</xs:element>
 		</xs:sequence>
 		<xs:attribute name="localID" type="gd:PlainTextType" use="optional">
 		</xs:attribute>
-		<xs:attribute name="nationalID" type="gd:PlainTextType" use="optional">
+		<xs:attribute name="nationalID" type="gd:PlainTextType"
+			use="optional">
 		</xs:attribute>
 	</xs:complexType>
 
@@ -1632,53 +1761,57 @@
 			</xs:element>
 		</xs:sequence>
 	</xs:complexType>
- 
- 
- 
- 
- <!-- Root element: GeneralDiploma -->
+
+
+
+
+	<!-- Root element: GeneralDiploma -->
 
 	<xs:element name="GeneralDiploma" type="gd:GeneralDiplomaType">
-		<!--Primary Keys--> <!-- TODO: revisar estas restricciones que tengan sentido y deban seguir existiendo -->
+		<!--Primary Keys --> <!-- TODO: revisar estas restricciones que tengan sentido y deban seguir 
+			existiendo -->
 		<xs:key name="GroupIDPK">
-			<xs:selector xpath=".//gd:CoursesGroup"/>
-			<xs:field xpath="@groupID"/>
+			<xs:selector xpath=".//gd:CoursesGroup" />
+			<xs:field xpath="@groupID" />
 		</xs:key>
 		<xs:key name="AwardingInstitutionIDPK">
-			<xs:selector xpath=".//gd:AwardingInstitution"/>
-			<xs:field xpath="@awardingInstitutionID"/>
+			<xs:selector xpath=".//gd:AwardingInstitution" />
+			<xs:field xpath="@awardingInstitutionID" />
 		</xs:key>
 		<xs:key name="InstitutionAdministeringStudiesIDPK">
-			<xs:selector xpath=".//gd:InstitutionAdministeringStudies"/>
-			<xs:field xpath="@institutionAdministeringStudiesID"/>
+			<xs:selector xpath=".//gd:InstitutionAdministeringStudies" />
+			<xs:field xpath="@institutionAdministeringStudiesID" />
 		</xs:key>
-		<!--Foreign Keys-->
+		<!--Foreign Keys -->
 		<xs:keyref name="GroupFK" refer="gd:GroupIDPK">
-			<xs:selector xpath=".//gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit"/>
-			<xs:field xpath="@groupID"/>
+			<xs:selector
+				xpath=".//gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit" />
+			<xs:field xpath="@groupID" />
 		</xs:keyref>
-		<xs:keyref name="AwardingInstitutionOfficialCertifyingFK" refer="gd:AwardingInstitutionIDPK">
-			<xs:selector xpath=".//gd:OfficialCertifying"/>
-			<xs:field xpath="@awardingInstitutionID"/>
+		<xs:keyref name="AwardingInstitutionOfficialCertifyingFK"
+			refer="gd:AwardingInstitutionIDPK">
+			<xs:selector xpath=".//gd:OfficialCertifying" />
+			<xs:field xpath="@awardingInstitutionID" />
 		</xs:keyref>
 		<xs:keyref name="AwardingInstitutionOfficialStampFK" refer="gd:AwardingInstitutionIDPK">
-			<xs:selector xpath=".//gd:OfficialStamp"/>
-			<xs:field xpath="@awardingInstitutionID"/>
+			<xs:selector xpath=".//gd:OfficialStamp" />
+			<xs:field xpath="@awardingInstitutionID" />
 		</xs:keyref>
 		<xs:keyref name="InstitutionAdministeringStudiesFK" refer="gd:InstitutionAdministeringStudiesIDPK">
-			<xs:selector xpath=".//gd:ProgrammeDetails/gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit"/>
-			<xs:field xpath="@institutionAdministeringStudiesID"/>
+			<xs:selector
+				xpath=".//gd:ProgrammeDetails/gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit" />
+			<xs:field xpath="@institutionAdministeringStudiesID" />
 		</xs:keyref>
 	</xs:element>
- 
- 
- <!-- Root element: MultilingualGeneralDiploma -->
+
+
+	<!-- Root element: MultilingualGeneralDiploma -->
 
 	<xs:element name="MultilingualGeneralDiploma" type="gd:MultilingualGeneralDiplomaType">
-		<!--Unique Keys--> <!-- Language codes of each Diploma must be unique -->
+		<!--Unique Keys --> <!-- Language codes of each Diploma must be unique -->
 		<xs:unique name="GeneralDiplomaLanguageUQ">
-			<xs:selector xpath="gd:GeneralDiploma"/>
-			<xs:field xpath="@language"/>
+			<xs:selector xpath="gd:GeneralDiploma" />
+			<xs:field xpath="@language" />
 		</xs:unique>
 	</xs:element>
 </xs:schema>