From c0d6c3197a2d43781a97519458e703f60f221d7b Mon Sep 17 00:00:00 2001
From: Martin Goik <goik@hdm-stuttgart.de>
Date: Thu, 13 Nov 2014 19:22:44 +0100
Subject: [PATCH] Doodle Etest
---
Sda1/Etest/Doodle/.project | 17 +++++++
Sda1/Etest/Doodle/data.xml | 22 ++++++++
.../Xml => Sda1/Etest}/Doodle/doodle.png | Bin
Sda1/Etest/Doodle/doodle.xsd | 48 ++++++++++++++++++
ws/eclipse/Jdbc/Input/Xml/Doodle/data.xml | 13 -----
ws/eclipse/Jdbc/Input/Xml/Doodle/doodle.xsd | 29 -----------
6 files changed, 87 insertions(+), 42 deletions(-)
create mode 100644 Sda1/Etest/Doodle/.project
create mode 100644 Sda1/Etest/Doodle/data.xml
rename {ws/eclipse/Jdbc/Input/Xml => Sda1/Etest}/Doodle/doodle.png (100%)
create mode 100644 Sda1/Etest/Doodle/doodle.xsd
delete mode 100644 ws/eclipse/Jdbc/Input/Xml/Doodle/data.xml
delete mode 100644 ws/eclipse/Jdbc/Input/Xml/Doodle/doodle.xsd
diff --git a/Sda1/Etest/Doodle/.project b/Sda1/Etest/Doodle/.project
new file mode 100644
index 000000000..0e66b982f
--- /dev/null
+++ b/Sda1/Etest/Doodle/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>Doodle</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>com.oxygenxml.editor.xmlbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>com.oxygenxml.editor.xmlnature</nature>
+ </natures>
+</projectDescription>
diff --git a/Sda1/Etest/Doodle/data.xml b/Sda1/Etest/Doodle/data.xml
new file mode 100644
index 000000000..4efc893a0
--- /dev/null
+++ b/Sda1/Etest/Doodle/data.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<poll xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="doodle.xsd">
+
+ <timeslot start="2014-11-02T13:30:00" id="1"/>
+ <timeslot start="2014-11-04T13:30:00" id="2"/>
+ <timeslot start="2014-11-08T13:30:00" id="3"/>
+ <timeslot start="2014-11-09T13:30:00" id="4"/>
+
+ <person>
+ <name>Joachim Charzinski</name>
+ <participate ref="1"/>
+ <participate ref="2"/>
+ <participate ref="3"/>
+ </person>
+ <person>
+ <name>Oliver Kretzschmar</name>
+ <participate ref="1"/>
+ </person>
+ <!-- ... further data omitted for brevity -->
+</poll>
\ No newline at end of file
diff --git a/ws/eclipse/Jdbc/Input/Xml/Doodle/doodle.png b/Sda1/Etest/Doodle/doodle.png
similarity index 100%
rename from ws/eclipse/Jdbc/Input/Xml/Doodle/doodle.png
rename to Sda1/Etest/Doodle/doodle.png
diff --git a/Sda1/Etest/Doodle/doodle.xsd b/Sda1/Etest/Doodle/doodle.xsd
new file mode 100644
index 000000000..da54312a6
--- /dev/null
+++ b/Sda1/Etest/Doodle/doodle.xsd
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+ xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" elementFormDefault="qualified"
+ vc:minVersion="1.0" vc:maxVersion="1.1">
+
+ <xs:element name="poll">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element ref="timeslot" minOccurs="1" maxOccurs="unbounded"/>
+ <xs:element ref="person" minOccurs="0" maxOccurs="unbounded"/>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:key name="uniqueTimeslotId">
+ <xs:selector xpath="timeslot"/>
+ <xs:field xpath="@id"/>
+ </xs:key>
+ <xs:keyref refer="uniqueTimeslotId" name="targetDate">
+ <xs:selector xpath="person/participate"/>
+ <xs:field xpath="@ref"/>
+ </xs:keyref>
+ </xs:element>
+
+ <xs:element name="timeslot">
+ <xs:complexType>
+ <xs:attribute name="id" type="xs:int" use="required"/>
+ <xs:attribute name="start" type="xs:dateTime" use="required"/>
+ <xs:attribute name="end" type="xs:dateTime" use="optional"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="person">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="name"/>
+ <xs:element name="participate" minOccurs="0" maxOccurs="unbounded">
+ <xs:complexType>
+ <xs:attribute name="ref" type="xs:int"/>
+ </xs:complexType>
+ </xs:element>
+ </xs:sequence>
+ </xs:complexType>
+ <xs:key name="uniqueParticipate">
+ <xs:selector xpath="participate"/>
+ <xs:field xpath="@ref"/>
+ </xs:key>
+ </xs:element>
+
+</xs:schema>
\ No newline at end of file
diff --git a/ws/eclipse/Jdbc/Input/Xml/Doodle/data.xml b/ws/eclipse/Jdbc/Input/Xml/Doodle/data.xml
deleted file mode 100644
index 80ee8b04d..000000000
--- a/ws/eclipse/Jdbc/Input/Xml/Doodle/data.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<poll xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="doodle.xsd">
-
- <timeslot start="2014-03-22T08:00:00" end="2014-03-22T09:30:00" id="early"/>
- <timeslot start="2014-04-22T16:00:00" end="2014-04-22T17:30:00" id="normal"/>
- <timeslot start="2014-04-22T20:00:00" end="2014-04-22T21:30:00" id="late"/>
-
- <person participate="early late">Joachim Charzinski</person>
- <person participate="normal">Oliver Kretzschmar</person>
- <!-- ... further data omitted -->
-</poll>
\ No newline at end of file
diff --git a/ws/eclipse/Jdbc/Input/Xml/Doodle/doodle.xsd b/ws/eclipse/Jdbc/Input/Xml/Doodle/doodle.xsd
deleted file mode 100644
index dc9a44796..000000000
--- a/ws/eclipse/Jdbc/Input/Xml/Doodle/doodle.xsd
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:vc="http://www.w3.org/2007/XMLSchema-versioning" elementFormDefault="qualified"
- vc:minVersion="1.0" vc:maxVersion="1.1">
-
- <xs:element name="poll">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="timeslot" minOccurs="1" maxOccurs="unbounded"/>
- <xs:element ref="person" minOccurs="0" maxOccurs="unbounded"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="timeslot">
- <xs:complexType>
- <xs:attribute name="id" type="xs:ID" use="required"/>
- <xs:attribute name="start" type="xs:dateTime" use="required"/>
- <xs:attribute name="end" type="xs:dateTime" use="required"/>
- </xs:complexType>
- </xs:element>
-
- <xs:element name="person">
- <xs:complexType mixed="true">
- <xs:attribute name="participate" type="xs:IDREFS" use="required"/>
- </xs:complexType>
- </xs:element>
-
-</xs:schema>
\ No newline at end of file
--
GitLab