From 9c489b384be6d73e66269ae70649a223933fea1a Mon Sep 17 00:00:00 2001
From: jprocter <Jim Procter>
Date: Mon, 28 May 2007 11:14:05 +0000
Subject: [PATCH] moved castor-mapping.xsd to schemas

---
 resources/castor-mapping.xsd |  297 ------------------------------------------
 resources/embl_mapping.xml   |    2 +-
 2 files changed, 1 insertion(+), 298 deletions(-)
 delete mode 100644 resources/castor-mapping.xsd

diff --git a/resources/castor-mapping.xsd b/resources/castor-mapping.xsd
deleted file mode 100644
index 0955245..0000000
--- a/resources/castor-mapping.xsd
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--DOCTYPE schema PUBLIC "-//W3C/DTD XML Schema Version 1.0//EN"
-    "http://www.w3.org/TR/2000/WD-xmlschema-1-20000225/structures.dtd"-->
-    <!--
-        Castor Object Mapping XML Schema
-        
-        Namespace: http://castor.exolab.org/
-        System:    http://castor.exolab.org/mapping.xsd
-        Public:    -//EXOLAB/Castor Object Mapping Schema Version 1.0//EN
-        
-        *Note*: This schema is under evolution and subject to change.
-        
-    -->
-    <xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        targetNamespace="http://castor.exolab.org/"
-        xmlns="http://castor.exolab.org/"
-        version="0.9.4">
-        
-        <xsd:element name="mapping">
-            <xsd:complexType>
-                <xsd:sequence>
-                    <xsd:element name="description"   type="xsd:string" minOccurs="0" maxOccurs="1" />
-                    <xsd:element ref="include"        minOccurs="0" maxOccurs="unbounded" />
-                    <xsd:element ref="class"          minOccurs="0" maxOccurs="unbounded" />
-                    <xsd:element ref="key-generator"  minOccurs="0" maxOccurs="unbounded" />
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="include">
-            <xsd:complexType>
-                <xsd:attribute name="href" type="xsd:string" use="required"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="class">
-            <xsd:complexType>
-                <xsd:sequence>
-                    <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1" />
-                    <xsd:element ref="cache-type"   minOccurs="0" maxOccurs="1" />
-                    <xsd:element ref="map-to" minOccurs="0" maxOccurs="1" />
-                    <xsd:choice minOccurs="1">
-                        <xsd:element ref="field" minOccurs="0" maxOccurs="unbounded"/>
-                        <xsd:element ref="container" minOccurs="0" maxOccurs="unbounded"/>
-                    </xsd:choice>
-                </xsd:sequence>
-                <xsd:attribute name="name"     type="xsd:ID"         use="required"/>
-                <xsd:attribute name="extends"  type="xsd:IDREF"      use="optional"/>
-                <xsd:attribute name="depends"  type="xsd:IDREF"      use="optional"/>
-                <xsd:attribute name="identity" type="xsd:NMTOKENS"   use="optional"/>
-                <xsd:attribute name="access"   default="shared"    use="optional">
-                    <xsd:simpleType>
-                        <xsd:restriction base="xsd:string">
-                            <xsd:enumeration value="read-only"/>
-                            <xsd:enumeration value="shared"/>
-                            <xsd:enumeration value="exclusive"/>
-                            <xsd:enumeration value="db-locked"/>
-                        </xsd:restriction>
-                    </xsd:simpleType>
-                </xsd:attribute>
-                <xsd:attribute name="key-generator" type="xsd:string"   use="optional"/>
-                <xsd:attribute name="auto-complete" type="xsd:boolean"  use="optional" default="false"/>
-                <xsd:attribute name="verify-constructable" type="xsd:boolean"  use="optional" default="true"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="map-to">
-            <xsd:complexType>
-                <xsd:attribute name="table"     type="xsd:NMTOKEN"  use="optional"/>
-                <xsd:attribute name="xml"       type="xsd:string"   use="optional"/>
-                <xsd:attribute name="ns-uri"    type="xsd:string"   use="optional"/>
-                <xsd:attribute name="ns-prefix" type="xsd:NMTOKEN"  use="optional"/>
-                <xsd:attribute name="ldap-dn"   type="xsd:string"   use="optional"/>
-                <xsd:attribute name="ldap-oc"   type="xsd:string"   use="optional"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="field">
-            <xsd:complexType>
-                <xsd:sequence>
-                    <xsd:element name="description"   type="xsd:string" minOccurs="0" maxOccurs="1" />
-                    <xsd:element ref="sql"            minOccurs="0" maxOccurs="1"/>
-                    <xsd:element ref="bind-xml"       minOccurs="0" maxOccurs="1"/>
-                    <xsd:element ref="ldap"           minOccurs="0" maxOccurs="1"/>
-                </xsd:sequence>
-                
-                <xsd:attribute name="name"          type="xsd:string" use="required"/>
-                <xsd:attribute name="type"          type="xsd:string" use="optional"/>
-                <xsd:attribute name="required"      type="xsd:boolean"  use="optional"   default="false"/>
-                <xsd:attribute name="transient"     type="xsd:boolean"  use="optional"   default="false"/>
-                <xsd:attribute name="direct"        type="xsd:boolean"  use="optional"   default="false"/>
-                <xsd:attribute name="lazy"          type="xsd:boolean"  use="optional"   default="false"/>
-                <xsd:attribute name="container"     type="xsd:boolean"  use="optional"/>
-                <xsd:attribute name="get-method"    type="xsd:string"  use="optional"/>
-                <xsd:attribute name="has-method"    type="xsd:string"  use="optional"/>
-                <xsd:attribute name="set-method"    type="xsd:string"  use="optional"/>
-                <xsd:attribute name="create-method" type="xsd:string"  use="optional"/>
-                <xsd:attribute name="handler"       type="xsd:string"   use="optional"/>
-                <xsd:attribute name="collection"    use="optional">
-                    <xsd:simpleType>
-                        <xsd:restriction base="xsd:string">
-                            <xsd:enumeration value="array"/>
-                            <xsd:enumeration value="vector"/>
-                            <xsd:enumeration value="arraylist"/>
-                            <xsd:enumeration value="hashtable"/>
-                            <xsd:enumeration value="collection"/>
-                            <xsd:enumeration value="set"/>
-                            <xsd:enumeration value="map"/>
-                            <xsd:enumeration value="enumerate"/>
-                        </xsd:restriction>
-                    </xsd:simpleType>
-                </xsd:attribute>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="container">
-            <xsd:complexType>
-                <xsd:sequence>
-                    <xsd:element name="description" type="xsd:string" minOccurs="0" maxOccurs="1" />
-                    <xsd:element ref="field" minOccurs="1"/>
-                </xsd:sequence>
-                <xsd:attribute name="name"          type="xsd:NMTOKEN" use="required"/>
-                <xsd:attribute name="type"          type="xsd:NMTOKEN" use="optional"/>
-                <xsd:attribute name="required"      type="xsd:boolean" use="optional"  default="false"/>
-                <xsd:attribute name="direct"        type="xsd:boolean" use="optional"  default="false"/>
-                <xsd:attribute name="get-method"    type="xsd:NMTOKEN" use="optional"/>
-                <xsd:attribute name="set-method"    type="xsd:NMTOKEN" use="optional"/>
-                <xsd:attribute name="create-method" type="xsd:NMTOKEN" use="optional"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="sql">
-            <xsd:complexType>
-                <xsd:attribute name="name"       type="xsd:NMTOKENS"   use="optional"/>
-                <xsd:attribute name="type"       type="xsd:string"   use="optional"/>
-                <xsd:attribute name="many-table" type="xsd:NMTOKEN"    use="optional"/>
-                <xsd:attribute name="many-key"   type="xsd:NMTOKENS"   use="optional"/>
-                <xsd:attribute name="read-only"  type="xsd:boolean"    use="optional" default="false"/>
-                
-                <!-- signals that this field is transient for database mapping (ie should be ignored) -->
-                <xsd:attribute name="transient" type="xsd:boolean" use="optional"/>
-                
-                
-                <xsd:attribute name="dirty"  default="check"  use="optional">
-                    <xsd:simpleType>
-                        <xsd:restriction base="xsd:string">
-                            <xsd:enumeration value="check"/>
-                            <xsd:enumeration value="ignore"/>
-                        </xsd:restriction>
-                    </xsd:simpleType>
-                </xsd:attribute>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <!--
-            The 'bind-xml' element is used for specifying XML specific databinding
-            properties and behavior for a specific field. 'bind-xml' may only appear
-            as a child of a 'field' element.
-        -->
-        <xsd:element name="bind-xml">
-            <xsd:annotation>
-                <xsd:documentation>
-                    The 'bind-xml' element is used for specifying XML specific databinding
-                    properties and behavior for a specific field. 'bind-xml' may only appear
-                    as a child of a 'field' element.
-                </xsd:documentation>
-            </xsd:annotation>
-            <xsd:complexType>
-                
-                <xsd:sequence>
-                    <xsd:element ref="class" minOccurs="0" maxOccurs="1"/>
-                    <xsd:element name="property" type="propertyType" minOccurs="0" maxOccurs="unbounded"/>
-                </xsd:sequence>
-                
-                <!--
-                    An optional attribute used for specifying the XML name for the
-                    field associated with the 'bind-xml' element.
-                -->
-                <xsd:attribute name="name" type="xsd:QName"  use="optional">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            An optional attribute used for specifying the XML name for the
-                            field associated with the 'bind-xml' element.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                
-                <xsd:attribute name="type" type="xsd:NMTOKEN"  use="optional"/>
-                
-                <!--
-                    Allows specifying how Castor should automatically determines
-                    the XML name of this field when no name has been specified.
-                -->
-                <xsd:attribute name="auto-naming" use="optional">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            Allows specifying how Castor should automatically determines
-                            the XML name of this field when no name has been specified.
-                            In most cases the XML name is determined by using the field name,
-                            but in some cases the user may want to use the Class name of
-                            the field type. This attribute allows choosing between the
-                            two approaches. If this attribute is not specified, the field
-                            name is used as the XML name.
-                        </xsd:documentation>
-                    </xsd:annotation>
-                    <xsd:simpleType>
-                        <xsd:restriction base="xsd:string">
-                            <xsd:enumeration value="deriveByClass"/>
-                            <xsd:enumeration value="deriveByField"/>
-                        </xsd:restriction>
-                    </xsd:simpleType>
-                </xsd:attribute>
-                
-                <!--
-                    Allows specifying a nested location path for this field,
-                    the value should just be a simplified XPath like value
-                    where names are separated by "/".
-                -->
-                <xsd:attribute name="location" type="xsd:string" use="optional">
-                    <xsd:annotation>
-                        <xsd:documentation>
-                            Allows specifying a nested location path for this field,
-                            the value should just be a simplified XPath like value
-                            where names are separated by "/".
-                        </xsd:documentation>
-                    </xsd:annotation>
-                </xsd:attribute>
-                
-                <!-- Allows overriding the matching rule -->
-                <xsd:attribute name="matches" type="xsd:string" use="optional"/>
-                
-                
-                <!-- Signal that this field should be marshalled as a reference -->
-                <xsd:attribute name="reference" type="xsd:boolean" use="optional"/>
-                
-                <!-- NodeType for the XML node -->
-                <xsd:attribute name="node" use="optional">
-                    <xsd:simpleType>
-                        <xsd:restriction base="xsd:string">
-                            <xsd:enumeration value="attribute"/>
-                            <xsd:enumeration value="element"/>
-                            <xsd:enumeration value="namespace"/>
-                            <xsd:enumeration value="text"/>
-                        </xsd:restriction>
-                    </xsd:simpleType>
-                </xsd:attribute>
-                
-                <xsd:attribute name="QName-prefix" type="xsd:NMTOKEN" use="optional"/>
-                
-                <!-- Signal that this field is transient for XML (ie should be ignored) -->
-                <xsd:attribute name="transient" type="xsd:boolean" use="optional"/>
-                
-            </xsd:complexType>
-        </xsd:element>
-        
-        
-        
-        <xsd:element name="ldap">
-            <xsd:complexType>
-                <xsd:attribute name="name" type="xsd:NMTOKEN" use="optional"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="key-generator">
-            <xsd:complexType>
-                <xsd:sequence>
-                    <xsd:element ref="param" minOccurs="0" maxOccurs="unbounded" />
-                </xsd:sequence>
-                <xsd:attribute name="name"  type="xsd:ID"     use="required"/>
-                <xsd:attribute name="alias" type="xsd:string" use="optional"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="cache-type">
-            <xsd:complexType>
-                <xsd:attribute name="type" type="xsd:string" use="optional" default="count-limited" />
-                <xsd:attribute name="capacity" type="xsd:integer" use="optional"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        <xsd:element name="param">
-            <xsd:complexType>
-                <xsd:attribute name="name"  type="xsd:string"  use="required"/>
-                <xsd:attribute name="value" type="xsd:string"  use="required"/>
-            </xsd:complexType>
-        </xsd:element>
-        
-        
-        <xsd:complexType name="propertyType">
-            <xsd:sequence>
-                <xsd:element name="name"  type="xsd:string"/>
-                <xsd:element name="value" type="xsd:string"/>
-            </xsd:sequence>
-        </xsd:complexType>
-        
-        
-    </xsd:schema>
diff --git a/resources/embl_mapping.xml b/resources/embl_mapping.xml
index 61ccc51..2f3f046 100644
--- a/resources/embl_mapping.xml
+++ b/resources/embl_mapping.xml
@@ -5,7 +5,7 @@
 	-->
 	
 <mapping xmlns="http://castor.exolab.org/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://castor.exolab.org/ castor-mapping.xsd">
+	xsi:schemaLocation="http://castor.exolab.org/ ../schemas/castor-mapping.xsd">
 	<!-- -->
 	<class name="jalview.datamodel.xdb.embl.EmblFile">
 		<map-to xml="EMBL_Services"/>
-- 
1.7.10.2