DPML Notify

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

Author: mcconnell
Date: 2006-04-06 01:23:31 +0200 (Thu, 06 Apr 2006)
New Revision: 1326

Removed:
   trunk/main/metro/runtime/src/main/net/dpml/metro/builder/old/
Modified:
   trunk/main/depot/core/src/main/net/dpml/depot/Main.java
   trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
   
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
   trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
   trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryEncoder.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultProcessor.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/info/BuilderDirectiveHelper.java
   
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.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/DocTask.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/JarTask.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/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
   trunk/main/metro/component/src/main/net/dpml/component/Composition.java
   trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
   trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java
   
trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java
   trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/StandardLogger.java
   
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
Log:
housekeeping

Modified: trunk/main/depot/core/src/main/net/dpml/depot/Main.java
===================================================================
--- trunk/main/depot/core/src/main/net/dpml/depot/Main.java     2006-04-05 
22:46:20 UTC (rev 1325)
+++ trunk/main/depot/core/src/main/net/dpml/depot/Main.java     2006-04-05 
23:23:31 UTC (rev 1326)
@@ -18,10 +18,10 @@
 
 package net.dpml.depot;
 
+import java.io.File;
 import java.net.URL;
 import java.net.URI;
 import java.rmi.RMISecurityManager;
-import java.io.File;
 import java.util.ArrayList;
 import java.util.Date;
 
@@ -38,10 +38,10 @@
 
 import net.dpml.lang.Enum;
 import net.dpml.lang.PID;
+import net.dpml.lang.Part;
+
 import net.dpml.util.Logger;
 
-import net.dpml.lang.Part;
-
 /**
  * CLI hander for the depot package.
  *

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java  
2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultModule.java  
2006-04-05 23:23:31 UTC (rev 1326)
@@ -42,6 +42,7 @@
 
 import net.dpml.lang.Category;
 import net.dpml.lang.DuplicateKeyException;
+
 import net.dpml.util.Logger;
 
 /**

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java  
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/DefaultResource.java  
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -21,16 +21,15 @@
 import java.io.File;
 import java.io.IOException;
 import java.net.URISyntaxException;
+import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.ArrayList;
 import java.util.List;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 import java.util.Properties;
 
 import net.dpml.lang.Category;
-import net.dpml.util.Logger;
 
 import net.dpml.library.Type;
 import net.dpml.library.Resource;
@@ -44,9 +43,10 @@
 import net.dpml.library.info.ValidationException;
 import net.dpml.library.info.Scope;
 
+import net.dpml.util.Logger;
+
 import net.dpml.transit.Artifact;
 
-
 /**
  * Implementation of a resource.
  *

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java 
2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryDecoder.java 
2006-04-05 23:23:31 UTC (rev 1326)
@@ -37,13 +37,12 @@
 import net.dpml.library.info.TypeDirective;
 import net.dpml.library.info.Scope;
 
-import net.dpml.util.ElementHelper;
-
 import net.dpml.lang.Category;
-import net.dpml.util.DecodingException;
 import net.dpml.lang.Part;
 
+import net.dpml.util.DecodingException;
 import net.dpml.util.DOM3DocumentBuilder;
+import net.dpml.util.ElementHelper;
 
 import org.w3c.dom.Element;
 import org.w3c.dom.Document;

Modified: 
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryEncoder.java
===================================================================
--- 
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryEncoder.java 
2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/library/src/main/net/dpml/library/impl/LibraryEncoder.java 
2006-04-05 23:23:31 UTC (rev 1326)
@@ -26,6 +26,8 @@
 
 import javax.xml.XMLConstants;
 
+import net.dpml.lang.Category;
+
 import net.dpml.library.info.IncludeDirective;
 import net.dpml.library.info.IncludeDirective.Mode;
 import net.dpml.library.info.ModuleDirective;
@@ -34,8 +36,6 @@
 import net.dpml.library.info.TypeDirective;
 import net.dpml.library.info.Scope;
 
-import net.dpml.lang.Category;
-
 /**
  * Utility class used for construction of a module model from an XML source.
  *

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultProcessor.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultProcessor.java
   2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultProcessor.java
   2006-04-05 23:23:31 UTC (rev 1326)
@@ -21,11 +21,11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import net.dpml.library.impl.DefaultDictionary;
+
 import net.dpml.tools.info.ListenerDirective;
 import net.dpml.tools.model.Processor;
 
-import net.dpml.library.impl.DefaultDictionary;
-
 /**
  * Utility class used for construction of a module model from an XML source.
  *

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/DefaultWorkbench.java
   2006-04-05 23:23:31 UTC (rev 1326)
@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.ArrayList;
 
+import net.dpml.lang.UnknownKeyException;
+
 import net.dpml.library.Library;
 import net.dpml.library.Resource;
 import net.dpml.library.Type;
@@ -33,11 +35,8 @@
 import net.dpml.tools.model.Processor;
 import net.dpml.tools.model.ProcessorNotFoundException;
 
-import net.dpml.lang.UnknownKeyException;
-
 import org.apache.tools.ant.Project;
 
-
 /**
  * The Profile interface exposes the working configuration of the build 
system.
  *

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/impl/StandardBuilder.java
    2006-04-05 23:23:31 UTC (rev 1326)
@@ -31,10 +31,11 @@
 import net.dpml.tools.model.Context;
 
 import net.dpml.transit.Artifact;
-import net.dpml.util.Logger;
 import net.dpml.transit.model.TransitModel;
 import net.dpml.transit.tools.MainTask;
 
+import net.dpml.util.Logger;
+
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.ProjectHelper;
 import org.apache.tools.ant.BuildException;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/BuilderDirectiveHelper.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/BuilderDirectiveHelper.java
     2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/info/BuilderDirectiveHelper.java
     2006-04-05 23:23:31 UTC (rev 1326)
@@ -35,6 +35,7 @@
 
 import net.dpml.transit.Artifact;
 import net.dpml.transit.Transit;
+
 import net.dpml.util.ElementHelper;
 
 import org.w3c.dom.Element;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
===================================================================
--- 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/JarProcess.java
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -22,13 +22,13 @@
 
 import net.dpml.library.info.Scope;
 
+import net.dpml.tools.model.Context;
+import net.dpml.tools.model.Processor;
+
 import net.dpml.tools.tasks.JavacTask;
 import net.dpml.tools.tasks.JarTask;
 import net.dpml.tools.tasks.JUnitTestTask;
 
-import net.dpml.tools.model.Context;
-import net.dpml.tools.model.Processor;
-
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/process/PluginProcess.java
   2006-04-05 23:23:31 UTC (rev 1326)
@@ -18,10 +18,10 @@
 
 package net.dpml.tools.process;
 
+import net.dpml.tools.tasks.PartTask;
+
 import net.dpml.util.ExceptionHelper;
 
-import net.dpml.tools.tasks.PartTask;
-
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.Target;
 import org.apache.tools.ant.BuildEvent;

Modified: 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/DocTask.java
===================================================================
--- trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/DocTask.java 
  2006-04-05 22:46:20 UTC (rev 1325)
+++ trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/DocTask.java 
  2006-04-05 23:23:31 UTC (rev 1326)
@@ -23,6 +23,7 @@
 import java.io.FileFilter;
 import java.io.FileInputStream;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Hashtable;
 import java.util.Iterator;
@@ -30,7 +31,6 @@
 import java.util.Date;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import java.text.SimpleDateFormat;
 
 import javax.xml.transform.Transformer;
 import javax.xml.transform.TransformerFactory;

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/InitializationTask.java
        2006-04-05 23:23:31 UTC (rev 1326)
@@ -22,6 +22,9 @@
 import java.util.ArrayList;
 import java.util.Date;
 
+import net.dpml.lang.Part;
+import net.dpml.lang.Plugin;
+
 import net.dpml.library.Resource;
 
 import net.dpml.tools.model.Processor;
@@ -31,9 +34,6 @@
 import org.apache.tools.ant.BuildListener;
 import org.apache.tools.ant.BuildException;
 
-import net.dpml.lang.Part;
-import net.dpml.lang.Plugin;
-
 /**
  * Execute the install phase.
  *

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-04-05 22:46:20 UTC (rev 1325)
+++ trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/JarTask.java 
  2006-04-05 23:23:31 UTC (rev 1326)
@@ -20,14 +20,14 @@
 
 import java.io.File;
 
+import net.dpml.library.Resource;
+import net.dpml.library.Type;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.taskdefs.Jar;
 import org.apache.tools.ant.taskdefs.Manifest;
 import org.apache.tools.ant.taskdefs.ManifestException;
 
-import net.dpml.library.Resource;
-import net.dpml.library.Type;
-
 /**
  * Execute all plugins relative to the current build phase.
  *

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ModuleTask.java  
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -21,14 +21,14 @@
 import java.io.File;
 import java.io.FileOutputStream;
 
-import net.dpml.tools.model.Context;
-
 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.LibraryEncoder;
 
+import net.dpml.tools.model.Context;
+
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PartTask.java  
2006-04-05 23:23:31 UTC (rev 1326)
@@ -28,7 +28,6 @@
 
 import net.dpml.lang.Classpath;
 import net.dpml.lang.Category;
-
 import net.dpml.lang.Info;
 import net.dpml.lang.Part;
 import net.dpml.lang.PartDecoder;
@@ -37,13 +36,13 @@
 import net.dpml.library.Resource;
 import net.dpml.library.info.Scope;
 
+import net.dpml.transit.Artifact;
+
 import net.dpml.tools.model.Context;
 
 import org.apache.tools.ant.Project;
 import org.apache.tools.ant.BuildException;
 
-import net.dpml.transit.Artifact;
-
 import org.w3c.dom.Element;
 
 /**

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PluginTask.java  
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -18,12 +18,12 @@
 
 package net.dpml.tools.tasks;
 
-import net.dpml.tools.model.Context;
-
 import net.dpml.library.Library;
 import net.dpml.library.Resource;
 import net.dpml.library.ResourceNotFoundException;
 
+import net.dpml.tools.model.Context;
+
 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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/PrepareTask.java 
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -20,10 +20,10 @@
 
 import java.io.File;
 
+import net.dpml.library.Resource;
+
 import net.dpml.tools.model.Context;
 
-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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/builder/src/main/net/dpml/tools/tasks/ReactorTask.java 
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -22,11 +22,13 @@
 
 import net.dpml.library.Resource;
 import net.dpml.library.impl.DefaultLibrary;
+
 import net.dpml.tools.impl.StandardBuilder;
 
-import net.dpml.util.Logger;
 import net.dpml.transit.monitor.LoggingAdapter;
 
+import net.dpml.util.Logger;
+
 import org.apache.tools.ant.BuildException;
 import org.apache.tools.ant.Task;
 import org.apache.tools.ant.taskdefs.Ant;

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-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/depot/tools/checkstyle/src/main/net/dpml/tools/checkstyle/CheckstyleTask.java
    2006-04-05 23:23:31 UTC (rev 1326)
@@ -26,6 +26,7 @@
 
 import net.dpml.library.Resource;
 import net.dpml.library.Module;
+
 import net.dpml.tools.model.Context;
 
 import org.apache.tools.ant.BuildException;

Modified: 
trunk/main/metro/component/src/main/net/dpml/component/Composition.java
===================================================================
--- trunk/main/metro/component/src/main/net/dpml/component/Composition.java   
  2006-04-05 22:46:20 UTC (rev 1325)
+++ trunk/main/metro/component/src/main/net/dpml/component/Composition.java   
  2006-04-05 23:23:31 UTC (rev 1326)
@@ -22,11 +22,11 @@
 import java.net.URI;
 
 import net.dpml.lang.Classpath;
-import net.dpml.util.Logger;
-
 import net.dpml.lang.Info;
 import net.dpml.lang.Part;
 
+import net.dpml.util.Logger;
+
 /**
  * Component composition.
  *

Modified: 
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java
===================================================================
--- 
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java  
2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/component/src/main/net/dpml/component/InitialContext.java  
2006-04-05 23:23:31 UTC (rev 1326)
@@ -27,11 +27,11 @@
 import java.util.EventObject;
 import java.util.EventListener;
 
-import net.dpml.util.DefaultLogger;
-
 import net.dpml.lang.Part;
 import net.dpml.lang.Plugin;
 
+import net.dpml.util.DefaultLogger;
+
 /**
  * The CompositionControllerContext class wraps a ContentModel and supplies 
convinience
  * operations that translate ContentModel properties and events to type-safe 
values used 

Modified: trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java  
2006-04-05 22:46:20 UTC (rev 1325)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/Composite.java  
2006-04-05 23:23:31 UTC (rev 1326)
@@ -20,13 +20,13 @@
 
 import java.io.IOException;
 
-import net.dpml.util.Logger;
 import net.dpml.lang.Classpath;
 import net.dpml.lang.Value;
-
 import net.dpml.lang.Info;
 import net.dpml.lang.Plugin;
 
+import net.dpml.util.Logger;
+
 /**
  * A component based plugin.
  *

Modified: 
trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java
===================================================================
--- 
trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java  
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/model/src/main/net/dpml/metro/data/DeploymentDirective.java  
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -19,6 +19,7 @@
 package net.dpml.metro.data;
 
 import net.dpml.component.ActivationPolicy;
+
 import net.dpml.metro.info.Composite;
 import net.dpml.metro.info.PartReference;
 

Modified: 
trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java
===================================================================
--- trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java   
  2006-04-05 22:46:20 UTC (rev 1325)
+++ trunk/main/metro/model/src/main/net/dpml/metro/data/ValueDirective.java   
  2006-04-05 23:23:31 UTC (rev 1326)
@@ -21,11 +21,11 @@
 import java.net.URI;
 import java.net.URISyntaxException;
 
+import net.dpml.component.Directive;
+
 import net.dpml.lang.Value;
 import net.dpml.lang.Construct;
 
-import net.dpml.component.Directive;
-
 /**
  * A <code>ValueDirective</code> represents a single constructed argument 
value. The directive
  * holds a classname (default value of <code>java.lang.String</code>) and 
possible sub-directives.

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentDecoder.java
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -32,14 +32,15 @@
 import net.dpml.metro.data.ComponentDirective;
 import net.dpml.metro.data.ValueDirective;
 import net.dpml.metro.data.LookupDirective;
+
 import net.dpml.metro.info.LifestylePolicy;
 import net.dpml.metro.info.CollectionPolicy;
 import net.dpml.metro.info.PartReference;
 import net.dpml.metro.info.Priority;
 
-import net.dpml.util.DOM3DocumentBuilder;
 import net.dpml.lang.ValueDecoder;
 
+import net.dpml.util.DOM3DocumentBuilder;
 import net.dpml.util.ElementHelper;
 
 import org.w3c.dom.Document;

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentEncoder.java
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -29,8 +29,6 @@
 import net.dpml.component.Directive;
 
 import net.dpml.lang.Value;
-import net.dpml.util.Encoder;
-
 import net.dpml.lang.ValueEncoder;
 
 import net.dpml.metro.data.ContextDirective;
@@ -44,6 +42,8 @@
 import net.dpml.metro.info.PartReference;
 import net.dpml.metro.info.Priority;
 
+import net.dpml.util.Encoder;
+
 /**
  * Component part handler.
  *

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
  2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/builder/ComponentTypeDecoder.java
  2006-04-05 23:23:31 UTC (rev 1326)
@@ -25,7 +25,6 @@
 import java.util.Properties;
 
 import net.dpml.lang.Version;
-import net.dpml.util.DecodingException;
 
 import net.dpml.metro.data.ComponentDirective;
 import net.dpml.metro.info.Type;
@@ -41,6 +40,7 @@
 import net.dpml.metro.info.Priority;
 
 import net.dpml.util.DOM3DocumentBuilder;
+import net.dpml.util.DecodingException;
 
 import net.dpml.state.State;
 import net.dpml.state.impl.StateDecoder;

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
   2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/ComponentController.java
   2006-04-05 23:23:31 UTC (rev 1326)
@@ -27,20 +27,19 @@
 import java.rmi.RemoteException;
 import java.util.Map;
 
-import net.dpml.configuration.Configuration;
-
 import net.dpml.component.Directive;
 import net.dpml.component.ControlException;
 import net.dpml.component.Component;
 import net.dpml.component.Model;
 import net.dpml.component.ServiceNotFoundException;
 
+import net.dpml.configuration.Configuration;
+
+import net.dpml.lang.StandardClassLoader;
 import net.dpml.lang.Version;
 import net.dpml.lang.Classpath;
 import net.dpml.lang.UnknownKeyException;
 import net.dpml.lang.Value;
-import net.dpml.util.Logger;
-import net.dpml.util.DefaultLogger;
 
 import net.dpml.metro.info.Type;
 import net.dpml.metro.info.EntryDescriptor;
@@ -54,7 +53,8 @@
 
 import net.dpml.parameters.Parameters;
 
-import net.dpml.lang.StandardClassLoader;
+import net.dpml.util.Logger;
+import net.dpml.util.DefaultLogger;
 
 /**
  * The ComponentController class is a controller of a component instance.

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java
        2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionClassLoader.java
        2006-04-05 23:23:31 UTC (rev 1326)
@@ -24,13 +24,13 @@
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 
+import net.dpml.lang.Category;
+import net.dpml.lang.StandardClassLoader;
+
 import net.dpml.transit.Artifact;
 import net.dpml.transit.UnsupportedSchemeException;
 
-import net.dpml.lang.StandardClassLoader;
 
-import net.dpml.lang.Category;
-
 /**
  * A named classloader.
  *

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
 2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/CompositionController.java
 2006-04-05 23:23:31 UTC (rev 1326)
@@ -27,10 +27,6 @@
 import java.util.LinkedList;
 import java.util.List;
 
-import net.dpml.metro.ComponentModel;
-import net.dpml.metro.data.ComponentDirective;
-import net.dpml.metro.builder.ComponentDecoder;
-
 import net.dpml.component.Controller;
 import net.dpml.component.ControlException;
 import net.dpml.component.ControllerContext;
@@ -44,9 +40,13 @@
 import net.dpml.lang.Builder;
 import net.dpml.lang.StandardClassLoader;
 import net.dpml.lang.Info;
-
 import net.dpml.lang.Category;
 import net.dpml.lang.Classpath;
+
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.data.ComponentDirective;
+import net.dpml.metro.builder.ComponentDecoder;
+
 import net.dpml.util.Logger;
 import net.dpml.util.DefaultLogger;
 

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
       2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentHandler.java
       2006-04-05 23:23:31 UTC (rev 1326)
@@ -33,18 +33,6 @@
 import java.util.WeakHashMap;
 import java.util.logging.Level;
 
-import net.dpml.metro.info.Type;
-import net.dpml.metro.info.LifestylePolicy;
-import net.dpml.metro.info.CollectionPolicy;
-import net.dpml.metro.info.Priority;
-import net.dpml.metro.data.CategoryDirective;
-import net.dpml.metro.ComponentModel;
-import net.dpml.metro.ComponentHandler;
-import net.dpml.metro.PartsManager;
-import net.dpml.metro.ComponentModelManager;
-
-import net.dpml.util.Logger;
-
 import net.dpml.component.Controller;
 import net.dpml.component.ActivationPolicy;
 import net.dpml.component.Disposable;
@@ -59,9 +47,21 @@
 import net.dpml.lang.Version;
 import net.dpml.lang.UnknownKeyException;
 
+import net.dpml.metro.ComponentModel;
+import net.dpml.metro.ComponentHandler;
+import net.dpml.metro.PartsManager;
+import net.dpml.metro.ComponentModelManager;
+import net.dpml.metro.data.CategoryDirective;
+import net.dpml.metro.info.Type;
+import net.dpml.metro.info.LifestylePolicy;
+import net.dpml.metro.info.CollectionPolicy;
+import net.dpml.metro.info.Priority;
+
 import net.dpml.state.State;
 
+import net.dpml.util.Logger;
 
+
 /**
  * <p>Runtime handler for a component.  The component handler maintains an 
internal 
  * map of all instances derived from the component model based on the 
LifestylePolicy

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
 2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComponentModel.java
 2006-04-05 23:23:31 UTC (rev 1326)
@@ -25,6 +25,20 @@
 import java.util.EventListener;
 import java.util.Map;
 
+import net.dpml.component.Directive;
+import net.dpml.component.ActivationPolicy;
+import net.dpml.component.ControlException;
+import net.dpml.component.ModelListener;
+import net.dpml.component.ModelEvent;
+
+import net.dpml.configuration.Configuration;
+import net.dpml.configuration.Configurable;
+import net.dpml.configuration.ConfigurationException;
+import net.dpml.configuration.impl.DefaultConfiguration;
+
+import net.dpml.lang.Classpath;
+import net.dpml.lang.UnknownKeyException;
+
 import net.dpml.metro.data.ComponentDirective;
 import net.dpml.metro.data.ContextDirective;
 import net.dpml.metro.data.CategoriesDirective;
@@ -39,24 +53,10 @@
 import net.dpml.metro.ComponentModelManager;
 import net.dpml.metro.ContextModelManager;
 
-import net.dpml.component.Directive;
-import net.dpml.component.ActivationPolicy;
-import net.dpml.component.ControlException;
-import net.dpml.component.ModelListener;
-import net.dpml.component.ModelEvent;
-
-import net.dpml.configuration.Configuration;
-import net.dpml.configuration.Configurable;
-import net.dpml.configuration.ConfigurationException;
-import net.dpml.configuration.impl.DefaultConfiguration;
-
-import net.dpml.util.Logger;
-
 import net.dpml.parameters.Parameters;
 import net.dpml.parameters.impl.DefaultParameters;
 
-import net.dpml.lang.Classpath;
-import net.dpml.lang.UnknownKeyException;
+import net.dpml.util.Logger;
 
 /**
  * Default implementation of a mutable component model.

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
    2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultComposition.java
    2006-04-05 23:23:31 UTC (rev 1326)
@@ -24,13 +24,14 @@
 import net.dpml.component.Controller;
 import net.dpml.component.Composition;
 
+import net.dpml.lang.Classpath;
+import net.dpml.lang.Info;
+
 import net.dpml.metro.data.ComponentDirective;
 import net.dpml.metro.builder.ComponentEncoder;
 
-import net.dpml.lang.Classpath;
 import net.dpml.util.Logger;
 
-import net.dpml.lang.Info;
 
 /**
  * Component composition.

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
   2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultContextModel.java
   2006-04-05 23:23:31 UTC (rev 1326)
@@ -26,17 +26,14 @@
 import java.util.EventListener;
 import java.util.Map;
 
+import net.dpml.metro.ContextModelManager;
+import net.dpml.metro.ValidationException;
+import net.dpml.metro.ValidationException.Issue;
 import net.dpml.metro.data.ContextDirective;
 import net.dpml.metro.info.EntryDescriptor;
 import net.dpml.metro.info.PartReference;
 import net.dpml.metro.info.Type;
 
-import net.dpml.metro.ContextModelManager;
-import net.dpml.metro.ValidationException;
-import net.dpml.metro.ValidationException.Issue;
-
-import net.dpml.util.Logger;
-
 import net.dpml.component.Directive;
 import net.dpml.component.ModelException;
 import net.dpml.component.ModelListener;
@@ -44,6 +41,8 @@
 
 import net.dpml.lang.UnknownKeyException;
 
+import net.dpml.util.Logger;
+
 /**
  * Default implementation of <tt>ContextModel</tt>.
  *

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
   2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultPartsManager.java
   2006-04-05 23:23:31 UTC (rev 1326)
@@ -24,29 +24,28 @@
 import java.util.Hashtable;
 import java.lang.reflect.InvocationTargetException;
 
-
-import net.dpml.metro.PartsManager;
-import net.dpml.metro.ComponentHandler;
-import net.dpml.metro.ComponentModelManager;
-import net.dpml.metro.ComponentModel;
-
 import net.dpml.component.ActivationPolicy;
 import net.dpml.component.ControlException;
 import net.dpml.component.Component;
 import net.dpml.component.Model;
 import net.dpml.component.Service;
 
-import net.dpml.lang.Version;
-import net.dpml.lang.UnknownKeyException;
-import net.dpml.util.Logger;
-
 import net.dpml.job.CommissionerEvent;
 import net.dpml.job.CommissionerController;
 import net.dpml.job.TimeoutException;
 import net.dpml.job.TimeoutError;
-
 import net.dpml.job.impl.DefaultCommissioner;
 
+import net.dpml.lang.Version;
+import net.dpml.lang.UnknownKeyException;
+
+import net.dpml.metro.PartsManager;
+import net.dpml.metro.ComponentHandler;
+import net.dpml.metro.ComponentModelManager;
+import net.dpml.metro.ComponentModel;
+
+import net.dpml.util.Logger;
+
 /**
  * Default implementation of the local Parts interface.
  *

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java 
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultProvider.java 
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -27,8 +27,6 @@
 import java.util.EventObject;
 import java.util.EventListener;
 
-import net.dpml.util.Logger;
-
 import net.dpml.component.Provider;
 import net.dpml.component.ControlException;
 
@@ -39,6 +37,8 @@
 import net.dpml.state.UnknownOperationException;
 import net.dpml.state.impl.DefaultStateMachine;
 
+import net.dpml.util.Logger;
+
 /**
  * The DefaultProvider class maintains the state of a client instance.  On 
creation
  * of a new DefaultProvider the implementation constructs a proxy based on 
the 

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java  
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/DefaultService.java  
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -19,6 +19,7 @@
 package net.dpml.metro.runtime;
 
 import net.dpml.component.Service;
+
 import net.dpml.lang.Version;
 
 /**

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/StandardLogger.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/StandardLogger.java  
      2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/StandardLogger.java  
      2006-04-05 23:23:31 UTC (rev 1326)
@@ -18,9 +18,10 @@
 
 package net.dpml.metro.runtime;
 
-import net.dpml.util.Logger;
 import net.dpml.transit.monitor.LoggingAdapter;
 
+import net.dpml.util.Logger;
+
 /**
  * Default logging adapter.
  *

Modified: 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
===================================================================
--- 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
    2006-04-05 22:46:20 UTC (rev 1325)
+++ 
trunk/main/metro/runtime/src/main/net/dpml/metro/runtime/UnicastEventSource.java
    2006-04-05 23:23:31 UTC (rev 1326)
@@ -24,10 +24,10 @@
 import java.util.EventObject;
 import java.util.EventListener;
 
+import net.dpml.component.Disposable;
+
 import net.dpml.util.Logger;
 
-import net.dpml.component.Disposable;
-
 /**
  * A abstract base class that established an event queue and handles event 
dispatch 
  * operations for listeners declared in a class extending this base class.