cayenne-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntimof...@apache.org
Subject [01/12] cayenne-website git commit: Update cayenne XML schema
Date Mon, 05 Mar 2018 09:08:27 GMT
Repository: cayenne-website
Updated Branches:
  refs/heads/asf-site fa83fd279 -> 0260ae23a


http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/legacy-ant-build.html
----------------------------------------------------------------------
diff --git a/legacy-ant-build.html b/legacy-ant-build.html
index 045e3c2..71d1c21 100644
--- a/legacy-ant-build.html
+++ b/legacy-ant-build.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Legacy Ant Build &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/legacy-ant-unit-tests.html
----------------------------------------------------------------------
diff --git a/legacy-ant-unit-tests.html b/legacy-ant-unit-tests.html
index 725cebb..6e52ef9 100644
--- a/legacy-ant-unit-tests.html
+++ b/legacy-ant-unit-tests.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Legacy Ant Unit Tests &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/legacy-eclipse.html
----------------------------------------------------------------------
diff --git a/legacy-eclipse.html b/legacy-eclipse.html
index ec9d8a7..4916ab8 100644
--- a/legacy-eclipse.html
+++ b/legacy-eclipse.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Legacy Eclipse &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/legacy/index.html
----------------------------------------------------------------------
diff --git a/legacy/index.html b/legacy/index.html
index 96f8ffc..1b2a073 100644
--- a/legacy/index.html
+++ b/legacy/index.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Legacies &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/mailing-lists.html
----------------------------------------------------------------------
diff --git a/mailing-lists.html b/mailing-lists.html
index 233b9bc..43d56f5 100644
--- a/mailing-lists.html
+++ b/mailing-lists.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Mailing Lists &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/news/index.html
----------------------------------------------------------------------
diff --git a/news/index.html b/news/index.html
index 0a1931b..10d02c6 100644
--- a/news/index.html
+++ b/news/index.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>News &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/privacy-policy.html
----------------------------------------------------------------------
diff --git a/privacy-policy.html b/privacy-policy.html
index 16721dc..8ace55d 100644
--- a/privacy-policy.html
+++ b/privacy-policy.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Privacy Policy &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/release-guide-2.0.html
----------------------------------------------------------------------
diff --git a/release-guide-2.0.html b/release-guide-2.0.html
index 765808a..2ef9893 100644
--- a/release-guide-2.0.html
+++ b/release-guide-2.0.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Legacy Release Guide 2.0 &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/schema/10/graph.xsd
----------------------------------------------------------------------
diff --git a/schema/10/graph.xsd b/schema/10/graph.xsd
new file mode 100644
index 0000000..761a7ae
--- /dev/null
+++ b/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/0260ae23/schema/10/modelMap.xsd
----------------------------------------------------------------------
diff --git a/schema/10/modelMap.xsd b/schema/10/modelMap.xsd
index 7f36483..543c0a6 100644
--- a/schema/10/modelMap.xsd
+++ b/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>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/success-stories.html
----------------------------------------------------------------------
diff --git a/success-stories.html b/success-stories.html
index b4c0302..70d9ec1 100644
--- a/success-stories.html
+++ b/success-stories.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Success Stories &middot; Apache Cayenne</title>
     </head>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/thanks.html
----------------------------------------------------------------------
diff --git a/thanks.html b/thanks.html
index 64f0969..eb24177 100644
--- a/thanks.html
+++ b/thanks.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Thanks &middot; Apache Cayenne</title>
     </head>
@@ -94,7 +94,7 @@
 free licenses to use their tools in the development process:</p>
 
 <p><a href="http://www.oxygenxml.com" title="Oxygen XML Editor" rel="nofollow" target="_blank"
style="border: none;">
-<img src="/img/oxygen190x62-6d8c04ab27.png" width="190" height="62" alt="Oxygen XML Editor"
border="0"/>
+<img src="/img/oxygen190x62-f80743a879.png" width="190" height="62" alt="Oxygen XML Editor"
border="0"/>
 </a></p>
 
 <p>A license for Oxygen XML Editor is provided by Syncro Soft.</p>

http://git-wip-us.apache.org/repos/asf/cayenne-website/blob/0260ae23/why-cayenne.html
----------------------------------------------------------------------
diff --git a/why-cayenne.html b/why-cayenne.html
index 45eda18..395c4a4 100644
--- a/why-cayenne.html
+++ b/why-cayenne.html
@@ -13,7 +13,7 @@
         <meta name="msapplication-TileImage" content="/img/favicon/mstile-144x144-34e7696278.png">
         <meta name="msapplication-config" content="/img/favicon/browserconfig-82ff158058.xml">
         <meta name="theme-color" content="#ffffff">
-        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-179887de6c.css"/>
+        <link rel="stylesheet" href="https://cayenne.apache.org/css/styles-c9177521cd.css"/>
         <script src="https://cayenne.apache.org/js/bundle-bcaaf59313.js"></script>
         <title>Why Cayenne? &middot; Apache Cayenne</title>
     </head>


Mime
View raw message