notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1478 - in trunk/main: . depot depot/core depot/library depot/library/etc/data/dpml depot/library/etc/data/samples depot/library/src/main/net/dpml/library/info lang lang/component lang/component/etc lang/module lang/module/etc lang/part lang/part/etc lang/state/etc metro planet planet/http/server station station/info/etc transit

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1478 - in trunk/main: . depot depot/core depot/library depot/library/etc/data/dpml depot/library/etc/data/samples depot/library/src/main/net/dpml/library/info lang lang/component lang/component/etc lang/module lang/module/etc lang/part lang/part/etc lang/state/etc metro planet planet/http/server station station/info/etc transit
Date: Wed, 31 May 2006 08:31:57 +0200

Author: mcconnell
Date: 2006-05-31 08:31:48 +0200 (Wed, 31 May 2006)
New Revision: 1478

Removed:
trunk/main/lang/common/
trunk/main/planet/process/
Modified:
trunk/main/bootstrap
trunk/main/bootstrap.bat
trunk/main/depot/core/build.xml
trunk/main/depot/library/build.xml
trunk/main/depot/library/etc/data/dpml/module.xml
trunk/main/depot/library/etc/data/samples/duplicates.xml
trunk/main/depot/library/etc/data/samples/example-8.xml
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
trunk/main/depot/module.xml
trunk/main/lang/component/build.xml
trunk/main/lang/component/etc/component.xsd
trunk/main/lang/module.xml
trunk/main/lang/module/build.xml
trunk/main/lang/module/etc/module.xsd
trunk/main/lang/part/build.xml
trunk/main/lang/part/etc/part.xsd
trunk/main/lang/state/etc/state.xsd
trunk/main/metro/module.xml
trunk/main/planet/http/server/project.xml
trunk/main/planet/module.xml
trunk/main/station/info/etc/application.xsd
trunk/main/station/module.xml
trunk/main/transit/module.xml
Log:
removal of the common.xsd definition and associated project and process
project

Modified: trunk/main/bootstrap
===================================================================
--- trunk/main/bootstrap 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/bootstrap 2006-05-31 06:31:48 UTC (rev 1478)
@@ -42,13 +42,6 @@
ant -f bootstrap.xml xml
}

-dpmlCommon()
-{
- cd lang/common
- build clean install
- cd ../..
-}
-
dpmlModule()
{
cd lang/module
@@ -143,9 +136,8 @@
ID=$1
antlibCleanup
xmlSetup
-dpmlCommon
-dpmlPart
dpmlModule
+dpmlPart
dpmlState
dpmlComponent
dpmlType

Modified: trunk/main/bootstrap.bat
===================================================================
--- trunk/main/bootstrap.bat 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/bootstrap.bat 2006-05-31 06:31:48 UTC (rev 1478)
@@ -15,12 +15,10 @@
IF ERRORLEVEL 1 GOTO :exit
CALL :xml-setup
IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-common
+CALL :dpml-module
IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-part
IF ERRORLEVEL 1 GOTO :exit
-CALL :dpml-module
-IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-state
IF ERRORLEVEL 1 GOTO :exit
CALL :dpml-component
@@ -59,12 +57,6 @@
CALL ant -f bootstrap.xml xml
GOTO :EOF

-:dpml-common
-PUSHD lang\common
-CALL :build clean install
-POPD
-GOTO :EOF
-
:dpml-module
PUSHD lang\module
CALL :build clean install

Modified: trunk/main/depot/core/build.xml
===================================================================
--- trunk/main/depot/core/build.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/depot/core/build.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -30,7 +30,6 @@
<x:replicate self="true" verbose="false" layout="modern"
todir="${local}" >
<include ref="dpml/depot/dpml-tools-builder"/>
<include ref="dpml/depot/dpml-library"/>
- <include ref="dpml/lang/dpml-common"/>
<include ref="dpml/lang/dpml-part"/>
</x:replicate>
<echo>

Modified: trunk/main/depot/library/build.xml
===================================================================
--- trunk/main/depot/library/build.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/depot/library/build.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -9,7 +9,6 @@
<target name="init" depends="bootstrap.init">
<property name="project.xsd.version" value="${project.version}"/>
<filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#1.0"/>
- <filter token="COMMON-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-common#1.0"/>
<filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#1.0"/>
<filter value="${junit.version}" token="JUNIT_VERSION"/>
<filter value="${project.version}" token="PROJECT-VERSION"/>

Modified: trunk/main/depot/library/etc/data/dpml/module.xml
===================================================================
--- trunk/main/depot/library/etc/data/dpml/module.xml 2006-05-30 02:54:28
UTC (rev 1477)
+++ trunk/main/depot/library/etc/data/dpml/module.xml 2006-05-31 06:31:48
UTC (rev 1478)
@@ -158,7 +158,7 @@
<property name="project.template" value="${basedir}/builder.xml"/>
</properties>
<types>
- <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.lang.PartManager"/>
+ <part:plugin alias="true" class="net.dpml.lang.PartManager"/>
<type id="jar"/>
</types>
<dependencies>
@@ -218,7 +218,7 @@
</properties>
<types>
<type id="jar"/>
- <type id="part" xsi:type="part:plugin"
class="net.dpml.metro.runtime.edit.CompositionEditorFactory"/>
+ <part:plugin
class="net.dpml.metro.runtime.edit.CompositionEditorFactory"/>
</types>
<dependencies>
<runtime>
@@ -234,7 +234,7 @@
</properties>
<types>
<type id="jar"/>
- <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.metro.runtime.CompositionController"/>
+ <part:plugin alias="true"
class="net.dpml.metro.runtime.CompositionController"/>
</types>
<dependencies>
<runtime>
@@ -254,7 +254,7 @@
</properties>
<types>
<type id="jar"/>
- <type id="part" xsi:type="part:resource" urn="dpml:metro"
path="net/dpml/composition/tools/antlib.xml"/>
+ <part:resource urn="dpml:metro"
path="net/dpml/composition/tools/antlib.xml"/>
</types>
<dependencies>
<runtime>
@@ -324,7 +324,7 @@
</properties>
<types>
<type id="jar"/>
- <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.library.impl.BuildPlugin"/>
+ <part:plugin alias="true"
class="net.dpml.library.impl.BuildPlugin"/>
</types>
<dependencies>
<runtime>
@@ -343,7 +343,7 @@
</properties>
<types>
<type id="jar"/>
- <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.tools.impl.StandardBuilder"/>
+ <part:plugin alias="true"
class="net.dpml.tools.impl.StandardBuilder"/>
</types>
<dependencies>
<runtime>

Modified: trunk/main/depot/library/etc/data/samples/duplicates.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/duplicates.xml 2006-05-30
02:54:28 UTC (rev 1477)
+++ trunk/main/depot/library/etc/data/samples/duplicates.xml 2006-05-31
06:31:48 UTC (rev 1478)
@@ -7,18 +7,18 @@
<module name="acme">
<resource name="widget">
<types>
- <type id="foo" xsi:type="GenericType">
+ <type id="foo">
<property name="pink" value="floyd"/>
<property name="alice" value="cooper"/>
</type>
- <type id="part" xsi:type="part:plugin" class="Widget"/>
+ <part:plugin class="Widget"/>
</types>
</resource>
</module>
<module name="acme">
<resource name="gizmo">
<types>
- <type id="part" xsi:type="part:plugin" class="gizmo"/>
+ <part:plugin class="gizmo"/>
</types>
</resource>
</module>

Modified: trunk/main/depot/library/etc/data/samples/example-8.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/example-8.xml 2006-05-30
02:54:28 UTC (rev 1477)
+++ trunk/main/depot/library/etc/data/samples/example-8.xml 2006-05-31
06:31:48 UTC (rev 1478)
@@ -16,26 +16,10 @@
<property name="pink" value="floyd"/>
<property name="alice" value="cooper"/>
</type>
- <type xsi:type="part:plugin" class="Widget"/>
+ <part:plugin class="Widget"/>
</types>
</resource>
</module>
</modules>

- 
-
</library>

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-30 02:54:28 UTC (rev 1477)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-31 06:31:48 UTC (rev 1478)
@@ -730,47 +730,39 @@
TypeInfo info = element.getSchemaTypeInfo();
String namespace = info.getTypeNamespace();
String typeName = info.getTypeName();
+
if( null == namespace )
{
throw new NullPointerException( "namespace" );
}
- else if( COMMON_XSD_URI.equals( namespace ) )
+
+ if( MODULE_XSD_URI.equals( namespace ) )
{
+ // it's a generic type declaration
+
final String id = getID( element );
final boolean alias = getAliasFlag( element );
- return new TypeDirective( id, alias );
+ final Properties properties = getProperties( element );
+ return new TypeDirective( id, alias, properties );
}
- else if( MODULE_XSD_URI.equals( namespace ) )
+ else if( info.isDerivedFrom( MODULE_XSD_URI, "AbstractType",
TypeInfo.DERIVATION_EXTENSION ) )
{
- if( "GenericType".equals( typeName ) )
+ if(
+ PART_XSD_URI.equals( namespace )
+ || info.isDerivedFrom( PART_XSD_URI, "StrategyType",
TypeInfo.DERIVATION_EXTENSION ) )
{
- final String id = getID( element );
final boolean alias = getAliasFlag( element );
- final Properties properties = getProperties( element );
- return new TypeDirective( id, alias, properties );
+ return new TypeDirective( element, "part", alias );
}
else
{
- final String error =
- "Cannot create type bacause the element type is
unrecognized."
- + "\nNamespace: "
- + namespace
- + "\nType Name: "
- + info.getTypeName();
- throw new DecodingException( element, error );
+ // id attribute is required
+
+ final String id = getID( element );
+ final boolean alias = getAliasFlag( element );
+ return new TypeDirective( element, id, alias );
}
}
- else if( PART_XSD_URI.equals( namespace ) )
- {
- final boolean alias = getAliasFlag( element );
- return new TypeDirective( element, "part", alias );
- }
- else if( info.isDerivedFrom( COMMON_XSD_URI, "AbstractType",
TypeInfo.DERIVATION_EXTENSION ) )
- {
- final String id = getID( element );
- final boolean alias = getAliasFlag( element );
- return new TypeDirective( element, id, alias );
- }
else
{
final String error =

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/depot/module.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -21,7 +21,7 @@
<project name="dpml-library-build" basedir="build">
<types>
<type id="jar"/>
- <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.library.console.BuilderPlugin"/>
+ <part:plugin alias="true"
class="net.dpml.library.console.BuilderPlugin"/>
</types>
<dependencies>
<runtime>
@@ -75,7 +75,7 @@
<resource name="dpml-tools-builder" basedir="tools/builder">
<types>
<type id="jar"/>
- <type xsi:type="part:plugin" alias="true"
class="net.dpml.tools.impl.StandardBuilder"/>
+ <part:plugin alias="true" class="net.dpml.tools.impl.StandardBuilder"/>
</types>
<dependencies>
<runtime>
@@ -92,7 +92,7 @@
<project name="dpml-depot-checkstyle" basedir="tools/checkstyle">
<types>
<type id="jar"/>
- <type xsi:type="part:resource" alias="true" urn="dpml:checkstyle"
path="net/dpml/tools/checkstyle/antlib.xml"/>
+ <part:resource alias="true" urn="dpml:checkstyle"
path="net/dpml/tools/checkstyle/antlib.xml"/>
</types>
<dependencies>
<runtime>
@@ -113,7 +113,7 @@
<project name="dpml-depot-convert" basedir="tools/convert">
<types>
<type id="jar"/>
- <type xsi:type="part:resource" alias="true" urn="dpml:convert"
path="net/dpml/tools/convert/antlib.xml"/>
+ <part:resource alias="true" urn="dpml:convert"
path="net/dpml/tools/convert/antlib.xml"/>
</types>
<dependencies>
<runtime>

Modified: trunk/main/lang/component/build.xml
===================================================================
--- trunk/main/lang/component/build.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/lang/component/build.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -29,7 +29,7 @@

<target name="init" depends="bootstrap.init">
<filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#1.0"/>
- <filter token="COMMON-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-common#1.0"/>
+ <filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#1.0"/>
<filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
</target>

Modified: trunk/main/lang/component/etc/component.xsd
===================================================================
--- trunk/main/lang/component/etc/component.xsd 2006-05-30 02:54:28 UTC (rev
1477)
+++ trunk/main/lang/component/etc/component.xsd 2006-05-31 06:31:48 UTC (rev
1478)
@@ -2,12 +2,10 @@

<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:part="@PART-XSD-URI@"
- xmlns:common="@COMMON-XSD-URI@"
xmlns:this="@PROJECT-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">

- <import namespace="@COMMON-XSD-URI@" schemaLocation="@COMMON-XSD-URI@"/>
<import namespace="@PART-XSD-URI@" schemaLocation="@PART-XSD-URI@"/>

<element name="component" type="this:component"
substitutionGroup="part:strategy"/>
@@ -88,7 +86,6 @@

<complexType name="parts">
<sequence>
- 
<element name="component" type="this:TaggedComponent" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
</complexType>

Modified: trunk/main/lang/module/build.xml
===================================================================
--- trunk/main/lang/module/build.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/lang/module/build.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -27,7 +27,6 @@
<import file="${home}/bootstrap.xml"/>

<target name="init" depends="bootstrap.init">
- <filter token="COMMON-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-common#${project.version}"/>
<filter token="PART-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-part#${project.version}"/>
<filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
</target>

Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-05-30 02:54:28 UTC (rev
1477)
+++ trunk/main/lang/module/etc/module.xsd 2006-05-31 06:31:48 UTC (rev
1478)
@@ -2,20 +2,17 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:this="@PROJECT-XSD-URI@"
- xmlns:common="@COMMON-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">

- <import namespace="@COMMON-XSD-URI@" schemaLocation="@COMMON-XSD-URI@"/>
- <import namespace="@PART-XSD-URI@" schemaLocation="@PART-XSD-URI@"/>
-
<element name="library" type="this:LibraryType"/>
<element name="module" type="this:ModuleType"/>
<element name="project" type="this:ProjectType"/>
<element name="resource" type="this:ResourceType"/>
<element name="property" type="this:PropertyType"/>
- <element name="type" type="common:AbstractType"
substitutionGroup="common:type"/>
-
+ <element name="typedef" type="this:AbstractType"/>
+ <element name="type" type="this:GenericType"
substitutionGroup="this:typedef"/>
+
<complexType name="LibraryType">
<all>
<element name="imports" type="this:ImportsType" minOccurs="0"
maxOccurs="1"/>
@@ -94,16 +91,21 @@

<complexType name="TypesType">
<choice minOccurs="0" maxOccurs="unbounded">
- <element ref="common:type"/>
+ <element ref="this:typedef"/>
</choice>
</complexType>
+
+ <complexType name="AbstractType" abstract="true">
+ <attribute name="alias" type="boolean" default="false"/>
+ </complexType>

<complexType name="GenericType">
<complexContent>
- <extension base="common:AbstractType">
+ <extension base="this:AbstractType">
<sequence>
<element name="property" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
+ <attribute name="id" type="string"/>
</extension>
</complexContent>
</complexType>
@@ -218,45 +220,5 @@
</restriction>
</simpleType>

- 
-
- 
-
</schema>

Modified: trunk/main/lang/module.xml
===================================================================
--- trunk/main/lang/module.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/lang/module.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -4,19 +4,27 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">

+ 
+
+ <resource name="dpml-module" version="1.0">
+ <types>
<type id="xsd"/>
</types>
</resource>
-
+
<resource name="dpml-part" version="1.0">
<types>
<type id="xsd"/>
</types>
<dependencies>
<build>
- <include key="dpml-common"/>
+ <include key="dpml-module"/>
</build>
</dependencies>
</resource>
@@ -50,29 +58,4 @@
</dependencies>
</resource>

- <resource name="dpml-module" version="1.0">
- <types>
- <type id="xsd"/>
- </types>
- <dependencies>
- <build>
- <include key="dpml-common"/>
- <include key="dpml-part"/>
- </build>
- </dependencies>
- </resource>
-
- 
-
</module>

Modified: trunk/main/lang/part/build.xml
===================================================================
--- trunk/main/lang/part/build.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/lang/part/build.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -28,7 +28,7 @@
<import file="${home}/bootstrap.xml"/>

<target name="init" depends="bootstrap.init">
- <filter token="COMMON-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-common#${project.version}"/>
+ <filter token="MODULE-XSD-URI"
value="artifact:xsd:dpml/lang/dpml-module#${project.version}"/>
<filter token="PROJECT-XSD-URI"
value="artifact:xsd:${project.group}/${project.name}#${project.version}"/>
</target>

Modified: trunk/main/lang/part/etc/part.xsd
===================================================================
--- trunk/main/lang/part/etc/part.xsd 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/lang/part/etc/part.xsd 2006-05-31 06:31:48 UTC (rev 1478)
@@ -2,18 +2,18 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:this="@PROJECT-XSD-URI@"
- xmlns:common="@COMMON-XSD-URI@"
+ xmlns:module="@MODULE-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified"
>

- <import namespace="@COMMON-XSD-URI@" schemaLocation="@COMMON-XSD-URI@"/>
+ <import namespace="@MODULE-XSD-URI@" schemaLocation="@MODULE-XSD-URI@"/>

<element name="part" type="this:PartType"/>
- <element name="strategy" type="this:StrategyType"
substitutionGroup="common:type"/>
+ <element name="strategy" type="this:StrategyType"
substitutionGroup="module:typedef"/>
<element name="plugin" type="this:plugin"
substitutionGroup="this:strategy"/>
<element name="resource" type="this:resource"
substitutionGroup="this:strategy"/>
- <element name="codebase" type="this:codebase"
substitutionGroup="common:codebase"/>
+ <element name="codebase" type="this:CodeBaseType"/>
<element name="param" type="this:ValueType"/>

<complexType name="PartType">
@@ -26,7 +26,7 @@

<complexType name="StrategyType" abstract="true">
<complexContent>
- <extension base="common:AbstractType"/>
+ <extension base="module:AbstractType"/>
</complexContent>
</complexType>

@@ -95,7 +95,7 @@

<complexType name="codebase">
<complexContent>
- <extension base="common:CodeBaseType">
+ <extension base="this:CodeBaseType">
<sequence>
<element ref="this:param" minOccurs="0" maxOccurs="unbounded"/>
</sequence>
@@ -103,6 +103,10 @@
</complexContent>
</complexType>

+ <complexType name="CodeBaseType" abstract="true">
+ <attribute name="uri" type="anyURI"/>
+ </complexType>
+
<simpleType name="URI">
<restriction base="anyURI"/>
</simpleType>

Modified: trunk/main/lang/state/etc/state.xsd
===================================================================
--- trunk/main/lang/state/etc/state.xsd 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/lang/state/etc/state.xsd 2006-05-31 06:31:48 UTC (rev 1478)
@@ -6,31 +6,31 @@

<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:state="@PROJECT-XSD-URI@"
+ xmlns:this="@PROJECT-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">

- <element name="state" type="state:GraphType"/>
- <element name="action" type="state:ActionType"/>
- <element name="transition" type="state:TransitionType"
substitutionGroup="state:action"/>
- <element name="operation" type="state:OperationType"
substitutionGroup="state:action"/>
- <element name="apply" type="state:ApplyType"
substitutionGroup="state:action"/>
- <element name="exec" type="state:ExecType"
substitutionGroup="state:action"/>
+ <element name="state" type="this:GraphType"/>
+ <element name="action" type="this:ActionType"/>
+ <element name="transition" type="this:TransitionType"
substitutionGroup="this:action"/>
+ <element name="operation" type="this:OperationType"
substitutionGroup="this:action"/>
+ <element name="apply" type="this:ApplyType"
substitutionGroup="this:action"/>
+ <element name="exec" type="this:ExecType"
substitutionGroup="this:action"/>

<complexType name="GraphType">
<choice minOccurs="0" maxOccurs="unbounded">
- <element name="transition" type="state:TransitionType"/>
- <element name="operation" type="state:OperationType"/>
- <element name="interface" type="state:InterfaceType"/>
- <element name="state" type="state:StateType"/>
- <element name="trigger" type="state:TriggerType"/>
+ <element name="transition" type="this:TransitionType"/>
+ <element name="operation" type="this:OperationType"/>
+ <element name="interface" type="this:InterfaceType"/>
+ <element name="state" type="this:StateType"/>
+ <element name="trigger" type="this:TriggerType"/>
</choice>
<attribute name="terminal" type="boolean" default="false"/>
</complexType>

<complexType name="StateType">
<complexContent>
- <extension base="state:GraphType">
+ <extension base="this:GraphType">
<attribute name="name" type="string" use="required"/>
</extension>
</complexContent>
@@ -38,18 +38,18 @@

<complexType name="TriggerType">
<sequence>
- <element ref="state:action" minOccurs="1" maxOccurs="1"/>
+ <element ref="this:action" minOccurs="1" maxOccurs="1"/>
</sequence>
- <attribute name="event" type="state:trigger"/>
+ <attribute name="event" type="this:trigger"/>
</complexType>

<complexType name="ActionType" abstract="true"/>

<complexType name="TransitionType">
<complexContent>
- <extension base="state:ActionType">
+ <extension base="this:ActionType">
<sequence>
- <element name="operation" type="state:OperationType"
minOccurs="0" maxOccurs="1"/>
+ <element name="operation" type="this:OperationType"
minOccurs="0" maxOccurs="1"/>
</sequence>
<attribute name="name" type="string" use="required"/>
<attribute name="target" type="string" use="required"/>
@@ -59,7 +59,7 @@

<complexType name="OperationType">
<complexContent>
- <extension base="state:ActionType">
+ <extension base="this:ActionType">
<attribute name="name" type="string" use="required"/>
<attribute name="method" type="string"/>
</extension>
@@ -68,7 +68,7 @@

<complexType name="InterfaceType">
<complexContent>
- <extension base="state:ActionType">
+ <extension base="this:ActionType">
<attribute name="class" type="string" use="required"/>
</extension>
</complexContent>
@@ -76,7 +76,7 @@

<complexType name="ApplyType">
<complexContent>
- <extension base="state:ActionType">
+ <extension base="this:ActionType">
<attribute name="id" type="string" use="required"/>
</extension>
</complexContent>
@@ -84,7 +84,7 @@

<complexType name="ExecType">
<complexContent>
- <extension base="state:ActionType">
+ <extension base="this:ActionType">
<attribute name="id" type="string" use="required"/>
</extension>
</complexContent>

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/metro/module.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -109,9 +109,9 @@
</info>
<types>
<type id="jar"/>
- <type xsi:type="part:plugin" alias="true"
class="net.dpml.metro.runtime.CompositionController">
+ <part:plugin alias="true"
class="net.dpml.metro.runtime.CompositionController">
<part:param class="net.dpml.component.InitialContext"/>
- </type>
+ </part:plugin>
</types>
<dependencies>
<runtime>
@@ -143,7 +143,7 @@
</info>
<types>
<type id="jar"/>
- <type xsi:type="part:resource" alias="true" urn="dpml:metro"
+ <part:resource alias="true" urn="dpml:metro"
path="net/dpml/metro/tools/antlib.xml"/>
</types>
<dependencies>

Modified: trunk/main/planet/http/server/project.xml
===================================================================
--- trunk/main/planet/http/server/project.xml 2006-05-30 02:54:28 UTC (rev
1477)
+++ trunk/main/planet/http/server/project.xml 2006-05-31 06:31:48 UTC (rev
1478)
@@ -5,10 +5,7 @@
xmlns:metro="artifact:xsd:dpml/lang/dpml-component#1.0">

<types>
- <type xsi:type="metro:component"
- type="net.dpml.http.Server"
- id="part"
- alias="true">
+ <metro:component alias="true" type="net.dpml.http.Server">
<parts xmlns="artifact:xsd:dpml/lang/dpml-component#1.0">
<!--
Add a select channel connector to 8080.
@@ -94,7 +91,7 @@
</parts>
</component>
</parts>
- </type>
+ </metro:component>
</types>

<dependencies>

Modified: trunk/main/planet/module.xml
===================================================================
--- trunk/main/planet/module.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/planet/module.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -4,6 +4,5 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; >

<module file="http/module.xml"/>
- <module file="process/module.xml"/>

</module>

Modified: trunk/main/station/info/etc/application.xsd
===================================================================
--- trunk/main/station/info/etc/application.xsd 2006-05-30 02:54:28 UTC (rev
1477)
+++ trunk/main/station/info/etc/application.xsd 2006-05-31 06:31:48 UTC (rev
1478)
@@ -26,17 +26,15 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:this="@PROJECT-XSD-URI@"
- xmlns:common="@COMMON-XSD-URI@"
xmlns:part="@PART-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">

- <import namespace="@COMMON-XSD-URI@" schemaLocation="@COMMON-XSD-URI@"/>
<import namespace="@PART-XSD-URI@" schemaLocation="@PART-XSD-URI@"/>

+ <element name="codebase" type="part:codebase"/>
<element name="application" type="this:ApplicationType"/>
<element name="param" type="part:ValueType"
substitutionGroup="part:param"/>
- <element name="codebase" type="part:codebase"
substitutionGroup="common:codebase"/>
<element name="registry" type="this:RegistryType"/>
<element name="app" type="this:TaggedApplicationType"/>

@@ -51,7 +49,7 @@
<complexType name="ApplicationType">
<sequence>
<element name="jvm" type="this:JVMType" minOccurs="0" maxOccurs="1"/>
- <element ref="common:codebase" minOccurs="1" maxOccurs="1"/>
+ <element ref="this:codebase" minOccurs="1" maxOccurs="1"/>
</sequence>
<attribute name="title" type="string"/>
<attribute name="policy" type="this:StartupPolicy"/>

Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/station/module.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -14,7 +14,6 @@
</build>
</dependencies>
<filters>
- <feature token="COMMON-XSD-URI" ref="dpml/lang/dpml-common" type="xsd"
id="uri"/>
<feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri"/>
<feature token="PROJECT-XSD-URI" type="xsd" id="uri"/>
</filters>
@@ -34,7 +33,6 @@
</test>
</dependencies>
<filters>
- <feature token="COMMON-XSD-URI" ref="dpml/lang/dpml-common" type="xsd"
id="uri"/>
<feature token="PART-XSD-URI" ref="dpml/lang/dpml-part" type="xsd"
id="uri"/>
<feature token="COMPONENT-XSD-URI" ref="dpml/lang/dpml-component"
type="xsd" id="uri"/>
<feature token="APPLICATION-XSD-URI"
ref="dpml/station/dpml-station-info" type="xsd" id="uri"/>
@@ -44,7 +42,7 @@
<project name="dpml-station-exec" basedir="exec">
<types>
<type id="jar"/>
- <type xsi:type="part:plugin"
class="net.dpml.station.exec.ApplicationHandler" alias="true"/>
+ <part:plugin class="net.dpml.station.exec.ApplicationHandler"
alias="true"/>
</types>
<dependencies>
<build>
@@ -87,7 +85,7 @@
</properties>
<types>
<type id="jar"/>
- <type xsi:type="part:plugin"
class="net.dpml.station.server.StationServerPlugin" alias="true"/>
+ <part:plugin class="net.dpml.station.server.StationServerPlugin"
alias="true"/>
</types>
<dependencies>
<runtime>
@@ -110,7 +108,7 @@
<project name="dpml-station-console" basedir="console">
<types>
<type id="jar"/>
- <type xsi:type="part:plugin" alias="true"
class="net.dpml.station.console.StationPlugin"/>
+ <part:plugin alias="true"
class="net.dpml.station.console.StationPlugin"/>
</types>
<dependencies>
<runtime>

Modified: trunk/main/transit/module.xml
===================================================================
--- trunk/main/transit/module.xml 2006-05-30 02:54:28 UTC (rev 1477)
+++ trunk/main/transit/module.xml 2006-05-31 06:31:48 UTC (rev 1478)
@@ -11,7 +11,7 @@
<project name="dpml-transit-console" basedir="console">
<types>
<type id="jar"/>
- <type xsi:type="part:plugin"
+ <part:plugin
class="net.dpml.transit.console.TransitConsoleHandler" alias="true"/>
</types>
<dependencies>

r1478 - in trunk/main: . depot depot/core depot/library depot/library/etc/data/dpml depot/library/etc/data/samples depot/library/src/main/net/dpml/library/info lang lang/component lang/component/etc lang/module lang/module/etc lang/part lang/part/etc lang/state/etc metro planet planet/http/server station station/info/etc transit, mcconnell at BerliOS, 05/31/2006