Author: clopes Date: 2012-01-31 11:46:05 -0800 (Tue, 31 Jan 2012) New Revision: 28167
Added: core3/impl/trunk/io-impl/impl/src/main/resources/xsd/cysession.xsd core3/impl/trunk/io-impl/impl/src/main/resources/xsd/xlinks-2001.xsd Removed: core3/api/trunk/property-api/src/main/resources/xsd/cysession.xsd Log: Bug #649 : Remove the Cysession class from the API (missing changes) Deleted: core3/api/trunk/property-api/src/main/resources/xsd/cysession.xsd =================================================================== --- core3/api/trunk/property-api/src/main/resources/xsd/cysession.xsd 2012-01-31 19:43:40 UTC (rev 28166) +++ core3/api/trunk/property-api/src/main/resources/xsd/cysession.xsd 2012-01-31 19:46:05 UTC (rev 28167) @@ -1,210 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xlink="http://www.w3.org/1999/xlink"; - elementFormDefault="qualified"> - <!-- get access to the xlink: attribute groups for xlink:type (simple) --> - <xs:import namespace="http://www.w3.org/1999/xlink"; schemaLocation="xlinks-2001.xsd"/> - <xs:element name="cysession"> - <xs:complexType> - <xs:sequence> - <xs:element ref="sessionNote"/> - <xs:element ref="sessionState"/> - <xs:element ref="networkTree"/> - </xs:sequence> - <xs:attribute name="id" use="required" type="xs:NCName"/> - <xs:attribute name="documentVersion" use="optional" default="3.0" type="xs:normalizedString"/> - </xs:complexType> - </xs:element> - <xs:element name="sessionNote" type="xs:string"/> - <xs:element name="sessionState"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="plugins"/> - <xs:element minOccurs="0" ref="desktop"/> - <xs:element minOccurs="0" ref="server"/> - <xs:element ref="cytopanels"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="plugins"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="plugin"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="plugin"> - <xs:complexType> - <xs:attribute name="id" use="required" type="xs:NCName"/> - <xs:attribute name="stateLocation" use="required" type="xs:NCName"/> - </xs:complexType> - </xs:element> - <xs:element name="server"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="ontologyServer"/> - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:element name="ontologyServer"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="ontology"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="ontology"> - <xs:complexType> - <xs:attribute name="name" use="required" type="xs:NCName"/> - <xs:attribute ref="xlink:href" use="required"/> - <xs:attribute name="ontologyType" use="optional" type="xs:NCName"/> - </xs:complexType> - </xs:element> - - <xs:element name="desktop"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" ref="desktopSize"/> - <xs:element minOccurs="0" ref="networkFrames"/> - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:element name="desktopSize"> - <xs:complexType> - <xs:attribute name="width" use="required" type="xs:integer"/> - <xs:attribute name="height" use="required" type="xs:integer"/> - </xs:complexType> - </xs:element> - - <xs:element name="networkFrames"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="networkFrame"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="networkFrame"> - <xs:complexType> - <xs:attribute name="frameID" use="required" type="xs:NCName"/> - <xs:attribute name="width" use="required" type="xs:integer"/> - <xs:attribute name="height" use="required" type="xs:integer"/> - <xs:attribute name="x" use="required" type="xs:integer"/> - <xs:attribute name="y" use="required" type="xs:integer"/> - </xs:complexType> - </xs:element> - - <xs:element name="cytopanels"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="cytopanel"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="cytopanel"> - <xs:complexType> - <xs:sequence> - <xs:element ref="panelState"/> - <xs:element ref="selectedPanel"/> - <xs:element ref="panels"/> - </xs:sequence> - <xs:attribute name="id" use="required" type="xs:NCName"/> - </xs:complexType> - </xs:element> - <xs:element name="panelState" type="xs:NCName"/> - <xs:element name="selectedPanel" type="xs:NCName"/> - <xs:element name="panels"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="panel"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="panel"> - <xs:complexType> - <xs:attribute name="id" use="required" type="xs:NCName"/> - </xs:complexType> - </xs:element> - <xs:element name="networkTree"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="network"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="network"> - <xs:complexType> - <xs:sequence> - <xs:element minOccurs="1" ref="parent"/> - <xs:element minOccurs="0" maxOccurs="unbounded" ref="child"/> - <xs:element minOccurs="0" ref="selectedNodes"/> - <xs:element minOccurs="0" ref="hiddenNodes"/> - <xs:element minOccurs="0" ref="selectedEdges"/> - <xs:element minOccurs="0" ref="hiddenEdges"/> - <xs:element minOccurs="0" ref="viewableNodes"/> - </xs:sequence> - <xs:attribute name="filename" use="required" type="xs:NCName"/> - <xs:attribute name="id" use="required" type="xs:NCName"/> - <xs:attribute name="viewAvailable" use="optional" type="xs:boolean"/> - <xs:attribute name="visualStyle" use="optional" type="xs:NCName"/> - </xs:complexType> - </xs:element> - <xs:element name="parent"> - <xs:complexType> - <xs:attribute name="id" use="required" type="xs:NCName"/> - </xs:complexType> - </xs:element> - <xs:element name="child"> - <xs:complexType> - <xs:attribute name="id" use="required" type="xs:NCName"/> - </xs:complexType> - </xs:element> - <xs:element name="selectedNodes"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="node"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="hiddenNodes"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="node"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="selectedEdges"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="edge"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="hiddenEdges"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="edge"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="viewableNodes"> - <xs:complexType> - <xs:sequence> - <xs:element maxOccurs="unbounded" ref="node"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="node"> - <xs:complexType> - <xs:attribute name="id" use="required" type="xs:NCName"/> - </xs:complexType> - </xs:element> - <xs:element name="edge"> - <xs:complexType> - <xs:attribute name="id" use="required" type="xs:NCName"/> - <xs:attribute name="source" use="optional" type="xs:NCName"/> - <xs:attribute name="target" use="optional" type="xs:NCName"/> - <xs:attribute name="interaction" use="optional" type="xs:NCName"/> - </xs:complexType> - </xs:element> -</xs:schema> Added: core3/impl/trunk/io-impl/impl/src/main/resources/xsd/cysession.xsd =================================================================== --- core3/impl/trunk/io-impl/impl/src/main/resources/xsd/cysession.xsd (rev 0) +++ core3/impl/trunk/io-impl/impl/src/main/resources/xsd/cysession.xsd 2012-01-31 19:46:05 UTC (rev 28167) @@ -0,0 +1,210 @@ +<?xml version="1.0" encoding="UTF-8"?> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"; xmlns:xlink="http://www.w3.org/1999/xlink"; + elementFormDefault="qualified"> + <!-- get access to the xlink: attribute groups for xlink:type (simple) --> + <xs:import namespace="http://www.w3.org/1999/xlink"; schemaLocation="xlinks-2001.xsd"/> + <xs:element name="cysession"> + <xs:complexType> + <xs:sequence> + <xs:element ref="sessionNote"/> + <xs:element ref="sessionState"/> + <xs:element ref="networkTree"/> + </xs:sequence> + <xs:attribute name="id" use="required" type="xs:NCName"/> + <xs:attribute name="documentVersion" use="optional" default="3.0" type="xs:normalizedString"/> + </xs:complexType> + </xs:element> + <xs:element name="sessionNote" type="xs:string"/> + <xs:element name="sessionState"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="plugins"/> + <xs:element minOccurs="0" ref="desktop"/> + <xs:element minOccurs="0" ref="server"/> + <xs:element ref="cytopanels"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="plugins"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="plugin"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="plugin"> + <xs:complexType> + <xs:attribute name="id" use="required" type="xs:NCName"/> + <xs:attribute name="stateLocation" use="required" type="xs:NCName"/> + </xs:complexType> + </xs:element> + <xs:element name="server"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="ontologyServer"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="ontologyServer"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="ontology"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="ontology"> + <xs:complexType> + <xs:attribute name="name" use="required" type="xs:NCName"/> + <xs:attribute ref="xlink:href" use="required"/> + <xs:attribute name="ontologyType" use="optional" type="xs:NCName"/> + </xs:complexType> + </xs:element> + + <xs:element name="desktop"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" ref="desktopSize"/> + <xs:element minOccurs="0" ref="networkFrames"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="desktopSize"> + <xs:complexType> + <xs:attribute name="width" use="required" type="xs:integer"/> + <xs:attribute name="height" use="required" type="xs:integer"/> + </xs:complexType> + </xs:element> + + <xs:element name="networkFrames"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="networkFrame"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="networkFrame"> + <xs:complexType> + <xs:attribute name="frameID" use="required" type="xs:NCName"/> + <xs:attribute name="width" use="required" type="xs:integer"/> + <xs:attribute name="height" use="required" type="xs:integer"/> + <xs:attribute name="x" use="required" type="xs:integer"/> + <xs:attribute name="y" use="required" type="xs:integer"/> + </xs:complexType> + </xs:element> + + <xs:element name="cytopanels"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="cytopanel"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="cytopanel"> + <xs:complexType> + <xs:sequence> + <xs:element ref="panelState"/> + <xs:element ref="selectedPanel"/> + <xs:element ref="panels"/> + </xs:sequence> + <xs:attribute name="id" use="required" type="xs:NCName"/> + </xs:complexType> + </xs:element> + <xs:element name="panelState" type="xs:NCName"/> + <xs:element name="selectedPanel" type="xs:NCName"/> + <xs:element name="panels"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="panel"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="panel"> + <xs:complexType> + <xs:attribute name="id" use="required" type="xs:NCName"/> + </xs:complexType> + </xs:element> + <xs:element name="networkTree"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="network"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="network"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="1" ref="parent"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="child"/> + <xs:element minOccurs="0" ref="selectedNodes"/> + <xs:element minOccurs="0" ref="hiddenNodes"/> + <xs:element minOccurs="0" ref="selectedEdges"/> + <xs:element minOccurs="0" ref="hiddenEdges"/> + <xs:element minOccurs="0" ref="viewableNodes"/> + </xs:sequence> + <xs:attribute name="filename" use="required" type="xs:NCName"/> + <xs:attribute name="id" use="required" type="xs:NCName"/> + <xs:attribute name="viewAvailable" use="optional" type="xs:boolean"/> + <xs:attribute name="visualStyle" use="optional" type="xs:NCName"/> + </xs:complexType> + </xs:element> + <xs:element name="parent"> + <xs:complexType> + <xs:attribute name="id" use="required" type="xs:NCName"/> + </xs:complexType> + </xs:element> + <xs:element name="child"> + <xs:complexType> + <xs:attribute name="id" use="required" type="xs:NCName"/> + </xs:complexType> + </xs:element> + <xs:element name="selectedNodes"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="node"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="hiddenNodes"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="node"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="selectedEdges"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="edge"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="hiddenEdges"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="edge"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="viewableNodes"> + <xs:complexType> + <xs:sequence> + <xs:element maxOccurs="unbounded" ref="node"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="node"> + <xs:complexType> + <xs:attribute name="id" use="required" type="xs:NCName"/> + </xs:complexType> + </xs:element> + <xs:element name="edge"> + <xs:complexType> + <xs:attribute name="id" use="required" type="xs:NCName"/> + <xs:attribute name="source" use="optional" type="xs:NCName"/> + <xs:attribute name="target" use="optional" type="xs:NCName"/> + <xs:attribute name="interaction" use="optional" type="xs:NCName"/> + </xs:complexType> + </xs:element> +</xs:schema> Added: core3/impl/trunk/io-impl/impl/src/main/resources/xsd/xlinks-2001.xsd =================================================================== --- core3/impl/trunk/io-impl/impl/src/main/resources/xsd/xlinks-2001.xsd (rev 0) +++ core3/impl/trunk/io-impl/impl/src/main/resources/xsd/xlinks-2001.xsd 2012-01-31 19:46:05 UTC (rev 28167) @@ -0,0 +1,127 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- File: xlinks-2001.xsd + Updated version of http://www.opengis.net/namespaces/gml/core/xlinks.xsd --> +<schema targetNamespace="http://www.w3.org/1999/xlink"; + xmlns:xlink="http://www.w3.org/1999/xlink"; + xmlns="http://www.w3.org/2001/XMLSchema";> + <annotation> + <appinfo>xlinks-2001.xsd 2001-06</appinfo> + <documentation xml:lang="en"> + This schema provides the XLink attributes for general use. + </documentation> + </annotation> +<!-- ============================================================== + global declarations + =============================================================== --> + <!-- locator attribute --> + <attribute name="href" type="anyURI"/> + <!-- semantic attributes --> + <attribute name="role" type="anyURI"/> + <attribute name="arcrole" type="anyURI"/> + <attribute name="title" type="string"/> + <!-- behavior attributes --> + <attribute name="show"> + <annotation> + <documentation> + The 'show' attribute is used to communicate the desired presentation + of the ending resource on traversal from the starting resource; it's + value should be treated as follows: + new - load ending resource in a new window, frame, pane, or other + presentation context + replace - load the resource in the same window, frame, pane, or + other presentation context + embed - load ending resource in place of the presentation of the + starting resource + other - behavior is unconstrained; examine other markup in the + link for hints + none - behavior is unconstrained + </documentation> + </annotation> + <simpleType> + <restriction base="string"> + <enumeration value="new"/> + <enumeration value="replace"/> + <enumeration value="embed"/> + <enumeration value="other"/> + <enumeration value="none"/> + </restriction> + </simpleType> + </attribute> + <attribute name="actuate"> + <annotation> + <documentation> + The 'actuate' attribute is used to communicate the desired timing + of traversal from the starting resource to the ending resource; + it's value should be treated as follows: + onLoad - traverse to the ending resource immediately on loading + the starting resource + onRequest - traverse from the starting resource to the ending + resource only on a post-loading event triggered for + this purpose + other - behavior is unconstrained; examine other markup in link + for hints + none - behavior is unconstrained + </documentation> + </annotation> + <simpleType> + <restriction base="string"> + <enumeration value="onLoad"/> + <enumeration value="onRequest"/> + <enumeration value="other"/> + <enumeration value="none"/> + </restriction> + </simpleType> + </attribute> + <!-- traversal attributes --> + <attribute name="label" type="string"/> + <attribute name="from" type="string"/> + <attribute name="to" type="string"/> + <!-- ============================================================== + Attributes grouped by XLink type, as specified in the W3C + Recommendation (dated 2000-06-27) + =================================================================== --> + <attributeGroup name="simpleLink"> + <attribute name="type" type="string" fixed="simple" form="qualified"/> + <attribute ref="xlink:href" use="optional"/> + <attribute ref="xlink:role" use="optional"/> + <attribute ref="xlink:arcrole" use="optional"/> + <attribute ref="xlink:title" use="optional"/> + <attribute ref="xlink:show" use="optional"/> + <attribute ref="xlink:actuate" use="optional"/> + </attributeGroup> + <attributeGroup name="extendedLink"> + <attribute name="type" type="string" fixed="extended" form="qualified"/> + <attribute ref="xlink:role" use="optional"/> + <attribute ref="xlink:title" use="optional"/> + </attributeGroup> + <attributeGroup name="locatorLink"> + <attribute name="type" type="string" fixed="locator" form="qualified"/> + <attribute ref="xlink:href" use="required"/> + <attribute ref="xlink:role" use="optional"/> + <attribute ref="xlink:title" use="optional"/> + <attribute ref="xlink:label" use="optional"/> + </attributeGroup> + <attributeGroup name="arcLink"> + <attribute name="type" type="string" fixed="arc" form="qualified"/> + <attribute ref="xlink:arcrole" use="optional"/> + <attribute ref="xlink:title" use="optional"/> + <attribute ref="xlink:show" use="optional"/> + <attribute ref="xlink:actuate" use="optional"/> + <attribute ref="xlink:from" use="optional"/> + <attribute ref="xlink:to" use="optional"/> + </attributeGroup> + <attributeGroup name="resourceLink"> + <attribute name="type" type="string" fixed="resource" form="qualified"/> + <attribute ref="xlink:role" use="optional"/> + <attribute ref="xlink:title" use="optional"/> + <attribute ref="xlink:label" use="optional"/> + </attributeGroup> + <attributeGroup name="titleLink"> + <attribute name="type" type="string" fixed="title" form="qualified"/> + </attributeGroup> + <attributeGroup name="emptyLink"> + <attribute name="type" type="string" fixed="none" form="qualified"/> + </attributeGroup> +</schema> + + Property changes on: core3/impl/trunk/io-impl/impl/src/main/resources/xsd/xlinks-2001.xsd ___________________________________________________________________ Added: svn:executable + * -- You received this message because you are subscribed to the Google Groups "cytoscape-cvs" group. To post to this group, send email to [email protected]. To unsubscribe from this group, send email to [email protected]. For more options, visit this group at http://groups.google.com/group/cytoscape-cvs?hl=en.
