notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1440 - in trunk/main: . central/src/docs/depot/library central/src/docs/depot/library/data depot depot/library/etc/test/dpml depot/library/etc/test/samples depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/tasks lang/common/etc lang/module lang/module/etc lang/part/etc lang/process lang/process/etc lang/process/etc/test metro station transit/core/etc/test

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1440 - in trunk/main: . central/src/docs/depot/library central/src/docs/depot/library/data depot depot/library/etc/test/dpml depot/library/etc/test/samples depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/tasks lang/common/etc lang/module lang/module/etc lang/part/etc lang/process lang/process/etc lang/process/etc/test metro station transit/core/etc/test
Date: Sun, 14 May 2006 07:40:17 +0200

Author: mcconnell
Date: 2006-05-14 07:40:06 +0200 (Sun, 14 May 2006)
New Revision: 1440

Added:
trunk/main/central/src/docs/depot/library/data/
trunk/main/central/src/docs/depot/library/data/index.xml
trunk/main/central/src/docs/depot/library/data/navigation.xml

trunk/main/depot/library/src/main/net/dpml/library/info/GenericTypeDirective.java
Modified:
trunk/main/central/src/docs/depot/library/projects.xml
trunk/main/depot/library/etc/test/dpml/module.xml
trunk/main/depot/library/etc/test/samples/duplicates.xml
trunk/main/depot/library/etc/test/samples/example-8.xml
trunk/main/depot/library/etc/test/samples/filters.xml
trunk/main/depot/library/etc/test/samples/rmic.xml
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java

trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java

trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java

trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java

trunk/main/depot/library/src/test/net/dpml/library/info/ModuleDirectiveTestCase.java

trunk/main/depot/library/src/test/net/dpml/library/info/ResourceDirectiveTestCase.java
trunk/main/depot/module.xml
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
trunk/main/lang/common/etc/common.xsd
trunk/main/lang/module/build.xml
trunk/main/lang/module/etc/module.xsd
trunk/main/lang/part/etc/part.xsd
trunk/main/lang/process/build.xml
trunk/main/lang/process/etc/process.xsd
trunk/main/lang/process/etc/test/sample.xml
trunk/main/library.xml
trunk/main/metro/module.xml
trunk/main/station/module.xml
trunk/main/transit/core/etc/test/plugin.xml
Log:
moving forward with product/process model

Added: trunk/main/central/src/docs/depot/library/data/index.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/data/index.xml 2006-05-06
20:55:46 UTC (rev 1439)
+++ trunk/main/central/src/docs/depot/library/data/index.xml 2006-05-14
05:40:06 UTC (rev 1440)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<document>
+
+ <properties>
+ <author email="mcconnell AT dpml.net">Stephen McConnell</author>
+ <title>DPML Depot Type Production</title>
+ </properties>
+
+ <body>
+
+ <section name="Process Data">
+
+ <p>
+ </p>
+
+ <subsection name="XML Nested elements">
+
+ <table>
+ <tr>
+ <td></td>
+ <td>0..n</td>
+ <td></td>
+ </tr>
+ </table>
+
+ </subsection>
+
+ </section>
+
+ <section name="Example">
+
+ <p>
+ </p>
+
+<source>
+<![CDATA[
+]]></source>
+
+ </section>
+
+ </body>
+
+</document>
+
+
+

Added: trunk/main/central/src/docs/depot/library/data/navigation.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/data/navigation.xml
2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/central/src/docs/depot/library/data/navigation.xml
2006-05-14 05:40:06 UTC (rev 1440)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+
+<project>
+
+ <title>DPML Depot</title>
+
+ <body>
+
+ <menu>
+ </menu>
+
+ </body>
+
+</project>

Modified: trunk/main/central/src/docs/depot/library/projects.xml
===================================================================
--- trunk/main/central/src/docs/depot/library/projects.xml 2006-05-06
20:55:46 UTC (rev 1439)
+++ trunk/main/central/src/docs/depot/library/projects.xml 2006-05-14
05:40:06 UTC (rev 1440)
@@ -77,8 +77,10 @@
<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 project
- (e.g. a jar file or a plugin definition). The types declared
by a project
- can be viewed as the artifact produced by the project as a
result of a build.</td>
+ (e.g. a jar file, plugin, war, etc.). Each type declaration
asserted by a project
+ can be viewed as an artifact produced by the project as a
result of a build. When
+ a project declares a type, features of that type (such as the
filename) may be
+ accessed by build procedures associated to this or other
projects).</td>
</tr>
<tr>
<td><a href="dependencies.html">dependencies</a></td>
@@ -99,6 +101,12 @@
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>
@@ -111,13 +119,13 @@
The following example project is taken from the DPML Metro module. The
project
declares a basedir and the project name <tt>dpml-metro-runtime</tt>.
It declares
that it produces two artifacts - a jar file and a plugin part
definition. The part type
- is an example of a plugin declaration concaining nexted constructor
arguments.
+ is an example of a plugin declaration containing nexted constructor
arguments.
The project includes several dependencies collected under two groups -
the
first group maps to the projects <tt>RUNTIME</tt> dependencies and
second group maps
to <tt>TEST</tt> scoped dependencies. Within the runtime group the
dependencies
in this example are tagged with respect to classloader categories
<tt>PUBLIC</tt>,
<tt>PROTECTED</tt> or <tt>PRIVATE</tt> (the default). Runtime
dependency tags are
- used extensively in the creation of plugin metadata.
+ typically used in the creation of a classloader chains.
</p>

<source><![CDATA[

Modified: trunk/main/depot/library/etc/test/dpml/module.xml
===================================================================
--- trunk/main/depot/library/etc/test/dpml/module.xml 2006-05-06 20:55:46
UTC (rev 1439)
+++ trunk/main/depot/library/etc/test/dpml/module.xml 2006-05-14 05:40:06
UTC (rev 1440)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
<module xmlns="@MODULE-XSD-URI@"
xmlns:part="@PART-XSD-URI@"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
name="dpml" basedir=".." >

<properties>
@@ -157,7 +158,7 @@
<property name="project.template" value="${basedir}/builder.xml"/>
</properties>
<types>
- <part:plugin alias="true" class="net.dpml.lang.PartManager"/>
+ <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.lang.PartManager"/>
<type id="jar"/>
</types>
<dependencies>
@@ -217,7 +218,7 @@
</properties>
<types>
<type id="jar"/>
- <part:plugin
class="net.dpml.metro.runtime.edit.CompositionEditorFactory"/>
+ <type id="part" xsi:type="part:plugin"
class="net.dpml.metro.runtime.edit.CompositionEditorFactory"/>
</types>
<dependencies>
<runtime>
@@ -233,7 +234,7 @@
</properties>
<types>
<type id="jar"/>
- <part:plugin alias="true"
class="net.dpml.metro.runtime.CompositionController"/>
+ <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.metro.runtime.CompositionController"/>
</types>
<dependencies>
<runtime>
@@ -253,7 +254,7 @@
</properties>
<types>
<type id="jar"/>
- <part:resource urn="dpml:metro"
path="net/dpml/composition/tools/antlib.xml"/>
+ <type id="part" xsi:type="part:resource" urn="dpml:metro"
path="net/dpml/composition/tools/antlib.xml"/>
</types>
<dependencies>
<runtime>
@@ -323,7 +324,7 @@
</properties>
<types>
<type id="jar"/>
- <part:plugin alias="true"
class="net.dpml.library.impl.BuildPlugin"/>
+ <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.library.impl.BuildPlugin"/>
</types>
<dependencies>
<runtime>
@@ -342,7 +343,7 @@
</properties>
<types>
<type id="jar"/>
- <part:plugin alias="true"
class="net.dpml.tools.impl.StandardBuilder"/>
+ <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.tools.impl.StandardBuilder"/>
</types>
<dependencies>
<runtime>

Modified: trunk/main/depot/library/etc/test/samples/duplicates.xml
===================================================================
--- trunk/main/depot/library/etc/test/samples/duplicates.xml 2006-05-06
20:55:46 UTC (rev 1439)
+++ trunk/main/depot/library/etc/test/samples/duplicates.xml 2006-05-14
05:40:06 UTC (rev 1440)
@@ -7,18 +7,18 @@
<module name="acme">
<resource name="widget">
<types>
- <type id="foo">
+ <type id="foo" xsi:type="GenericType">
<property name="pink" value="floyd"/>
<property name="alice" value="cooper"/>
</type>
- <part:plugin class="Widget"/>
+ <type id="part" xsi:type="part:plugin" class="Widget"/>
</types>
</resource>
</module>
<module name="acme">
<resource name="gizmo">
<types>
- <part:plugin class="gizmo"/>
+ <type id="part" xsi:type="part:plugin" class="gizmo"/>
</types>
</resource>
</module>

Modified: trunk/main/depot/library/etc/test/samples/example-8.xml
===================================================================
--- trunk/main/depot/library/etc/test/samples/example-8.xml 2006-05-06
20:55:46 UTC (rev 1439)
+++ trunk/main/depot/library/etc/test/samples/example-8.xml 2006-05-14
05:40:06 UTC (rev 1440)
@@ -12,14 +12,30 @@
<module name="acme">
<resource name="widget">
<types>
- <type id="foo">
+ <type id="foo" xsi:type="GenericType">
<property name="pink" value="floyd"/>
<property name="alice" value="cooper"/>
</type>
- <part:plugin class="Widget"/>
+ <type xsi:type="part:plugin" class="Widget"/>
</types>
</resource>
</module>
</modules>
+
+ 

</library>

Modified: trunk/main/depot/library/etc/test/samples/filters.xml
===================================================================
--- trunk/main/depot/library/etc/test/samples/filters.xml 2006-05-06
20:55:46 UTC (rev 1439)
+++ trunk/main/depot/library/etc/test/samples/filters.xml 2006-05-14
05:40:06 UTC (rev 1440)
@@ -5,18 +5,14 @@

<modules>
<module name="acme">
- <data>
+ <filters>
+ <filter token="PUBLISHER" value="ACME"/>
+ </filters>
+ <project name="widget" basedir=".">
<filters>
- <filter token="PUBLISHER" value="ACME"/>
+ <filter token="NAME" value="Widget"/>
+ <filter token="DESCRIPTION" value="A Widget."/>
</filters>
- </data>
- <project name="widget" basedir=".">
- <data>
- <filters>
- <filter token="NAME" value="Widget"/>
- <filter token="DESCRIPTION" value="A Widget."/>
- </filters>
- </data>
</project>
</module>
</modules>

Modified: trunk/main/depot/library/etc/test/samples/rmic.xml
===================================================================
--- trunk/main/depot/library/etc/test/samples/rmic.xml 2006-05-06 20:55:46
UTC (rev 1439)
+++ trunk/main/depot/library/etc/test/samples/rmic.xml 2006-05-14 05:40:06
UTC (rev 1440)
@@ -1,18 +1,19 @@
<?xml version="1.0"?>

-<library xmlns="@MODULE-XSD-URI@">
+<library xmlns="@MODULE-XSD-URI@"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>

<modules>
<module name="acme">
- <data>
- <rmic>
+ <types>
+ <data xsi:type="RMICType">
<include name="red"/>
<include name="white"/>
<include name="blue"/>
<exclude name="pink"/>
<exclude name="magenta"/>
- </rmic>
- </data>
+ </data>
+ </types>
</module>
</modules>

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -410,12 +410,11 @@
InfoDirective info = m_directive.getInfoDirective();
TypeDirective[] types = m_directive.getTypeDirectives();
TypeDirective[] exportedTypes = createExportedTypes( types );
- //Properties properties = module.getExportProperties(); // <-- why
the module?
Properties properties = getExportProperties();
return new ModuleDirective(
name, version, Classifier.EXTERNAL, basedir,
info, exportedTypes, new DependencyDirective[0],
- directives, properties, null );
+ directives, properties, null, null );
}

//----------------------------------------------------------------------------

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -188,17 +188,12 @@
setProperty( "project.version", getVersion() );
}

- FiltersDirective filtersDirective =
- (FiltersDirective) directive.getDataDirective( "filters" );
- if( null != filtersDirective )
+ FilterDirective[] filters = directive.getFilterDirectives();
+ for( int i=0; i<filters.length; i++ )
{
- FilterDirective[] filters =
filtersDirective.getFilterDirectives();
- for( int i=0; i<filters.length; i++ )
- {
- FilterDirective filter = filters[i];
- String token = filter.getToken();
- m_filters.put( token, filter );
- }
+ FilterDirective filter = filters[i];
+ String token = filter.getToken();
+ m_filters.put( token, filter );
}
}

@@ -631,7 +626,7 @@
Properties properties = getExportProperties();
return ResourceDirective.createResourceDirective(
name, version, Classifier.EXTERNAL, basedir,
- info, exportedTypes, dependencies, properties, null );
+ info, exportedTypes, dependencies, properties, null, null );
}

TypeDirective[] createExportedTypes( TypeDirective[] types )

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -20,31 +20,67 @@

import net.dpml.lang.AbstractDirective;

+import org.w3c.dom.Element;
+
/**
* Base class for a data directives.
*
* @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
* @version @PROJECT-VERSION@
*/
-public abstract class DataDirective extends AbstractDirective
+public class DataDirective extends AbstractDirective
{
- private final String m_id;
+ private final Element m_element;

/**
- * Creation of a new data directive.
- * @param id the unique datatype key
+ * Creation of a new data directive using a DOM element as the
+ * datastructure definition.
+ * @param element the DOM element
*/
- public DataDirective( String id )
+ public DataDirective( Element element )
{
- m_id = id;
+ if( null == element )
+ {
+ throw new NullPointerException( "element" );
+ }
+ m_element = element;
}

/**
- * Return the datatype id.
- * @return the id
+ * Return the datatype element.
+ * @return the DOM element
*/
- public String getID()
+ public String getElement()
{
- return m_id;
+ return m_element;
}
+
+ /**
+ * Compare this object with another for equality.
+ * @param other the other object
+ * @return true if equal
+ */
+ public boolean equals( Object other )
+ {
+ if( super.equals( other ) && ( other instanceof DataDirective ) )
+ {
+ DataDirective object = (DataDirective) other;
+ return m_element.equals( object.m_element );
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Compute the hash value.
+ * @return the hascode value
+ */
+ public int hashCode()
+ {
+ int hash = super.hashCode();
+ hash ^= m_element.hashCode();
+ return hash;
+ }
}

Added:
trunk/main/depot/library/src/main/net/dpml/library/info/GenericTypeDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/GenericTypeDirective.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/GenericTypeDirective.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2005 Stephen J. McConnell
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package net.dpml.library.info;
+
+import java.util.Properties;
+
+import org.w3c.dom.Element;
+
+/**
+ * Definition of a generic type production assertion.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class GenericTypeDirective extends TypeDirective
+{
+ private final Properties m_properties;
+
+ /**
+ * Creation of a new generic type directive.
+ * @param element the DOM element definition
+ * @param id the type identifier
+ */
+ public GenericTypeDirective( Element element, String id, Properties
properties )
+ {
+ this( element, id, false, properties );
+ }
+
+ /**
+ * Creation of a new generic type directive.
+ * @param element the DOM element definition
+ * @param id the type identifier
+ * @param alias alias production policy
+ */
+ public GenericTypeDirective( Element element, String id, boolean alias,
Properties properties )
+ {
+ super( element, id, alias );
+
+ if( null == properties )
+ {
+ m_properties = new Properties();
+ }
+ else
+ {
+ m_properties = properties;
+ }
+ }
+
+ /**
+ * Return the associated type properties.
+ * @return the properties
+ */
+ public Properties getProperties()
+ {
+ return m_properties;
+ }
+
+ /**
+ * Compare this object with another for equality.
+ * @param other the other object
+ * @return true if equal
+ */
+ public boolean equals( Object other )
+ {
+ if( super.equals( other ) && ( other instanceof GenericTypeDirective
) )
+ {
+ GenericTypeDirective object = (GenericTypeDirective) other;
+ return m_properties.equals( object.m_properties );
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Compute the hash value.
+ * @return the hashcode value
+ */
+ public int hashCode()
+ {
+ int hash = super.hashCode();
+ hash ^= m_properties.hashCode();
+ return hash;
+ }
+}

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-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDecoder.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -596,6 +596,10 @@
buildDependencyDirectives(
ElementHelper.getChild( element, "dependencies" ) );

+ final FilterDirective[] filters =
+ buildFilterDirectives(
+ ElementHelper.getChild( element, "filters" ) );
+
final DataDirective[] data =
buildDataDirectives(
ElementHelper.getChild( element, "data" ) );
@@ -627,13 +631,13 @@
(ResourceDirective[]) list.toArray( new
ResourceDirective[0] );
return ModuleDirective.createModuleDirective(
name, version, classifier, basedir, info, types,
dependencies,
- properties, data, resources );
+ properties, filters, data, resources );
}
else
{
return ResourceDirective.createResourceDirective(
name, version, classifier, basedir, info, types,
dependencies,
- properties, data );
+ properties, filters, data );
}
}
else
@@ -713,12 +717,17 @@
else if( MODULE_XSD_URI.equals( namespace ) )
{
String tag = element.getTagName();
- if( FiltersDirective.KEY.equals( tag ) )
+ //if( FiltersDirective.KEY.equals( tag ) )
+ //{
+ // return buildFiltersDirective( element );
+ //}
+ //else
+
+ // TODO: rework all of the following to allow for arbitrary
process
+ // parameters
+
+ if( RMICDirective.KEY.equals( tag ) )
{
- return buildFiltersDirective( element );
- }
- else if( RMICDirective.KEY.equals( tag ) )
- {
return buildRMICDirective( element );
}
else
@@ -761,6 +770,48 @@
return patterns;
}

+ private FilterDirective[] buildFilterDirectives( Element element )
throws Exception
+ {
+ if( null == element )
+ {
+ return new FilterDirective[0];
+ }
+ else
+ {
+ Element[] children = ElementHelper.getChildren( element );
+ FilterDirective[] filters = new FilterDirective[ children.length
];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element child = children[i];
+ String token = ElementHelper.getAttribute( child, "token" );
+ if( "filter".equals( child.getTagName() ) )
+ {
+ String value = ElementHelper.getAttribute( child,
"value" );
+ filters[i] = new SimpleFilterDirective( token, value );
+ }
+ else if( "feature".equals( child.getTagName() ) )
+ {
+ String id = ElementHelper.getAttribute( child, "id" );
+ Feature feature = Feature.parse( id );
+ String ref = ElementHelper.getAttribute( child, "ref" );
+ String type = ElementHelper.getAttribute( child, "type"
);
+ boolean alias = ElementHelper.getBooleanAttribute(
child, "alias" );
+ filters[i] = new FeatureFilterDirective( token, ref,
feature, type, alias );
+ }
+ else
+ {
+ final String error =
+ "Element name not recognized ["
+ + child.getTagName()
+ + "] (expecting 'filter').";
+ throw new DecodingException( element, error );
+ }
+ }
+ return filters;
+ }
+ }
+
+ /*
private FiltersDirective buildFiltersDirective( Element element ) throws
Exception
{
if( null == element )
@@ -801,6 +852,7 @@
return new FiltersDirective( filters );
}
}
+ */

private TypeDirective[] buildTypes( Element element ) throws Exception
{
@@ -822,55 +874,81 @@
{
TypeInfo info = element.getSchemaTypeInfo();
String namespace = info.getTypeNamespace();
+ String typeName = info.getTypeName();
if( null == namespace )
{
throw new NullPointerException( "namespace" );
}
- String typeName = info.getTypeName();
- if( info.isDerivedFrom( COMMON_XSD_URI, "AbstractType",
TypeInfo.DERIVATION_EXTENSION ) )
+ else if( COMMON_XSD_URI.equals( namespace ) )
{
- final boolean alias = getAliasFlag( element );
- if( MODULE_XSD_URI.equals( namespace ) )
+ if( "AbstractType".equals( typeName ) )
{
- if( "GenericType".equals( typeName ) )
- {
- final String id = getID( element );
- final Properties properties = getProperties( element );
- return new TypeDirective( id, alias, properties );
- }
- else
- {
- final String error =
- "Element namespace is recognized as within the module
definition "
- + " however the type identifier is not recognized."
- + "\nNamespace: "
- + namespace
- + "\nType Name: "
- + info.getTypeName();
- throw new DecodingException( element, error );
- }
+ final String id = getID( element );
+ final boolean alias = getAliasFlag( element );
+ return new TypeDirective( id, alias );
}
- else if( info.isDerivedFrom( PART_XSD_URI, "StrategyType",
TypeInfo.DERIVATION_EXTENSION ) )
+ else
{
- return new TypeDirective( "part", alias, element );
+ final String error =
+ "Cannot create type bacause the element type is
unrecognized."
+ + "\nNamespace: "
+ + namespace
+ + "\nType Name: "
+ + info.getTypeName();
+ throw new DecodingException( element, error );
}
+ }
+ else if( MODULE_XSD_URI.equals( namespace ) )
+ {
+ if( "GenericType".equals( typeName ) )
+ {
+ final String id = getID( element );
+ final boolean alias = getAliasFlag( element );
+ final Properties properties = getProperties( element );
+ return new TypeDirective( id, alias, properties );
+ }
+ else if( "RMICType".equals( typeName ) )
+ {
+ final String error =
+ "RMIC element support is not implemented."
+ + "\nNamespace: "
+ + namespace
+ + "\nType: "
+ + info.getTypeName();
+ throw new DecodingException( element, error );
+ }
else
{
final String error =
- "Element type is invalid."
+ "Cannot create type bacause the element type is
unrecognized."
+ "\nNamespace: "
+ namespace
- + "\nElement Type Name: "
+ + "\nType Name: "
+ info.getTypeName();
throw new DecodingException( element, error );
}
}
+ else if( PART_XSD_URI.equals( namespace ) )
+ {
+ final boolean alias = getAliasFlag( element );
+ return new TypeDirective( "part", alias, element );
+ }
+ else if( info.isDerivedFrom( COMMON_XSD_URI, "AbstractType",
TypeInfo.DERIVATION_EXTENSION ) )
+ {
+ final String id = getID( element );
+ final boolean alias = getAliasFlag( element );
+ return new TypeDirective( id, alias, element );
+ }
else
{
final String error =
- "Element is not derived from the schema type 'AbstractType'
defined under the common namespace."
- + "\nNamespace: " + namespace
- + "\nElement Name (from Schema Info): " + info.getTypeName();
+ "Unsupported element type encountered in tpe directive
production."
+ + "\nNamespace: "
+ + namespace
+ + "\nType: "
+ + info.getTypeName()
+ + "\nName: "
+ + element.getTagName();
throw new DecodingException( element, error );
}
}

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -52,7 +52,8 @@
String name, String version, Classifier classifier, String basedir,
InfoDirective info, TypeDirective[] types,
DependencyDirective[] dependencies, Properties properties,
- DataDirective[] data, ResourceDirective[] resources )
+ FilterDirective[] filters, DataDirective[] data,
+ ResourceDirective[] resources )
{
int n = name.indexOf( "/" );
if( n > -1 )
@@ -67,7 +68,7 @@
enclosing =
new ModuleDirective(
elem, version, classifier, basedir, info, types,
dependencies,
- resources, properties, data );
+ resources, properties, filters, data );
}
else
{
@@ -75,7 +76,7 @@
new ModuleDirective(
elem, null, Classifier.EXTERNAL, ".", null,
new TypeDirective[0], new DependencyDirective[0],
- new ResourceDirective[]{enclosing}, null, null );
+ new ResourceDirective[]{enclosing}, null, null, null
);
}
}
return enclosing;
@@ -84,7 +85,7 @@
{
return new ModuleDirective(
name, version, classifier, basedir, info, types, dependencies,
- resources, properties, data );
+ resources, properties, filters, data );
}
}

@@ -100,7 +101,7 @@
this(
name, null, Classifier.ANONYMOUS, null, null,
new TypeDirective[0], new DependencyDirective[0],
- new ResourceDirective[]{resource}, null, null );
+ new ResourceDirective[]{resource}, null, null, null );
}

/**
@@ -120,9 +121,9 @@
String name, String version, Classifier classifier, String basedir,
InfoDirective info, TypeDirective[] types,
DependencyDirective[] dependencies, ResourceDirective[] resources,
- Properties properties, DataDirective[] data )
+ Properties properties, FilterDirective[] filters, DataDirective[] data
)
{
- super( name, version, classifier, basedir, info, types,
dependencies, properties, data );
+ super( name, version, classifier, basedir, info, types,
dependencies, properties, filters, data );

if( null == resources )
{

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -50,10 +50,11 @@
private final String m_name;
private final String m_version;
private final String m_basedir;
- private final TypeDirective[] m_types;
+ private final DataDirective[] m_types;
+ private final DataDirective[] m_data;
private final DependencyDirective[] m_dependencies;
private final Classifier m_classifier;
- private final DataDirective[] m_data;
+ private final FilterDirective[] m_filters;
private final InfoDirective m_info;

/**
@@ -69,11 +70,11 @@
{
return createResourceDirective(
name, version, Classifier.ANONYMOUS, null,
- null, new TypeDirective[]{new TypeDirective( type )},
+ null, new DataDirective[]{new TypeDirective( type )},
new DependencyDirective[0],
properties, null );
}
-
+
/**
* Creation of a new resource directive. If the resource name if
composite
* then the resource directive will be a module directive instance that
either
@@ -87,46 +88,47 @@
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
+ * @param filters project filters
* @param data supporting production data
* @return the immediate enclosing resource
*/
public static ResourceDirective createResourceDirective(
String name, String version, Classifier classifier, String basedir,
- InfoDirective info, TypeDirective[] types,
+ InfoDirective info, DataDirective[] types,
DependencyDirective[] dependencies, Properties properties,
- DataDirective[] data )
+ FilterDirective[] filters )
{
int n = name.indexOf( "/" );
if( n > -1 )
{
- ResourceDirective enclosing = null;
+ ResourceDirective resource = null;
String[] elements = name.split( "/", -1 );
for( int i = ( elements.length-1 ); i>-1; i-- )
{
String elem = elements[i];
if( i == ( elements.length-1 ) )
{
- enclosing =
+ resource =
new ResourceDirective(
elem, version, classifier, basedir, info, types,
dependencies,
- properties, data );
+ properties, filters );
}
else
{
- enclosing =
+ resource =
new ModuleDirective(
elem, null, Classifier.EXTERNAL, ".", null,
- new TypeDirective[0], new DependencyDirective[0],
- new ResourceDirective[]{enclosing}, null, null );
+ new DataDirective[0], new DependencyDirective[0],
+ new ResourceDirective[]{resource}, null, null );
}
}
- return enclosing;
+ return resource;
}
else
{
return new ResourceDirective(
name, version, classifier, basedir, info, types,
- dependencies, properties, data );
+ dependencies, properties, filters );
}
}

@@ -137,16 +139,16 @@
* @param classifier LOCAL or EXTERNAL classifier
* @param basedir the project basedir
* @param info info descriptor
- * @param types types produced by the resource
+ * @param data type production data
* @param dependencies resource dependencies
* @param properties suppliementary properties
- * @param data supporting production data
+ * @param filters suppliementary filters
*/
ResourceDirective(
String name, String version, Classifier classifier, String basedir,
- InfoDirective info, TypeDirective[] types,
+ InfoDirective info, DataDirective[] data,
DependencyDirective[] dependencies, Properties properties,
- DataDirective[] data )
+ FilterDirective[] filters )
{
super( properties );

@@ -181,17 +183,28 @@
m_info = info;
}

- m_types = types;
m_dependencies = dependencies;

- if( null == data )
+ if( null == filters )
{
- m_data = new DataDirective[0];
+ m_filters = new FilterDirective[0];
}
else
{
- m_data = data;
+ m_filters = filters;
}
+
+ ArrayList list = new ArrayList();
+ for( int i=0; i<types.length; i++ )
+ {
+ DataDrective directive = types[i];
+ if( directive instanceof TypeDirective )
+ {
+ list.add( directive );
+ }
+ }
+ m_types = (TypeDirective[]) list.toArray( new TypeDirective[0] );
+ m_data = types;
}

/**
@@ -268,30 +281,22 @@
}

/**
- * Return an array of supporting production data directives.
- * @return the data directives
+ * Return an array of supplimentary filter directives.
+ * @return the filter directives
*/
- public DataDirective[] getDataDirectives()
+ public FilterDirective[] getFilterDirectives()
{
- return m_data;
+ return m_filters;
}

/**
- * Return a data directive mathching the supplied key.
- * @param key the datatype key
- * @return the data directive or null if unknown
+ * Return an array of supporting production data directives
+ * (including all produced types).
+ * @return the data directives
*/
- public DataDirective getDataDirective( String key )
+ public DataDirective[] getDataDirectives()
{
- for( int i=0; i<m_data.length; i++ )
- {
- DataDirective data = m_data[i];
- if( key.equals( data.getID() ) )
- {
- return data;
- }
- }
- return null;
+ return m_data;
}

/**

Modified:
trunk/main/depot/library/src/test/net/dpml/library/info/ModuleDirectiveTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/info/ModuleDirectiveTestCase.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/test/net/dpml/library/info/ModuleDirectiveTestCase.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -38,13 +38,13 @@

MODULES[0] = new ModuleDirective(
"aaa", "1.1", ResourceDirective.LOCAL, ".", info, types,
- dependencies, resources, PROPERTIES, null );
+ dependencies, resources, PROPERTIES, null, null );
MODULES[1] = new ModuleDirective(
"bbb", "1.1", ResourceDirective.LOCAL, ".", info, types,
- dependencies, resources, PROPERTIES, null );
+ dependencies, resources, PROPERTIES, null, null );
MODULES[2] = new ModuleDirective(
"ccc", "1.1", ResourceDirective.LOCAL, ".", info, types,
- dependencies, resources, PROPERTIES, null );
+ dependencies, resources, PROPERTIES, null, null );
}

private final Classifier m_classifier = ResourceDirective.LOCAL;
@@ -55,6 +55,7 @@
private final TypeDirective[] m_types = TypeDirectiveTestCase.TYPES;
private final DependencyDirective[] m_dependencies =
DependencyDirectiveTestCase.DEPENDENCIES;
private final ResourceDirective[] m_resources =
ResourceDirectiveTestCase.RESOURCES;
+ private final FilterDirective[] m_filters = new FilterDirective[0];
private final DataDirective[] m_data = new DataDirective[0];

private ModuleDirective m_module;
@@ -67,7 +68,8 @@
{
m_module =
new ModuleDirective(
- m_name, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_data );
+ m_name, m_version, m_classifier, "test", m_info, m_types,
m_dependencies,
+ m_resources, PROPERTIES, m_filters, m_data );
}

/**
@@ -79,7 +81,8 @@
try
{
new ModuleDirective(
- null, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_data );
+ null, m_version, m_classifier, "test", m_info, m_types,
+ m_dependencies, m_resources, PROPERTIES, m_filters, m_data );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -97,7 +100,8 @@
try
{
new ModuleDirective(
- m_name, null, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_data );
+ m_name, null, m_classifier, "test", m_info, m_types,
m_dependencies,
+ m_resources, PROPERTIES, m_filters, m_data );
}
catch( NullPointerException e )
{
@@ -114,7 +118,8 @@
try
{
new ModuleDirective(
- m_name, m_version, m_classifier, "test", m_info, m_types,
null, m_resources, PROPERTIES, m_data );
+ m_name, m_version, m_classifier, "test", m_info, m_types,
null,
+ m_resources, PROPERTIES, m_filters, m_data );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -132,7 +137,8 @@
try
{
new ModuleDirective(
- m_name, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, null, PROPERTIES, m_data );
+ m_name, m_version, m_classifier, "test", m_info, m_types,
+ m_dependencies, null, PROPERTIES, m_filters, m_data );
fail( "no-NPE" );
}
catch( NullPointerException e )

Modified:
trunk/main/depot/library/src/test/net/dpml/library/info/ResourceDirectiveTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/info/ResourceDirectiveTestCase.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/library/src/test/net/dpml/library/info/ResourceDirectiveTestCase.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -34,18 +34,19 @@
static final TypeDirective[] TYPES = TypeDirectiveTestCase.TYPES;
static final ResourceDirective[] RESOURCES = new ResourceDirective[3];
static final DataDirective[] DATA = new DataDirective[0];
+ static final FilterDirective[] FILTERS = new FilterDirective[0];

static
{
RESOURCES[0] =
new ResourceDirective(
- "fred", null, CLASSIFIER, "example/fred", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "fred", null, CLASSIFIER, "example/fred", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
RESOURCES[1] =
new ResourceDirective(
- "george", "1.3.0", CLASSIFIER, "example/george", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "george", "1.3.0", CLASSIFIER, "example/george", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
RESOURCES[2] =
new ResourceDirective(
- "mary", "2.7", CLASSIFIER, "example/mary", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "mary", "2.7", CLASSIFIER, "example/mary", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
}

/**
@@ -58,7 +59,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- null, "1.0", CLASSIFIER, "test", INFO, TYPES, DEPENDENCIES,
PROPERTIES, DATA );
+ null, "1.0", CLASSIFIER, "test", INFO, TYPES, DEPENDENCIES,
PROPERTIES, FILTERS, DATA );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -77,7 +78,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "fred", "1.0", CLASSIFIER, "test", INFO, null, DEPENDENCIES,
PROPERTIES, DATA );
+ "fred", "1.0", CLASSIFIER, "test", INFO, null, DEPENDENCIES,
PROPERTIES, FILTERS, DATA );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -96,7 +97,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "fred", "1.0", CLASSIFIER, "test", INFO, TYPES, null,
PROPERTIES, DATA );
+ "fred", "1.0", CLASSIFIER, "test", INFO, TYPES, null,
PROPERTIES, FILTERS, DATA );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -112,7 +113,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
assertEquals( "name", "resource", resource.getName() );
}

@@ -123,7 +124,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
assertEquals( "version", "2.7", resource.getVersion() );
}

@@ -134,7 +135,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
assertEquals( "basedir", "test", resource.getBasedir() );
}

@@ -145,7 +146,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
assertEquals( "types", 3, resource.getTypeDirectives().length );
}

@@ -156,7 +157,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
assertEquals( "dependencies", 3,
resource.getDependencyDirectives().length );
}

@@ -167,7 +168,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
assertEquals( "properties", PROPERTIES, resource.getProperties() );
}

@@ -179,7 +180,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS, DATA );
doSerializationTest( resource );
}
}

Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/depot/module.xml 2006-05-14 05:40:06 UTC (rev 1440)
@@ -21,7 +21,8 @@
<project name="dpml-library-build" basedir="build">
<types>
<type id="jar"/>
- <part:plugin alias="true"
class="net.dpml.library.console.BuilderPlugin"/>
+ <type id="part" xsi:type="part:plugin" alias="true"
class="net.dpml.library.console.BuilderPlugin"/>
+ 
</types>
<dependencies>
<runtime>
@@ -33,11 +34,9 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
- <data>
- <filters>
- <feature token="ANT-BUILDER-URI" ref="dpml/depot/dpml-tools-builder"
id="uri" type="part"/>
- </filters>
- </data>
+ <filters>
+ <feature token="ANT-BUILDER-URI" ref="dpml/depot/dpml-tools-builder"
id="uri" type="part"/>
+ </filters>
</project>

<project name="dpml-depot-console" basedir="core">
@@ -58,22 +57,20 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
- <data>
- <filters>
- <filter token="DEPOT-PATH" value="${depot.short.filename}"/>
- <filter token="DEPOT-MAIN-CLASS" value="${project.jar.main.class}"/>
- <filter token="TRANSIT-PATH" value="${transit.short.filename}"/>
- <filter token="DEPOT-CLASSLOADER-CLASS"
value="net.dpml.lang.SystemClassLoader"/>
- <feature token="BUILD-ID" id="version"/>
- <feature token="DEPOT-CONSOLE-URI" id="uri" type="jar"/>
- <feature token="TRANSIT-CORE-URI" id="uri" type="jar"
ref="dpml/transit/dpml-transit-main" />
- <feature token="TRANSIT-CONSOLE-URI" id="uri" type="part"
alias="true" ref="dpml/transit/dpml-transit-console" />
- <feature token="DEPOT-BUILDER-URI" id="uri" type="part" alias="true"
ref="dpml/depot/dpml-library-build" />
- <feature token="DEPOT-EXEC-URI" id="uri" type="part" alias="true"
ref="dpml/station/dpml-station-exec" />
- <feature token="DEPOT-STATION-URI" id="uri" type="part" alias="true"
ref="dpml/station/dpml-station-console" />
- <feature token="DEPOT-STATION-SERVER-URI" id="uri" type="part"
alias="true" ref="dpml/station/dpml-station-server" />
- </filters>
- </data>
+ <filters>
+ <filter token="DEPOT-PATH" value="${depot.short.filename}"/>
+ <filter token="DEPOT-MAIN-CLASS" value="${project.jar.main.class}"/>
+ <filter token="TRANSIT-PATH" value="${transit.short.filename}"/>
+ <filter token="DEPOT-CLASSLOADER-CLASS"
value="net.dpml.lang.SystemClassLoader"/>
+ <feature token="BUILD-ID" id="version"/>
+ <feature token="DEPOT-CONSOLE-URI" id="uri" type="jar"/>
+ <feature token="TRANSIT-CORE-URI" id="uri" type="jar"
ref="dpml/transit/dpml-transit-main" />
+ <feature token="TRANSIT-CONSOLE-URI" id="uri" type="part" alias="true"
ref="dpml/transit/dpml-transit-console" />
+ <feature token="DEPOT-BUILDER-URI" id="uri" type="part" alias="true"
ref="dpml/depot/dpml-library-build" />
+ <feature token="DEPOT-EXEC-URI" id="uri" type="part" alias="true"
ref="dpml/station/dpml-station-exec" />
+ <feature token="DEPOT-STATION-URI" id="uri" type="part" alias="true"
ref="dpml/station/dpml-station-console" />
+ <feature token="DEPOT-STATION-SERVER-URI" id="uri" type="part"
alias="true" ref="dpml/station/dpml-station-server" />
+ </filters>
</project>

<resource name="dpml-tools-builder" basedir="tools/builder">

Modified:
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
===================================================================
---
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
2006-05-06 20:55:46 UTC (rev 1439)
+++
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
2006-05-14 05:40:06 UTC (rev 1440)
@@ -194,6 +194,7 @@
Info info = getInfo( resource );
Classpath classpath = getClasspath( resource );
Type type = resource.getType( TYPE );
+
Element element = type.getElement();
PartDecoder decoder = PartDecoder.getInstance();
return decoder.build( info, classpath, element );

Modified: trunk/main/lang/common/etc/common.xsd
===================================================================
--- trunk/main/lang/common/etc/common.xsd 2006-05-06 20:55:46 UTC (rev
1439)
+++ trunk/main/lang/common/etc/common.xsd 2006-05-14 05:40:06 UTC (rev
1440)
@@ -11,24 +11,35 @@
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">

- <element name="data" type="common:AbstractData" abstract="true"/>
+ <element name="codebase" type="common:CodeBaseType" abstract="true"/>
<element name="type" type="common:AbstractType" abstract="true"/>
- <element name="codebase" type="common:CodeBaseType" abstract="true"/>
+
+ 

+ 

+ 

+ <complexType name="AbstractType">
+ <attribute name="id" type="string"/>
+ <attribute name="alias" type="boolean" default="false"/>
+ </complexType>
+
<complexType name="CodeBaseType" abstract="true">
<attribute name="uri" type="anyURI"/>
</complexType>

Modified: trunk/main/lang/module/build.xml
===================================================================
--- trunk/main/lang/module/build.xml 2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/lang/module/build.xml 2006-05-14 05:40:06 UTC (rev 1440)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>

+ 
+ 

<complexType name="LibraryType">
<all>
@@ -78,7 +78,8 @@
<complexContent>
<extension base="this:ResourceType">
<sequence>
- <element name="data" type="this:DataType" minOccurs="0"
maxOccurs="1"/>
+ <element name="filters" type="this:FiltersType" minOccurs="0"
maxOccurs="1"/>
+ 
</sequence>
</extension>
</complexContent>
@@ -98,16 +99,24 @@
</complexType>

<complexType name="TypesType">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element name="type" type="common:AbstractType"/>
+ <element name="data" type="anyType"/>
+ </choice>
+ 
</complexType>

+ 

<complexType name="GenericType">
<complexContent>
@@ -115,7 +124,7 @@
<sequence>
<element name="property" type="this:PropertyType" minOccurs="0"
maxOccurs="unbounded"/>
</sequence>
- <attribute name="id" type="string" use="required"/>
+ 
</extension>
</complexContent>
</complexType>
@@ -192,6 +201,7 @@
</complexContent>
</complexType>

+ 

+ <complexType name="PatternCollectionType">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element name="include" type="this:IncludePatternType"/>
+ <element name="exclude" type="this:ExcludePatternType"/>
+ </choice>
+ </complexType>
+
<complexType name="IncludePatternType">
<simpleContent>
<extension base="string">
@@ -219,7 +237,7 @@
</simpleContent>
</complexType>

-
+ 
+
+ <complexType name="FiltersType">
+ <choice minOccurs="0" maxOccurs="unbounded">
+ <element name="filter" type="this:Filter"/>
+ <element name="feature" type="this:Feature"/>
+ </choice>
+ </complexType>
+
<complexType name="AbstractFilter" abstract="true">
- <complexContent>
- <restriction base="xsd:anyType">
- <attribute name="token" type="string" use="required"/>
- </restriction>
- </complexContent>
+ <attribute name="token" type="string" use="required"/>
</complexType>

<complexType name="Filter">

Modified: trunk/main/lang/part/etc/part.xsd
===================================================================
--- trunk/main/lang/part/etc/part.xsd 2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/lang/part/etc/part.xsd 2006-05-14 05:40:06 UTC (rev 1440)
@@ -40,7 +40,7 @@
</extension>
</complexContent>
</complexType>
-
+
<complexType name="resource">
<complexContent>
<extension base="this:StrategyType">

Modified: trunk/main/lang/process/build.xml
===================================================================
--- trunk/main/lang/process/build.xml 2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/lang/process/build.xml 2006-05-14 05:40:06 UTC (rev 1440)
@@ -41,6 +41,8 @@

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

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

Modified: trunk/main/lang/process/etc/process.xsd
===================================================================
--- trunk/main/lang/process/etc/process.xsd 2006-05-06 20:55:46 UTC (rev
1439)
+++ trunk/main/lang/process/etc/process.xsd 2006-05-14 05:40:06 UTC (rev
1440)
@@ -1,10 +1,13 @@
<?xml version="1.0"?>
<schema xmlns="http://www.w3.org/2001/XMLSchema";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:common="artifact:xsd:dpml/lang/dpml-common#1.0"
xmlns:this="@PROJECT-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">

+ <import namespace="artifact:xsd:dpml/lang/dpml-common#1.0"
schemaLocation="artifact:xsd:dpml/lang/dpml-common#1.0"/>
+
<element name="configuration" type="this:ConfigurationType"/>
<element name="process" type="this:ProcessType"/>
<element name="product" type="this:ProductType"/>
@@ -68,8 +71,6 @@
<attribute name="implicit" type="boolean" default="false"/>
<attribute name="produces" type="string" use="optional"/>
</complexType>
-
- <complexType name="ParametersType" abstract="true"/>

<complexType name="DependenciesType">
<sequence>
@@ -132,7 +133,7 @@
</restriction>
</simpleType>

- <complexType name="SelectionParameters">
+ <complexType name="SelectionParameters" abstract="true">
<choice minOccurs="0" maxOccurs="unbounded">
<element name="include" type="this:SelectorType"/>
<element name="exclude" type="this:SelectorType"/>
@@ -141,19 +142,23 @@
<attribute name="defaultExcludes" type="string"/>
</complexType>

- <complexType name="SelectiveProcess">
+ 
+
+ <complexType name="rmic">
<complexContent>
- <extension base="this:ProcessType">
- <sequence>
- <element name="selection" type="this:SelectionParameters"
minOccurs="0" maxOccurs="1"/>
- </sequence>
+ <extension base="this:SelectionParameters"/>
+ </complexContent>
+ </complexType>
+
+ <complexType name="junit">
+ <complexContent>
+ <extension base="this:SelectionParameters">
+ <attribute name="fork" type="boolean" use="optional"
default="false"/>
</extension>
</complexContent>
</complexType>

- 
-
- <complexType name="JarParameters">
+ <complexType name="jar">
<complexContent>
<extension base="this:SelectionParameters">
<attribute name="compress" type="boolean" use="optional"
default="true"/>

Modified: trunk/main/lang/process/etc/test/sample.xml
===================================================================
--- trunk/main/lang/process/etc/test/sample.xml 2006-05-06 20:55:46 UTC (rev
1439)
+++ trunk/main/lang/process/etc/test/sample.xml 2006-05-14 05:40:06 UTC (rev
1440)
@@ -1,7 +1,8 @@
<?xml version="1.0"?>
<configuration xmlns="@PROJECT-XSD-URI@"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:this="@PROJECT-XSD-URI@">
+ xmlns:this="@PROJECT-XSD-URI@"
+ xmlns:part="@PART-XSD-URI@">



@@ -110,7 +111,7 @@
<validators>
<include id="junit"/>
</validators>
- <params xsi:type="this:JarParameters" index="true" compress="true">
+ <params xsi:type="this:jar" index="true" compress="true">
<include name="**/*.*"/>
<exclude name="**/package.html"/>
</params>
@@ -126,7 +127,7 @@
<input id="target.test.dir"/>
<input id="target.classes.test.dir" policy="conditional"/>
</consumes>
- <params xsi:type="this:SelectionParameters"/>
+ <params xsi:type="this:junit"/>
</process>

<process name="rmic" class="net.dpml.tools.process.RMICProcess">
@@ -136,7 +137,7 @@
<consumes>
<input id="target.classes.main.dir" policy="conditional"/>
</consumes>
- <params xsi:type="this:SelectionParameters"/>
+ <params xsi:type="this:rmic"/>
</process>

<process name="part" class="net.dpml.tools.process.PartProcess"
@@ -145,5 +146,7 @@
<input id="target.classes.main.dir"/>
</consumes>
</process>
+ 

</configuration>

Modified: trunk/main/library.xml
===================================================================
--- trunk/main/library.xml 2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/library.xml 2006-05-14 05:40:06 UTC (rev 1440)
@@ -27,13 +27,11 @@
<type id="module" alias="true"/>
</types>

- <data>
- <filters>
- <filter token="PUBLISHER-NAME" value="${project.publisher.name}"/>
- <filter token="PUBLISHER-URL" value="${project.publisher.url}"/>
- <feature token="PROJECT-VERSION" id="version"/>
- </filters>
- </data>
+ <filters>
+ <filter token="PUBLISHER-NAME" value="${project.publisher.name}"/>
+ <filter token="PUBLISHER-URL" value="${project.publisher.url}"/>
+ <feature token="PROJECT-VERSION" id="version"/>
+ </filters>

<module file="lang/module.xml"/>
<module file="transit/module.xml"/>
@@ -44,25 +42,23 @@
<module file="planet/module.xml"/>

<project name="central" basedir="central">
- <data>
- <filters>
- <feature token="VERSION" id="version"/>
- <feature token="ANT-JAR-VERSION" ref="ant/ant" id="version"/>
- <feature token="ANT-JAR-URI" ref="ant/ant" id="uri" type="jar" />
- <feature token="TRANSIT-TOOLS-URI"
ref="dpml/transit/dpml-transit-tools" id="uri" type="jar" />
- <feature token="TRANSIT-MODULE-VERSION" ref="dpml/transit"
id="version"/>
- <feature token="TRANSIT-HANDLER-URI"
ref="dpml/transit/dpml-transit-main" id="uri" type="jar" />
- <feature token="DEPOT-MODULE-VERSION" ref="dpml/depot"
id="version" />
- <feature token="DEPOT-CONSOLE-URI"
ref="dpml/depot/dpml-depot-console" id="uri" type="jar" />
- <feature token="DEPOT-TOOLS-ANT-URI"
ref="dpml/depot/dpml-tools-builder" id="uri" type="part" />
- <feature token="DEPOT-TOOLS-LIBRARY-URI"
ref="dpml/depot/dpml-library" id="uri" type="jar"/>
- <feature token="METRO-RUNTIME-URI"
ref="dpml/metro/dpml-metro-runtime" id="uri" type="part"/>
- <feature token="METRO-TOOLS-URI"
ref="dpml/metro/dpml-metro-tools" id="uri" type="part"/>
- <feature token="UTIL-CLI-URI" ref="dpml/util/dpml-util-cli"
id="uri" type="jar" />
- <feature token="UTIL-I18N-URI" ref="dpml/util/dpml-util-i18n"
id="uri" type="jar"/>
- <feature token="UTIL-LOGGING-API-URI"
ref="dpml/util/dpml-logging-api" id="uri" type="jar"/>
- </filters>
- </data>
+ <filters>
+ <feature token="VERSION" id="version"/>
+ <feature token="ANT-JAR-VERSION" ref="ant/ant" id="version"/>
+ <feature token="ANT-JAR-URI" ref="ant/ant" id="uri" type="jar" />
+ <feature token="TRANSIT-TOOLS-URI"
ref="dpml/transit/dpml-transit-tools" id="uri" type="jar" />
+ <feature token="TRANSIT-MODULE-VERSION" ref="dpml/transit"
id="version"/>
+ <feature token="TRANSIT-HANDLER-URI"
ref="dpml/transit/dpml-transit-main" id="uri" type="jar" />
+ <feature token="DEPOT-MODULE-VERSION" ref="dpml/depot"
id="version" />
+ <feature token="DEPOT-CONSOLE-URI"
ref="dpml/depot/dpml-depot-console" id="uri" type="jar" />
+ <feature token="DEPOT-TOOLS-ANT-URI"
ref="dpml/depot/dpml-tools-builder" id="uri" type="part" />
+ <feature token="DEPOT-TOOLS-LIBRARY-URI"
ref="dpml/depot/dpml-library" id="uri" type="jar"/>
+ <feature token="METRO-RUNTIME-URI"
ref="dpml/metro/dpml-metro-runtime" id="uri" type="part"/>
+ <feature token="METRO-TOOLS-URI"
ref="dpml/metro/dpml-metro-tools" id="uri" type="part"/>
+ <feature token="UTIL-CLI-URI" ref="dpml/util/dpml-util-cli"
id="uri" type="jar" />
+ <feature token="UTIL-I18N-URI" ref="dpml/util/dpml-util-i18n"
id="uri" type="jar"/>
+ <feature token="UTIL-LOGGING-API-URI"
ref="dpml/util/dpml-logging-api" id="uri" type="jar"/>
+ </filters>
</project>

</module>

Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/metro/module.xml 2006-05-14 05:40:06 UTC (rev 1440)
@@ -23,10 +23,10 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
+ <filters>
+ <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
+ </filters>
<data>
- <filters>
- <feature token="STATE-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-state"/>
- </filters>
<rmic>
<include name="**/DefaultStateListener.class"/>
</rmic>
@@ -76,14 +76,12 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
- <data>
- <filters>
- <feature token="NAME" id="name"/>
- <feature token="VERSION" id="version"/>
- <feature token="GROUP" id="group"/>
- <feature token="PART-HANDLER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
- </filters>
- </data>
+ <filters>
+ <feature token="NAME" id="name"/>
+ <feature token="VERSION" id="version"/>
+ <feature token="GROUP" id="group"/>
+ <feature token="PART-HANDLER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
+ </filters>
</project>

<project name="dpml-metro-model" basedir="model">
@@ -100,14 +98,12 @@
<include key="dpml-state-impl"/>
</test>
</dependencies>
- <data>
- <filters>
- <feature token="NAME" id="name"/>
- <feature token="VERSION" id="version"/>
- <feature token="GROUP" id="group"/>
- <feature token="PART-HANDLER-URI" id="uri"
ref="dpml/metro/dpml-metro-runtime" type="part"/>
- </filters>
- </data>
+ <filters>
+ <feature token="NAME" id="name"/>
+ <feature token="VERSION" id="version"/>
+ <feature token="GROUP" id="group"/>
+ <feature token="PART-HANDLER-URI" id="uri"
ref="dpml/metro/dpml-metro-runtime" type="part"/>
+ </filters>
</project>

<project name="dpml-metro-runtime" basedir="runtime">
@@ -134,14 +130,14 @@
<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>
<data>
- <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>
<rmic>
<include name="**/DefaultComponentModel.class"/>
<include name="**/DefaultContextModel.class"/>
@@ -173,14 +169,12 @@
<include ref="dpml/metro/dpml-metro-runtime"/>
</runtime>
</dependencies>
- <data>
- <filters>
- <feature token="PART-BUILDER-URI" id="uri" type="part"/>
- <feature token="PART-HANDLER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
- <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component"/>
- <feature token="STRATEGY-BUILDER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
- </filters>
- </data>
+ <filters>
+ <feature token="PART-BUILDER-URI" id="uri" type="part"/>
+ <feature token="PART-HANDLER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
+ <feature token="COMPONENT-XSD-URI" id="uri" type="xsd"
ref="dpml/lang/dpml-component"/>
+ <feature token="STRATEGY-BUILDER-URI" id="uri" type="part"
ref="dpml/metro/dpml-metro-runtime"/>
+ </filters>
</project>

<project name="dpml-metro-test" basedir="test">

Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-05-06 20:55:46 UTC (rev 1439)
+++ trunk/main/station/module.xml 2006-05-14 05:40:06 UTC (rev 1440)
@@ -16,14 +16,12 @@
<include ref="junit/junit"/>
</test>
</dependencies>
- <data>
- <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/lang/dpml-application" type="xsd" id="uri"/>
- </filters>
- </data>
+ <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/lang/dpml-application"
type="xsd" id="uri"/>
+ </filters>
</project>

<project name="dpml-station-exec" basedir="exec">
@@ -44,11 +42,9 @@
<include ref="dpml/util/dpml-util-cli"/>
</runtime>
</dependencies>
- <data>
- <filters>
- <feature token="COMPOSITION-CONTROLLER-URI"
ref="dpml/metro/dpml-metro-runtime" type="part" id="uri"/>
- </filters>
- </data>
+ <filters>
+ <feature token="COMPOSITION-CONTROLLER-URI"
ref="dpml/metro/dpml-metro-runtime" type="part" id="uri"/>
+ </filters>
</project>

<project name="dpml-station-builder" basedir="builder">
@@ -63,11 +59,9 @@
<include ref="junit/junit"/>
</test>
</dependencies>
- <data>
- <filters>
- <feature token="APPLICATION-XSD-URI"
ref="dpml/lang/dpml-application" type="xsd" id="uri"/>
- </filters>
- </data>
+ <filters>
+ <feature token="APPLICATION-XSD-URI" ref="dpml/lang/dpml-application"
type="xsd" id="uri"/>
+ </filters>
</project>

<project name="dpml-station-server" basedir="server">
@@ -91,10 +85,10 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
+ <filters>
+ <feature token="APPLICATION-XSD-URI" ref="dpml/lang/dpml-application"
type="xsd" id="uri"/>
+ </filters>
<data>
- <filters>
- <feature token="APPLICATION-XSD-URI"
ref="dpml/lang/dpml-application" type="xsd" id="uri"/>
- </filters>
<rmic>
<include name="**/RemoteApplicationRegistry.class"/>
<include name="**/RemoteApplication.class"/>
@@ -115,11 +109,9 @@
<include ref="dpml/station/dpml-station-server"/>
</runtime>
</dependencies>
- <data>
- <filters>
- <feature token="DEPOT-STATION-PLUGIN-URI"
ref="dpml/station/dpml-station-server" type="part" id="uri"/>
- </filters>
- </data>
+ <filters>
+ <feature token="DEPOT-STATION-PLUGIN-URI"
ref="dpml/station/dpml-station-server" type="part" id="uri"/>
+ </filters>
</project>

</module>

Modified: trunk/main/transit/core/etc/test/plugin.xml
===================================================================
--- trunk/main/transit/core/etc/test/plugin.xml 2006-05-06 20:55:46 UTC (rev
1439)
+++ trunk/main/transit/core/etc/test/plugin.xml 2006-05-14 05:40:06 UTC (rev
1440)
@@ -8,6 +8,7 @@
</info>


+
<plugin class="Widget"/>

<classpath>

r1440 - in trunk/main: . central/src/docs/depot/library central/src/docs/depot/library/data depot depot/library/etc/test/dpml depot/library/etc/test/samples depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/info depot/tools/builder/src/main/net/dpml/tools/tasks lang/common/etc lang/module lang/module/etc lang/part/etc lang/process lang/process/etc lang/process/etc/test metro station transit/core/etc/test, mcconnell at BerliOS, 05/14/2006