Repository: cayenne-website Updated Branches: refs/heads/master 9ee7afa02 -> 5712bbdb3
Update cayenne XML schema Project: http://git-wip-us.apache.org/repos/asf/cayenne-website/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne-website/commit/5712bbdb Tree: http://git-wip-us.apache.org/repos/asf/cayenne-website/tree/5712bbdb Diff: http://git-wip-us.apache.org/repos/asf/cayenne-website/diff/5712bbdb Branch: refs/heads/master Commit: 5712bbdb3ee55bb5385157defd4306fc30567910 Parents: 9ee7afa Author: stariy <stari...@gmail.com> Authored: Mon Mar 5 12:04:50 2018 +0300 Committer: stariy <stari...@gmail.com> Committed: Mon Mar 5 12:04:50 2018 +0300 ---------------------------------------------------------------------- src/main/site/static/schema/10/graph.xsd | 55 ++++++++++++++++++++++++ src/main/site/static/schema/10/modelMap.xsd | 12 +++++- 2 files changed, 66 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/5712bbdb/src/main/site/static/schema/10/graph.xsd ---------------------------------------------------------------------- diff --git a/src/main/site/static/schema/10/graph.xsd b/src/main/site/static/schema/10/graph.xsd new file mode 100644 index 0000000..761a7ae --- /dev/null +++ b/src/main/site/static/schema/10/graph.xsd @@ -0,0 +1,55 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> + +<xs:schema targetNamespace="http://cayenne.apache.org/schema/10/graph"; + elementFormDefault="qualified" version="10" + xmlns:cay="http://cayenne.apache.org/schema/10/graph"; + xmlns:xs="http://www.w3.org/2001/XMLSchema";> + + <xs:element name="graphs"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:graph"/> + </xs:sequence> + <xs:attribute name="selected" type="xs:string" /> + </xs:complexType> + </xs:element> + + <xs:element name="graph"> + <xs:complexType> + <xs:sequence> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:entity"/> + </xs:sequence> + <xs:attribute name="type" type="xs:string" /> + <xs:attribute name="scale" type="xs:double" /> + </xs:complexType> + </xs:element> + + <xs:element name="entity"> + <xs:complexType> + <xs:attribute name="name" type="xs:string" /> + <xs:attribute name="x" type="xs:double" /> + <xs:attribute name="y" type="xs:double" /> + <xs:attribute name="width" type="xs:double" /> + <xs:attribute name="height" type="xs:double" /> + </xs:complexType> + </xs:element> + +</xs:schema> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/5712bbdb/src/main/site/static/schema/10/modelMap.xsd ---------------------------------------------------------------------- diff --git a/src/main/site/static/schema/10/modelMap.xsd b/src/main/site/static/schema/10/modelMap.xsd index 7f36483..543c0a6 100644 --- a/src/main/site/static/schema/10/modelMap.xsd +++ b/src/main/site/static/schema/10/modelMap.xsd @@ -185,7 +185,7 @@ <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:ejbql"/> <xs:element name="qualifier" minOccurs="0" maxOccurs="unbounded" type="xs:string"/> <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:ordering"/> - <xs:element name="prefetch" minOccurs="0" maxOccurs="unbounded" type="xs:string"/> + <xs:element minOccurs="0" maxOccurs="unbounded" ref="cay:prefetch"/> <xs:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/> </xs:sequence> <xs:attribute name="type" use="required" type="xs:string"/> @@ -207,6 +207,16 @@ </xs:complexType> </xs:element> + <xs:element name="prefetch"> + <xs:complexType> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute name="type" type="xs:string"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> + </xs:element> + <xs:element name="sql"> <xs:annotation> <xs:documentation>Defines arbitrary SQL statement. Note that SQL statement can be customized for different SQL dialects per DbAdapter class. If no adapter-specific statement is found, the one with no adapter label is used by default.</xs:documentation>
