Changeset 101 for Xml/Working

Timestamp:

09/26/07 09:33:32 (16 months ago)

Author:

andrew

Message:

Updated version numbers in files and final tweeks to the new schema.

Location:

Xml/Working

Files:

• AnalysisModule.xsd (modified) (1 diff)
• SPW.xsd (modified) (1 diff)
• ome.xsd (modified) (3 diffs)
• omeOxySvnProject.xpr (modified) (1 diff)

Xml/Working/AnalysisModule.xsd

@@ -24 +24 @@
         xmlns:OME = "http://www.openmicroscopy.org/Schemas/OME/2007-06"
         xmlns:xsd = "http://www.w3.org/2001/XMLSchema"
-         version = "1"
+         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"/>

Xml/Working/SPW.xsd

@@ -21 +21 @@
     xmlns:AML="http://www.openmicroscopy.org/Schemas/AnalysisModule/2007-06" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-    version="1" 
+    version="2" 
     elementFormDefault="qualified">
     <xsd:import namespace="http://www.openmicroscopy.org/Schemas/OME/2007-06" schemaLocation="http://www.openmicroscopy.org/Schemas/OME/2007-06/ome.xsd"/>

Xml/Working/ome.xsd

@@ -712 +712 @@
                 <xsd:annotation>
                         <xsd:documentation>
-                                This element describes a person who performed an imaging experiment.  Required elements are FirstName, LastName and Email.
+                                This element describes a person who performed an imaging experiment.
                                 This person may also be a user of the OME system, in which case the OMEName element contains their login name.
                                 Experimenters may belong to one or more groups which are specified using one or more GroupRef elements.
@@ -997 +997 @@
                         <xsd:documentation>
                                 Just some free-form text to describe Images, Screens and Projects.
-                                The content model is ANY, which means that an entire XML sub-document can be placed here.
+                                The content model is currently ANY, but this is going to change to String in 
+                                the near future. This is no longer the correct place for an XML sub-document
+                                - use CustomAttributes instead.
                         </xsd:documentation>
                 </xsd:annotation>
@@ -1025 +1027 @@
                 <xsd:attribute name="Manufacturer" use="required" type="xsd:string"/>
                 <xsd:attribute name="Model" use="required" type="xsd:string"/>
-                <xsd:attribute name="SerialNumber" use="required" type="xsd:string"/>
+                <xsd:attribute name="SerialNumber" type="xsd:string"/>
         </xsd:complexType>
         <xsd:element name="Thumbnail">

Xml/Working/omeOxySvnProject.xpr

@@ -20 +20 @@
         <file name="ome.xsd"/>
         <file name="sample-updated.ome.xml"/>
+        <file name="../../../../Desktop/scratch.xml"/>
         <file name="SPW.xsd"/>
         <file name="STD.xsd"/>