DPML Notify

[mcconnell at BerliOS <mcconnell AT mail.berlios.de>]

Author: mcconnell
Date: 2006-03-17 19:05:48 +0100 (Fri, 17 Mar 2006)
New Revision: 1210

Added:
   trunk/main/depot/library/src/main/net/dpml/library/Builder.java
   trunk/main/depot/library/src/main/net/dpml/library/Dictionary.java
   
trunk/main/depot/library/src/main/net/dpml/library/DuplicateNameException.java
   trunk/main/depot/library/src/main/net/dpml/library/Library.java
   trunk/main/depot/library/src/main/net/dpml/library/Module.java
   
trunk/main/depot/library/src/main/net/dpml/library/ModuleNotFoundException.java
   
trunk/main/depot/library/src/main/net/dpml/library/ReferentialException.java
   trunk/main/depot/library/src/main/net/dpml/library/Resource.java
   
trunk/main/depot/library/src/main/net/dpml/library/ResourceNotFoundException.java
   trunk/main/depot/library/src/main/net/dpml/library/Type.java
   
trunk/main/depot/library/src/main/net/dpml/library/TypeNotFoundException.java
   trunk/main/depot/library/src/main/net/dpml/library/package.html
Removed:
   trunk/main/depot/library/src/main/net/dpml/library/model/Builder.java
   trunk/main/depot/library/src/main/net/dpml/library/model/Dictionary.java
   
trunk/main/depot/library/src/main/net/dpml/library/model/DuplicateNameException.java
   trunk/main/depot/library/src/main/net/dpml/library/model/Library.java
   trunk/main/depot/library/src/main/net/dpml/library/model/Module.java
   
trunk/main/depot/library/src/main/net/dpml/library/model/ModuleNotFoundException.java
   
trunk/main/depot/library/src/main/net/dpml/library/model/ReferentialException.java
   trunk/main/depot/library/src/main/net/dpml/library/model/Resource.java
   
trunk/main/depot/library/src/main/net/dpml/library/model/ResourceNotFoundException.java
   trunk/main/depot/library/src/main/net/dpml/library/model/Type.java
   
trunk/main/depot/library/src/main/net/dpml/library/model/TypeNotFoundException.java
   trunk/main/depot/library/src/main/net/dpml/library/model/package.html
Modified:
   trunk/main/build.xml
   trunk/main/central/src/docs/depot/cli/plugin.xml
   trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
   
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
   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/test/net/dpml/library/impl/AbstractTestCase.java
   
trunk/main/depot/library/src/test/net/dpml/library/impl/AnonymousTestCase.java
   
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java
   
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
   
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultModuleTestCase.java
   
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
   trunk/main/depot/library/src/test/net/dpml/library/impl/ExportTestCase.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Processor.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Workbench.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/PluginProcess.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ModuleTask.java
   trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PluginTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReactorTask.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
   
trunk/main/depot/tools/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
Log:
move dpml/library/model to dpml/library

Modified: trunk/main/build.xml
===================================================================
--- trunk/main/build.xml        2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/build.xml        2006-03-17 18:05:48 UTC (rev 1210)
@@ -239,11 +239,13 @@
       <group title="Depot">
         <package name="net.dpml.depot"/>
         <package name="net.dpml.depot.*"/>
-        <package name="net.dpml.library"/>
-        <package name="net.dpml.library.*"/>
         <package name="net.dpml.tools"/>
         <package name="net.dpml.tools.*"/>
       </group>
+      <group title="Library">
+        <package name="net.dpml.library"/>
+        <package name="net.dpml.library.*"/>
+      </group>
       <group title="Transit">
         <package name="net.dpml.lang"/>
         <package name="net.dpml.part"/>

Modified: trunk/main/central/src/docs/depot/cli/plugin.xml
===================================================================
--- trunk/main/central/src/docs/depot/cli/plugin.xml    2006-03-17 07:45:18 
UTC (rev 1209)
+++ trunk/main/central/src/docs/depot/cli/plugin.xml    2006-03-17 18:05:48 
UTC (rev 1210)
@@ -19,7 +19,7 @@
       The <tt>-plugin</tt> option allows explicit overriding of the 
       default builder plugin to use when executing a build sequence.
       The artifact uri must refer to a Transit plugin that implements
-      the <tt>net.dpml.library.model.Builder</tt> interface. Unless
+      the <tt>net.dpml.library.Builder</tt> interface. Unless
       otherwise specified the Ant-based builder will be used.
       </p>
 

Modified: 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java
===================================================================
--- 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java 
2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/build/src/main/net/dpml/library/console/BuilderPlugin.java 
2006-03-17 18:05:48 UTC (rev 1210)
@@ -30,9 +30,9 @@
 
 import net.dpml.library.info.Scope;
 import net.dpml.library.info.ResourceDirective.Classifier;
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.Builder;
+import net.dpml.library.Module;
+import net.dpml.library.Resource;
+import net.dpml.library.Builder;
 
 import net.dpml.lang.Type;
 

Copied: trunk/main/depot/library/src/main/net/dpml/library/Builder.java (from 
rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/Builder.java)
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Builder.java     
  2006-03-17 07:05:05 UTC (rev 1204)
+++ trunk/main/depot/library/src/main/net/dpml/library/Builder.java     
2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,38 @@
+/*
+ * 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;
+
+/**
+ * A Builder is implementated by a plugin that handles the building of
+ * a project.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Builder
+{
+   /**
+    * Build a resource.
+    * @param resource the resource to build
+    * @param targets build target names
+    * @return the success status of the build
+    */
+    public boolean build( Resource resource, String[] targets );
+
+}

Copied: trunk/main/depot/library/src/main/net/dpml/library/Dictionary.java 
(from rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/Dictionary.java)
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Dictionary.java  
  2006-03-17 07:05:05 UTC (rev 1204)
+++ trunk/main/depot/library/src/main/net/dpml/library/Dictionary.java  
2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,56 @@
+/*
+ * 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;
+
+/**
+ * The Dictonary interface exposes operations dealing with named properties.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Dictionary
+{
+   /**
+    * Return the property names associated with the dictionary.
+    * @return the array of property names
+    */
+    String[] getPropertyNames();
+    
+   /**
+    * Return the local property names associated with the dictionary.
+    * @return the array of local property names
+    */
+    String[] getLocalPropertyNames();
+
+   /**
+    * Return a property value.
+    * @param key the property key
+    * @return the property value
+    */
+    String getProperty( String key );
+    
+   /**
+    * Return a property value.
+    * @param key the property key
+    * @param value the default value
+    * @return the property value
+    */
+    String getProperty( String key, String value );
+    
+}

Copied: 
trunk/main/depot/library/src/main/net/dpml/library/DuplicateNameException.java
 (from rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/DuplicateNameException.java)
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/DuplicateNameException.java
        2006-03-17 07:05:05 UTC (rev 1204)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/DuplicateNameException.java
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+/**
+ * A DuplicateNameException is thrown when an attempt is made to duplicate 
+ * an existing named object within a model .
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class DuplicateNameException extends Exception
+{
+   /**
+    * Creation of a new DuplicateNameException.
+    * @param message the exception message
+    */
+    public DuplicateNameException( String message )
+    {
+        this( message, null );
+    }
+    
+   /**
+    * Creation of a new DuplicateNameException.
+    * @param message the exception message
+    * @param cause the causal excetion
+    */
+    public DuplicateNameException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+}

Copied: trunk/main/depot/library/src/main/net/dpml/library/Library.java (from 
rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/Library.java)
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Library.java     
  2006-03-17 07:05:05 UTC (rev 1204)
+++ trunk/main/depot/library/src/main/net/dpml/library/Library.java     
2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,114 @@
+/*
+ * 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;
+
+import java.io.File;
+
+/**
+ * The Library interface is the application root for module management.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Library
+{
+   /**
+    * Utility operation to sort a collection of resources.
+    * @param resources the resources to sort
+    * @return the sorted resource array
+    */
+    Resource[] sort( Resource[] resources );
+    
+   /**
+    * Return a array of the top-level modules within the library.
+    * @return the module array
+    */
+    Module[] getModules();
+    
+   /**
+    * Return a array of all modules in the library.
+    * @return module array
+    */
+    Module[] getAllModules();
+    
+   /**
+    * Return a named module.
+    * @param ref the fully qualified module name
+    * @return the module
+    * @exception ModuleNotFoundException if the module cannot be found
+    */
+    Module getModule( String ref ) throws ModuleNotFoundException;
+    
+   /**
+    * Recursively lookup a resource using a fully qualified reference.
+    * @param ref the fully qualified resource name
+    * @return the resource instance
+    * @exception ResourceNotFoundException if the resource cannot be found
+    */
+    Resource getResource( String ref ) throws ResourceNotFoundException;
+    
+   /**
+    * <p>Select a set of resource matching a supplied a resource selection 
+    * constraint.  The constraint may contain the wildcards '**' and '*'.
+    * @param criteria the selection criteria
+    * @param sort if true the returned array will be sorted relative to 
dependencies
+    *   otherwise the array will be sorted alphanumerically with respect to 
the resource
+    *   path
+    * @return an array of resources matching the selction criteria
+    */
+    Resource[] select( String criteria, boolean sort );
+    
+   /**
+    * <p>Select a set of resource matching a supplied a resource selection 
+    * constraint.  The constraint may contain the wildcards '**' and '*'.
+    * @param local if true limit the selection to local projects
+    * @param criteria the selection criteria
+    * @param sort if true the returned array will be sorted relative to 
dependencies
+    *   otherwise the array will be sorted alphanumerically with respect to 
the resource
+    *   path
+    * @return an array of resources matching the selction criteria
+    */
+    Resource[] select( String criteria, boolean local, boolean sort );
+    
+   /**
+    * Select all local projects with a basedir equal to or depper than the 
supplied 
+    * directory.
+    * @param base the reference basedir
+    * @return an array of projects within or lower than the supplied basedir
+    */
+    Resource[] select( File base );
+    
+   /**
+    * Select all local projects relative to the supplied basedir.
+    * @param base the reference basedir
+    * @param self if true and the basedir resolves to a project then include 
the project
+    *   otherwise the project will be expluded from selection
+    * @return an array of projects relative to the basedir
+    */
+    Resource[] select( File base, boolean self );
+    
+   /**
+    * Locate a resource relative to a base directory.
+    * @param base the base directory
+    * @return a resource with a matching basedir
+    * @exception ResourceNotFoundException if resource match  relative to 
the supplied base
+    */
+    Resource locate( File base ) throws ResourceNotFoundException;
+    
+}

Copied: trunk/main/depot/library/src/main/net/dpml/library/Module.java (from 
rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/Module.java)
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Module.java      
  2006-03-17 07:05:05 UTC (rev 1204)
+++ trunk/main/depot/library/src/main/net/dpml/library/Module.java      
2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,84 @@
+/*
+ * 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;
+
+import net.dpml.library.info.ModuleDirective;
+
+/**
+ * The Modele interface defines a node within a module hierachy.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Module extends Resource
+{
+   /**
+    * Return an array of immediate resources contained within the
+    * module.
+    * @return the resource array
+    */
+    Resource[] getResources();
+    
+   /**
+    * Return a resource using a supplied name.
+    * @param ref a path relative to the module
+    * @return the resource array
+    * @exception ResourceNotFoundException if the ref value is not recognized
+    */
+    Resource getResource( String ref ) throws ResourceNotFoundException;
+    
+   /**
+    * Return the array of modules that are direct children of this module.
+    * @return the child modules
+    */
+    Module[] getModules();
+    
+   /**
+    * Return the array of modules that are descendants of this module.
+    * @return the descendants module array
+    */
+    Module[] getAllModules();
+    
+   /**
+    * Return a module using a supplied reference.
+    * @param ref a path relative to the module
+    * @return the module array
+    * @exception ModuleNotFoundException if the ref value is not recognized
+    */
+    Module getModule( String ref ) throws ModuleNotFoundException;
+    
+   /**
+    * <p>Select a set of resource matching a supplied a resource selection 
+    * constraint.  The constraint may contain the wildcards '**' and '*'.
+    * @param local if true limit the selection to local projects
+    * @param criteria the selection criteria
+    * @param sort if true the returned array will be sorted relative to 
dependencies
+    *   otherwise the array will be sorted alphanumerically with respect to 
the resource
+    *   path
+    * @return an array of resources matching the selction criteria
+    */
+    Resource[] select( String criteria, boolean local, boolean sort );
+
+   /**
+    * Return a directive suitable for publication as an external description.
+    * @return the module directive
+    */
+    ModuleDirective export();
+
+}

Copied: 
trunk/main/depot/library/src/main/net/dpml/library/ModuleNotFoundException.java
 (from rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/ModuleNotFoundException.java)
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/ModuleNotFoundException.java
       2006-03-17 07:05:05 UTC (rev 1204)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/ModuleNotFoundException.java
     2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+/**
+ * A ModuleNotFoundException is thrown when a requested for a named module 
cannot
+ * be resolved.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class ModuleNotFoundException extends ResourceNotFoundException
+{
+   /**
+    * Creation of a new ModuleNotFoundException.
+    * @param message the exception message
+    */
+    public ModuleNotFoundException( String message )
+    {
+        this( message, null );
+    }
+    
+   /**
+    * Creation of a new ModuleNotFoundException.
+    * @param message the exception message
+    * @param cause the causal excetion
+    */
+    public ModuleNotFoundException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+}

Copied: 
trunk/main/depot/library/src/main/net/dpml/library/ReferentialException.java 
(from rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/ReferentialException.java)
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/ReferentialException.java
  2006-03-17 07:05:05 UTC (rev 1204)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/ReferentialException.java  
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,49 @@
+/*
+ * 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;
+
+/**
+ * A ReferentialException is thrown when a requested change would result
+ * in the creation of a referential integrity issue within a model (such 
+ * as the removal of a resource referenced by another resource).
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class ReferentialException extends Exception
+{
+   /**
+    * Creation of a new ReferentialException.
+    * @param message the exception message
+    */
+    public ReferentialException( String message )
+    {
+        this( message, null );
+    }
+    
+   /**
+    * Creation of a new ReferentialException.
+    * @param message the exception message
+    * @param cause the causal excetion
+    */
+    public ReferentialException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+}

Copied: trunk/main/depot/library/src/main/net/dpml/library/Resource.java 
(from rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/Resource.java)
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Resource.java    
  2006-03-17 07:05:05 UTC (rev 1204)
+++ trunk/main/depot/library/src/main/net/dpml/library/Resource.java    
2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,168 @@
+/*
+ * 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;
+
+import java.io.File;
+
+import net.dpml.lang.Type;
+import net.dpml.library.info.Scope;
+import net.dpml.library.info.ResourceDirective.Classifier;
+
+import net.dpml.transit.Artifact;
+import net.dpml.lang.Category;
+
+/**
+ * The Resource interface describes infomation about a published resource.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Resource extends Dictionary
+{
+   /**
+    * Return the name of the resource.
+    * @return the resource name
+    */
+    String getName();
+    
+   /**
+    * Return the resource version.
+    * @return the version
+    */
+    String getVersion();
+    
+   /**
+    * Return the fully qualified path to the resource.
+    * @return the path
+    */
+    String getResourcePath();
+
+   /**
+    * Return the basedir for this resource.
+    * @return the base directory (possibly null)
+    */
+    File getBaseDir();
+
+   /**
+    * Return the resource classifier.
+    * @return the classifier (LOCAL, EXTERNAL or ANONYMOUS)
+    */
+    Classifier getClassifier();
+    
+   /**
+    * Return the expanded array of types associated with the resource.
+    * The returned array is a function of the types declared by a resource
+    * expanded relative to any types implied by processor dependencies.
+    * @return the type array
+    */
+    Type[] getTypes();
+    
+   /**
+    * Test if this resource is associated with a type of the supplied name.
+    * @param type the type id
+    * @return TRUE if this resource produces an artifact of the supplied type
+    */
+    boolean isa( String type );
+    
+   /**
+    * Return a resource type relative to a supplied type id.
+    * @param id the type name to retrieve
+    * @return the type instance
+    */
+    Type getType( String id );
+    
+   /**
+    * Construct an artifact for the supplied type.
+    * @param type the resource type id
+    * @return the artifact
+    */
+    Artifact getArtifact( String type );
+    
+   /**
+    * Construct an unversion link artifact for the supplied type.
+    * @param type the resource type id
+    * @return the link artifact
+    */
+    Artifact getLinkArtifact( String type );
+    
+   /**
+    * Return the enclosing parent module.
+    * @return the enclosing module of null if this a top-level module.
+    */
+    Module getParent();
+    
+   /**
+    * Return an array of resource that are providers to this resource.
+    * @param scope the operational scope
+    * @param expand if true include transitive dependencies
+    * @param sort if true the array will sorted relative to dependencies
+    * @return the resource providers
+    */
+    Resource[] getProviders( Scope scope, boolean expand, boolean sort );
+    
+   /**
+    * Return an array of resource that are providers to this resource. If
+    * the supplied scope is BUILD the returned resource array is equivalent
+    * <src>getProviders( Scope.BUILD, .. )</src>.  If the scope is RUNTIME
+    * the returned resource array includes BUILD and RUNTIME resources. If 
+    * the scope is TEST the returned array includes BUILD, RUNTIME and TEST
+    * resources.
+    * @param scope the scope of aggregation to be applied to the selection
+    * @param expand if TRUE include transitive dependencies
+    * @param sort if true the array will sorted relative to dependencies
+    * @return the resource providers
+    */
+    Resource[] getAggregatedProviders( Scope scope, boolean expand, boolean 
sort );
+    
+   /**
+    * Return a sorted and filtered array of providers. Resources not 
declaring
+    * the "jar" type as a produced type are excluded from selection.  The 
+    * resource array will include transitive dependencies.  The method is 
+    * suitable for the construction of build and test phase classloaders.
+    *
+    * @param scope the aggregation scope
+    * @return the scoped resource chain
+    */
+    Resource[] getClasspathProviders( Scope scope );
+
+   /**
+    * Return an array of runtime providers filtered relative to a supplied
+    * classloading category.  Resources not declaring the "jar" type as a 
+    * produced type are excluded from selection.  The resource array 
returned 
+    * from this operation is a sorted transitive sequence excluding all 
+    * resource references by any category higher than the supplied category.
+    * This method is typically used to construct information suitable for 
+    * the gerneration of plugin metadata.
+    *
+    * @param category the classloader category
+    * @return the category scoped resource chain
+    */
+    Resource[] getClasspathProviders( Category category );
+
+   /**
+    * Return an array of resources that are consumers of this resource.
+    * @param expand if true the returned array includes consumers associated
+    *   through transitive dependency relationships, otherwise the array is 
+    *   limited to direct consumers
+    * @param sort if true the array is sorted relative to depenency 
relationships
+    * @return the array of consumer projects
+    */
+    Resource[] getConsumers( boolean expand, boolean sort );
+    
+}

Copied: 
trunk/main/depot/library/src/main/net/dpml/library/ResourceNotFoundException.java
 (from rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/ResourceNotFoundException.java)
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/ResourceNotFoundException.java
     2006-03-17 07:05:05 UTC (rev 1204)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/ResourceNotFoundException.java
   2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+/**
+ * A ResourceNotFoundException is thrown when a requested for a named 
resource cannot
+ * be resolved.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public class ResourceNotFoundException extends Exception
+{
+   /**
+    * Creation of a new ResourceNotFoundException.
+    * @param message the exception message
+    */
+    public ResourceNotFoundException( String message )
+    {
+        this( message, null );
+    }
+    
+   /**
+    * Creation of a new ResourceNotFoundException.
+    * @param message the exception message
+    * @param cause the causal excetion
+    */
+    public ResourceNotFoundException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+}

Copied: trunk/main/depot/library/src/main/net/dpml/library/Type.java (from 
rev 1204, trunk/main/depot/library/src/main/net/dpml/library/model/Type.java)
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Type.java  
2006-03-17 07:05:05 UTC (rev 1204)
+++ trunk/main/depot/library/src/main/net/dpml/library/Type.java        
2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,55 @@
+/*
+ * 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;
+
+/**
+ * The Process interface defines a process model.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public interface Type extends Dictionary
+{
+   /**
+    * JAR type name constant.
+    */
+    static final String JAR = "jar";
+    
+   /**
+    * Plugin type name constant.
+    */
+    static final String PLUGIN = "plugin";
+    
+   /**
+    * Module type name constant.
+    */
+    static final String MODULE = "module";
+    
+   /**
+    * Return the name of the type.
+    * @return the type name
+    */
+    String getName();
+    
+   /**
+    * Return the alias association policy.
+    * @return true if alias production assumed
+    */
+    boolean getAlias();
+}

Copied: 
trunk/main/depot/library/src/main/net/dpml/library/TypeNotFoundException.java 
(from rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/TypeNotFoundException.java)
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/TypeNotFoundException.java
 2006-03-17 07:05:05 UTC (rev 1204)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/TypeNotFoundException.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -0,0 +1,48 @@
+/*
+ * 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;
+
+/**
+ * A TypeNotFoundException is thrown when a requested for a named type cannot
+ * be resolved relative to the enclosing object.
+ *
+ * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
+ * @version @PROJECT-VERSION@
+ */
+public final class TypeNotFoundException extends Exception
+{
+   /**
+    * Creation of a new TypeNotFoundException.
+    * @param message the exception message
+    */
+    public TypeNotFoundException( String message )
+    {
+        this( message, null );
+    }
+    
+   /**
+    * Creation of a new TypeNotFoundException.
+    * @param message the exception message
+    * @param cause the causal excetion
+    */
+    public TypeNotFoundException( String message, Throwable cause )
+    {
+        super( message, cause );
+    }
+}

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultDictionary.java
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -22,7 +22,7 @@
 import java.util.Enumeration;
 import java.util.Properties;
 
-import net.dpml.library.model.Dictionary;
+import net.dpml.library.Dictionary;
 import net.dpml.library.info.AbstractDirective;
 
 import net.dpml.transit.util.PropertyResolver;

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-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultLibrary.java 
2006-03-17 18:05:48 UTC (rev 1210)
@@ -34,11 +34,11 @@
 import net.dpml.library.info.ModuleDirective;
 import net.dpml.library.info.ResourceDirective;
 import net.dpml.library.info.Scope;
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Module;
-import net.dpml.library.model.ModuleNotFoundException;
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.ResourceNotFoundException;
+import net.dpml.library.Library;
+import net.dpml.library.Module;
+import net.dpml.library.ModuleNotFoundException;
+import net.dpml.library.Resource;
+import net.dpml.library.ResourceNotFoundException;
 
 import net.dpml.transit.Artifact;
 import net.dpml.lang.Logger;

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-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java  
2006-03-17 18:05:48 UTC (rev 1210)
@@ -32,10 +32,10 @@
 import net.dpml.library.info.DependencyDirective;
 import net.dpml.library.info.ResourceDirective.Classifier;
 import net.dpml.library.info.TypeDirective;
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.ResourceNotFoundException;
-import net.dpml.library.model.ModuleNotFoundException;
+import net.dpml.library.Module;
+import net.dpml.library.Resource;
+import net.dpml.library.ResourceNotFoundException;
+import net.dpml.library.ModuleNotFoundException;
 
 import net.dpml.lang.Category;
 

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-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java  
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -29,8 +29,8 @@
 import java.util.TimeZone;
 import java.util.Properties;
 
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.Module;
+import net.dpml.library.Resource;
+import net.dpml.library.Module;
 import net.dpml.library.info.TypeDirective;
 import net.dpml.library.info.ResourceDirective;
 import net.dpml.library.info.ResourceDirective.Classifier;

Deleted: trunk/main/depot/library/src/main/net/dpml/library/model/Builder.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Builder.java     
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/library/src/main/net/dpml/library/model/Builder.java     
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,38 +0,0 @@
-/*
- * 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.model;
-
-/**
- * A Builder is implementated by a plugin that handles the building of
- * a project.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface Builder
-{
-   /**
-    * Build a resource.
-    * @param resource the resource to build
-    * @param targets build target names
-    * @return the success status of the build
-    */
-    public boolean build( Resource resource, String[] targets );
-
-}

Deleted: 
trunk/main/depot/library/src/main/net/dpml/library/model/Dictionary.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Dictionary.java  
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/library/src/main/net/dpml/library/model/Dictionary.java  
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,56 +0,0 @@
-/*
- * 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.model;
-
-/**
- * The Dictonary interface exposes operations dealing with named properties.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface Dictionary
-{
-   /**
-    * Return the property names associated with the dictionary.
-    * @return the array of property names
-    */
-    String[] getPropertyNames();
-    
-   /**
-    * Return the local property names associated with the dictionary.
-    * @return the array of local property names
-    */
-    String[] getLocalPropertyNames();
-
-   /**
-    * Return a property value.
-    * @param key the property key
-    * @return the property value
-    */
-    String getProperty( String key );
-    
-   /**
-    * Return a property value.
-    * @param key the property key
-    * @param value the default value
-    * @return the property value
-    */
-    String getProperty( String key, String value );
-    
-}

Deleted: 
trunk/main/depot/library/src/main/net/dpml/library/model/DuplicateNameException.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/DuplicateNameException.java
        2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/model/DuplicateNameException.java
        2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,48 +0,0 @@
-/*
- * 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.model;
-
-/**
- * A DuplicateNameException is thrown when an attempt is made to duplicate 
- * an existing named object within a model .
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class DuplicateNameException extends Exception
-{
-   /**
-    * Creation of a new DuplicateNameException.
-    * @param message the exception message
-    */
-    public DuplicateNameException( String message )
-    {
-        this( message, null );
-    }
-    
-   /**
-    * Creation of a new DuplicateNameException.
-    * @param message the exception message
-    * @param cause the causal excetion
-    */
-    public DuplicateNameException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-}

Deleted: trunk/main/depot/library/src/main/net/dpml/library/model/Library.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Library.java     
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/library/src/main/net/dpml/library/model/Library.java     
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,114 +0,0 @@
-/*
- * 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.model;
-
-import java.io.File;
-
-/**
- * The Library interface is the application root for module management.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface Library
-{
-   /**
-    * Utility operation to sort a collection of resources.
-    * @param resources the resources to sort
-    * @return the sorted resource array
-    */
-    Resource[] sort( Resource[] resources );
-    
-   /**
-    * Return a array of the top-level modules within the library.
-    * @return the module array
-    */
-    Module[] getModules();
-    
-   /**
-    * Return a array of all modules in the library.
-    * @return module array
-    */
-    Module[] getAllModules();
-    
-   /**
-    * Return a named module.
-    * @param ref the fully qualified module name
-    * @return the module
-    * @exception ModuleNotFoundException if the module cannot be found
-    */
-    Module getModule( String ref ) throws ModuleNotFoundException;
-    
-   /**
-    * Recursively lookup a resource using a fully qualified reference.
-    * @param ref the fully qualified resource name
-    * @return the resource instance
-    * @exception ResourceNotFoundException if the resource cannot be found
-    */
-    Resource getResource( String ref ) throws ResourceNotFoundException;
-    
-   /**
-    * <p>Select a set of resource matching a supplied a resource selection 
-    * constraint.  The constraint may contain the wildcards '**' and '*'.
-    * @param criteria the selection criteria
-    * @param sort if true the returned array will be sorted relative to 
dependencies
-    *   otherwise the array will be sorted alphanumerically with respect to 
the resource
-    *   path
-    * @return an array of resources matching the selction criteria
-    */
-    Resource[] select( String criteria, boolean sort );
-    
-   /**
-    * <p>Select a set of resource matching a supplied a resource selection 
-    * constraint.  The constraint may contain the wildcards '**' and '*'.
-    * @param local if true limit the selection to local projects
-    * @param criteria the selection criteria
-    * @param sort if true the returned array will be sorted relative to 
dependencies
-    *   otherwise the array will be sorted alphanumerically with respect to 
the resource
-    *   path
-    * @return an array of resources matching the selction criteria
-    */
-    Resource[] select( String criteria, boolean local, boolean sort );
-    
-   /**
-    * Select all local projects with a basedir equal to or depper than the 
supplied 
-    * directory.
-    * @param base the reference basedir
-    * @return an array of projects within or lower than the supplied basedir
-    */
-    Resource[] select( File base );
-    
-   /**
-    * Select all local projects relative to the supplied basedir.
-    * @param base the reference basedir
-    * @param self if true and the basedir resolves to a project then include 
the project
-    *   otherwise the project will be expluded from selection
-    * @return an array of projects relative to the basedir
-    */
-    Resource[] select( File base, boolean self );
-    
-   /**
-    * Locate a resource relative to a base directory.
-    * @param base the base directory
-    * @return a resource with a matching basedir
-    * @exception ResourceNotFoundException if resource match  relative to 
the supplied base
-    */
-    Resource locate( File base ) throws ResourceNotFoundException;
-    
-}

Deleted: trunk/main/depot/library/src/main/net/dpml/library/model/Module.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Module.java      
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/library/src/main/net/dpml/library/model/Module.java      
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,84 +0,0 @@
-/*
- * 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.model;
-
-import net.dpml.library.info.ModuleDirective;
-
-/**
- * The Modele interface defines a node within a module hierachy.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface Module extends Resource
-{
-   /**
-    * Return an array of immediate resources contained within the
-    * module.
-    * @return the resource array
-    */
-    Resource[] getResources();
-    
-   /**
-    * Return a resource using a supplied name.
-    * @param ref a path relative to the module
-    * @return the resource array
-    * @exception ResourceNotFoundException if the ref value is not recognized
-    */
-    Resource getResource( String ref ) throws ResourceNotFoundException;
-    
-   /**
-    * Return the array of modules that are direct children of this module.
-    * @return the child modules
-    */
-    Module[] getModules();
-    
-   /**
-    * Return the array of modules that are descendants of this module.
-    * @return the descendants module array
-    */
-    Module[] getAllModules();
-    
-   /**
-    * Return a module using a supplied reference.
-    * @param ref a path relative to the module
-    * @return the module array
-    * @exception ModuleNotFoundException if the ref value is not recognized
-    */
-    Module getModule( String ref ) throws ModuleNotFoundException;
-    
-   /**
-    * <p>Select a set of resource matching a supplied a resource selection 
-    * constraint.  The constraint may contain the wildcards '**' and '*'.
-    * @param local if true limit the selection to local projects
-    * @param criteria the selection criteria
-    * @param sort if true the returned array will be sorted relative to 
dependencies
-    *   otherwise the array will be sorted alphanumerically with respect to 
the resource
-    *   path
-    * @return an array of resources matching the selction criteria
-    */
-    Resource[] select( String criteria, boolean local, boolean sort );
-
-   /**
-    * Return a directive suitable for publication as an external description.
-    * @return the module directive
-    */
-    ModuleDirective export();
-
-}

Deleted: 
trunk/main/depot/library/src/main/net/dpml/library/model/ModuleNotFoundException.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/ModuleNotFoundException.java
       2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/model/ModuleNotFoundException.java
       2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,48 +0,0 @@
-/*
- * 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.model;
-
-/**
- * A ModuleNotFoundException is thrown when a requested for a named module 
cannot
- * be resolved.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class ModuleNotFoundException extends ResourceNotFoundException
-{
-   /**
-    * Creation of a new ModuleNotFoundException.
-    * @param message the exception message
-    */
-    public ModuleNotFoundException( String message )
-    {
-        this( message, null );
-    }
-    
-   /**
-    * Creation of a new ModuleNotFoundException.
-    * @param message the exception message
-    * @param cause the causal excetion
-    */
-    public ModuleNotFoundException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-}

Deleted: 
trunk/main/depot/library/src/main/net/dpml/library/model/ReferentialException.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/ReferentialException.java
  2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/model/ReferentialException.java
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,49 +0,0 @@
-/*
- * 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.model;
-
-/**
- * A ReferentialException is thrown when a requested change would result
- * in the creation of a referential integrity issue within a model (such 
- * as the removal of a resource referenced by another resource).
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class ReferentialException extends Exception
-{
-   /**
-    * Creation of a new ReferentialException.
-    * @param message the exception message
-    */
-    public ReferentialException( String message )
-    {
-        this( message, null );
-    }
-    
-   /**
-    * Creation of a new ReferentialException.
-    * @param message the exception message
-    * @param cause the causal excetion
-    */
-    public ReferentialException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-}

Deleted: 
trunk/main/depot/library/src/main/net/dpml/library/model/Resource.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Resource.java    
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/library/src/main/net/dpml/library/model/Resource.java    
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,168 +0,0 @@
-/*
- * 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.model;
-
-import java.io.File;
-
-import net.dpml.lang.Type;
-import net.dpml.library.info.Scope;
-import net.dpml.library.info.ResourceDirective.Classifier;
-
-import net.dpml.transit.Artifact;
-import net.dpml.lang.Category;
-
-/**
- * The Resource interface describes infomation about a published resource.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface Resource extends Dictionary
-{
-   /**
-    * Return the name of the resource.
-    * @return the resource name
-    */
-    String getName();
-    
-   /**
-    * Return the resource version.
-    * @return the version
-    */
-    String getVersion();
-    
-   /**
-    * Return the fully qualified path to the resource.
-    * @return the path
-    */
-    String getResourcePath();
-
-   /**
-    * Return the basedir for this resource.
-    * @return the base directory (possibly null)
-    */
-    File getBaseDir();
-
-   /**
-    * Return the resource classifier.
-    * @return the classifier (LOCAL, EXTERNAL or ANONYMOUS)
-    */
-    Classifier getClassifier();
-    
-   /**
-    * Return the expanded array of types associated with the resource.
-    * The returned array is a function of the types declared by a resource
-    * expanded relative to any types implied by processor dependencies.
-    * @return the type array
-    */
-    Type[] getTypes();
-    
-   /**
-    * Test if this resource is associated with a type of the supplied name.
-    * @param type the type id
-    * @return TRUE if this resource produces an artifact of the supplied type
-    */
-    boolean isa( String type );
-    
-   /**
-    * Return a resource type relative to a supplied type id.
-    * @param id the type name to retrieve
-    * @return the type instance
-    */
-    Type getType( String id );
-    
-   /**
-    * Construct an artifact for the supplied type.
-    * @param type the resource type id
-    * @return the artifact
-    */
-    Artifact getArtifact( String type );
-    
-   /**
-    * Construct an unversion link artifact for the supplied type.
-    * @param type the resource type id
-    * @return the link artifact
-    */
-    Artifact getLinkArtifact( String type );
-    
-   /**
-    * Return the enclosing parent module.
-    * @return the enclosing module of null if this a top-level module.
-    */
-    Module getParent();
-    
-   /**
-    * Return an array of resource that are providers to this resource.
-    * @param scope the operational scope
-    * @param expand if true include transitive dependencies
-    * @param sort if true the array will sorted relative to dependencies
-    * @return the resource providers
-    */
-    Resource[] getProviders( Scope scope, boolean expand, boolean sort );
-    
-   /**
-    * Return an array of resource that are providers to this resource. If
-    * the supplied scope is BUILD the returned resource array is equivalent
-    * <src>getProviders( Scope.BUILD, .. )</src>.  If the scope is RUNTIME
-    * the returned resource array includes BUILD and RUNTIME resources. If 
-    * the scope is TEST the returned array includes BUILD, RUNTIME and TEST
-    * resources.
-    * @param scope the scope of aggregation to be applied to the selection
-    * @param expand if TRUE include transitive dependencies
-    * @param sort if true the array will sorted relative to dependencies
-    * @return the resource providers
-    */
-    Resource[] getAggregatedProviders( Scope scope, boolean expand, boolean 
sort );
-    
-   /**
-    * Return a sorted and filtered array of providers. Resources not 
declaring
-    * the "jar" type as a produced type are excluded from selection.  The 
-    * resource array will include transitive dependencies.  The method is 
-    * suitable for the construction of build and test phase classloaders.
-    *
-    * @param scope the aggregation scope
-    * @return the scoped resource chain
-    */
-    Resource[] getClasspathProviders( Scope scope );
-
-   /**
-    * Return an array of runtime providers filtered relative to a supplied
-    * classloading category.  Resources not declaring the "jar" type as a 
-    * produced type are excluded from selection.  The resource array 
returned 
-    * from this operation is a sorted transitive sequence excluding all 
-    * resource references by any category higher than the supplied category.
-    * This method is typically used to construct information suitable for 
-    * the gerneration of plugin metadata.
-    *
-    * @param category the classloader category
-    * @return the category scoped resource chain
-    */
-    Resource[] getClasspathProviders( Category category );
-
-   /**
-    * Return an array of resources that are consumers of this resource.
-    * @param expand if true the returned array includes consumers associated
-    *   through transitive dependency relationships, otherwise the array is 
-    *   limited to direct consumers
-    * @param sort if true the array is sorted relative to depenency 
relationships
-    * @return the array of consumer projects
-    */
-    Resource[] getConsumers( boolean expand, boolean sort );
-    
-}

Deleted: 
trunk/main/depot/library/src/main/net/dpml/library/model/ResourceNotFoundException.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/ResourceNotFoundException.java
     2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/model/ResourceNotFoundException.java
     2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,48 +0,0 @@
-/*
- * 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.model;
-
-/**
- * A ResourceNotFoundException is thrown when a requested for a named 
resource cannot
- * be resolved.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public class ResourceNotFoundException extends Exception
-{
-   /**
-    * Creation of a new ResourceNotFoundException.
-    * @param message the exception message
-    */
-    public ResourceNotFoundException( String message )
-    {
-        this( message, null );
-    }
-    
-   /**
-    * Creation of a new ResourceNotFoundException.
-    * @param message the exception message
-    * @param cause the causal excetion
-    */
-    public ResourceNotFoundException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-}

Deleted: trunk/main/depot/library/src/main/net/dpml/library/model/Type.java
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/Type.java  
2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/library/src/main/net/dpml/library/model/Type.java  
2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,55 +0,0 @@
-/*
- * 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.model;
-
-/**
- * The Process interface defines a process model.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public interface Type extends Dictionary
-{
-   /**
-    * JAR type name constant.
-    */
-    static final String JAR = "jar";
-    
-   /**
-    * Plugin type name constant.
-    */
-    static final String PLUGIN = "plugin";
-    
-   /**
-    * Module type name constant.
-    */
-    static final String MODULE = "module";
-    
-   /**
-    * Return the name of the type.
-    * @return the type name
-    */
-    String getName();
-    
-   /**
-    * Return the alias association policy.
-    * @return true if alias production assumed
-    */
-    boolean getAlias();
-}

Deleted: 
trunk/main/depot/library/src/main/net/dpml/library/model/TypeNotFoundException.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/model/TypeNotFoundException.java
 2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/model/TypeNotFoundException.java
 2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,48 +0,0 @@
-/*
- * 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.model;
-
-/**
- * A TypeNotFoundException is thrown when a requested for a named type cannot
- * be resolved relative to the enclosing object.
- *
- * @author <a href="@PUBLISHER-URL@">@PUBLISHER-NAME@</a>
- * @version @PROJECT-VERSION@
- */
-public final class TypeNotFoundException extends Exception
-{
-   /**
-    * Creation of a new TypeNotFoundException.
-    * @param message the exception message
-    */
-    public TypeNotFoundException( String message )
-    {
-        this( message, null );
-    }
-    
-   /**
-    * Creation of a new TypeNotFoundException.
-    * @param message the exception message
-    * @param cause the causal excetion
-    */
-    public TypeNotFoundException( String message, Throwable cause )
-    {
-        super( message, cause );
-    }
-}

Deleted: trunk/main/depot/library/src/main/net/dpml/library/model/package.html
===================================================================
--- trunk/main/depot/library/src/main/net/dpml/library/model/package.html     
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/library/src/main/net/dpml/library/model/package.html     
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -1,8 +0,0 @@
-
-<body>
-
-<p>
-Library interfaces.
-</p>
-
-</body>

Copied: trunk/main/depot/library/src/main/net/dpml/library/package.html (from 
rev 1204, 
trunk/main/depot/library/src/main/net/dpml/library/model/package.html)

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/AbstractTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/AbstractTestCase.java 
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/AbstractTestCase.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -33,7 +33,7 @@
 
 import junit.framework.TestCase;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
 
 import net.dpml.lang.Logger;

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/AnonymousTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/AnonymousTestCase.java
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/AnonymousTestCase.java
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -18,8 +18,8 @@
 
 package net.dpml.library.impl;
 
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Module;
+import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
 
 /**

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultDictionaryTestCase.java
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -18,7 +18,7 @@
 
 package net.dpml.library.impl;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 
 /**
  * Testing the DefaultDictionary implementation.

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
 2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultLibraryTestCase.java
 2006-03-17 18:05:48 UTC (rev 1210)
@@ -18,8 +18,8 @@
 
 package net.dpml.library.impl;
 
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Module;
+import net.dpml.library.Resource;
 
 import net.dpml.lang.Type;
 

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultModuleTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultModuleTestCase.java
  2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultModuleTestCase.java
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -18,8 +18,8 @@
 
 package net.dpml.library.impl;
 
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Module;
+import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
 
 /**

Modified: 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
===================================================================
--- 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
        2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/DefaultResourceTestCase.java
        2006-03-17 18:05:48 UTC (rev 1210)
@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
 
 import net.dpml.lang.Type;

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-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/library/src/test/net/dpml/library/impl/ExportTestCase.java 
2006-03-17 18:05:48 UTC (rev 1210)
@@ -22,8 +22,8 @@
 import java.io.FileOutputStream;
 import java.util.Arrays;
 
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Module;
+import net.dpml.library.Resource;
 import net.dpml.library.info.ModuleDirective;
 import net.dpml.library.info.ResourceDirective;
 import net.dpml.library.info.DependencyDirective;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultContext.java
     2006-03-17 18:05:48 UTC (rev 1210)
@@ -23,8 +23,8 @@
 import java.net.URL;
 
 import net.dpml.library.info.Scope;
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Library;
+import net.dpml.library.Resource;
 
 import net.dpml.lang.Type;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
   2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
   2006-03-17 18:05:48 UTC (rev 1210)
@@ -21,8 +21,8 @@
 import java.util.List;
 import java.util.ArrayList;
 
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Library;
+import net.dpml.library.Resource;
 
 import net.dpml.lang.Type;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
    2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
    2006-03-17 18:05:48 UTC (rev 1210)
@@ -23,9 +23,9 @@
 import java.net.URL;
 import java.util.Vector;
 
-import net.dpml.library.model.Builder;
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Builder;
+import net.dpml.library.Library;
+import net.dpml.library.Resource;
 
 import net.dpml.tools.model.Workbench;
 import net.dpml.tools.model.Context;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java
===================================================================
--- trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java 
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Context.java 
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -21,8 +21,8 @@
 import java.io.File;
 
 import net.dpml.library.info.Scope;
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Library;
+import net.dpml.library.Resource;
 
 import net.dpml.lang.Type;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Processor.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Processor.java 
2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Processor.java 
2006-03-17 18:05:48 UTC (rev 1210)
@@ -20,7 +20,7 @@
 
 import java.net.URI;
 
-import net.dpml.library.model.Dictionary;
+import net.dpml.library.Dictionary;
 
 /**
  * The Processor interface defines a process model.

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Workbench.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Workbench.java 
2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/model/Workbench.java 
2006-03-17 18:05:48 UTC (rev 1210)
@@ -18,8 +18,8 @@
 
 package net.dpml.tools.model;
 
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Library;
+import net.dpml.library.Resource;
 
 import org.apache.tools.ant.Project;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/PluginProcess.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/PluginProcess.java
   2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/PluginProcess.java
   2006-03-17 18:05:48 UTC (rev 1210)
@@ -42,7 +42,7 @@
 
 import net.dpml.lang.Type;
 import net.dpml.library.info.Scope;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 
 import net.dpml.tools.tasks.PartTask;
 import net.dpml.tools.model.Context;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.java 
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/FeatureTask.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -20,8 +20,8 @@
 
 import java.io.File;
 
-import net.dpml.library.model.ResourceNotFoundException;
-import net.dpml.library.model.Resource;
+import net.dpml.library.ResourceNotFoundException;
+import net.dpml.library.Resource;
 
 import net.dpml.transit.Artifact;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java 
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/GenericTask.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -24,8 +24,8 @@
 import net.dpml.tools.model.Workbench;
 import net.dpml.tools.impl.DefaultWorkbench;
 
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Library;
+import net.dpml.library.Resource;
 import net.dpml.library.impl.DefaultLibrary;
 
 import net.dpml.lang.Logger;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
        2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
        2006-03-17 18:05:48 UTC (rev 1210)
@@ -22,7 +22,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 
 import net.dpml.tools.model.Processor;
 import net.dpml.tools.model.ProcessorNotFoundException;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java 
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InstallTask.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -24,8 +24,8 @@
 import java.io.OutputStreamWriter;
 import java.io.Writer;
 
-import net.dpml.library.model.Module;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Module;
+import net.dpml.library.Resource;
 
 import net.dpml.lang.Type;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java
===================================================================
--- trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java 
  2006-03-17 07:45:18 UTC (rev 1209)
+++ trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java 
  2006-03-17 18:05:48 UTC (rev 1210)
@@ -25,7 +25,7 @@
 import org.apache.tools.ant.taskdefs.Manifest;
 import org.apache.tools.ant.taskdefs.ManifestException;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 
 import net.dpml.lang.Type;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java 
2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavacTask.java 
2006-03-17 18:05:48 UTC (rev 1210)
@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
 
 import net.dpml.tools.model.Context;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java 
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JavadocTask.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -23,7 +23,7 @@
 import java.util.List;
 
 import net.dpml.library.info.Scope;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ModuleTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ModuleTask.java  
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ModuleTask.java  
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -26,8 +26,8 @@
 
 import net.dpml.tools.model.Context;
 
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.Module;
+import net.dpml.library.Resource;
+import net.dpml.library.Module;
 import net.dpml.library.info.Scope;
 import net.dpml.library.info.ModuleDirective;
 import net.dpml.library.impl.LibraryBuilder;

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-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java  
2006-03-17 18:05:48 UTC (rev 1210)
@@ -42,7 +42,7 @@
 import net.dpml.lang.Type;
 
 import net.dpml.library.info.Scope;
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 
 import net.dpml.tools.model.Context;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PluginTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PluginTask.java  
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PluginTask.java  
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -20,9 +20,9 @@
 
 import net.dpml.tools.model.Context;
 
-import net.dpml.library.model.Library;
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.ResourceNotFoundException;
+import net.dpml.library.Library;
+import net.dpml.library.Resource;
+import net.dpml.library.ResourceNotFoundException;
 
 import org.apache.tools.ant.BuildException;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java 
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -22,7 +22,7 @@
 
 import net.dpml.tools.model.Context;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 
 import org.apache.tools.ant.Project;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReactorTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReactorTask.java 
      2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReactorTask.java 
      2006-03-17 18:05:48 UTC (rev 1210)
@@ -20,7 +20,7 @@
 
 import java.io.File;
 
-import net.dpml.library.model.Resource;
+import net.dpml.library.Resource;
 import net.dpml.library.impl.DefaultLibrary;
 import net.dpml.tools.impl.StandardBuilder;
 

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
     2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReplicateTask.java
     2006-03-17 18:05:48 UTC (rev 1210)
@@ -23,8 +23,8 @@
 import java.util.List;
 
 import net.dpml.library.info.Scope;
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.ResourceNotFoundException;
+import net.dpml.library.Resource;
+import net.dpml.library.ResourceNotFoundException;
 
 import net.dpml.lang.Type;
 

Modified: 
trunk/main/depot/tools/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
===================================================================
--- 
trunk/main/depot/tools/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
    2006-03-17 07:45:18 UTC (rev 1209)
+++ 
trunk/main/depot/tools/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
    2006-03-17 18:05:48 UTC (rev 1210)
@@ -24,8 +24,8 @@
 
 import com.puppycrawl.tools.checkstyle.CheckStyleTask;
 
-import net.dpml.library.model.Resource;
-import net.dpml.library.model.Module;
+import net.dpml.library.Resource;
+import net.dpml.library.Module;
 import net.dpml.tools.model.Context;
 
 import org.apache.tools.ant.BuildException;