notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1495 - in trunk/main: central/src/docs/about/download central/src/docs/depot/library central/src/docs/depot/library/filters depot/library/etc/data/samples depot/library/src/main/net/dpml/library/info lang/module/etc metro transit/core/etc/data transit/core/src/test/net/dpml/lang

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1495 - in trunk/main: central/src/docs/about/download central/src/docs/depot/library central/src/docs/depot/library/filters depot/library/etc/data/samples depot/library/src/main/net/dpml/library/info lang/module/etc metro transit/core/etc/data transit/core/src/test/net/dpml/lang
Date: Mon, 5 Jun 2006 08:19:11 +0200

Author: mcconnell
Date: 2006-06-05 08:19:02 +0200 (Mon, 05 Jun 2006)
New Revision: 1495

Added:
trunk/main/central/src/docs/depot/library/info.xml
trunk/main/transit/core/etc/data/plugin-xsi.xml
trunk/main/transit/core/etc/data/resource-xsi.xml
Removed:
trunk/main/central/src/docs/depot/library/data/
Modified:
trunk/main/central/src/docs/about/download/archive.xml
trunk/main/central/src/docs/depot/library/filters/feature.xml
trunk/main/central/src/docs/depot/library/modules.xml
trunk/main/central/src/docs/depot/library/navigation.xml
trunk/main/central/src/docs/depot/library/projects.xml
trunk/main/central/src/docs/depot/library/resources.xml
trunk/main/central/src/docs/depot/library/types.xml
trunk/main/depot/library/etc/data/samples/info.xml
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
trunk/main/lang/module/etc/module.xsd
trunk/main/metro/module.xml
trunk/main/transit/core/etc/data/resource.xml
trunk/main/transit/core/src/test/net/dpml/lang/PartTestCase.java
Log:
normalize <info> element between module and part xsd files

Modified: trunk/main/central/src/docs/about/download/archive.xml
===================================================================
--- trunk/main/central/src/docs/about/download/archive.xml 2006-06-03
04:14:45 UTC (rev 1494)
+++ trunk/main/central/src/docs/about/download/archive.xml 2006-06-05
06:19:02 UTC (rev 1495)
@@ -20,6 +20,64 @@
<subsection name="Build @VERSION@">

<p>
+ Resolved issues and/or enhancements:
+ </p>
+
+ <ul>
+ <li>Updated project/module/resource <tt>info</tt> element to be
equivalent
+ to the info element declared under the <tt>plugin</tt>
schema.</li>
+ <li>Documentation improvements inclouding information about type
versions
+ and alias references.</li>
+ <li>Addition of testcases dealing with <tt>xsi:type</tt> usage in
plugin
+ XML instances.</li>
+ </ul>
+
+ <table>
+ <tr>
+ <td>Windows NSIS Installer</td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.exe";>
+ dpml-sdk-win32-@VERSION@.exe</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.exe.md5";>
+ MD5</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Windows Zip Archive</td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.zip";>
+ dpml-sdk-win32-@VERSION@.zip</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.zip.md5";>
+ MD5</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Linux Archive</td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-linux-@VERSION@.tar.gz";>
+ dpml-sdk-linux-@VERSION@.tar.gz</a>
+ </td>
+ <td>
+ <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-linux-@VERSION@.tar.gz.md5";>
+ MD5</a>
+ </td>
+ </tr>
+ </table>
+
+ <p>
+ Online <a href="http://api.dpml.net/dpml/@VERSION@";>Javadoc</a>,
+ <a href="http://www.dpml.net/reports/@VERSION@/junit";>JUnit</a> and
<a
href="http://www.dpml.net/reports/@VERSION@/catalog/index.html";>Catalog</a>
reports are available.
+ </p>
+
+ </subsection>
+
+ <subsection name="Build 1.0.0-RC9">
+
+ <p>
Enhancements include:
</p>

@@ -40,33 +98,33 @@
<tr>
<td>Windows NSIS Installer</td>
<td>
- <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.exe";>
- dpml-sdk-win32-@VERSION@.exe</a>
+ <a
href="http://download.dpml.net/milestones/1.0.0-RC9/dpml-sdk-win32-1.0.0-RC9.exe";>
+ dpml-sdk-win32-1.0.0-RC9.exe</a>
</td>
<td>
- <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.exe.md5";>
+ <a
href="http://download.dpml.net/milestones/1.0.0-RC9/dpml-sdk-win32-1.0.0-RC9.exe.md5";>
MD5</a>
</td>
</tr>
<tr>
<td>Windows Zip Archive</td>
<td>
- <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.zip";>
- dpml-sdk-win32-@VERSION@.zip</a>
+ <a
href="http://download.dpml.net/milestones/1.0.0-RC9/dpml-sdk-win32-1.0.0-RC9.zip";>
+ dpml-sdk-win32-1.0.0-RC9.zip</a>
</td>
<td>
- <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-win32-@VERSION@.zip.md5";>
+ <a
href="http://download.dpml.net/milestones/1.0.0-RC9/dpml-sdk-win32-1.0.0-RC9.zip.md5";>
MD5</a>
</td>
</tr>
<tr>
<td>Linux Archive</td>
<td>
- <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-linux-@VERSION@.tar.gz";>
- dpml-sdk-linux-@VERSION@.tar.gz</a>
+ <a
href="http://download.dpml.net/milestones/1.0.0-RC9/dpml-sdk-linux-1.0.0-RC9.tar.gz";>
+ dpml-sdk-linux-1.0.0-RC9.tar.gz</a>
</td>
<td>
- <a
href="http://download.dpml.net/milestones/@VERSION@/dpml-sdk-linux-@VERSION@.tar.gz.md5";>
+ <a
href="http://download.dpml.net/milestones/1.0.0-RC9/dpml-sdk-linux-1.0.0-RC9.tar.gz.md5";>
MD5</a>
</td>
</tr>
@@ -84,8 +142,8 @@
</p>

<p>
- Online <a href="http://api.dpml.net/dpml/@VERSION@";>Javadoc</a>,
- <a href="http://www.dpml.net/reports/@VERSION@/junit";>JUnit</a> and
<a
href="http://www.dpml.net/reports/@VERSION@/catalog/index.html";>Catalog</a>
reports are available.
+ Online <a href="http://api.dpml.net/dpml/1.0.0-RC9";>Javadoc</a>,
+ <a href="http://www.dpml.net/reports/1.0.0-RC9/junit";>JUnit</a> and
<a
href="http://www.dpml.net/reports/1.0.0-RC9/catalog/index.html";>Catalog</a>
reports are available.
</p>

</subsection>

Modified: trunk/main/central/src/docs/depot/library/filters/feature.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/filters/feature.xml
2006-06-03 04:14:45 UTC (rev 1494)
+++ trunk/main/central/src/docs/depot/library/filters/feature.xml
2006-06-05 06:19:02 UTC (rev 1495)
@@ -41,7 +41,20 @@
</table>

</subsection>
+
+ <subsection name="Special URI Feature related Attributes">

+ <table>
+ <tr>
+ <td>alias</td>
+ <td>If <tt>true</tt> the artifact uri returned for the uri feature
will
+ be a link (assuming that the resource declares production of
+ an link alias).</td>
+ </tr>
+ </table>
+
+ </subsection>
+
<subsection name="Features">

<p>
@@ -49,7 +62,6 @@
</p>

<table>
- <tr><th>Feature</th><th>Description</th></tr>
<tr>
<td>name</td>
<td>The resource name.</td>

Added: trunk/main/central/src/docs/depot/library/info.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/info.xml 2006-06-03 04:14:45
UTC (rev 1494)
+++ trunk/main/central/src/docs/depot/library/info.xml 2006-06-05 06:19:02
UTC (rev 1495)
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+ <properties>
+ <author email="mcconnell AT dpml.net">Stephen McConnell</author>
+ <title>DPML Depot Info Element</title>
+ </properties>
+
+ <body>
+
+ <section name="Info">
+
+ <p>
+ An info element the <tt><module></tt>, <tt><project></tt>,
and
+ <tt><resource></tt> elements. An <tt>info</tt> element captures
a
+ title and description of the enclosing entity.
+ </p>
+
+ <subsection name="XML Attributes">
+
+ <table>
+ <tr>
+ <td>title</td>
+ <td>The title of the enclosing resource/project or module
(optional).</td>
+ </tr>
+ </table>
+
+ </subsection>
+
+ <subsection name="XML Nested elements">
+
+ <table>
+ <tr>
+ <td>description</td>
+ <td>0..1</td>
+ <td>A description of the enclosing element.</td>
+ </tr>
+ </table>
+
+ </subsection>
+
+ </section>
+
+ <section name="Example">
+
+ <p><i>Example info element within a project definition.</i></p>
+
+<source>
+ <project name="dpml-metro-runtime" basedir="runtime">
+ <font color="darkred"><info title="</font>Metro Container
Runtime<font color="darkred">">
+ <description></font>
+ DPML Component management platform runtime container.
+ <font color="darkred"></description></font>
+ <font color="darkred"></info></font>
+
+ ...
+
+ </project>
+</source>
+
+ </section>
+
+ </body>
+
+</document>
+

Modified: trunk/main/central/src/docs/depot/library/modules.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/modules.xml 2006-06-03
04:14:45 UTC (rev 1494)
+++ trunk/main/central/src/docs/depot/library/modules.xml 2006-06-05
06:19:02 UTC (rev 1495)
@@ -53,6 +53,12 @@

<table>
<tr>
+ <td><a href="info.html">info</a></td>
+ <td>0..1</td>
+ <td>Declaration of supplimentary human readable <a
href="info.html">info</a>
+ about the module.</td>
+ </tr>
+ <tr>
<td><a href="properties.html">properties</a></td>
<td>0..1</td>
<td>Declaration of a set of <a
href="properties.html">properties</a>

Modified: trunk/main/central/src/docs/depot/library/navigation.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/navigation.xml 2006-06-03
04:14:45 UTC (rev 1494)
+++ trunk/main/central/src/docs/depot/library/navigation.xml 2006-06-05
06:19:02 UTC (rev 1495)
@@ -25,11 +25,12 @@
<body>

<menu>
- <item name="Properties" href="properties.html"/>
<item name="Imports" href="imports.html"/>
<item name="Modules" href="modules.html"/>
<item name="Projects" href="projects.html"/>
<item name="Resources" href="resources.html"/>
+ <item name="Info" href="info.html"/>
+ <item name="Properties" href="properties.html"/>
<item name="Types" href="types.html"/>
<item name="Dependencies" href="dependencies.html"/>
<item name="Filters" href="filters/index.html"/>

Modified: trunk/main/central/src/docs/depot/library/projects.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/projects.xml 2006-06-03
04:14:45 UTC (rev 1494)
+++ trunk/main/central/src/docs/depot/library/projects.xml 2006-06-05
06:19:02 UTC (rev 1495)
@@ -67,6 +67,12 @@

<table>
<tr>
+ <td><a href="info.html">info</a></td>
+ <td>0..1</td>
+ <td>Declaration of supplimentary human readable <a
href="info.html">info</a>
+ about the project.</td>
+ </tr>
+ <tr>
<td><a href="properties.html">properties</a></td>
<td>0..1</td>
<td>Declaration of a set of <a
href="properties.html">properties</a>
@@ -101,12 +107,6 @@
string tokens in source code with values resolved from the
project
model (or other project/resources).</td>
</tr>
- <tr>
- <td><a href="data/index.html">filters</a></td>
- <td>0..1</td>
- <td>Declaration of process data. Process data entries may be
used to
- trigger supplimentary or custom build processes.</td>
- </tr>
</table>

</subsection>
@@ -130,8 +130,8 @@

<source><![CDATA[
<project name="dpml-metro-runtime" basedir="runtime">
- <info>
- <description title="Metro Container Runtime">
+ <info title="Metro Container Runtime">
+ <description>
DPML Component management platform runtime container.
</description>
</info>
@@ -155,10 +155,10 @@
</dependencies>
<filters>
<feature token="PART-HANDLER-URI" id="uri" type="part"/>
- <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
- <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part"/>
- <feature token="TYPE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-type"/>
- <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component"/>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state" alias="true"/>
+ <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part" alias="true"/>
+ <feature token="TYPE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-type" alias="true"/>
+ <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component" alias="true"/>
</filters>
</project>
]]></source>

Modified: trunk/main/central/src/docs/depot/library/resources.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/resources.xml 2006-06-03
04:14:45 UTC (rev 1494)
+++ trunk/main/central/src/docs/depot/library/resources.xml 2006-06-05
06:19:02 UTC (rev 1495)
@@ -58,19 +58,25 @@

<table>
<tr>
- <td>properties</td>
+ <td><a href="info.html">info</a></td>
<td>0..1</td>
+ <td>Declaration of supplimentary human readable <a
href="info.html">info</a>
+ about the resource.</td>
+ </tr>
+ <tr>
+ <td><a href="properties.html">properties</a></td>
+ <td>0..1</td>
<td>Declaration of a set of <a
href="properties.html">properties</a>
associated with the resource.</td>
</tr>
<tr>
- <td>types</td>
+ <td><a href="types.html">types</a></td>
<td>0..1</td>
<td>A collection of <a href="types.html">types</a> associated
with the resource
(e.g. a jar file or a plugin definition).</td>
</tr>
<tr>
- <td>dependecies</td>
+ <td><a href="dependencies.html">dependencies</a></td>
<td>0..n</td>
<td>A collection of <a
href="dependencies.html">dependencies</a> that the resource has
with other resources.</td>

Modified: trunk/main/central/src/docs/depot/library/types.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/types.xml 2006-06-03 04:14:45
UTC (rev 1494)
+++ trunk/main/central/src/docs/depot/library/types.xml 2006-06-05 06:19:02
UTC (rev 1495)
@@ -100,33 +100,38 @@
</p>

<source><![CDATA[
-<project name="dpml-metro-runtime" basedir="runtime">
- <types>
- <type id="jar"/>
- <part:plugin alias="true"
class="net.dpml.metro.runtime.CompositionController">
- <part:param class="net.dpml.component.InitialContext"/>
- </part:plugin>
- </types>
- <dependencies>
- <runtime>
- <include ref="dpml/util/dpml-logging-api" tag="public"/>
- <include ref="dpml/metro/dpml-metro-component" tag="protected"/>
- <include ref="dpml/metro/dpml-metro-model" tag="protected"/>
- <include ref="dpml/metro/dpml-job-impl"/>
- <include ref="dpml/metro/dpml-state-impl"/>
- </runtime>
- <test>
- <include ref="ant/ant-junit"/>
- </test>
- </dependencies>
- <filters>
- <feature token="PART-HANDLER-URI" id="uri" type="part"/>
- <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
- <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part"/>
- <feature token="TYPE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-type"/>
- <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component"/>
- </filters>
-</project>
+ <project name="dpml-metro-runtime" basedir="runtime">
+ <info title="Metro Container Runtime">
+ <description>
+ DPML Component management platform runtime container.
+ </description>
+ </info>
+ <types>
+ <type id="jar"/>
+ <part:plugin alias="true"
class="net.dpml.metro.runtime.CompositionController">
+ <part:param class="net.dpml.component.InitialContext"/>
+ </part:plugin>
+ </types>
+ <dependencies>
+ <runtime>
+ <include ref="dpml/util/dpml-logging-api" tag="public"/>
+ <include ref="dpml/metro/dpml-metro-component" tag="protected"/>
+ <include ref="dpml/metro/dpml-metro-model" tag="protected"/>
+ <include ref="dpml/metro/dpml-job-impl"/>
+ <include ref="dpml/metro/dpml-state-impl"/>
+ </runtime>
+ <test>
+ <include ref="ant/ant-junit"/>
+ </test>
+ </dependencies>
+ <filters>
+ <feature token="PART-HANDLER-URI" id="uri" type="part"/>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state" alias="true"/>
+ <feature token="PART-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-part" alias="true"/>
+ <feature token="TYPE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-type" alias="true"/>
+ <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component" alias="true"/>
+ </filters>
+ </project>
]]></source>

</section>

Modified: trunk/main/depot/library/etc/data/samples/info.xml
===================================================================
--- trunk/main/depot/library/etc/data/samples/info.xml 2006-06-03 04:14:45
UTC (rev 1494)
+++ trunk/main/depot/library/etc/data/samples/info.xml 2006-06-05 06:19:02
UTC (rev 1495)
@@ -13,13 +13,13 @@
</info>
</module>
<module name="acme-3">
- <info>
- <description title="Widget"/>
+ <info title="Widget">
+ <description/>
</info>
</module>
<module name="acme-4">
- <info>
- <description title="Widget">
+ <info title="Widget">
+ <description>
An example of a widget.
</description>
</info>

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-06-03 04:14:45 UTC (rev 1494)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-06-05 06:19:02 UTC (rev 1495)
@@ -624,6 +624,7 @@
}
else
{
+ String title = ElementHelper.getAttribute( element, "title" );
Element child = ElementHelper.getChild( element, "description" );
if( null == child )
{
@@ -631,7 +632,6 @@
}
else
{
- String title = ElementHelper.getAttribute( child, "title" );
String value = ElementHelper.getValue( child );
String description = trim( value );
return new InfoDirective( title, description );

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
2006-06-03 04:14:45 UTC (rev 1494)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryEncoder.java
2006-06-05 06:19:02 UTC (rev 1495)
@@ -219,17 +219,17 @@
private void writeInfo(
Writer writer, InfoDirective info, String lead ) throws IOException
{
- writer.write( "\n" + lead + "<info>" );
- writer.write( "\n" + lead + " <description" );
+ writer.write( "\n" + lead + "<info" );
if( null != info.getTitle() )
{
writer.write( " title=\"" + info.getTitle() + "\"" );
}
String description = info.getDescription();
- if( null != info.getDescription() )
+ if( null != description )
{
writer.write( ">" );
- writer.write( "\n" + lead + " " + info.getDescription() );
+ writer.write( "\n" + lead + " <description>" );
+ writer.write( "\n" + lead + " " + description );
writer.write( "\n" + lead + " </description>" );
}
else

Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-06-03 04:14:45 UTC (rev
1494)
+++ trunk/main/lang/module/etc/module.xsd 2006-06-05 06:19:02 UTC (rev
1495)
@@ -148,18 +148,11 @@

<complexType name="InfoType">
<sequence>
- <element name="description" type="this:DescriptionType"
minOccurs="0" maxOccurs="1"/>
+ <element name="description" type="string" minOccurs="0"
maxOccurs="1"/>
</sequence>
+ <attribute name="title" type="string"/>
</complexType>

- <complexType name="DescriptionType">
- <simpleContent>
- <extension base="string">
- <attribute name="title" type="string"/>
- </extension>
- </simpleContent>
- </complexType>
-
<complexType name="RuntimeIncludeType">
<complexContent>
<extension base="this:IncludeType">

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-06-03 04:14:45 UTC (rev 1494)
+++ trunk/main/metro/module.xml 2006-06-05 06:19:02 UTC (rev 1495)
@@ -102,8 +102,8 @@
</project>

<project name="dpml-metro-runtime" basedir="runtime">
- <info>
- <description title="Metro Container Runtime">
+ <info title="Metro Container Runtime">
+ <description>
DPML Component management platform runtime container.
</description>
</info>
@@ -135,8 +135,8 @@
</project>

<project name="dpml-metro-tools" basedir="tools">
- <info>
- <description title="DPML Metro Tools">
+ <info title="DPML Metro Tools">
+ <description>
DPML extensions supporting the Ant build system for component
type and deployment data management
</description>

Added: trunk/main/transit/core/etc/data/plugin-xsi.xml
===================================================================
--- trunk/main/transit/core/etc/data/plugin-xsi.xml 2006-06-03 04:14:45
UTC (rev 1494)
+++ trunk/main/transit/core/etc/data/plugin-xsi.xml 2006-06-05 06:19:02
UTC (rev 1495)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<part xmlns="@PART-XSD-SPEC-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <info title="Demo Plugin">
+ <description>
+ Plugin descriptor using XMLSchema.
+ </description>
+ </info>
+
+ <strategy xsi:type="plugin" class="Widget"/>
+
+ <classpath>
+ <public>
+ <uri>link:jar:fred/blogs</uri>
+ <uri>link:jar:peter/rabbit</uri>
+ </public>
+ </classpath>
+
+</part>

Added: trunk/main/transit/core/etc/data/resource-xsi.xml
===================================================================
--- trunk/main/transit/core/etc/data/resource-xsi.xml 2006-06-03 04:14:45
UTC (rev 1494)
+++ trunk/main/transit/core/etc/data/resource-xsi.xml 2006-06-05 06:19:02
UTC (rev 1495)
@@ -0,0 +1,19 @@
+<?xml version="1.0"?>
+<part xmlns="@PART-XSD-SPEC-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
+
+ <info title="Demo Resource">
+ <description>
+ Resource descriptor using XMLSchema.
+ </description>
+ </info>
+
+ <strategy xsi:type="resource" urn="foo:bar" path="org/acme"/>
+
+ <classpath>
+ <public>
+ <uri>link:jar:fred/blogs</uri>
+ <uri>link:jar:peter/rabbit</uri>
+ </public>
+ </classpath>
+
+</part>

Modified: trunk/main/transit/core/etc/data/resource.xml
===================================================================
--- trunk/main/transit/core/etc/data/resource.xml 2006-06-03 04:14:45
UTC (rev 1494)
+++ trunk/main/transit/core/etc/data/resource.xml 2006-06-05 06:19:02
UTC (rev 1495)
@@ -7,7 +7,7 @@
</description>
</info>

- <strategy xsi:type="resource" urn="foo:bar" path="org/acme"/>
+ <resource urn="foo:bar" path="org/acme"/>

<classpath>
<public>

Modified: trunk/main/transit/core/src/test/net/dpml/lang/PartTestCase.java
===================================================================
--- trunk/main/transit/core/src/test/net/dpml/lang/PartTestCase.java
2006-06-03 04:14:45 UTC (rev 1494)
+++ trunk/main/transit/core/src/test/net/dpml/lang/PartTestCase.java
2006-06-05 06:19:02 UTC (rev 1495)
@@ -37,7 +37,7 @@
}

/**
- * Test the demo class.
+ * Test the loading of a part using the plugin strategy.
* @exception Exception if a error occurs during test execution
*/
public void testPlugin() throws Exception
@@ -46,7 +46,7 @@
}

/**
- * Test the demo class.
+ * Test the loading of a part using the resource strategy.
* @exception Exception if a error occurs during test execution
*/
public void testResource() throws Exception
@@ -54,13 +54,30 @@
evaluateDocument( "resource.xml" );
}

+ /**
+ * Test the loading of a part using the plugin strategy via an xsi type
reference.
+ * @exception Exception if a error occurs during test execution
+ */
+ public void testXsiPlugin() throws Exception
+ {
+ evaluateDocument( "plugin-xsi.xml" );
+ }
+
+ /**
+ * Test the loading of a part using the resource strategy via an xsi type
reference.
+ * @exception Exception if a error occurs during test execution
+ */
+ public void testXsiResource() throws Exception
+ {
+ evaluateDocument( "resource-xsi.xml" );
+ }
+
private void evaluateDocument( String path ) throws Exception
{
String base = System.getProperty( "project.test.dir" );
File test = new File( base );
File file = new File( test, path );
- System.out.println( "source: " + file + " (" + file.exists() + ")" );
-
+ //System.out.println( "source: " + file + " (" + file.exists() + ")"
);
Part part = Part.load( file.toURI() );
File out = new File( test, "export-" + path );
FileOutputStream output = new FileOutputStream( out );

r1495 - in trunk/main: central/src/docs/about/download central/src/docs/depot/library central/src/docs/depot/library/filters depot/library/etc/data/samples depot/library/src/main/net/dpml/library/info lang/module/etc metro transit/core/etc/data transit/core/src/test/net/dpml/lang, mcconnell at BerliOS, 06/05/2006