notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1405 - in trunk/main: . depot 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 lang/common/etc lang/module/etc lang/part/etc metro planet/http/impl/src/test/net/dpml/http station
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1405 - in trunk/main: . depot 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 lang/common/etc lang/module/etc lang/part/etc metro planet/http/impl/src/test/net/dpml/http station
- Date: Tue, 25 Apr 2006 18:16:21 +0200
Author: mcconnell
Date: 2006-04-25 18:16:17 +0200 (Tue, 25 Apr 2006)
New Revision: 1405
Added:
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
trunk/main/depot/library/src/main/net/dpml/library/info/FiltersDirective.java
Modified:
trunk/main/
trunk/main/depot/library/etc/test/samples/filters.xml
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
trunk/main/depot/library/src/main/net/dpml/library/impl/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/lang/common/etc/common.xsd
trunk/main/lang/module/etc/module.xsd
trunk/main/lang/part/etc/part.xsd
trunk/main/library.xml
trunk/main/metro/module.xml
trunk/main/planet/http/impl/src/test/net/dpml/http/NCSARequestLogTestCase.java
trunk/main/planet/http/impl/src/test/net/dpml/http/ResourceContextHandlerTestCase.java
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
trunk/main/planet/http/impl/src/test/net/dpml/http/WebAppContextHandlerTestCase.java
trunk/main/station/module.xml
Log:
move <filters> to a nested <data><filters> element enabling the association
of generic production data
Property changes on: trunk/main
___________________________________________________________________
Name: svn:ignore
- target
+ target
NOTES.TXT
Modified: trunk/main/depot/library/etc/test/samples/filters.xml
===================================================================
--- trunk/main/depot/library/etc/test/samples/filters.xml 2006-04-24
18:19:49 UTC (rev 1404)
+++ trunk/main/depot/library/etc/test/samples/filters.xml 2006-04-25
16:16:17 UTC (rev 1405)
@@ -5,14 +5,18 @@
<modules>
<module name="acme">
- <filters>
- <filter token="PUBLISHER" value="ACME"/>
- </filters>
- <project name="widget" basedir=".">
+ <data>
<filters>
- <filter token="NAME" value="Widget"/>
- <filter token="DESCRIPTION" value="A Widget."/>
+ <filter token="PUBLISHER" value="ACME"/>
</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/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -39,6 +39,7 @@
import net.dpml.library.Module;
import net.dpml.library.Resource;
import net.dpml.library.Type;
+import net.dpml.library.info.DataDirective;
import net.dpml.library.info.InfoDirective;
import net.dpml.library.info.TypeDirective;
import net.dpml.library.info.ResourceDirective;
@@ -48,6 +49,7 @@
import net.dpml.library.info.AbstractDirective;
import net.dpml.library.info.ValidationException;
import net.dpml.library.info.FilterDirective;
+import net.dpml.library.info.FiltersDirective;
import net.dpml.library.info.Scope;
import net.dpml.util.Logger;
@@ -189,12 +191,17 @@
setProperty( "project.version", getVersion() );
}
- FilterDirective[] filters = directive.getFilterDirectives();
- for( int i=0; i<filters.length; i++ )
+ FiltersDirective filtersDirective =
+ (FiltersDirective) directive.getDataDirective( "filters" );
+ if( null != filtersDirective )
{
- FilterDirective filter = filters[i];
- String token = filter.getToken();
- m_filters.put( token, filter );
+ 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 );
+ }
}
}
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -38,8 +38,10 @@
import net.dpml.library.info.DependencyDirective;
import net.dpml.library.info.TypeDirective;
import net.dpml.library.info.FilterDirective;
+import net.dpml.library.info.FiltersDirective;
import net.dpml.library.info.SimpleFilterDirective;
import net.dpml.library.info.FeatureFilterDirective;
+import net.dpml.library.info.DataDirective;
import net.dpml.library.info.Scope;
import net.dpml.lang.Category;
@@ -597,9 +599,9 @@
buildDependencyDirectives(
ElementHelper.getChild( element, "dependencies" ) );
- final FilterDirective[] filters =
- buildFilters(
- ElementHelper.getChild( element, "filters" ) );
+ final DataDirective[] data =
+ buildDataDirectives(
+ ElementHelper.getChild( element, "data" ) );
final Properties properties =
buildProperties(
@@ -643,13 +645,13 @@
(ResourceDirective[]) list.toArray( new
ResourceDirective[0] );
return ModuleDirective.createModuleDirective(
name, version, classifier, basedir, info, types,
dependencies,
- properties, filters, resources );
+ properties, data, resources );
}
else
{
return ResourceDirective.createResourceDirective(
name, version, classifier, basedir, info, types,
dependencies,
- properties, filters );
+ properties, data );
}
}
else
@@ -706,11 +708,55 @@
}
}
- private FilterDirective[] buildFilters( Element element ) throws
Exception
+ private DataDirective[] buildDataDirectives( Element element ) throws
Exception
{
+ Element[] children = ElementHelper.getChildren( element );
+ DataDirective[] data = new DataDirective[ children.length ];
+ for( int i=0; i<children.length; i++ )
+ {
+ Element child = children[i];
+ data[i] = buildDataDirective( child );
+ }
+ return data;
+ }
+
+ private DataDirective buildDataDirective( Element element ) throws
Exception
+ {
+ TypeInfo info = element.getSchemaTypeInfo();
+ String namespace = info.getTypeNamespace();
+ if( null == namespace )
+ {
+ throw new NullPointerException( "namespace" );
+ }
+ else if( MODULE_XSD_URI.equals( namespace ) )
+ {
+ String tag = element.getTagName();
+ if( "filters".equals( tag ) )
+ {
+ return buildFilters( element );
+ }
+ else
+ {
+ final String error =
+ "Element name ["
+ + tag
+ + "] declared within the module namespace is not
recognized.";
+ throw new DecodingException( element, error );
+ }
+ }
+ else
+ {
+ final String error =
+ "Foreign datatype loading not implemented.";
+ throw new DecodingException( element, error );
+ }
+ }
+
+ private FiltersDirective buildFilters( Element element ) throws Exception
+ {
if( null == element )
{
- return new FilterDirective[0];
+ return new FiltersDirective( new FilterDirective[0] );
}
else
{
@@ -743,7 +789,7 @@
throw new DecodingException( element, error );
}
}
- return filters;
+ return new FiltersDirective( filters );
}
}
Added:
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-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/DataDirective.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -0,0 +1,50 @@
+/*
+ * 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 net.dpml.lang.AbstractDirective;
+
+/**
+ * Base class for a data directives.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public abstract class DataDirective extends AbstractDirective
+{
+ private final String m_key;
+
+ /**
+ * Creation of a new data directive.
+ * @param key the unique datatype key
+ */
+ public DataDirective( String key )
+ {
+ m_key = key;
+ }
+
+ /**
+ * Return the datatype key.
+ * @return the key
+ */
+ public String getKey()
+ {
+ return m_key;
+ }
+}
Added:
trunk/main/depot/library/src/main/net/dpml/library/info/FiltersDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/FiltersDirective.java
2006-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/FiltersDirective.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -0,0 +1,81 @@
+/*
+ * 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.Arrays;
+
+/**
+ * Datatype describing a collection of filters.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class FiltersDirective extends DataDirective
+{
+ private final FilterDirective[] m_filters;
+
+ /**
+ * Creation of a filter collection.
+ * @param filters the array of filters
+ */
+ public FiltersDirective( FilterDirective[] filters )
+ {
+ super( "filters" );
+
+ m_filters = filters;
+ }
+
+ /**
+ * Return the filter array.
+ * @return the filters
+ */
+ public FilterDirective[] getFilterDirectives()
+ {
+ return m_filters;
+ }
+
+ /**
+ * 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 FiltersDirective ) )
+ {
+ FiltersDirective directive = (FiltersDirective) other;
+ return Arrays.equals( m_filters, directive.m_filters );
+ }
+ else
+ {
+ return false;
+ }
+ }
+
+ /**
+ * Compute the hash value.
+ * @return the hashcode value
+ */
+ public int hashCode()
+ {
+ int hash = super.hashCode();
+ hash ^= super.hashArray( m_filters );
+ return hash;
+ }
+}
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-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -44,7 +44,7 @@
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
- * @param filters source filters
+ * @param data production data
* @param resources subsidary resources
* @return the immediate enclosing resource
*/
@@ -52,7 +52,7 @@
String name, String version, Classifier classifier, String basedir,
InfoDirective info, TypeDirective[] types,
DependencyDirective[] dependencies, Properties properties,
- FilterDirective[] filters, ResourceDirective[] resources )
+ DataDirective[] data, ResourceDirective[] resources )
{
int n = name.indexOf( "/" );
if( n > -1 )
@@ -67,7 +67,7 @@
enclosing =
new ModuleDirective(
elem, version, classifier, basedir, info, types,
dependencies,
- resources, properties, filters );
+ resources, properties, data );
}
else
{
@@ -84,7 +84,7 @@
{
return new ModuleDirective(
name, version, classifier, basedir, info, types, dependencies,
- resources, properties, filters );
+ resources, properties, data );
}
}
@@ -114,15 +114,15 @@
* @param dependencies resource dependencies
* @param resources resource included within the module
* @param properties suppliementary properties
- * @param filters associated filters
+ * @param data production data
*/
public ModuleDirective(
String name, String version, Classifier classifier, String basedir,
InfoDirective info, TypeDirective[] types,
DependencyDirective[] dependencies, ResourceDirective[] resources,
- Properties properties, FilterDirective[] filters )
+ Properties properties, DataDirective[] data )
{
- super( name, version, classifier, basedir, info, types,
dependencies, properties, filters );
+ super( name, version, classifier, basedir, info, types,
dependencies, properties, 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-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -53,7 +53,7 @@
private final TypeDirective[] m_types;
private final DependencyDirective[] m_dependencies;
private final Classifier m_classifier;
- private final FilterDirective[] m_filters;
+ private final DataDirective[] m_data;
private final InfoDirective m_info;
/**
@@ -87,14 +87,14 @@
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
- * @param filters source 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,
DependencyDirective[] dependencies, Properties properties,
- FilterDirective[] filters )
+ DataDirective[] data )
{
int n = name.indexOf( "/" );
if( n > -1 )
@@ -109,7 +109,7 @@
enclosing =
new ResourceDirective(
elem, version, classifier, basedir, info, types,
dependencies,
- properties, filters );
+ properties, data );
}
else
{
@@ -126,7 +126,7 @@
{
return new ResourceDirective(
name, version, classifier, basedir, info, types,
- dependencies, properties, filters );
+ dependencies, properties, data );
}
}
@@ -140,13 +140,13 @@
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
- * @param filters source filters
+ * @param data supporting production data
*/
ResourceDirective(
String name, String version, Classifier classifier, String basedir,
InfoDirective info, TypeDirective[] types,
DependencyDirective[] dependencies, Properties properties,
- FilterDirective[] filters )
+ DataDirective[] data )
{
super( properties );
@@ -184,13 +184,13 @@
m_types = types;
m_dependencies = dependencies;
- if( null == filters )
+ if( null == data )
{
- m_filters = new FilterDirective[0];
+ m_data = new DataDirective[0];
}
else
{
- m_filters = filters;
+ m_data = data;
}
}
@@ -268,15 +268,33 @@
}
/**
- * Return an array of filter directives.
- * @return the filter directives
+ * Return an array of supporting production data directives.
+ * @return the data directives
*/
- public FilterDirective[] getFilterDirectives()
+ public DataDirective[] getDataDirectives()
{
- return m_filters;
+ return m_data;
}
/**
+ * Return a data directive mathching the supplied key.
+ * @param key the datatype key
+ * @return the data directive or null if unknown
+ */
+ public DataDirective getDataDirective( String key )
+ {
+ for( int i=0; i<m_data.length; i++ )
+ {
+ DataDirective data = m_data[i];
+ if( key.equals( data.getKey() ) )
+ {
+ return data;
+ }
+ }
+ return null;
+ }
+
+ /**
* Return an named type.
* @param name the type name
* @return the type directives
@@ -354,7 +372,7 @@
{
return false;
}
- else if( !Arrays.equals( m_filters, object.m_filters ) )
+ else if( !Arrays.equals( m_data, object.m_data ) )
{
return false;
}
@@ -382,7 +400,7 @@
hash ^= super.hashValue( m_info );
hash ^= super.hashArray( m_types );
hash ^= super.hashArray( m_dependencies );
- hash ^= super.hashArray( m_filters );
+ hash ^= super.hashArray( m_data );
return hash;
}
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-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/test/net/dpml/library/info/ModuleDirectiveTestCase.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -55,7 +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 +67,7 @@
{
m_module =
new ModuleDirective(
- m_name, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_filters );
+ m_name, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_data );
}
/**
@@ -79,7 +79,7 @@
try
{
new ModuleDirective(
- null, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_filters );
+ null, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_data );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -97,7 +97,7 @@
try
{
new ModuleDirective(
- m_name, null, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_filters );
+ m_name, null, m_classifier, "test", m_info, m_types,
m_dependencies, m_resources, PROPERTIES, m_data );
}
catch( NullPointerException e )
{
@@ -114,7 +114,7 @@
try
{
new ModuleDirective(
- m_name, m_version, m_classifier, "test", m_info, m_types,
null, m_resources, PROPERTIES, m_filters );
+ m_name, m_version, m_classifier, "test", m_info, m_types,
null, m_resources, PROPERTIES, m_data );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -132,7 +132,7 @@
try
{
new ModuleDirective(
- m_name, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, null, PROPERTIES, m_filters );
+ m_name, m_version, m_classifier, "test", m_info, m_types,
m_dependencies, null, PROPERTIES, 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-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/depot/library/src/test/net/dpml/library/info/ResourceDirectiveTestCase.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -33,19 +33,19 @@
static final DependencyDirective[] DEPENDENCIES =
DependencyDirectiveTestCase.DEPENDENCIES;
static final TypeDirective[] TYPES = TypeDirectiveTestCase.TYPES;
static final ResourceDirective[] RESOURCES = new ResourceDirective[3];
- static final FilterDirective[] FILTERS = new FilterDirective[0];
+ static final DataDirective[] DATA = new DataDirective[0];
static
{
RESOURCES[0] =
new ResourceDirective(
- "fred", null, CLASSIFIER, "example/fred", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "fred", null, CLASSIFIER, "example/fred", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
RESOURCES[1] =
new ResourceDirective(
- "george", "1.3.0", CLASSIFIER, "example/george", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "george", "1.3.0", CLASSIFIER, "example/george", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
RESOURCES[2] =
new ResourceDirective(
- "mary", "2.7", CLASSIFIER, "example/mary", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "mary", "2.7", CLASSIFIER, "example/mary", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
}
/**
@@ -58,7 +58,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- null, "1.0", CLASSIFIER, "test", INFO, TYPES, DEPENDENCIES,
PROPERTIES, FILTERS );
+ null, "1.0", CLASSIFIER, "test", INFO, TYPES, DEPENDENCIES,
PROPERTIES, DATA );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -77,7 +77,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "fred", "1.0", CLASSIFIER, "test", INFO, null, DEPENDENCIES,
PROPERTIES, FILTERS );
+ "fred", "1.0", CLASSIFIER, "test", INFO, null, DEPENDENCIES,
PROPERTIES, DATA );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -96,7 +96,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "fred", "1.0", CLASSIFIER, "test", INFO, TYPES, null,
PROPERTIES, FILTERS );
+ "fred", "1.0", CLASSIFIER, "test", INFO, TYPES, null,
PROPERTIES, DATA );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -112,7 +112,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
assertEquals( "name", "resource", resource.getName() );
}
@@ -123,7 +123,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
assertEquals( "version", "2.7", resource.getVersion() );
}
@@ -134,7 +134,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
assertEquals( "basedir", "test", resource.getBasedir() );
}
@@ -145,7 +145,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
assertEquals( "types", 3, resource.getTypeDirectives().length );
}
@@ -156,7 +156,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
assertEquals( "dependencies", 3,
resource.getDependencyDirectives().length );
}
@@ -167,7 +167,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
assertEquals( "properties", PROPERTIES, resource.getProperties() );
}
@@ -179,7 +179,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, DATA );
doSerializationTest( resource );
}
}
Modified: trunk/main/depot/module.xml
===================================================================
--- trunk/main/depot/module.xml 2006-04-24 18:19:49 UTC (rev 1404)
+++ trunk/main/depot/module.xml 2006-04-25 16:16:17 UTC (rev 1405)
@@ -33,9 +33,11 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
- <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>
+ </data>
</project>
<project name="dpml-depot-console" basedir="core">
@@ -56,20 +58,22 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
- <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>
+ </data>
</project>
<resource name="dpml-tools-builder" basedir="tools/builder">
Modified: trunk/main/lang/common/etc/common.xsd
===================================================================
--- trunk/main/lang/common/etc/common.xsd 2006-04-24 18:19:49 UTC (rev
1404)
+++ trunk/main/lang/common/etc/common.xsd 2006-04-25 16:16:17 UTC (rev
1405)
@@ -11,9 +11,16 @@
targetNamespace="@PROJECT-XSD-URI@"
elementFormDefault="qualified">
+ <element name="data" type="common:AbstractData" abstract="true"/>
<element name="type" type="common:AbstractType" abstract="true"/>
<element name="codebase" type="common:CodeBaseType" abstract="true"/>
+ <complexType name="AbstractData">
+ <complexContent>
+ <restriction base="xsd:anyType"/>
+ </complexContent>
+ </complexType>
+
<complexType name="AbstractType">
<complexContent>
<restriction base="xsd:anyType">
Modified: trunk/main/lang/module/etc/module.xsd
===================================================================
--- trunk/main/lang/module/etc/module.xsd 2006-04-24 18:19:49 UTC (rev
1404)
+++ trunk/main/lang/module/etc/module.xsd 2006-04-25 16:16:17 UTC (rev
1405)
@@ -16,6 +16,7 @@
<element name="property" type="this:PropertyType"/>
<element name="type" type="this:GenericType"
substitutionGroup="common:type"/>
<element name="abstract-filter" type="this:AbstractFilter"/>
+ <element name="filters" type="this:FiltersType"
substitutionGroup="common:data"/>
<element name="filter" type="this:Filter"
substitutionGroup="this:abstract-filter"/>
<element name="feature" type="this:Feature"
substitutionGroup="this:abstract-filter"/>
@@ -75,7 +76,7 @@
<complexContent>
<extension base="this:ResourceType">
<sequence>
- <element name="filters" type="this:FiltersType" minOccurs="0"
maxOccurs="1"/>
+ <element name="data" type="this:DataType" minOccurs="0"
maxOccurs="1"/>
</sequence>
</extension>
</complexContent>
@@ -100,6 +101,12 @@
</sequence>
</complexType>
+ <complexType name="DataType">
+ <sequence>
+ <element ref="common:data" minOccurs="0" maxOccurs="unbounded"/>
+ </sequence>
+ </complexType>
+
<complexType name="GenericType">
<complexContent>
<extension base="common:AbstractType">
@@ -177,6 +184,16 @@
</restriction>
</simpleType>
+ <complexType name="FiltersType">
+ <complexContent>
+ <extension base="common:AbstractData">
+ <sequence>
+ <element ref="this:abstract-filter" minOccurs="0"
maxOccurs="unbounded"/>
+ </sequence>
+ </extension>
+ </complexContent>
+ </complexType>
+
<complexType name="AbstractFilter" abstract="true">
<complexContent>
<restriction base="xsd:anyType">
@@ -185,12 +202,6 @@
</complexContent>
</complexType>
- <complexType name="FiltersType">
- <sequence>
- <element ref="this:abstract-filter" minOccurs="0"
maxOccurs="unbounded"/>
- </sequence>
- </complexType>
-
<complexType name="Filter">
<complexContent>
<extension base="this:AbstractFilter">
Modified: trunk/main/lang/part/etc/part.xsd
===================================================================
--- trunk/main/lang/part/etc/part.xsd 2006-04-24 18:19:49 UTC (rev 1404)
+++ trunk/main/lang/part/etc/part.xsd 2006-04-25 16:16:17 UTC (rev 1405)
@@ -4,7 +4,8 @@
xmlns:this="@PROJECT-XSD-URI@"
xmlns:common="@COMMON-XSD-URI@"
targetNamespace="@PROJECT-XSD-URI@"
- elementFormDefault="qualified">
+ elementFormDefault="qualified"
+ >
<import namespace="@COMMON-XSD-URI@" schemaLocation="@COMMON-XSD-URI@"/>
Modified: trunk/main/library.xml
===================================================================
--- trunk/main/library.xml 2006-04-24 18:19:49 UTC (rev 1404)
+++ trunk/main/library.xml 2006-04-25 16:16:17 UTC (rev 1405)
@@ -27,11 +27,13 @@
<type id="module" alias="true"/>
</types>
- <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>
+ </data>
<import file="lang/module.xml"/>
<import file="transit/module.xml"/>
@@ -42,23 +44,25 @@
<import file="planet/module.xml"/>
<project name="central" basedir="central">
- <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>
+ </data>
</project>
</module>
Modified: trunk/main/metro/module.xml
===================================================================
--- trunk/main/metro/module.xml 2006-04-24 18:19:49 UTC (rev 1404)
+++ trunk/main/metro/module.xml 2006-04-25 16:16:17 UTC (rev 1405)
@@ -23,9 +23,11 @@
<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>
+ </data>
</project>
<project name="dpml-job-api" basedir="job/api">
@@ -71,12 +73,14 @@
<include ref="ant/ant-junit"/>
</test>
</dependencies>
- <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>
+ </data>
</project>
<project name="dpml-metro-model" basedir="model">
@@ -93,12 +97,14 @@
<include key="dpml-state-impl"/>
</test>
</dependencies>
- <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>
+ </data>
</project>
<project name="dpml-metro-runtime" basedir="runtime">
@@ -125,13 +131,15 @@
<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>
+ </data>
</project>
<project name="dpml-metro-tools" basedir="tools">
@@ -153,12 +161,14 @@
<include ref="dpml/metro/dpml-metro-runtime"/>
</runtime>
</dependencies>
- <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>
+ </data>
</project>
<project name="dpml-metro-test" basedir="test">
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/NCSARequestLogTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/NCSARequestLogTestCase.java
2006-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/NCSARequestLogTestCase.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -32,7 +32,7 @@
*/
public class NCSARequestLogTestCase extends TestCase
{
- private static final String[] IGNORE_PATHS = new String[]{"abc","def"};
+ private static final String[] IGNORE_PATHS = new String[]{"abc", "def"};
private static final boolean APPEND_POLICY = true;
private static final boolean EXTENDED_POLICY = true;
private static final boolean PROXY_PREFERRED_POLICY = true;
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/ResourceContextHandlerTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/ResourceContextHandlerTestCase.java
2006-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/ResourceContextHandlerTestCase.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -20,7 +20,6 @@
import java.io.File;
import java.util.Map;
-import java.util.Hashtable;
import net.dpml.http.ResourceContextHandler.Context;
@@ -55,6 +54,10 @@
m_handler = new ResourceContextHandler( logger, context );
}
+ /**
+ * Return the context handler under evaluation.
+ * @return the context handler
+ */
protected ContextHandler getContextHandler()
{
return m_handler;
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
2006-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/SelectChannelConnectorTestCase.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -19,7 +19,6 @@
package net.dpml.http;
import java.util.Map;
-import java.util.Hashtable;
import net.dpml.http.SelectChannelConnector.Context;
@@ -51,6 +50,10 @@
m_connector = new SelectChannelConnector( context );
}
+ /**
+ * Return the connector under evaluation.
+ * @return the connector
+ */
protected AbstractConnector getConnector()
{
return m_connector;
Modified:
trunk/main/planet/http/impl/src/test/net/dpml/http/WebAppContextHandlerTestCase.java
===================================================================
---
trunk/main/planet/http/impl/src/test/net/dpml/http/WebAppContextHandlerTestCase.java
2006-04-24 18:19:49 UTC (rev 1404)
+++
trunk/main/planet/http/impl/src/test/net/dpml/http/WebAppContextHandlerTestCase.java
2006-04-25 16:16:17 UTC (rev 1405)
@@ -76,6 +76,10 @@
m_handler = new WebAppContextHandler( logger, context );
}
+ /**
+ * Return the context handler under evaluation.
+ * @return the context handler
+ */
protected ContextHandler getContextHandler()
{
return m_handler;
Modified: trunk/main/station/module.xml
===================================================================
--- trunk/main/station/module.xml 2006-04-24 18:19:49 UTC (rev 1404)
+++ trunk/main/station/module.xml 2006-04-25 16:16:17 UTC (rev 1405)
@@ -16,12 +16,14 @@
<include ref="junit/junit"/>
</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/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>
+ </data>
</project>
<project name="dpml-station-exec" basedir="exec">
@@ -42,9 +44,11 @@
<include ref="dpml/util/dpml-util-cli"/>
</runtime>
</dependencies>
- <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>
+ </data>
</project>
<project name="dpml-station-builder" basedir="builder">
@@ -59,9 +63,11 @@
<include ref="junit/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>
+ </data>
</project>
<project name="dpml-station-server" basedir="server">
@@ -85,9 +91,11 @@
<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>
+ </data>
</project>
<project name="dpml-station-console" basedir="console">
@@ -102,9 +110,11 @@
<include ref="dpml/station/dpml-station-server"/>
</runtime>
</dependencies>
- <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>
+ </data>
</project>
</module>
- r1405 - in trunk/main: . depot 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 lang/common/etc lang/module/etc lang/part/etc metro planet/http/impl/src/test/net/dpml/http station, mcconnell at BerliOS, 04/25/2006
Archive powered by MHonArc 2.6.24.