svnno****@sourc*****
svnno****@sourc*****
2008年 11月 9日 (日) 02:38:44 JST
Revision: 2110
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=jiemamy&view=rev&rev=2110
Author: daisuke_m
Date: 2008-11-09 02:38:44 +0900 (Sun, 09 Nov 2008)
Log Message:
-----------
viewの仕様も定義。view.xsdは J-viewSpec に居るべきだが、ひとまずJ-coreSpecに配置。
Modified Paths:
--------------
zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-core.xsd
zeus/trunk/org.jiemamy.spec.core/src/main/resources/sample-validation-target.xml
Added Paths:
-----------
zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-view.xsd
-------------- next part --------------
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-core.xsd
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-core.xsd 2008-11-08 16:31:28 UTC (rev 2109)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-core.xsd 2008-11-08 17:38:44 UTC (rev 2110)
@@ -48,7 +48,7 @@
</xsd:complexType>
</xsd:element>
<xsd:element ref="insertDataSetModels" />
- <xsd:any minOccurs="0" maxOccurs="unbounded" namespace="##other" processContents="lax"/>
+ <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
</xsd:sequence>
<xsd:attribute name="id" type="uuidType" use="required" />
</xsd:complexType>
@@ -320,21 +320,39 @@
</xsd:complexType>
</xsd:element>
- <xs:element name="insertDataSetModels">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="dataset" maxOccurs="unbounded">
- <xs:complexType>
- <xs:sequence>
- <xs:element ref="table" maxOccurs="unbounded" />
- </xs:sequence>
- <xs:attribute name="name" type="xs:NMTOKEN" use="required" />
- <xs:attribute name="id" type="xs:NMTOKEN" use="required" />
- </xs:complexType>
- </xs:element>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
+ <xsd:element name="insertDataSetModels">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="dataset" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="name" />
+ <xsd:element name="table" maxOccurs="unbounded">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="record">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="column" maxOccurs="unbounded">
+ <xsd:complexType mixed="true">
+ <xsd:attribute name="ref" type="uuidRefType" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="xsd:ID" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ <xsd:attribute name="ref" type="uuidRefType" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ <xsd:attribute name="id" type="uuidType" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:element>
<xsd:element name="name" type="xsd:string">
<xsd:annotation>
Added: zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-view.xsd
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-view.xsd (rev 0)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-view.xsd 2008-11-08 17:38:44 UTC (rev 2110)
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema
+ targetNamespace="http://jiemamy.org/xml/ns/view"
+ xmlns:core="http://jiemamy.org/xml/ns/core"
+ xmlns="http://jiemamy.org/xml/ns/view"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified"
+ attributeFormDefault="unqualified"
+ version="0.2.0">
+
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">Jiemamy view model schema.</xsd:documentation>
+ <xsd:documentation xml:lang="ja-JP">Jiemamyビューモデルスキーマ</xsd:documentation>
+ </xsd:annotation>
+
+ <xsd:import namespace="http://jiemamy.org/xml/ns/core" schemaLocation="jiemamy-core.xsd"/>
+
+ <xsd:element name="diagramPresentations">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element ref="diagramPresentation"/>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+
+
+ <xsd:element name="diagramPresentation">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="core:name" />
+ <xsd:element ref="node" maxOccurs="unbounded" />
+ <xsd:element ref="connection" maxOccurs="unbounded" />
+ </xsd:sequence>
+ <xsd:attribute name="id" type="core:uuidType" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="node">
+ <xsd:complexType>
+ <xsd:attribute name="ref" type="core:uuidRefType" use="required" />
+ <xsd:attribute name="x" type="overMinusOneType" default="-1" />
+ <xsd:attribute name="y" type="overMinusOneType" default="-1" />
+ <xsd:attribute name="width" type="overMinusOneType" default="-1" />
+ <xsd:attribute name="height" type="overMinusOneType" default="-1" />
+ <xsd:attribute name="color" type="colorType" />
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="connection">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element ref="bendpoint" minOccurs="0" maxOccurs="unbounded" />
+ </xsd:sequence>
+ <xsd:attribute name="ref" type="core:uuidRefType" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+
+ <xsd:element name="bendpoint">
+ <xsd:complexType>
+ <xsd:attribute name="x" type="overMinusOneType" default="-1" />
+ <xsd:attribute name="y" type="overMinusOneType" default="-1" />
+ </xsd:complexType>
+ </xsd:element>
+
+ <!-- 単純型 -->
+
+ <xsd:simpleType name="overMinusOneType">
+ <xsd:restriction base="xsd:integer">
+ <xsd:minInclusive value="-1" />
+ </xsd:restriction>
+ </xsd:simpleType>
+
+ <xsd:simpleType name="colorType">
+ <xsd:annotation>
+ <xsd:documentation xml:lang="en">RGB color type</xsd:documentation>
+ <xsd:documentation xml:lang="ja-JP">RGB色定義型</xsd:documentation>
+ </xsd:annotation>
+ <xsd:restriction base="xsd:string">
+ <xsd:pattern value="#[0-9a-f]{6}"/>
+ </xsd:restriction>
+ </xsd:simpleType>
+
+</xsd:schema>
\ No newline at end of file
Property changes on: zeus/trunk/org.jiemamy.spec.core/src/main/resources/jiemamy-view.xsd
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: zeus/trunk/org.jiemamy.spec.core/src/main/resources/sample-validation-target.xml
===================================================================
--- zeus/trunk/org.jiemamy.spec.core/src/main/resources/sample-validation-target.xml 2008-11-08 16:31:28 UTC (rev 2109)
+++ zeus/trunk/org.jiemamy.spec.core/src/main/resources/sample-validation-target.xml 2008-11-08 17:38:44 UTC (rev 2110)
@@ -1,9 +1,12 @@
<?xml version="1.0"?>
<rootModel id="d5a96af3-b1e9-4285-a8ef-c491ce5ae308"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xsi:schemaLocation="http://jiemamy.org/xml/ns/core jiemamy-core.xsd"
-xmlns="http://jiemamy.org/xml/ns/core"
-xmlns:view="http://jiemamy.org/xml/ns/view">
+ xmlns="http://jiemamy.org/xml/ns/core"
+ xmlns:view="http://jiemamy.org/xml/ns/view"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation=
+ "http://jiemamy.org/xml/ns/core jiemamy-core.xsd
+ http://jiemamy.org/xml/ns/view jiemamy-view.xsd">
+
<dialect class="org.jiemamy.dialect.mysql.MySqlDialect"/>
<schemaName>FOO</schemaName>
<beginScript>BEGIN;</beginScript>
@@ -418,7 +421,7 @@
</dataset>
<dataset id="6001">
<name>データ群ja</name>
- <table id="d7489ed6-0add-443d-95cf-234376eb0455">
+ <table ref="d7489ed6-0add-443d-95cf-234376eb0455">
<record id="rec21">
<column ref="c7ed225d-92a6-4cc2-90de-60531804464e">1</column>
<column ref="2d951389-6bc7-49d7-8631-1d26fe17047e">10</column>
@@ -520,21 +523,23 @@
</dataset>
</insertDataSetModels>
<view:diagramPresentations>
- <view:diagramPresentation id="5000" name="全部表示する">
- <node ref="d7489ed6-0add-443d-95cf-234376eb0455" x="360" y="60" width="-1" height="-1" color="#ff00ff"/>
- <node ref="9f522e56-809c-45fd-8416-39201014218b" x="60" y="60" width="-1" height="-1" color="#ff00ff"/>
- <node ref="516f7961-cb7b-48e2-990b-7fb0c750c3a4" x="60" y="270" width="-1" height="-1" color="#ff00ff"/>
- <node ref="43beb884-2562-4480-8030-bb797f701783" x="360" y="270" width="-1" height="-1" color="#ff00ff"/>
- <connection ref="e43d3c43-33c8-4b02-aa42-83f2d868cfe6"/>
- <connection ref="e7dd92b4-1d97-4be6-bab6-fa9fe26eb6ed">
- <bendpoint x="310" y="60" />
- <bendpoint x="360" y="10" />
- </connection>
+ <view:diagramPresentation id="5000">
+ <name>全部表示する</name>
+ <view:node ref="d7489ed6-0add-443d-95cf-234376eb0455" x="360" y="60" width="-1" height="-1" color="#ff00ff"/>
+ <view:node ref="9f522e56-809c-45fd-8416-39201014218b" x="60" y="60" width="-1" height="-1" color="#ff00ff"/>
+ <view:node ref="516f7961-cb7b-48e2-990b-7fb0c750c3a4" x="60" y="270" width="-1" height="-1" color="#ff00ff"/>
+ <view:node ref="43beb884-2562-4480-8030-bb797f701783" x="360" y="270" width="-1" height="-1" color="#ff00ff"/>
+ <view:connection ref="e43d3c43-33c8-4b02-aa42-83f2d868cfe6"/>
+ <view:connection ref="e7dd92b4-1d97-4be6-bab6-fa9fe26eb6ed">
+ <view:bendpoint x="310" y="60" />
+ <view:bendpoint x="360" y="10" />
+ </view:connection>
</view:diagramPresentation>
- <view:diagramPresentation id="5001" name="一部表示する">
- <node ref="d7489ed6-0add-443d-95cf-234376eb0455" x="60" y="60" width="-1" height="-1" color="#ff00ff"/>
- <node ref="516f7961-cb7b-48e2-990b-7fb0c750c3a4" x="270" y="270" width="-1" height="-1" color="#ff00ff"/>
- <connection ref="e43d3c43-33c8-4b02-aa42-83f2d868cfe6"/>
+ <view:diagramPresentation id="5001">
+ <name>一部表示する</name>
+ <view:node ref="d7489ed6-0add-443d-95cf-234376eb0455" x="60" y="60" width="-1" height="-1" color="#ff00ff"/>
+ <view:node ref="516f7961-cb7b-48e2-990b-7fb0c750c3a4" x="270" y="270" width="-1" height="-1" color="#ff00ff"/>
+ <view:connection ref="e43d3c43-33c8-4b02-aa42-83f2d868cfe6"/>
</view:diagramPresentation>
</view:diagramPresentations>
</rootModel>