notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1574 - in trunk/main/lang: . component component/etc type type/etc

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1574 - in trunk/main/lang: . component component/etc type type/etc
Date: Sun, 16 Jul 2006 20:28:50 +0200

Author: mcconnell
Date: 2006-07-16 20:28:47 +0200 (Sun, 16 Jul 2006)
New Revision: 1574

Modified:
trunk/main/lang/component/build.xml
trunk/main/lang/component/etc/component.xsd
trunk/main/lang/module.xml
trunk/main/lang/type/build.xml
trunk/main/lang/type/etc/type.xsd
Log:
remove parts for a type definition (resulting in composition in component
definition only for the reason of simplifying the overall semantic model)

Modified: trunk/main/lang/component/build.xml
===================================================================
--- trunk/main/lang/component/build.xml 2006-07-16 18:27:23 UTC (rev 1573)
+++ trunk/main/lang/component/build.xml 2006-07-16 18:28:47 UTC (rev 1574)
@@ -30,6 +30,7 @@
<target name="init" depends="bootstrap.init">
<property name="xsd.uri"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
<filter token="PART-XSD-LINK-URI"
value="link:xsd:dpml/lang/dpml-part#1.0"/>
+ <filter token="TYPE-XSD-URI" value="link:xsd:dpml/lang/dpml-type#1.0"/>
<filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#1.0"/>
<filter token="PROJECT-XSD-URI" value="${xsd.uri}"/>
<filter token="PROJECT-XSD-LINK-URI"

Modified: trunk/main/lang/component/etc/component.xsd
===================================================================
--- trunk/main/lang/component/etc/component.xsd 2006-07-16 18:27:23 UTC (rev
1573)
+++ trunk/main/lang/component/etc/component.xsd 2006-07-16 18:28:47 UTC (rev
1574)
@@ -3,10 +3,12 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:part="@PART-XSD-LINK-URI@"
xmlns:this="@PROJECT-XSD-LINK-URI@"
+ xmlns:type="@TYPE-XSD-URI@"
targetNamespace="@PROJECT-XSD-LINK-URI@"
elementFormDefault="qualified">

<import namespace="@PART-XSD-LINK-URI@"
schemaLocation="@PART-XSD-LINK-URI@"/>
+ <import namespace="@TYPE-XSD-URI@" schemaLocation="@TYPE-XSD-URI@"/>

<element name="component" type="this:component"
substitutionGroup="part:strategy"/>
<element name="category" type="this:CategoryType"/>
@@ -24,8 +26,8 @@
</sequence>
<attribute name="name" type="string"/>
<attribute name="type" type="string"/>
- <attribute name="lifestyle" type="this:lifestyle"/>
- <attribute name="collection" type="this:collection"/>
+ <attribute name="lifestyle" type="type:lifestyle"/>
+ <attribute name="collection" type="type:collection"/>
<attribute name="activation" type="this:activation"/>
<attribute name="handler" type="part:URI"
default="link:part:dpml/metro/dpml-metro-runtime"/>
<attribute name="uri" type="anyURI"/>
@@ -35,7 +37,7 @@

<complexType name="CategoryType">
<attribute name="name" type="string"/>
- <attribute name="priority" type="this:priority"/>
+ <attribute name="priority" type="type:priority"/>
<attribute name="target" type="string"/>
</complexType>

@@ -52,7 +54,6 @@
<complexType name="ContextType">
<choice minOccurs="0" maxOccurs="unbounded">
<element ref="this:entry"/>
- <element name="component" type="this:TaggedComponent" minOccurs="0"
maxOccurs="unbounded"/> 
</choice>
</complexType>

@@ -79,29 +80,6 @@
</complexContent>
</complexType>

- <complexType name="TaggedComponentImport">
- <attribute name="key" type="string" use="required"/>
- <attribute name="uri" type="anyURI" use="required"/>
- </complexType>
-
- <simpleType name="lifestyle">
- <restriction base="string">
- <enumeration value="singleton"/>
- <enumeration value="thread"/>
- <enumeration value="transient"/>
- <enumeration value="system"/>
- </restriction>
- </simpleType>
-
- <simpleType name="collection">
- <restriction base="string">
- <enumeration value="hard"/>
- <enumeration value="soft"/>
- <enumeration value="weak"/>
- <enumeration value="system"/>
- </restriction>
- </simpleType>
-
<simpleType name="activation">
<restriction base="string">
<enumeration value="demand"/>
@@ -109,14 +87,5 @@
<enumeration value="system"/>
</restriction>
</simpleType>
-
- <simpleType name="priority">
- <restriction base="string">
- <enumeration value="debug"/>
- <enumeration value="info"/>
- <enumeration value="warn"/>
- <enumeration value="error"/>
- </restriction>
- </simpleType>
-
+
</schema>

Modified: trunk/main/lang/module.xml
===================================================================
--- trunk/main/lang/module.xml 2006-07-16 18:27:23 UTC (rev 1573)
+++ trunk/main/lang/module.xml 2006-07-16 18:28:47 UTC (rev 1574)
@@ -31,6 +31,7 @@
<dependencies>
<build>
<include key="dpml-part"/>
+ <include key="dpml-type"/>
</build>
</dependencies>
</resource>
@@ -42,7 +43,7 @@
<dependencies>
<build>
<include key="dpml-state"/>
- <include key="dpml-component"/>
+ <include key="dpml-part"/>
</build>
</dependencies>
</resource>

Modified: trunk/main/lang/type/build.xml
===================================================================
--- trunk/main/lang/type/build.xml 2006-07-16 18:27:23 UTC (rev 1573)
+++ trunk/main/lang/type/build.xml 2006-07-16 18:28:47 UTC (rev 1574)
@@ -33,7 +33,6 @@
<filter token="PROJECT-XSD-URI" value="${xsd.link.uri}"/>
<filter token="PART-XSD-URI" value="link:xsd:dpml/lang/dpml-part#1.0"/>
<filter token="STATE-XSD-URI" value="link:xsd:dpml/lang/dpml-state#1.0"/>
- <filter token="COMPONENT-XSD-URI"
value="link:xsd:dpml/lang/dpml-component#1.0"/>
</target>

<target name="package" depends="bootstrap.package">

Modified: trunk/main/lang/type/etc/type.xsd
===================================================================
--- trunk/main/lang/type/etc/type.xsd 2006-07-16 18:27:23 UTC (rev 1573)
+++ trunk/main/lang/type/etc/type.xsd 2006-07-16 18:28:47 UTC (rev 1574)
@@ -8,12 +8,10 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:this="@PROJECT-XSD-URI@"
xmlns:state="@STATE-XSD-URI@"
- xmlns:component="@COMPONENT-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">

<import namespace="@STATE-XSD-URI@" schemaLocation="@STATE-XSD-URI@"/>
- <import namespace="@COMPONENT-XSD-URI@"
schemaLocation="@COMPONENT-XSD-URI@"/>

<element name="type" type="this:TypeDefinition"/>

@@ -21,10 +19,9 @@
<sequence>
<element name="info" type="this:InfoType" minOccurs="0"
maxOccurs="1"/>
<element name="services" type="this:ServicesType" minOccurs="0"
maxOccurs="1"/>
- <element name="context" type="this:ContextType" minOccurs="0"
maxOccurs="1"/>
- <element name="categories" type="this:CategoriesType" minOccurs="0"
maxOccurs="1"/>
+ <element name="context" type="this:ContextDescriptorType"
minOccurs="0" maxOccurs="1"/>
+ <element name="categories" type="this:CategoriesDescriptorType"
minOccurs="0" maxOccurs="1"/>
<element ref="state:state" minOccurs="0" maxOccurs="1"/>
- <element name="parts" type="component:PartsType" minOccurs="0"
maxOccurs="1"/>
</sequence>
</complexType>

@@ -35,18 +32,18 @@
<attribute name="name" type="string"/>
<attribute name="class" type="string" use="required"/>
<attribute name="version" type="string"/>
- <attribute name="lifestyle" type="component:lifestyle"/>
- <attribute name="collection" type="component:collection"/>
+ <attribute name="lifestyle" type="this:lifestyle"/>
+ <attribute name="collection" type="this:collection"/>
<attribute name="threadsafe" type="this:threadsafe"/>
</complexType>

- <complexType name="CategoriesType">
+ <complexType name="CategoriesDescriptorType">
<sequence>
- <element name="category" type="this:CategoryType" minOccurs="0"
maxOccurs="unbounded"/>
+ <element name="category" type="this:CategoryDescriptorType"
minOccurs="0" maxOccurs="unbounded"/>
</sequence>
</complexType>

- <complexType name="CategoryType">
+ <complexType name="CategoryDescriptorType">
<sequence>
<element name="property" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
@@ -54,13 +51,13 @@
<attribute name="priority" type="this:priority"/>
</complexType>

- <complexType name="ContextType">
+ <complexType name="ContextDescriptorType">
<sequence>
- <element name="entry" type="this:EntryType" minOccurs="0"
maxOccurs="unbounded"/>
+ <element name="entry" type="this:EntryDescriptorType" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
</complexType>

- <complexType name="EntryType">
+ <complexType name="EntryDescriptorType">
<attribute name="key" type="string" use="required"/>
<attribute name="class" type="string" use="required"/>
<attribute name="optional" type="boolean" default="false"/>
@@ -89,6 +86,7 @@
<enumeration value="warn"/>
<enumeration value="error"/>
<enumeration value="debug"/>
+ <enumeration value="trace"/>
</restriction>
</simpleType>

@@ -99,5 +97,23 @@
<enumeration value="unknown"/>
</restriction>
</simpleType>
+
+ <simpleType name="lifestyle">
+ <restriction base="string">
+ <enumeration value="singleton"/>
+ <enumeration value="thread"/>
+ <enumeration value="transient"/>
+ <enumeration value="system"/>
+ </restriction>
+ </simpleType>

+ <simpleType name="collection">
+ <restriction base="string">
+ <enumeration value="hard"/>
+ <enumeration value="soft"/>
+ <enumeration value="weak"/>
+ <enumeration value="system"/>
+ </restriction>
+ </simpleType>
+
</schema>

r1574 - in trunk/main/lang: . component component/etc type type/etc, mcconnell at BerliOS, 07/16/2006