Changeset 2652

Timestamp:

27/06/07 14:26:26 (14 years ago)

Author:

ko23

Message:

Split of MOLES security into separate schema (moles_security1.0.xsd) and mod to ndgmetadata1.3.xsd. Note that a schemaLocation in ndgmetadata1.3.xsd means that this and moles_security1.0.xsd should be in the same directory to allow validation.

Location:

TI07-MOLES/trunk/v1Schema/Schemae

Files:

• MOLES1.spp (modified) (1 diff)
• moles_security1.0.xsd (added)
• ndgmetadata1.3.xsd (modified) (3 diffs)
• ndgmetadata1.3_presplit.xsd (added)

TI07-MOLES/trunk/v1Schema/Schemae/MOLES1.spp

@@ -22 +22 @@
         <Folder FolderName="DTD/Schemas" ExtStr="dtd;dcd;xdr;biz;xsd">
                 <File FilePath=".\..\..\DIF\Schemae\dif9-4.xsd" HomeFolder="Yes"/>
+                <File FilePath=".\moles_security1.0.xsd" HomeFolder="Yes"/>
                 <File FilePath=".\MOLESTypes.xsd" HomeFolder="Yes"/>
                 <File FilePath=".\ndgmetadata1.2.4.xsd" HomeFolder="Yes"/>
                 <File FilePath=".\ndgmetadata1.2.5.xsd" HomeFolder="Yes"/>
                 <File FilePath=".\ndgmetadata1.3.xsd" HomeFolder="Yes"/>
+                <File FilePath=".\ndgmetadata1.3_presplit.xsd" HomeFolder="Yes"/>
                 <File FilePath="C:\Documents and Settings\Kevin\Desktop\NDG Subversion Repository\TI07-MOLES\trunk\StubB\Schemae\StubB.xsd" HomeFolder="Yes"/>
                 <File FilePath=".\..\..\StubB\Schemae\StubBActivity.xsd" HomeFolder="Yes"/>

TI07-MOLES/trunk/v1Schema/Schemae/ndgmetadata1.3.xsd

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- edited with XMLSPY v5 rel. 4 U (http://www.xmlspy.com) by Kev O'Neill (CCLRC) -->
-<xs:schema targetNamespace="http://ndg.nerc.ac.uk/moles" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:moles="http://ndg.nerc.ac.uk/moles" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.03">
+<xs:schema targetNamespace="http://ndg.nerc.ac.uk/moles" xmlns:molessec="http://ndg.nerc.ac.uk/moles/security" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:moles="http://ndg.nerc.ac.uk/moles" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.03">
         <xs:import namespace="http://www.w3.org/1999/xlink" schemaLocation="http://www.isotc211.org/2005/xlink/xlinks.xsd"/>
+        <xs:import namespace="http://ndg.nerc.ac.uk/moles/security" schemaLocation="./moles_security1.0.xsd"/>
         <!--version 1.03 of NDG metadata schema. Modifications from 1.02.05:
                 removal of dgDataObjectType
@@ -726 +727 @@
                                 <xs:complexType>
                                         <xs:sequence>
-                                                <xs:element name="dgSecurityCondition" type="moles:dgSecurityConditionType" maxOccurs="unbounded"/>
+                                                <xs:element ref="molessec:dgSecurityCondition" maxOccurs="unbounded"/>
                                         </xs:sequence>
                                 </xs:complexType>
@@ -1016 +1017 @@
                                                                         <xs:element name="accessControlPolicyURL" type="xs:anyURI"/>
                                                                         <xs:element name="accessControlPolicyText" type="xs:string"/>
-                                                                        <xs:element name="dgSecurityCondition" type="moles:dgSecurityConditionType" maxOccurs="unbounded"/>
+                                                                        <xs:element ref="molessec:dgSecurityCondition" maxOccurs="unbounded"/>
                                                                 </xs:choice>
                                                         </xs:complexType>