notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

r1179 - in trunk/main: depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/impl planet/http planet/http/server

From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
To: notify-dpml AT lists.ibiblio.org
Subject: r1179 - in trunk/main: depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/impl planet/http planet/http/server
Date: Tue, 14 Mar 2006 19:10:38 +0100

Author: mcconnell
Date: 2006-03-14 19:10:35 +0100 (Tue, 14 Mar 2006)
New Revision: 1179

Added:
trunk/main/planet/http/server/project.xml
Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java

trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDirective.java
trunk/main/depot/library/src/test/net/dpml/library/impl/ExportTestCase.java
trunk/main/depot/library/src/test/net/dpml/library/impl/XMLTestCase.java
trunk/main/planet/http/module.xml
Log:
Update the library handling to allow the import of project definitions (was
restricted to module import). An example of a project import is included in
the planet/http/server package.

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-03-14 16:13:48 UTC (rev 1178)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java
2006-03-14 18:10:35 UTC (rev 1179)
@@ -116,10 +116,20 @@
String path = include.getValue();
URI uri = new URI( path );
getLogger().debug( "loading external import: " + uri );
- importModuleDirectives[i] = BUILDER.buildModule( uri );
-
- //InputStream input = url.openStream();
- //importModuleDirectives[i] =
LibraryDirectiveBuilder.buildModuleDirective( input );
+ ResourceDirective resource = BUILDER.buildResource( uri );
+ if( resource instanceof ModuleDirective )
+ {
+ ModuleDirective moduleDirective = (ModuleDirective)
resource;
+ importModuleDirectives[i] = moduleDirective;
+ }
+ else
+ {
+ final String error =
+ "Not yet equipped to import resource of the type ["
+ + resource.getClass().getName()
+ + ".";
+ throw new IllegalArgumentException( error );
+ }
}
}
DefaultModule[] importModules = new DefaultModule[
importModuleDirectives.length ];
@@ -132,13 +142,30 @@

// create the top-level modules

- ModuleDirective[] moduleDirectives =
m_directive.getModuleDirectives();
- DefaultModule[] modules = new DefaultModule[ moduleDirectives.length
];
+ ArrayList moduleDirectives = new ArrayList();
+ ResourceDirective[] directives = m_directive.getResourceDirectives();
+ for( int i=0; i<directives.length; i++ )
+ {
+ ResourceDirective directive = directives[i];
+ if( directive instanceof ModuleDirective )
+ {
+ ModuleDirective md = (ModuleDirective) directive;
+ moduleDirectives.add( md );
+ }
+ else
+ {
+ final String error =
+ "No support in place for non-module top-level resources.";
+ throw new IllegalArgumentException( error );
+ }
+ }
+ ModuleDirective[] values = (ModuleDirective[])
moduleDirectives.toArray( new ModuleDirective[0] );
+ DefaultModule[] modules = new DefaultModule[ values.length ];
m_module = new DefaultModule( this, m_directive, modules );
- for( int i=0; i<moduleDirectives.length; i++ )
+ for( int i=0; i<modules.length; i++ )
{
- ModuleDirective moduleDirective = moduleDirectives[i];
- modules[i] = new DefaultModule( this, m_module, moduleDirective
);
+ ModuleDirective md = values[i];
+ modules[i] = new DefaultModule( this, m_module, md );
}
}

Modified:
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java
2006-03-14 16:13:48 UTC (rev 1178)
+++
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryBuilder.java
2006-03-14 18:10:35 UTC (rev 1179)
@@ -163,13 +163,13 @@
}
}

- public ModuleDirective buildModule( URI uri ) throws IOException
+ public ResourceDirective buildResource( URI uri ) throws IOException
{
try
{
final Document document = m_builder.parse( uri );
Element root = document.getDocumentElement();
- return buildModuleDirectiveFromElement( null, root, null );
+ return buildResourceDirectiveFromElement( null, root, null );
}
catch( IOException e )
{
@@ -290,7 +290,7 @@

Properties properties = null;
ImportDirective[] imports = new ImportDirective[0];
- ModuleDirective[] modules = new ModuleDirective[0];
+ ResourceDirective[] resources = new ResourceDirective[0];
Element[] children = ElementHelper.getChildren( element );
for( int i=0; i<children.length; i++ )
{
@@ -306,7 +306,7 @@
}
else if( MODULES_ELEMENT_NAME.equals( tag ) )
{
- modules = buildModuleDirectivesFromElement( base, child );
+ resources = buildResourceDirectivesFromElement( base, child
);
}
else
{
@@ -315,7 +315,7 @@
throw new IllegalArgumentException( error );
}
}
- return new LibraryDirective( imports, modules, properties );
+ return new LibraryDirective( imports, resources, properties );
}

/**
@@ -324,7 +324,7 @@
* @param base the basedire of the enclosing library or module
* @param element the element definting the module
*/
- private ModuleDirective[] buildModuleDirectivesFromElement(
+ private ResourceDirective[] buildResourceDirectivesFromElement(
File base, Element element ) throws Exception
{
String tag = element.getTagName();
@@ -335,13 +335,13 @@
throw new IllegalArgumentException( error );
}
Element[] children = ElementHelper.getChildren( element );
- ModuleDirective[] modules = new ModuleDirective[ children.length ];
+ ResourceDirective[] resources = new ModuleDirective[ children.length
];
for( int i=0; i<children.length; i++ )
{
Element child = children[i];
- modules[i] = buildModuleDirectiveFromElement( base, child, null
);
+ resources[i] = buildResourceDirectiveFromElement( base, child,
null );
}
- return modules;
+ return resources;
}

/**
@@ -351,7 +351,7 @@
* @return the module directive
* @exception IOException if an IO exception occurs
*/
- public ModuleDirective buildModuleDirective( File source, String path )
throws IOException
+ public ResourceDirective buildResourceDirective( File source, String
path ) throws IOException
{
if( null == source )
{
@@ -371,10 +371,10 @@
}
try
{
- final Element root = getRootElement( source );
final File parent = source.getParentFile();
final String basedir = path;
- return buildModuleDirectiveFromElement( parent, root, basedir );
+ final Element root = getRootElement( source );
+ return buildResourceDirectiveFromElement( parent, root, basedir
);
}
catch( Throwable e )
{
@@ -387,14 +387,14 @@
}
}

-
+
/**
* Build a module using an XML element.
* @param base the base directory
* @param element the module element
* @param offset the imported file directory offset
*/
- private ModuleDirective buildModuleDirectiveFromElement(
+ private ResourceDirective buildResourceDirectiveFromElement(
File base, Element element, String offset ) throws Exception
{
final String elementName = element.getTagName();
@@ -415,9 +415,17 @@
}
else
{
- return buildModuleDirective( source, spec );
+ return buildResourceDirective( source, spec ); // ##
}
}
+ else if( RESOURCE_ELEMENT_NAME.equals( elementName ) )
+ {
+ return buildResourceDirective( element, offset );
+ }
+ else if( PROJECT_ELEMENT_NAME.equals( elementName ) )
+ {
+ return buildResourceDirective( element, offset );
+ }
else if( MODULE_ELEMENT_NAME.equals( elementName ) )
{
ResourceDirective resource = buildResourceDirective( element,
offset );
@@ -441,14 +449,14 @@
}
else if( MODULE_ELEMENT_NAME.equals( tag ) )
{
- ModuleDirective directive =
- buildModuleDirectiveFromElement( base, child, null );
+ ResourceDirective directive =
+ buildResourceDirectiveFromElement( base, child, null );
list.add( directive );
}
else if( IMPORT_ELEMENT_NAME.equals( tag ) )
{
- ModuleDirective directive =
- buildModuleDirectiveFromElement( base, child, null );
+ ResourceDirective directive =
+ buildResourceDirectiveFromElement( base, child, null );
list.add( directive );
}
else if( PROJECT_ELEMENT_NAME.equals( tag ) )

Modified:
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDirective.java
===================================================================
---
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDirective.java
2006-03-14 16:13:48 UTC (rev 1178)
+++
trunk/main/depot/library/src/main/net/dpml/library/info/LibraryDirective.java
2006-03-14 18:10:35 UTC (rev 1179)
@@ -31,7 +31,7 @@
public final class LibraryDirective extends AbstractDirective
{
private final ImportDirective[] m_imports;
- private final ModuleDirective[] m_modules;
+ private final ResourceDirective[] m_resources;

/**
* Creation of a new library directive.
@@ -40,7 +40,7 @@
* @param properties library properties
*/
public LibraryDirective(
- ImportDirective[] imports, ModuleDirective[] modules, Properties
properties )
+ ImportDirective[] imports, ResourceDirective[] resources, Properties
properties )
{
super( properties );

@@ -55,19 +55,19 @@
throw new NullPointerException( "import" );
}
}
- if( null == modules )
+ if( null == resources )
{
- throw new NullPointerException( "modules" );
+ throw new NullPointerException( "resources" );
}
- for( int i=0; i<modules.length; i++ )
+ for( int i=0; i<resources.length; i++ )
{
- if( null == modules[i] )
+ if( null == resources[i] )
{
- throw new NullPointerException( "module" );
+ throw new NullPointerException( "resource" );
}
}

- m_modules = modules;
+ m_resources = resources;
m_imports = imports;
}

@@ -84,9 +84,9 @@
* Return the set of module directives.
* @return the module directive array
*/
- public ModuleDirective[] getModuleDirectives()
+ public ResourceDirective[] getResourceDirectives()
{
- return m_modules;
+ return m_resources;
}

/**
@@ -99,7 +99,7 @@
if( super.equals( other ) && ( other instanceof LibraryDirective ) )
{
LibraryDirective object = (LibraryDirective) other;
- if( !Arrays.equals( m_modules, object.m_modules ) )
+ if( !Arrays.equals( m_resources, object.m_resources ) )
{
return false;
}
@@ -121,7 +121,7 @@
public int hashCode()
{
int hash = super.hashCode();
- hash ^= super.hashArray( m_modules );
+ hash ^= super.hashArray( m_resources );
hash ^= super.hashArray( m_imports );
return hash;
}

Modified:
trunk/main/depot/library/src/test/net/dpml/library/impl/ExportTestCase.java
===================================================================
---
trunk/main/depot/library/src/test/net/dpml/library/impl/ExportTestCase.java
2006-03-14 16:13:48 UTC (rev 1178)
+++
trunk/main/depot/library/src/test/net/dpml/library/impl/ExportTestCase.java
2006-03-14 18:10:35 UTC (rev 1179)
@@ -52,7 +52,7 @@
File test = new File( testPath );
File export = new File( test, "export.xml" );
builder.export( directive, new FileOutputStream( export ) );
- ModuleDirective result = builder.buildModule( export.toURI() );
+ ResourceDirective result = builder.buildResource( export.toURI() );
compareResourceDirective( directive, result );
assertEquals( "export", directive, result );
}

Modified:
trunk/main/depot/library/src/test/net/dpml/library/impl/XMLTestCase.java
===================================================================
--- trunk/main/depot/library/src/test/net/dpml/library/impl/XMLTestCase.java
2006-03-14 16:13:48 UTC (rev 1178)
+++ trunk/main/depot/library/src/test/net/dpml/library/impl/XMLTestCase.java
2006-03-14 18:10:35 UTC (rev 1179)
@@ -70,7 +70,7 @@
{
LibraryDirective library = getDirective( "samples/example-1.xml" );
assertEquals( "imports", 0, library.getImportDirectives().length );
- assertEquals( "modules", 0, library.getModuleDirectives().length );
+ assertEquals( "resources", 0, library.getResourceDirectives().length
);
assertEquals( "properties", 0,
library.getProperties().keySet().size() );
}

@@ -81,7 +81,7 @@
{
LibraryDirective library = getDirective( "samples/example-2.xml" );
assertEquals( "imports", 0, library.getImportDirectives().length );
- assertEquals( "modules", 0, library.getModuleDirectives().length );
+ assertEquals( "resources", 0, library.getResourceDirectives().length
);
assertEquals( "properties", 2,
library.getProperties().keySet().size() );
}

@@ -92,7 +92,7 @@
{
LibraryDirective library = getDirective( "samples/example-3.xml" );
assertEquals( "imports", 2, library.getImportDirectives().length );
- assertEquals( "modules", 0, library.getModuleDirectives().length );
+ assertEquals( "resources", 0, library.getResourceDirectives().length
);
assertEquals( "properties", 0,
library.getProperties().keySet().size() );
}

@@ -103,7 +103,7 @@
{
LibraryDirective library = getDirective( "samples/example-4.xml" );
assertEquals( "imports", 2, library.getImportDirectives().length );
- assertEquals( "modules", 3, library.getModuleDirectives().length );
+ assertEquals( "resources", 3, library.getResourceDirectives().length
);
assertEquals( "properties", 0,
library.getProperties().keySet().size() );
}

@@ -113,9 +113,9 @@
public void testModuleName() throws Exception
{
LibraryDirective library = getDirective( "samples/example-5.xml" );
- ModuleDirective[] modules = library.getModuleDirectives();
- ModuleDirective module = modules[0];
- String name = module.getName();
+ ResourceDirective[] resources = library.getResourceDirectives();
+ ResourceDirective resource = resources[0];
+ String name = resource.getName();
assertEquals( "name", "acme", name );
}

@@ -125,9 +125,9 @@
public void testModuleBasedir() throws Exception
{
LibraryDirective library = getDirective( "samples/example-5.xml" );
- ModuleDirective[] modules = library.getModuleDirectives();
- ModuleDirective module = modules[0];
- String basedir = module.getBasedir();
+ ResourceDirective[] resources = library.getResourceDirectives();
+ ResourceDirective resource = resources[0];
+ String basedir = resource.getBasedir();
assertEquals( "basedir", ".", basedir );
}

@@ -137,9 +137,9 @@
public void testModuleProperties() throws Exception
{
LibraryDirective library = getDirective( "samples/example-5.xml" );
- ModuleDirective[] modules = library.getModuleDirectives();
- ModuleDirective module = modules[0];
- assertEquals( "properties", 3,
module.getProperties().keySet().size() );
+ ResourceDirective[] resources = library.getResourceDirectives();
+ ResourceDirective resource = resources[0];
+ assertEquals( "properties", 3,
resource.getProperties().keySet().size() );
}

/**
@@ -148,8 +148,8 @@
public void testModuleImport() throws Exception
{
LibraryDirective library = getDirective( "samples/example-6.xml" );
- ModuleDirective[] modules = library.getModuleDirectives();
- assertEquals( "modules", 1, modules.length );
+ ResourceDirective[] resources = library.getResourceDirectives();
+ assertEquals( "modules", 1, resources.length );
}

/**
@@ -158,11 +158,19 @@
public void testNestedModuleImport() throws Exception
{
LibraryDirective library = getDirective( "samples/example-7.xml" );
- ModuleDirective[] modules = library.getModuleDirectives();
- assertEquals( "modules", 1, modules.length );
- ModuleDirective module = modules[0];
- ResourceDirective[] resources = module.getResourceDirectives();
+ ResourceDirective[] resources = library.getResourceDirectives();
assertEquals( "resources", 1, resources.length );
+ ResourceDirective resource = resources[0];
+ if( resource instanceof ModuleDirective )
+ {
+ ModuleDirective module = (ModuleDirective) resource;
+ ResourceDirective[] ress = module.getResourceDirectives();
+ assertEquals( "resources", 1, ress.length );
+ }
+ else
+ {
+ fail( "Expecting a module - found a resource." );
+ }
}

/**
@@ -171,14 +179,22 @@
public void testResourceStatement() throws Exception
{
LibraryDirective library = getDirective( "samples/example-8.xml" );
- ModuleDirective[] modules = library.getModuleDirectives();
- assertEquals( "modules", 1, modules.length );
- ModuleDirective module = modules[0];
- ResourceDirective[] resources = module.getResourceDirectives();
+ ResourceDirective[] resources = library.getResourceDirectives();
assertEquals( "resources", 1, resources.length );
ResourceDirective resource = resources[0];
- TypeDirective[] types = resource.getTypeDirectives();
- assertEquals( "types", 2, types.length );
+ if( resource instanceof ModuleDirective )
+ {
+ ModuleDirective module = (ModuleDirective) resource;
+ ResourceDirective[] ress = module.getResourceDirectives();
+ assertEquals( "resources", 1, ress.length );
+ ResourceDirective r = ress[0];
+ TypeDirective[] types = r.getTypeDirectives();
+ assertEquals( "types", 2, types.length );
+ }
+ else
+ {
+ fail( "Expecting a module - found a resource." );
+ }
}

private LibraryDirective getDirective( String path ) throws Exception

Modified: trunk/main/planet/http/module.xml
===================================================================
--- trunk/main/planet/http/module.xml 2006-03-14 16:13:48 UTC (rev 1178)
+++ trunk/main/planet/http/module.xml 2006-03-14 18:10:35 UTC (rev 1179)
@@ -40,104 +40,7 @@
</dependencies>
</project>

- <project name="dpml-http-server" basedir="server">
- <types>
- <component xmlns="artifact:xsd:dpml/lang/dpml-component#1.0"
class="net.dpml.http.Server" lifestyle="singleton">
- <parts>
- 
- <component key="plain"
class="net.dpml.http.SelectChannelConnector">
- <context>
- <entry key="port" value="8080"/>
- <entry key="maxIdleTime" value="50000"/>
- <entry key="acceptors" value="10"/>
- </context>
- </component>
- 
- <component key="ssl" class="net.dpml.http.SslSocketConnector">
- <context>
- <entry key="port" value="8443"/>
- <entry key="maxIdleTime" value="30000"/>
- <entry key="keystore"
value="local:keystore:dpml/planet/http/jetty"/>
- <entry key="password"
value="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/>
- <entry key="keyPassword" value="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/>
- </context>
- </component>
- 
- <component key="realm" class="net.dpml.http.HashUserRealm">
- <context>
- <entry key="name" value="Test Realm"/>
- <entry key="URI"
value="local:properties:dpml/planet/http/realm"/>
- </context>
- </component>
- 
- <component key="webapp" class="net.dpml.http.WebAppContextHandler">
- <context>
- <entry key="contextPath" value="/"/>
- <entry key="war"
value="link:war:dpml/planet/http/dpml-http-app"/>
- </context>
- </component>
- 
- <component key="context"
class="net.dpml.http.ResourceContextHandler">
- <context>
- <entry key="resourceBase" value="${dpml.share}/docs"/>
- <entry key="contextPath" value="/docs"/>
- </context>
- </component>
- 
- <component key="servlets"
class="net.dpml.http.ServletContextHandler">
- <context>
- <entry key="resourceBase" value="${dpml.data}"/>
- <entry key="contextPath" value="/data"/>
- <entry key="servletHolders">
- <param class="net.dpml.http.ServletHolder">
- <param value="data"/>
- <param value="org.mortbay.jetty.servlet.DefaultServlet"/>
- </param>
- </entry>
- <entry key="servletEntries">
- <param class="net.dpml.http.ServletEntry">
- <param value="data"/>
- <param value="/"/>
- </param>
- </entry>
- </context>
- </component>
- </parts>
- </component>
- 
- 
- <type id="part" alias="true"/>
- </types>
- <dependencies scope="build">
- <include key="dpml-http-app"/>
- </dependencies>
- <dependencies scope="runtime">
- <include urn="artifact:jar:org/mortbay/servlet-api-2.5#20060213"
tag="PUBLIC"/>
- <include key="dpml-http-impl"/>
- </dependencies>
- </project>
+ <import file="server/project.xml"/>

<project name="dpml-http-test" basedir="test">
<properties>

Added: trunk/main/planet/http/server/project.xml
===================================================================
--- trunk/main/planet/http/server/project.xml 2006-03-14 16:13:48 UTC (rev
1178)
+++ trunk/main/planet/http/server/project.xml 2006-03-14 18:10:35 UTC (rev
1179)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project name="dpml-http-server" basedir="."
xmlns="artifact:xsd:dpml/lang/dpml-module#1.0">
+
+ <types>
+ <component xmlns="artifact:xsd:dpml/lang/dpml-component#1.0"
+ class="net.dpml.http.Server"
+ lifestyle="singleton"
+ alias="true">
+ <parts>
+ 
+ <component key="plain" class="net.dpml.http.SelectChannelConnector">
+ <context>
+ <entry key="port" value="8080"/>
+ <entry key="maxIdleTime" value="50000"/>
+ <entry key="acceptors" value="10"/>
+ </context>
+ </component>
+ 
+ <component key="ssl" class="net.dpml.http.SslSocketConnector">
+ <context>
+ <entry key="port" value="8443"/>
+ <entry key="maxIdleTime" value="30000"/>
+ <entry key="keystore"
value="local:keystore:dpml/planet/http/jetty"/>
+ <entry key="password"
value="OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4"/>
+ <entry key="keyPassword" value="OBF:1u2u1wml1z7s1z7a1wnl1u2g"/>
+ </context>
+ </component>
+ 
+ <component key="realm" class="net.dpml.http.HashUserRealm">
+ <context>
+ <entry key="name" value="Test Realm"/>
+ <entry key="URI"
value="local:properties:dpml/planet/http/realm"/>
+ </context>
+ </component>
+ 
+ <component key="webapp" class="net.dpml.http.WebAppContextHandler">
+ <context>
+ <entry key="contextPath" value="/"/>
+ <entry key="war"
value="link:war:dpml/planet/http/dpml-http-app"/>
+ </context>
+ </component>
+ 
+ <component key="context"
class="net.dpml.http.ResourceContextHandler">
+ <context>
+ <entry key="resourceBase" value="${dpml.share}/docs"/>
+ <entry key="contextPath" value="/docs"/>
+ </context>
+ </component>
+ 
+ <component key="servlets"
class="net.dpml.http.ServletContextHandler">
+ <context>
+ <entry key="resourceBase" value="${dpml.data}"/>
+ <entry key="contextPath" value="/data"/>
+ <entry key="servletHolders">
+ <param class="net.dpml.http.ServletHolder">
+ <param value="data"/>
+ <param value="org.mortbay.jetty.servlet.DefaultServlet"/>
+ </param>
+ </entry>
+ <entry key="servletEntries">
+ <param class="net.dpml.http.ServletEntry">
+ <param value="data"/>
+ <param value="/"/>
+ </param>
+ </entry>
+ </context>
+ </component>
+ </parts>
+ </component>
+ </types>
+
+ <dependencies scope="build">
+ <include key="dpml-http-app"/>
+ </dependencies>
+ <dependencies scope="runtime">
+ <include urn="artifact:jar:org/mortbay/servlet-api-2.5#20060213"
tag="PUBLIC"/>
+ <include key="dpml-http-impl"/>
+ </dependencies>
+
+</project>

r1179 - in trunk/main: depot/library/src/main/net/dpml/library/impl depot/library/src/main/net/dpml/library/info depot/library/src/test/net/dpml/library/impl planet/http planet/http/server, mcconnell at BerliOS, 03/14/2006