Changeset 172 for Xml/Release/AnalysisModule.xsd

Timestamp:

05/14/08 16:07:43 (6 months ago)

Author:

andrew

Message:

Changed to reflect the proposed release for May 2008 (2008-02 Version 2).
This allows people to preview the files.

Files:

• Xml/Release/AnalysisModule.xsd (modified) (7 diffs)

Xml/Release/AnalysisModule.xsd

@@ -3 +3 @@
         #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         #
-        # Copyright (C) 2003-2007 Open Microscopy Environment
+        # Copyright (C) 2003-2008 Open Microscopy Environment
         #       Massachusetts Institute of Technology,
         #       National Institutes of Health,
@@ -17 +17 @@
 -->
 <schema xmlns = "http://www.w3.org/2001/XMLSchema"
-        targetNamespace = "http://www.openmicroscopy.org/Schemas/AnalysisModule/2007-06"
-        xmlns:AML = "http://www.openmicroscopy.org/Schemas/AnalysisModule/2007-06"
-        xmlns:CLI = "http://www.openmicroscopy.org/Schemas/CLI/2007-06"
-        xmlns:Bin = "http://www.openmicroscopy.org/Schemas/BinaryFile/2007-06"
-        xmlns:MLI = "http://www.openmicroscopy.org/Schemas/MLI/2007-06"
-        xmlns:OME = "http://www.openmicroscopy.org/Schemas/OME/2007-06"
+        targetNamespace = "http://www.openmicroscopy.org/Schemas/AnalysisModule/2008-02"
+        xmlns:AML = "http://www.openmicroscopy.org/Schemas/AnalysisModule/2008-02"
+        xmlns:CLI = "http://www.openmicroscopy.org/Schemas/CLI/2008-02"
+        xmlns:Bin = "http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02"
+        xmlns:MLI = "http://www.openmicroscopy.org/Schemas/MLI/2008-02"
+        xmlns:OME = "http://www.openmicroscopy.org/Schemas/OME/2008-02"
         xmlns:xsd = "http://www.w3.org/2001/XMLSchema"
         xmlns:xml="http://www.w3.org/XML/1998/namespace"
-        version = "2"
-         elementFormDefault = "qualified">
-        <import namespace = "http://www.openmicroscopy.org/Schemas/CLI/2007-06" schemaLocation = "http://www.openmicroscopy.org/Schemas/CLI/2007-06/CLI.xsd"/>
-        <import namespace = "http://www.openmicroscopy.org/Schemas/BinaryFile/2007-06" schemaLocation = "http://www.openmicroscopy.org/Schemas/BinaryFile/2007-06/BinaryFile.xsd"/>
-        <import namespace = "http://www.openmicroscopy.org/Schemas/MLI/2007-06" schemaLocation = "http://www.openmicroscopy.org/Schemas/MLI/2007-06/MLI.xsd"/>
-        <import namespace = "http://www.openmicroscopy.org/Schemas/OME/2007-06" schemaLocation = "http://www.openmicroscopy.org/Schemas/OME/2007-06/ome.xsd"/>
+        version = "1"
+        elementFormDefault = "qualified">
+        <import namespace = "http://www.openmicroscopy.org/Schemas/CLI/2008-02" schemaLocation = "http://www.openmicroscopy.org/Schemas/CLI/2008-02/CLI.xsd"/>
+        <import namespace = "http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02" schemaLocation = "http://www.openmicroscopy.org/Schemas/BinaryFile/2008-02/BinaryFile.xsd"/>
+        <import namespace = "http://www.openmicroscopy.org/Schemas/MLI/2008-02" schemaLocation = "http://www.openmicroscopy.org/Schemas/MLI/2008-02/MLI.xsd"/>
+        <import namespace = "http://www.openmicroscopy.org/Schemas/OME/2008-02" schemaLocation = "http://www.openmicroscopy.org/Schemas/OME/2008-02/ome.xsd"/>
         <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
         <element name = "Entry">
@@ -63 +63 @@
                         <sequence>
                                 <element ref = "AML:Entry" maxOccurs = "unbounded"/>
-                                <element ref = "AML:Description" minOccurs = "0"/>
+                                <element ref = "OME:Description" minOccurs = "0"/>
                         </sequence>
                         <attribute name = "Name" use = "required">
@@ -85 +85 @@
                         <sequence>
                                 <element ref = "AML:LookupTable" minOccurs = "0"/>
-                                <element ref = "AML:Description" minOccurs = "0"/>
+                                <element ref = "OME:Description" minOccurs = "0"/>
                         </sequence>
                         <attribute name = "UserDefined" default = "false" type = "boolean">
@@ -131 +131 @@
                 <complexType>
                         <sequence>
-                                <element ref = "AML:Description" minOccurs = "0"/>
+                                <element ref = "OME:Description" minOccurs = "0"/>
                         </sequence>
                         <attribute name = "IBelongTo">
@@ -200 +200 @@
                 <complexType>
                         <sequence>
-                                <element ref = "AML:Description" minOccurs = "0"/>
+                                <element ref = "OME:Description" minOccurs = "0"/>
                                 <element ref = "AML:Declaration"/>
                                 <choice minOccurs = "0">
@@ -419 +419 @@
                 </restriction>
         </simpleType>
-        <element name = "Description" type = "string">
-                <annotation>
-                        <documentation>
-                                Just some free-form text to describe Images, Screens and Projects.
-                                The content model is ANY, which means that en entire XML sub-document can be placed here.
-                        </documentation>
-                </annotation>
-        </element>
         <element name = "Category">
                 <complexType>
                         <sequence>
-                                <element ref = "AML:Description"/>
+                                <element ref = "OME:Description"/>
                         </sequence>
                         <attribute name = "Path" use = "required">