Changeset 1155

Timestamp:

12/06/06 14:46:24 (13 years ago)

Author:

domlowe

Message:

CSML Schema Version 1.1 commit. Added support for NDG security in the form of AccessControlPolicyType? which mirrors the MOLES AccesControlPolicy? element structure. Within this dgSecurityCondition references the dgSecurityConditionType in the MOLES schema. Additional change - ctlVariableName attribute added to GRIBExtract to enable cdunif reading of GRIB files.

File:

• TI02-CSML/trunk/XMLSchemas/CSMLAppSchema.xsd (modified) (5 diffs)

TI02-CSML/trunk/XMLSchemas/CSMLAppSchema.xsd

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<schema targetNamespace="http://ndg.nerc.ac.uk/csml" xmlns:gml="http://www.opengis.net/gml" xmlns:om="http://www.opengis.net/om" xmlns:csml="http://ndg.nerc.ac.uk/csml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="0.1">
+<schema targetNamespace="http://ndg.nerc.ac.uk/csml" xmlns:gml="http://www.opengis.net/gml" xmlns:om="http://www.opengis.net/om" xmlns:moles="http://ndg.nerc.ac.uk/moles" xmlns:csml="http://ndg.nerc.ac.uk/csml" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.1">
         <annotation>
                 <documentation>CSML application schema</documentation>
@@ -7 +7 @@
         <import namespace="http://www.opengis.net/gml" schemaLocation="GML-3.1.0/base/gml.xsd"/>
         <import namespace="http://www.opengis.net/om" schemaLocation="phenomenon.xsd"/>
+        <import namespace="http://ndg.nerc.ac.uk/moles" schemaLocation="ndgmetadata1.2.4.xsd"/>
         <!--====================================================================== -->
         <!--===== Root element for CSML dataset =====-->
@@ -23 +24 @@
                         <extension base="gml:AbstractGMLType">
                                 <sequence>
+                                        <element ref="csml:AccessControlPolicy" minOccurs="0" maxOccurs="1"/>
                                         <element ref="csml:UnitDefinitions" minOccurs="0" maxOccurs="unbounded"/>
                                         <element ref="csml:ReferenceSystemDefinitions" minOccurs="0" maxOccurs="unbounded"/>
@@ -33 +35 @@
         </complexType>
         <element name="Dataset" type="csml:DatasetType"/>
+        <!--====================================================================== -->
+        <!-- =======Security Conditions========== -->
+        <!--====================================================================== -->
+        <complexType name="AccessControlPolicyType">
+                <annotation>
+                        <documentation>Contains either a text file giving the access control policy to the actual data granule, or a URL that points to such a document. In the long run, this is likely to be an XACML document. Note the assumption that there will be only one definitive source for such a policy.</documentation>
+                </annotation>
+                <choice>
+                                <element name="accessControlPolicyURL" type="anyURI"/>
+                                <element name="accessControlPolicyText" type="string"/>
+                                <element name="dgSecurityCondition" type="moles:dgSecurityConditionType" maxOccurs="unbounded"/>
+                </choice>
+        </complexType>
+        <element name="AccessControlPolicy" type="csml:AccessControlPolicyType"/>
+        <complexType name="AccessControlPolicyPropertyType">
+                <sequence>
+                        <element ref="csml:AccessControlPolicy" minOccurs="0"/>
+                </sequence>
+        </complexType>
         <!--====================================================================== -->
         <!--===== Dictionary/definition elements =====-->
@@ -869 +890 @@
                                         <element name="recordNumber" type="int" minOccurs="0"/>
                                         <element name="fileOffset" type="int" minOccurs="0"/>
+                                        <element name="ctlVariableName" type="string" minOccurs="0"/>
                                 </sequence>
                         </extension>