notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
r1373 - in trunk/main: central/src/docs/about/download 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/impl depot/library/src/test/net/dpml/library/info
- From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
- To: notify-dpml AT lists.ibiblio.org
- Subject: r1373 - in trunk/main: central/src/docs/about/download 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/impl depot/library/src/test/net/dpml/library/info
- Date: Fri, 14 Apr 2006 09:53:29 +0200
Author: mcconnell
Date: 2006-04-14 09:53:03 +0200 (Fri, 14 Apr 2006)
New Revision: 1373
Added:
trunk/main/depot/library/etc/test/samples/absolute.xml
trunk/main/depot/library/src/test/net/dpml/library/impl/AbsoluteTestCase.java
Modified:
trunk/main/central/src/docs/about/download/archive.xml
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
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/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/ResourceDirectiveTestCase.java
Log:
Complete the implementation of composite module names across resources,
projects and modules. These update enable declarations such as <resource
name="org/acme"> resulting in the construction of the "org" module enclosing
the "acme" resource.
Modified: trunk/main/central/src/docs/about/download/archive.xml
===================================================================
--- trunk/main/central/src/docs/about/download/archive.xml 2006-04-13
08:54:16 UTC (rev 1372)
+++ trunk/main/central/src/docs/about/download/archive.xml 2006-04-14
07:53:03 UTC (rev 1373)
@@ -24,13 +24,7 @@
</p>
<ul>
- <li>Support for the declaration of custom etc/main and etc/text
directories.</li>
- <li>Removal of activity api (functionality covered by state
package).</li>
- <li>Removal of the configuration and parameterization packages
(functionality covered via Context IOC model).</li>
- <li>Support for filter declarations within a
<tt><project></tt> definition.</li>
- <li>Improvements to DOM related error reporting.</li>
- <li>Structural enhancements to the module schema.</li>
- <li>Upgrade to Jetty 6.0.0 B14.</li>
+ <li>Module name processing enhanced to support composite
names.</li>
</ul>
<table>
@@ -76,7 +70,65 @@
</subsection>
+ <subsection name="Build 1.0.0 RC7">
+ <p>
+ Enhancements include:
+ </p>
+
+ <ul>
+ <li>Support for the declaration of custom etc/main and etc/text
directories.</li>
+ <li>Removal of activity api (functionality covered by state
package).</li>
+ <li>Removal of the configuration and parameterization packages
(functionality covered via Context IOC model).</li>
+ <li>Support for filter declarations within a
<tt><project></tt> definition.</li>
+ <li>Improvements to DOM related error reporting.</li>
+ <li>Structural enhancements to the module schema.</li>
+ <li>Upgrade to Jetty 6.0.0 B14.</li>
+ </ul>
+
+ <table>
+ <tr>
+ <td>Windows NSIS Installer</td>
+ <td>
+ <a href="http://download.dpml.net/milestones/1.0.0
RC7/dpml-sdk-win32-1.0.0 RC7.exe">
+ dpml-sdk-win32-1.0.0 RC7.exe</a>
+ </td>
+ <td>
+ <a href="http://download.dpml.net/milestones/1.0.0
RC7/dpml-sdk-win32-1.0.0 RC7.exe.md5">
+ MD5</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Windows Zip Archive</td>
+ <td>
+ <a href="http://download.dpml.net/milestones/1.0.0
RC7/dpml-sdk-win32-1.0.0 RC7.zip">
+ dpml-sdk-win32-1.0.0 RC7.zip</a>
+ </td>
+ <td>
+ <a href="http://download.dpml.net/milestones/1.0.0
RC7/dpml-sdk-win32-1.0.0 RC7.zip.md5">
+ MD5</a>
+ </td>
+ </tr>
+ <tr>
+ <td>Linux Archive</td>
+ <td>
+ <a href="http://download.dpml.net/milestones/1.0.0
RC7/dpml-sdk-linux-1.0.0 RC7.tar.gz">
+ dpml-sdk-linux-1.0.0 RC7.tar.gz</a>
+ </td>
+ <td>
+ <a href="http://download.dpml.net/milestones/1.0.0
RC7/dpml-sdk-linux-1.0.0 RC7.tar.gz.md5">
+ MD5</a>
+ </td>
+ </tr>
+ </table>
+
+ <p>
+ Online <a href="http://api.dpml.net/dpml/1.0.0 RC7">Javadoc</a>,
+ <a href="http://www.dpml.net/reports/1.0.0 RC7/junit">JUnit</a> and
<a href="http://www.dpml.net/reports/1.0.0
RC7/catalog/index.html">Catalog</a> reports are available.
+ </p>
+
+ </subsection>
+
<subsection name="Build 1.0.0 RC6 (SVN rev 1333)">
<p>
Added: trunk/main/depot/library/etc/test/samples/absolute.xml
===================================================================
--- trunk/main/depot/library/etc/test/samples/absolute.xml 2006-04-13
08:54:16 UTC (rev 1372)
+++ trunk/main/depot/library/etc/test/samples/absolute.xml 2006-04-14
07:53:03 UTC (rev 1373)
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<library xmlns="@MODULE-XSD-URI@"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:part="artifact:xsd:dpml/lang/dpml-part#1.0">
+
+ <modules>
+ <module name="gov/nsa/acme">
+ <info/>
+ </module>
+ </modules>
+
+</library>
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-04-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -379,7 +379,8 @@
String type = artifact.getType();
ResourceDirective resourceDirective =
- new ResourceDirective( name, version, type, properties );
+ ResourceDirective.createAnonymousResource( name, version, type,
properties );
+
ModuleDirective enclosing = null;
String[] elements = group.split( "/", -1 );
for( int i = ( elements.length-1 ); i>-1; i-- )
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-04-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -584,7 +584,7 @@
}
}
final String error =
- "An reference to ["
+ "The reference to ["
+ ref
+ "] within the module ["
+ getResourcePath()
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-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -615,9 +615,9 @@
TypeDirective[] exportedTypes = createExportedTypes( types );
DependencyDirective[] dependencies = createDeps( module );
Properties properties = getExportProperties();
- return new ResourceDirective(
+ return ResourceDirective.createResourceDirective(
name, version, Classifier.EXTERNAL, basedir,
- info, exportedTypes, dependencies, properties );
+ info, exportedTypes, dependencies, properties, null );
}
TypeDirective[] createExportedTypes( TypeDirective[] types )
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-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -322,61 +322,15 @@
}
else if( RESOURCE_ELEMENT_NAME.equals( elementName ) )
{
- return buildResourceDirective( element, offset );
+ return buildResourceDirective( base, element, offset );
}
else if( PROJECT_ELEMENT_NAME.equals( elementName ) )
{
- return buildResourceDirective( element, offset );
+ return buildResourceDirective( base, element, offset );
}
else if( MODULE_ELEMENT_NAME.equals( elementName ) )
{
- try
- {
- ResourceDirective resource = buildResourceDirective(
element, offset );
- ArrayList list = new ArrayList();
- Element[] children = ElementHelper.getChildren( element );
- for( int i=0; i<children.length; i++ )
- {
- Element child = children[i];
- final String tag = child.getTagName();
- if( MODULE_ELEMENT_NAME.equals( tag ) )
- {
- ResourceDirective directive =
- buildResourceDirectiveFromElement( base, child,
null );
- list.add( directive );
- }
- else if( IMPORT_ELEMENT_NAME.equals( tag ) )
- {
- ResourceDirective directive =
- buildResourceDirectiveFromElement( base, child,
null );
- list.add( directive );
- }
- else if( PROJECT_ELEMENT_NAME.equals( tag ) )
- {
- ResourceDirective directive =
- buildResourceDirective( child );
- list.add( directive );
- }
- else if( RESOURCE_ELEMENT_NAME.equals( tag ) )
- {
- ResourceDirective directive =
- buildResourceDirective( child );
- list.add( directive );
- }
- }
- ResourceDirective[] resources = (ResourceDirective[])
list.toArray( new ResourceDirective[0] );
- return new ModuleDirective( resource, resources );
- }
- catch( DecodingException e )
- {
- throw e;
- }
- catch( Throwable e )
- {
- final String error =
- "Internal error while attempting to build a module
directive from an element.";
- throw new DecodingException( element, error, e );
- }
+ return buildResourceDirective( base, element, offset );
}
else
{
@@ -576,12 +530,12 @@
}
}
- private ResourceDirective buildResourceDirective( Element element )
throws Exception
+ private ResourceDirective buildResourceDirective( File base, Element
element ) throws Exception
{
- return buildResourceDirective( element, null );
+ return buildResourceDirective( base, element, null );
}
- private ResourceDirective buildResourceDirective( Element element,
String path ) throws Exception
+ private ResourceDirective buildResourceDirective( File base, Element
element, String path ) throws Exception
{
Classifier classifier = null;
final String tag = element.getTagName();
@@ -651,8 +605,52 @@
buildProperties(
ElementHelper.getChild( element, "properties" ) );
- return new ResourceDirective(
- name, version, classifier, basedir, info, types, dependencies,
properties, filters );
+ if( MODULE_ELEMENT_NAME.equals( tag ) )
+ {
+ ArrayList list = new ArrayList();
+ Element[] children = ElementHelper.getChildren( element );
+ for( int i=0; i<children.length; i++ )
+ {
+ Element child = children[i];
+ final String t = child.getTagName();
+ if( MODULE_ELEMENT_NAME.equals( t ) )
+ {
+ ResourceDirective directive =
+ buildResourceDirectiveFromElement( base, child,
null );
+ list.add( directive );
+ }
+ else if( IMPORT_ELEMENT_NAME.equals( t ) )
+ {
+ ResourceDirective directive =
+ buildResourceDirectiveFromElement( base, child,
null );
+ list.add( directive );
+ }
+ else if( PROJECT_ELEMENT_NAME.equals( t ) )
+ {
+ ResourceDirective directive =
+ buildResourceDirective( base, child );
+ list.add( directive );
+ }
+ else if( RESOURCE_ELEMENT_NAME.equals( t ) )
+ {
+ ResourceDirective directive =
+ buildResourceDirective( base, child );
+ list.add( directive );
+ }
+ }
+
+ ResourceDirective[] resources =
+ (ResourceDirective[]) list.toArray( new
ResourceDirective[0] );
+ return ModuleDirective.createModuleDirective(
+ name, version, classifier, basedir, info, types,
dependencies,
+ properties, filters, resources );
+ }
+ else
+ {
+ return ResourceDirective.createResourceDirective(
+ name, version, classifier, basedir, info, types,
dependencies,
+ properties, filters );
+ }
}
else
{
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-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ModuleDirective.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -32,6 +32,62 @@
private final ResourceDirective[] m_resources;
/**
+ * Creation of a new module directive. If the resource name if composite
+ * then the resource directive will be a module directive instance that
either
+ * encloses the resource or enclosed a resource containing the resource.
+ *
+ * @param name the resource name
+ * @param version the resource version
+ * @param classifier LOCAL or EXTERNAL classifier
+ * @param basedir the project basedir
+ * @param info info descriptor
+ * @param types types produced by the resource
+ * @param dependencies resource dependencies
+ * @param properties suppliementary properties
+ * @param filters source filters
+ * @return the immediate enclosing resource
+ */
+ public static ModuleDirective createModuleDirective(
+ String name, String version, Classifier classifier, String basedir,
+ InfoDirective info, TypeDirective[] types,
+ DependencyDirective[] dependencies, Properties properties,
+ FilterDirective[] filters, ResourceDirective[] resources )
+ {
+ int n = name.indexOf( "/" );
+ if( n > -1 )
+ {
+ ModuleDirective enclosing = 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 =
+ new ModuleDirective(
+ elem, version, classifier, basedir, info, types,
dependencies,
+ resources, properties, filters );
+ }
+ else
+ {
+ enclosing =
+ new ModuleDirective(
+ elem, null, Classifier.EXTERNAL, ".", null,
+ new TypeDirective[0], new DependencyDirective[0],
+ new ResourceDirective[]{enclosing}, null, null );
+ }
+ }
+ return enclosing;
+ }
+ else
+ {
+ return new ModuleDirective(
+ name, version, classifier, basedir, info, types, dependencies,
+ resources, properties, filters );
+ }
+ }
+
+ /**
* Creation of a new module directive supporting the establishment
* of an anonymous resource.
*
@@ -48,27 +104,6 @@
/**
* Creation of a new module directive.
- * @param resource the abstract resource definition
- * @param resources resource contained within the module
- */
- public ModuleDirective(
- ResourceDirective resource, ResourceDirective[] resources )
- {
- this(
- resource.getName(),
- resource.getVersion(),
- resource.getClassifier(),
- resource.getBasedir(),
- resource.getInfoDirective(),
- resource.getTypeDirectives(),
- resource.getDependencyDirectives(),
- resources,
- resource.getProperties(),
- resource.getFilterDirectives() );
- }
-
- /**
- * Creation of a new module directive.
* @param name the resource name
* @param version the resource version
* @param classifier LOCAL or EXTERNAL classifier
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-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/ResourceDirective.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -63,18 +63,21 @@
* @param type the resource type
* @param properties suppliementary properties
*/
- public ResourceDirective(
+ public static ResourceDirective createAnonymousResource(
String name, String version, String type, Properties properties )
{
- this(
+ return createResourceDirective(
name, version, Classifier.ANONYMOUS, null,
null, new TypeDirective[]{new TypeDirective( type )},
new DependencyDirective[0],
- properties );
+ properties, null );
}
/**
- * Creation of a new resource directive.
+ * Creation of a new resource directive. If the resource name if
composite
+ * then the resource directive will be a module directive instance that
either
+ * encloses the resource or enclosed a resource containing the resource.
+ *
* @param name the resource name
* @param version the resource version
* @param classifier LOCAL or EXTERNAL classifier
@@ -83,15 +86,49 @@
* @param types types produced by the resource
* @param dependencies resource dependencies
* @param properties suppliementary properties
+ * @param filters source filters
+ * @return the immediate enclosing resource
*/
- public ResourceDirective(
+ public static ResourceDirective createResourceDirective(
String name, String version, Classifier classifier, String basedir,
InfoDirective info, TypeDirective[] types,
- DependencyDirective[] dependencies, Properties properties )
+ DependencyDirective[] dependencies, Properties properties,
+ FilterDirective[] filters )
{
- this( name, version, classifier, basedir, info, types, dependencies,
properties, null );
+ int n = name.indexOf( "/" );
+ if( n > -1 )
+ {
+ ResourceDirective enclosing = 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 =
+ new ResourceDirective(
+ elem, version, classifier, basedir, info, types,
dependencies,
+ properties, filters );
+ }
+ else
+ {
+ enclosing =
+ new ModuleDirective(
+ elem, null, Classifier.EXTERNAL, ".", null,
+ new TypeDirective[0], new DependencyDirective[0],
+ new ResourceDirective[]{enclosing}, null, null );
+ }
+ }
+ return enclosing;
+ }
+ else
+ {
+ return new ResourceDirective(
+ name, version, classifier, basedir, info, types,
+ dependencies, properties, filters );
+ }
}
-
+
/**
* Creation of a new resource directive.
* @param name the resource name
@@ -104,7 +141,7 @@
* @param properties suppliementary properties
* @param filters source filters
*/
- public ResourceDirective(
+ ResourceDirective(
String name, String version, Classifier classifier, String basedir,
InfoDirective info, TypeDirective[] types,
DependencyDirective[] dependencies, Properties properties,
Added:
trunk/main/depot/library/src/test/net/dpml/library/impl/AbsoluteTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/impl/AbsoluteTestCase.java
2006-04-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/test/net/dpml/library/impl/AbsoluteTestCase.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -0,0 +1,71 @@
+/*
+ * 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.impl;
+
+import java.io.File;
+
+import net.dpml.library.Module;
+
+import net.dpml.util.Logger;
+import net.dpml.util.DefaultLogger;
+
+import junit.framework.TestCase;
+
+/**
+ * The ImportDirective class describes a the inclusion of a typed value.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class AbsoluteTestCase extends AbstractTestCase
+{
+ static
+ {
+ System.setProperty( "java.protocol.handler.pkgs", "net.dpml.transit"
);
+ }
+
+ private DefaultLibrary m_library;
+
+ /**
+ * Setup the library directive builder.
+ * @exception Exception if an error occurs during test execution
+ */
+ public void setUp() throws Exception
+ {
+ String base = System.getProperty( "project.test.dir" );
+ File test = new File( base );
+ File file = new File( test, "samples/absolute.xml" );
+ Logger logger = new DefaultLogger( "test" );
+ m_library = new DefaultLibrary( logger, file );
+ }
+
+ /**
+ * Validation of an absolute module path expansion. The module defintion
+ * includes a path in the form "gov/nsa/acme" which should be expanded to
+ * a structure containing the "gov" module, containing the "nsa" module,
+ * containing the "acme" module.
+ * @exception Exception if an error occurs during test execution
+ */
+ public void testAbsoluteModulePath() throws Exception
+ {
+ Module gov = m_library.getModule( "gov" );
+ Module nsa = m_library.getModule( "gov/nsa" );
+ Module acme = m_library.getModule( "gov/nsa/acme" );
+ }
+}
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-13 08:54:16 UTC (rev 1372)
+++
trunk/main/depot/library/src/test/net/dpml/library/info/ResourceDirectiveTestCase.java
2006-04-14 07:53:03 UTC (rev 1373)
@@ -33,18 +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
{
RESOURCES[0] =
new ResourceDirective(
- "fred", null, CLASSIFIER, "example/fred", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "fred", null, CLASSIFIER, "example/fred", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
RESOURCES[1] =
new ResourceDirective(
- "george", "1.3.0", CLASSIFIER, "example/george", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "george", "1.3.0", CLASSIFIER, "example/george", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
RESOURCES[2] =
new ResourceDirective(
- "mary", "2.7", CLASSIFIER, "example/mary", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "mary", "2.7", CLASSIFIER, "example/mary", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
}
/**
@@ -56,7 +57,8 @@
try
{
ResourceDirective resource =
- new ResourceDirective( null, "1.0", CLASSIFIER, "test", INFO,
TYPES, DEPENDENCIES, PROPERTIES );
+ new ResourceDirective(
+ null, "1.0", CLASSIFIER, "test", INFO, TYPES, DEPENDENCIES,
PROPERTIES, FILTERS );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -74,7 +76,8 @@
try
{
ResourceDirective resource =
- new ResourceDirective( "fred", "1.0", CLASSIFIER, "test",
INFO, null, DEPENDENCIES, PROPERTIES );
+ new ResourceDirective(
+ "fred", "1.0", CLASSIFIER, "test", INFO, null, DEPENDENCIES,
PROPERTIES, FILTERS );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -92,7 +95,8 @@
try
{
ResourceDirective resource =
- new ResourceDirective( "fred", "1.0", CLASSIFIER, "test",
INFO, TYPES, null, PROPERTIES );
+ new ResourceDirective(
+ "fred", "1.0", CLASSIFIER, "test", INFO, TYPES, null,
PROPERTIES, FILTERS );
fail( "no-NPE" );
}
catch( NullPointerException e )
@@ -108,7 +112,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
assertEquals( "name", "resource", resource.getName() );
}
@@ -119,7 +123,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
assertEquals( "version", "2.7", resource.getVersion() );
}
@@ -130,7 +134,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
assertEquals( "basedir", "test", resource.getBasedir() );
}
@@ -141,7 +145,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
assertEquals( "types", 3, resource.getTypeDirectives().length );
}
@@ -152,7 +156,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
assertEquals( "dependencies", 3,
resource.getDependencyDirectives().length );
}
@@ -163,7 +167,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
assertEquals( "properties", PROPERTIES, resource.getProperties() );
}
@@ -175,7 +179,7 @@
{
ResourceDirective resource =
new ResourceDirective(
- "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES );
+ "resource", "2.7", CLASSIFIER, "test", INFO, TYPES,
DEPENDENCIES, PROPERTIES, FILTERS );
doSerializationTest( resource );
}
}
- r1373 - in trunk/main: central/src/docs/about/download 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/impl depot/library/src/test/net/dpml/library/info, mcconnell at BerliOS, 04/14/2006
Archive powered by MHonArc 2.6.24.