Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2323 - in development/main/metro: activation/providers/avalon/src/main/net/dpml/activation/avalon activation/providers/metro/src/main/net/dpml/activation/metro automation/builder/src/main/net/dpml/automation/builder automation/control/src/main/net/dpml/automation/control automation/control/src/main/net/dpml/automation/model automation/control/src/main/net/dpml/automation/part composition/api/src/main/net/dpml/composition/data composition/api/src/main/net/dpml/composition/event composition/api/src/main/net/dpml/composition/model composition/api/src/test/net/dpml/composition/data/test composition/builder/src/main/net/dpml/composition/builder composition/builder/src/main/net/dpml/composition/builder/datatypes composition/control/src/main/net/dpml/composition/control composition/control/src/main/net/dpml/composition/models composition/impl/src/main/net/dpml/composition/data/builder composition/impl/src/main/net/dpml/composition/model/impl composition/impl/src/main/net/dpml/composition/util composition/impl/src/test/net/dpml/composition/model/impl composition/test/src/main/net/dpml/composition/test composition/test/src/test/net/dpml/composition/model/impl/test composition/testing/acme/src/main/net/dpml/composition/testing composition/testing/activity/src/main/net/dpml/test composition/testing/activity/src/test/net/dpml/test composition/unit/src/main/net/dpml/composition/unit logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test main/src/main/net/dpml/metro meta/api/src/main/net/dpml/meta/info meta/api/src/test/net/dpml/meta/info/test meta/impl/src/main/net/dpml/meta/info/builder/impl meta/impl/src/main/net/dpml/meta/info/writer/impl meta/spi/src/main/net/dpml/meta/info/builder meta/tools/src/main/net/dpml/meta/info/ant meta/tools/src/main/net/dpml/meta/info/tags parameters/impl/src/main/net/dpml/parameters/impl state/impl/src/main/net/dpml/state/impl state/impl/src/test/net/dpml/state/impl system/impl/src/main/net/dpml/system/impl system/impl/src/main/net/dpml/system/monitors system/test/src/test/net/dpml/system/impl/test

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: peter AT neubauer.se
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2323 - in development/main/metro: activation/providers/avalon/src/main/net/dpml/activation/avalon activation/providers/metro/src/main/net/dpml/activation/metro automation/builder/src/main/net/dpml/automation/builder automation/control/src/main/net/dpml/automation/control automation/control/src/main/net/dpml/automation/model automation/control/src/main/net/dpml/automation/part composition/api/src/main/net/dpml/composition/data composition/api/src/main/net/dpml/composition/event composition/api/src/main/net/dpml/composition/model composition/api/src/test/net/dpml/composition/data/test composition/builder/src/main/net/dpml/composition/builder composition/builder/src/main/net/dpml/composition/builder/datatypes composition/control/src/main/net/dpml/composition/control composition/control/src/main/net/dpml/composition/models composition/impl/src/main/net/dpml/composition/data/builder composition/impl/src/main/net/dpml/composition/model/impl composition/impl/src/main/net/dpml/composition/util composition/impl/src/test/net/dpml/composition/model/impl composition/test/src/main/net/dpml/composition/test composition/test/src/test/net/dpml/composition/model/impl/test composition/testing/acme/src/main/net/dpml/composition/testing composition/testing/activity/src/main/net/dpml/test composition/testing/activity/src/test/net/dpml/test composition/unit/src/main/net/dpml/composition/unit logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test main/src/main/net/dpml/metro meta/api/src/main/net/dpml/meta/info meta/api/src/test/net/dpml/meta/info/test meta/impl/src/main/net/dpml/meta/info/builder/impl meta/impl/src/main/net/dpml/meta/info/writer/impl meta/spi/src/main/net/dpml/meta/info/builder meta/tools/src/main/net/dpml/meta/info/ant meta/tools/src/main/net/dpml/meta/info/tags parameters/impl/src/main/net/dpml/parameters/impl state/impl/src/main/net/dpml/state/impl state/impl/src/test/net/dpml/state/impl system/impl/src/main/net/dpml/system/impl system/impl/src/main/net/dpml/system/monitors system/test/src/test/net/dpml/system/impl/test
  • Date: Tue, 19 Apr 2005 17:02:49 -0400

Author: peter AT neubauer.se
Date: Tue Apr 19 17:02:41 2005
New Revision: 2323

Modified:

development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AbstractLifestyleManager.java

development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/ApplianceInvocationHandler.java

development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AvalonParameters.java

development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/DefaultComponentFactory.java

development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/ContextInvocationHandler.java

development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java

development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java

development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DependencyInvocationHandler.java

development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/PartsInvocationHandler.java

development/main/metro/automation/builder/src/main/net/dpml/automation/builder/PartBuilder.java

development/main/metro/automation/control/src/main/net/dpml/automation/control/Control.java

development/main/metro/automation/control/src/main/net/dpml/automation/control/Controller.java

development/main/metro/automation/control/src/main/net/dpml/automation/control/Disposable.java

development/main/metro/automation/control/src/main/net/dpml/automation/control/SystemManager.java

development/main/metro/automation/control/src/main/net/dpml/automation/control/UnsupportedPartTypeException.java

development/main/metro/automation/control/src/main/net/dpml/automation/model/Model.java

development/main/metro/automation/control/src/main/net/dpml/automation/part/PartHolder.java

development/main/metro/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java

development/main/metro/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java

development/main/metro/composition/api/src/main/net/dpml/composition/data/CompositionDirective.java

development/main/metro/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java

development/main/metro/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java

development/main/metro/composition/api/src/main/net/dpml/composition/model/ContextModel.java

development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java

development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyModel.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/AbstractSerializableTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/CompositionDirectiveTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContainmentProfileTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/DependencyDirectiveTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/NamedComponentProfileTestCase.java

development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ProfilePackageTestCase.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ConstructionException.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ContainerBuilderTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/SerializableObjectHelper.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeWriterTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ConfigurationDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ParametersDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ValueDataType.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextInvocationHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextManagerInvocationHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/AbstractModel.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/ContextTable.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/DuplicateKeyException.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/EntryTable.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/Holder.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/PartsTable.java

development/main/metro/composition/control/src/main/net/dpml/composition/models/ValueModel.java

development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java

development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java

development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java

development/main/metro/composition/impl/src/main/net/dpml/composition/util/Resource.java

development/main/metro/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java

development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java

development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/AssemblyTestCase.java

development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java

development/main/metro/composition/testing/acme/src/main/net/dpml/composition/testing/ExampleComponent.java

development/main/metro/composition/testing/activity/src/main/net/dpml/test/Component.java

development/main/metro/composition/testing/activity/src/main/net/dpml/test/Container.java

development/main/metro/composition/testing/activity/src/test/net/dpml/test/ContainerTestCase.java

development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionHelper.java

development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java

development/main/metro/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java

development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
development/main/metro/main/src/main/net/dpml/metro/Metro.java

development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
development/main/metro/meta/api/src/main/net/dpml/meta/info/TypeHolder.java

development/main/metro/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java

development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java

development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java

development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java

development/main/metro/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java

development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java

development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java

development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java

development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java

development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java

development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java

development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java

development/main/metro/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java

development/main/metro/state/impl/src/main/net/dpml/state/impl/AbstractStateManager.java

development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultOperation.java

development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultState.java

development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultTransition.java

development/main/metro/state/impl/src/test/net/dpml/state/impl/DefaultStateTestCase.java

development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java

development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java

development/main/metro/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java

development/main/metro/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java

development/main/metro/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java

development/main/metro/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java
Log:
Removed unused imports, renamed parameters hiding fields and other formatting
stuff


Modified:
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AbstractLifestyleManager.java
==============================================================================
---
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AbstractLifestyleManager.java
(original)
+++
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AbstractLifestyleManager.java
Tue Apr 19 17:02:41 2005
@@ -19,25 +19,17 @@
package net.dpml.activation.avalon;

import java.lang.ref.Reference;
+import java.lang.ref.ReferenceQueue;
import java.lang.ref.SoftReference;
import java.lang.ref.WeakReference;
-import java.lang.ref.ReferenceQueue;
-import java.util.Map;

-import net.dpml.activation.LifecycleException;
import net.dpml.activation.ComponentFactory;
-
import net.dpml.composition.model.ComponentModel;
import net.dpml.composition.provider.LifestyleManager;
-
-import net.dpml.logging.Logger;
-import net.dpml.context.Context;
-import net.dpml.context.impl.DefaultContext;
-
-import net.dpml.meta.info.InfoDescriptor;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
+import net.dpml.logging.Logger;
+import net.dpml.meta.info.InfoDescriptor;

/**
* Abstract implentation class for a lifestyle handler.

Modified:
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/ApplianceInvocationHandler.java
==============================================================================
---
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/ApplianceInvocationHandler.java
(original)
+++
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/ApplianceInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -20,21 +20,16 @@

import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
import java.security.PrivilegedActionException;
-import java.security.AccessController;
-import java.security.PrivilegedExceptionAction;

import net.dpml.activation.ApplianceException;
import net.dpml.activation.TransientApplianceException;
-
import net.dpml.composition.model.ComponentModel;
-import net.dpml.composition.model.TransientRuntimeException;
import net.dpml.composition.model.Reclaimer;
-
+import net.dpml.composition.model.TransientRuntimeException;
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;

/**

Modified:
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AvalonParameters.java
==============================================================================
---
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AvalonParameters.java
(original)
+++
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/AvalonParameters.java
Tue Apr 19 17:02:41 2005
@@ -16,11 +16,8 @@
*/
package net.dpml.activation.avalon;

-import java.util.Properties;
-
-import net.dpml.parameters.Parameters;
import net.dpml.parameters.ParameterException;
-import net.dpml.parameters.impl.DefaultParameters;
+import net.dpml.parameters.Parameters;


/**

Modified:
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/DefaultComponentFactory.java
==============================================================================
---
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/DefaultComponentFactory.java
(original)
+++
development/main/metro/activation/providers/avalon/src/main/net/dpml/activation/avalon/DefaultComponentFactory.java
Tue Apr 19 17:02:41 2005
@@ -23,25 +23,16 @@

import net.dpml.activation.ComponentFactory;
import net.dpml.activation.LifecycleException;
-
import net.dpml.composition.model.ComponentModel;
import net.dpml.composition.model.ContextModel;
-import net.dpml.composition.model.DeploymentModel;
-
import net.dpml.configuration.Configuration;
-
import net.dpml.context.Context;
import net.dpml.context.impl.DefaultContext;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.parameters.Parameters;
-
import net.dpml.service.ServiceManager;



Modified:
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/ContextInvocationHandler.java
==============================================================================
---
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/ContextInvocationHandler.java
(original)
+++
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/ContextInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -19,17 +19,14 @@
package net.dpml.activation.metro;

import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;
import java.util.Hashtable;
import java.util.Map;

-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.EntryDescriptor;
-
-import net.dpml.composition.model.EntryModel;
import net.dpml.composition.model.ComponentModel;
+import net.dpml.composition.model.EntryModel;
+import net.dpml.meta.info.EntryDescriptor;
+import net.dpml.meta.info.Type;

/**
* This makes a dynamic proxy for an object. The object can be represented

Modified:
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java
==============================================================================
---
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java
(original)
+++
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultComponentFactory.java
Tue Apr 19 17:02:41 2005
@@ -21,49 +21,30 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
-import java.util.Hashtable;
import java.util.Map;

import net.dpml.activation.ComponentFactory;
import net.dpml.activation.LifecycleException;
-
import net.dpml.activity.Disposable;
import net.dpml.activity.Executable;
import net.dpml.activity.Initializable;
import net.dpml.activity.Startable;
-
-import net.dpml.composition.info.DeliveryDescriptor;
-import net.dpml.composition.info.NativeDeliveryDescriptor;
-import net.dpml.composition.info.StagedDeliveryDescriptor;
-
import net.dpml.composition.model.ComponentModel;
import net.dpml.composition.model.ContextModel;
-import net.dpml.composition.model.ContextualizationHandler;
-import net.dpml.composition.model.DeploymentModel;
-import net.dpml.composition.model.ModelException;
import net.dpml.composition.model.DependencyModel;
-
import net.dpml.configuration.Configurable;
import net.dpml.configuration.Configuration;
-
import net.dpml.context.Context;
import net.dpml.context.Contextualizable;
-
import net.dpml.context.impl.DefaultContext;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.LogEnabled;
import net.dpml.logging.Logger;
-
import net.dpml.meta.info.Type;
-
import net.dpml.parameters.Parameterizable;
import net.dpml.parameters.Parameters;
-
import net.dpml.service.ServiceManager;
import net.dpml.service.Serviceable;


Modified:
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java
==============================================================================
---
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java
(original)
+++
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DefaultServiceManager.java
Tue Apr 19 17:02:41 2005
@@ -18,25 +18,20 @@

package net.dpml.activation.metro;

-import java.util.Map;
-import java.util.Hashtable;
-import java.lang.reflect.Proxy;
import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Proxy;
+import java.util.Hashtable;
+import java.util.Map;

-import net.dpml.composition.model.ComponentModel;
-import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.DependencyModel;
-
+import net.dpml.composition.model.DeploymentModel;
+import net.dpml.i18n.ResourceManager;
+import net.dpml.i18n.Resources;
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
+import net.dpml.service.FatalServiceException;
import net.dpml.service.ServiceException;
import net.dpml.service.ServiceManager;
-import net.dpml.service.FatalServiceException;
-
-import net.dpml.i18n.ResourceManager;
-import net.dpml.i18n.Resources;

/**
* Default implementation of the framework {@link ServiceManager} interface.

Modified:
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DependencyInvocationHandler.java
==============================================================================
---
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DependencyInvocationHandler.java
(original)
+++
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/DependencyInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -19,22 +19,16 @@
package net.dpml.activation.metro;

import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.lang.reflect.Proxy;
import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
import java.util.Hashtable;
import java.util.Map;

-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.DependencyDescriptor;
-
import net.dpml.composition.model.ComponentModel;
-import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.DependencyModel;
-
-import net.dpml.composition.model.EntryModel;
-
+import net.dpml.composition.model.DeploymentModel;
+import net.dpml.meta.info.DependencyDescriptor;
+import net.dpml.meta.info.Type;
import net.dpml.service.FulfillmentRuntimeException;

/**

Modified:
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/PartsInvocationHandler.java
==============================================================================
---
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/PartsInvocationHandler.java
(original)
+++
development/main/metro/activation/providers/metro/src/main/net/dpml/activation/metro/PartsInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -19,15 +19,9 @@
package net.dpml.activation.metro;

import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.lang.reflect.Proxy;
import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Map;

import net.dpml.meta.info.Type;
-import net.dpml.meta.info.PartDescriptor;

/**
* This makes a dynamic proxy for a Parts object.

Modified:
development/main/metro/automation/builder/src/main/net/dpml/automation/builder/PartBuilder.java
==============================================================================
---
development/main/metro/automation/builder/src/main/net/dpml/automation/builder/PartBuilder.java
(original)
+++
development/main/metro/automation/builder/src/main/net/dpml/automation/builder/PartBuilder.java
Tue Apr 19 17:02:41 2005
@@ -18,11 +18,10 @@

package net.dpml.automation.builder;

-import java.net.URI;
import java.io.IOException;
+import java.net.URI;

import net.dpml.automation.part.Part;
-import net.dpml.automation.part.PartReference;

/**
* The contract for builders that create component parts.

Modified:
development/main/metro/automation/control/src/main/net/dpml/automation/control/Control.java
==============================================================================
---
development/main/metro/automation/control/src/main/net/dpml/automation/control/Control.java
(original)
+++
development/main/metro/automation/control/src/main/net/dpml/automation/control/Control.java
Tue Apr 19 17:02:41 2005
@@ -18,9 +18,6 @@

package net.dpml.automation.control;

-import java.net.URI;
-
-import net.dpml.automation.part.Part;

/**
* Common interface implemented by controls.

Modified:
development/main/metro/automation/control/src/main/net/dpml/automation/control/Controller.java
==============================================================================
---
development/main/metro/automation/control/src/main/net/dpml/automation/control/Controller.java
(original)
+++
development/main/metro/automation/control/src/main/net/dpml/automation/control/Controller.java
Tue Apr 19 17:02:41 2005
@@ -19,12 +19,11 @@
package net.dpml.automation.control;

import java.net.URI;
-import java.io.IOException;
import java.util.Map.Entry;

-import net.dpml.automation.part.Part;
import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;
+import net.dpml.automation.part.Part;

/**
* The Controller interface defines the a contract for a object that is
capable of

Modified:
development/main/metro/automation/control/src/main/net/dpml/automation/control/Disposable.java
==============================================================================
---
development/main/metro/automation/control/src/main/net/dpml/automation/control/Disposable.java
(original)
+++
development/main/metro/automation/control/src/main/net/dpml/automation/control/Disposable.java
Tue Apr 19 17:02:41 2005
@@ -18,9 +18,6 @@

package net.dpml.automation.control;

-import java.net.URI;
-
-import net.dpml.automation.part.Part;

/**
* Common interface implemented by disposable objects.

Modified:
development/main/metro/automation/control/src/main/net/dpml/automation/control/SystemManager.java
==============================================================================
---
development/main/metro/automation/control/src/main/net/dpml/automation/control/SystemManager.java
(original)
+++
development/main/metro/automation/control/src/main/net/dpml/automation/control/SystemManager.java
Tue Apr 19 17:02:41 2005
@@ -18,10 +18,9 @@

package net.dpml.automation.control;

-import java.net.URI;
import java.io.IOException;
+import java.net.URI;

-import net.dpml.automation.part.Part;
import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;


Modified:
development/main/metro/automation/control/src/main/net/dpml/automation/control/UnsupportedPartTypeException.java
==============================================================================
---
development/main/metro/automation/control/src/main/net/dpml/automation/control/UnsupportedPartTypeException.java
(original)
+++
development/main/metro/automation/control/src/main/net/dpml/automation/control/UnsupportedPartTypeException.java
Tue Apr 19 17:02:41 2005
@@ -18,8 +18,6 @@

package net.dpml.automation.control;

-import java.net.URI;
-
import net.dpml.automation.part.Part;

/**

Modified:
development/main/metro/automation/control/src/main/net/dpml/automation/model/Model.java
==============================================================================
---
development/main/metro/automation/control/src/main/net/dpml/automation/model/Model.java
(original)
+++
development/main/metro/automation/control/src/main/net/dpml/automation/model/Model.java
Tue Apr 19 17:02:41 2005
@@ -18,8 +18,6 @@

package net.dpml.automation.model;

-import java.util.Map.Entry;
-import java.io.Serializable;
import java.net.URI;
import java.util.Map.Entry;


Modified:
development/main/metro/automation/control/src/main/net/dpml/automation/part/PartHolder.java
==============================================================================
---
development/main/metro/automation/control/src/main/net/dpml/automation/part/PartHolder.java
(original)
+++
development/main/metro/automation/control/src/main/net/dpml/automation/part/PartHolder.java
Tue Apr 19 17:02:41 2005
@@ -18,10 +18,9 @@

package net.dpml.automation.part;

+import java.io.Serializable;
import java.net.URI;
import java.util.Arrays;
-import java.util.Properties;
-import java.io.Serializable;

/**
*

Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/data/ClassLoaderDirective.java
Tue Apr 19 17:02:41 2005
@@ -19,7 +19,6 @@
package net.dpml.composition.data;

import java.io.Serializable;
-import java.net.URI;

/**
* Description of classloader.

Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/data/ComponentProfile.java
Tue Apr 19 17:02:41 2005
@@ -18,14 +18,12 @@

package net.dpml.composition.data;

-import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-
import net.dpml.configuration.Configuration;
-import net.dpml.parameters.Parameters;
-import net.dpml.meta.info.InfoDescriptor;
import net.dpml.lang.NullArgumentException;
import net.dpml.logging.data.CategoriesDirective;
+import net.dpml.meta.info.InfoDescriptor;
+import net.dpml.parameters.Parameters;

/**
* Definition of the criteria for an explicit component profile. A profile,
when

Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/data/CompositionDirective.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/data/CompositionDirective.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/data/CompositionDirective.java
Tue Apr 19 17:02:41 2005
@@ -20,8 +20,6 @@

import java.net.URI;

-import net.dpml.lang.NullArgumentException;
-
/**
* The CompositionDirective describes the addition of a block to containment
profile
* it is declared within.

Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/data/ContainmentProfile.java
Tue Apr 19 17:02:41 2005
@@ -20,7 +20,6 @@

import java.util.ArrayList;

-import net.dpml.automation.part.Part;
import net.dpml.logging.data.CategoriesDirective;
import net.dpml.meta.info.ServiceDescriptor;


Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/event/CompositionEvent.java
Tue Apr 19 17:02:41 2005
@@ -18,8 +18,8 @@

package net.dpml.composition.event;

-import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.ContainmentModel;
+import net.dpml.composition.model.DeploymentModel;


/**
@@ -39,12 +39,12 @@
/**
* Create a CompositionEvent event.
*
- * @param source the comtainment model raising the event
+ * @param iSource the comtainment model raising the event
* @param child the model that is the subject of composition
*/
- public CompositionEvent( final ContainmentModel source, DeploymentModel
child )
+ public CompositionEvent( final ContainmentModel iSource, DeploymentModel
child )
{
- super( source );
+ super( iSource );
m_child = child;
}


Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/model/ContextModel.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/model/ContextModel.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/model/ContextModel.java
Tue Apr 19 17:02:41 2005
@@ -21,8 +21,6 @@
import java.util.Map;
import java.util.Map.Entry;

-import net.dpml.automation.model.Model;
-
/**
* <p>Specification of a context model from which a
* a fully qualifed context can be established.</p>

Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyGraph.java
Tue Apr 19 17:02:41 2005
@@ -341,7 +341,8 @@
DeploymentModel[] providers = model.getProviders();
for ( int i = ( providers.length - 1 ); i > -1; i-- )
{
- visitcomponent( providers[i], true, done, order );
+ DeploymentModel deploymentModel = providers[i];
+ visitcomponent( deploymentModel, true, done, order );
}
}


Modified:
development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyModel.java
==============================================================================
---
development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyModel.java
(original)
+++
development/main/metro/composition/api/src/main/net/dpml/composition/model/DependencyModel.java
Tue Apr 19 17:02:41 2005
@@ -19,7 +19,6 @@
package net.dpml.composition.model;

import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.ServiceDescriptor;

/**
* Dependency model handles the establishment of an explicit source

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/AbstractSerializableTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/AbstractSerializableTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/AbstractSerializableTestCase.java
Tue Apr 19 17:02:41 2005
@@ -21,7 +21,6 @@

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
import java.io.Serializable;

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ComponentProfileTestCase.java
Tue Apr 19 17:02:41 2005
@@ -17,30 +17,19 @@

package net.dpml.composition.data.test;

-import junit.framework.TestCase;
-
-import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-
+import net.dpml.composition.data.ClassLoaderDirective;
import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.ClassLoaderDirective;
import net.dpml.composition.data.DependencyDirective;
import net.dpml.composition.data.DeploymentProfile;
-import net.dpml.composition.data.ImportDirective;
import net.dpml.composition.data.Mode;
-
import net.dpml.configuration.Configuration;
-
import net.dpml.configuration.impl.DefaultConfiguration;
-
import net.dpml.logging.data.CategoriesDirective;
import net.dpml.logging.data.CategoryDirective;
-
import net.dpml.meta.info.InfoDescriptor;
-
import net.dpml.parameters.Parameters;
-
import net.dpml.parameters.impl.DefaultParameters;

/**

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/CompositionDirectiveTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/CompositionDirectiveTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/CompositionDirectiveTestCase.java
Tue Apr 19 17:02:41 2005
@@ -19,12 +19,8 @@

import java.net.URI;

-import net.dpml.composition.data.Mode;
-import net.dpml.composition.data.DeploymentProfile;
import net.dpml.composition.data.CompositionDirective;

-import net.dpml.logging.data.CategoriesDirective;
-
/**
* CompositionDirectiveTestCase tests the overall behaviour and
* serialization integrity.

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContainmentProfileTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContainmentProfileTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContainmentProfileTestCase.java
Tue Apr 19 17:02:41 2005
@@ -17,32 +17,21 @@

package net.dpml.composition.data.test;

-import junit.framework.TestCase;
-
-import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-
-import net.dpml.composition.data.ServiceDirective;
import net.dpml.composition.data.ClassLoaderDirective;
-import net.dpml.composition.data.ContainmentProfile;
import net.dpml.composition.data.ComponentProfile;
+import net.dpml.composition.data.ContainmentProfile;
import net.dpml.composition.data.ContextDirective;
import net.dpml.composition.data.DependencyDirective;
import net.dpml.composition.data.DeploymentProfile;
-import net.dpml.composition.data.ImportDirective;
import net.dpml.composition.data.Mode;
-
+import net.dpml.composition.data.ServiceDirective;
import net.dpml.configuration.Configuration;
-
import net.dpml.configuration.impl.DefaultConfiguration;
-
import net.dpml.logging.data.CategoriesDirective;
import net.dpml.logging.data.CategoryDirective;
-
import net.dpml.meta.info.InfoDescriptor;
-
import net.dpml.parameters.Parameters;
-
import net.dpml.parameters.impl.DefaultParameters;

/**

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ContextDirectiveTestCase.java
Tue Apr 19 17:02:41 2005
@@ -17,13 +17,9 @@

package net.dpml.composition.data.test;

-import junit.framework.TestCase;
-
import net.dpml.automation.part.PartReference;
-
-import net.dpml.composition.data.ValueDirective;
-import net.dpml.composition.data.ImportDirective;
import net.dpml.composition.data.ContextDirective;
+import net.dpml.composition.data.ValueDirective;

/**
* ContextDirectiveTestCase does XYZ

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/DependencyDirectiveTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/DependencyDirectiveTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/DependencyDirectiveTestCase.java
Tue Apr 19 17:02:41 2005
@@ -17,10 +17,6 @@

package net.dpml.composition.data.test;

-import net.dpml.lang.NullArgumentException;
-
-import junit.framework.TestCase;
-
import net.dpml.composition.data.DependencyDirective;

/**

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ImportDirectiveTestCase.java
Tue Apr 19 17:02:41 2005
@@ -17,12 +17,8 @@

package net.dpml.composition.data.test;

-import net.dpml.lang.NullArgumentException;
-
-import junit.framework.TestCase;
-
-import net.dpml.composition.data.MetaDataException;
import net.dpml.composition.data.ImportDirective;
+import net.dpml.composition.data.MetaDataException;

/**
* ImportDirectiveTestCase does XYZ

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/NamedComponentProfileTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/NamedComponentProfileTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/NamedComponentProfileTestCase.java
Tue Apr 19 17:02:41 2005
@@ -17,10 +17,8 @@

package net.dpml.composition.data.test;

-import junit.framework.TestCase;
-
-import net.dpml.composition.data.NamedComponentProfile;
import net.dpml.composition.data.DeploymentProfile;
+import net.dpml.composition.data.NamedComponentProfile;

/**
* Test case for the NamedComponentProfile datatype.

Modified:
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ProfilePackageTestCase.java
==============================================================================
---
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ProfilePackageTestCase.java
(original)
+++
development/main/metro/composition/api/src/test/net/dpml/composition/data/test/ProfilePackageTestCase.java
Tue Apr 19 17:02:41 2005
@@ -17,8 +17,6 @@

package net.dpml.composition.data.test;

-import junit.framework.TestCase;
-
import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.ProfilePackage;


Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.java
Tue Apr 19 17:02:41 2005
@@ -18,87 +18,51 @@

package net.dpml.composition.builder;

-import java.io.File;
-import java.io.Serializable;
import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
+import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.io.OutputStream;
import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.net.URI;
-import java.net.URL;
import java.net.URISyntaxException;
-import java.rmi.MarshalledObject;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Properties;
-import java.util.List;
-import java.util.LinkedList;
+import java.net.URL;
import java.util.ArrayList;
-import java.util.Hashtable;
-
-import net.dpml.meta.info.Type;
-
-import net.dpml.logging.data.CategoryDirective;
-import net.dpml.logging.data.CategoriesDirective;
-
-import net.dpml.composition.data.TypeNotFoundException;
-import net.dpml.composition.data.DeploymentProfile;
-import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.DependencyDirective;
-import net.dpml.composition.data.ClassLoaderDirective;
-import net.dpml.composition.data.ClasspathDirective;
-import net.dpml.composition.data.FilesetDirective;
-import net.dpml.composition.data.ComponentProfile;
-import net.dpml.composition.data.Mode;
-
-import net.dpml.composition.control.CompositionPartHandler;

+import net.dpml.automation.builder.IntrospectionException;
+import net.dpml.automation.part.Part;
+import net.dpml.automation.part.PartHolder;
+import net.dpml.automation.part.PartReference;
import net.dpml.composition.builder.datatypes.CategoriesDataType;
+import net.dpml.composition.builder.datatypes.ConfigurationDataType;
import net.dpml.composition.builder.datatypes.ContextDataType;
import net.dpml.composition.builder.datatypes.DependenciesDataType;
import net.dpml.composition.builder.datatypes.ParametersDataType;
-import net.dpml.composition.builder.datatypes.ConfigurationDataType;
import net.dpml.composition.builder.datatypes.PartsDataType;
-
-import net.dpml.meta.info.EntryDescriptor;
-
-import net.dpml.automation.control.PartNotFoundException;
-import net.dpml.automation.control.DelegationException;
-import net.dpml.automation.part.Part;
-import net.dpml.automation.part.PartHolder;
-import net.dpml.automation.part.PartReference;
-import net.dpml.automation.builder.PartBuilder;
-import net.dpml.automation.builder.IntrospectionException;
-
+import net.dpml.composition.data.ClassLoaderDirective;
+import net.dpml.composition.data.ClasspathDirective;
+import net.dpml.composition.data.ComponentProfile;
+import net.dpml.composition.data.ContextDirective;
+import net.dpml.composition.data.DependencyDirective;
+import net.dpml.composition.data.DeploymentProfile;
+import net.dpml.composition.data.Mode;
import net.dpml.configuration.Configuration;
-import net.dpml.configuration.impl.DefaultConfiguration;
-
-import net.dpml.meta.info.Type;
+import net.dpml.logging.data.CategoriesDirective;
+import net.dpml.magic.model.Definition;
+import net.dpml.magic.model.Policy;
+import net.dpml.magic.model.Resource;
+import net.dpml.magic.model.ResourceRef;
+import net.dpml.magic.tasks.ProjectTask;
+import net.dpml.meta.info.EntryDescriptor;
import net.dpml.meta.info.InfoDescriptor;
+import net.dpml.meta.info.Type;
import net.dpml.meta.info.TypeHolder;
-
import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;

-import net.dpml.magic.tasks.ProjectTask;
-import net.dpml.magic.model.Policy;
-import net.dpml.magic.model.Definition;
-import net.dpml.magic.model.Resource;
-import net.dpml.magic.model.ResourceRef;
-import net.dpml.magic.project.Context;
-
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DynamicElementNS;
-import org.apache.tools.ant.DynamicConfiguratorNS;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.Path;

/**
* Task that handles the construction of a serialized container part.
@@ -219,8 +183,8 @@
{
if( null == m_parameters )
{
- Project project = getProject();
- m_parameters = new ParametersDataType( project );
+ Project t_project = getProject();
+ m_parameters = new ParametersDataType( t_project );
return m_parameters;
}
else
@@ -239,8 +203,8 @@
{
if( null == m_configuration )
{
- Project project = getProject();
- m_configuration = new ConfigurationDataType( project );
+ Project t_project = getProject();
+ m_configuration = new ConfigurationDataType( t_project );
return m_configuration;
}
else
@@ -272,11 +236,11 @@

public void execute()
{
- Project project = getProject();
- Path path = getDefinition().getPath( project, Policy.RUNTIME );
+ Project t_project = getProject();
+ Path path = getDefinition().getPath( t_project, Policy.RUNTIME );
File classes = getContext().getClassesDirectory();
path.createPathElement().setLocation( classes );
- ClassLoader classloader = new AntClassLoader( project, path );
+ ClassLoader classloader = new AntClassLoader( t_project, path );

File file = getOutputFile();
File parent = file.getParentFile();

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ConstructionException.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ConstructionException.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ConstructionException.java
Tue Apr 19 17:02:41 2005
@@ -18,10 +18,8 @@

package net.dpml.composition.builder;

-import java.net.URI;
-
-import org.apache.tools.ant.Location;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Location;

/**
* A construction exception indicates a generation phase error in the
construction

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ContainerBuilderTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ContainerBuilderTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ContainerBuilderTask.java
Tue Apr 19 17:02:41 2005
@@ -19,54 +19,36 @@
package net.dpml.composition.builder;

import java.io.File;
-import java.io.Serializable;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.List;
-import java.util.LinkedList;
import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;

-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.InfoDescriptor;
-
+import net.dpml.automation.builder.PartBuilder;
import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartHolder;
-import net.dpml.automation.builder.PartBuilder;
-import net.dpml.automation.builder.IntrospectionException;
-
-import net.dpml.composition.data.DeploymentProfile;
-import net.dpml.composition.data.ContainmentProfile;
-import net.dpml.composition.data.ServiceDirective;
-import net.dpml.composition.data.ClasspathDirective;
import net.dpml.composition.data.ClassLoaderDirective;
+import net.dpml.composition.data.ClasspathDirective;
+import net.dpml.composition.data.ContainmentProfile;
+import net.dpml.composition.data.DeploymentProfile;
import net.dpml.composition.data.FilesetDirective;
+import net.dpml.composition.data.ServiceDirective;
import net.dpml.logging.data.CategoriesDirective;
-
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.ReferenceDescriptor;
-
-import net.dpml.magic.tasks.ProjectTask;
-import net.dpml.magic.model.Policy;
import net.dpml.magic.model.Definition;
+import net.dpml.magic.model.Policy;
import net.dpml.magic.model.Resource;
import net.dpml.magic.model.ResourceRef;
-import net.dpml.magic.project.Context;
+import net.dpml.magic.tasks.ProjectTask;
+import net.dpml.meta.info.ReferenceDescriptor;
+import net.dpml.meta.info.ServiceDescriptor;

-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DynamicElementNS;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;

/**
* Task that handles the construction of a serialized container part.
@@ -112,9 +94,9 @@

public ComponentBuilderTask createComponent()
{
- Project project = getProject();
+ Project proj = getProject();
ComponentBuilderTask builder = new ComponentBuilderTask();
- builder.setProject( project );
+ builder.setProject( proj );
m_builders.add( builder );
return builder;
}
@@ -136,11 +118,11 @@

public void execute()
{
- Project project = getProject();
- Path path = getDefinition().getPath( project, Policy.RUNTIME );
+ Project proj = getProject();
+ Path path = getDefinition().getPath( proj, Policy.RUNTIME );
File classes = getContext().getClassesDirectory();
path.createPathElement().setLocation( classes );
- ClassLoader classloader = new AntClassLoader( project, path );
+ ClassLoader classloader = new AntClassLoader( proj, path );
ContainmentProfile profile = buildContainer( classloader );

File file = getOutputFile();

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.java
Tue Apr 19 17:02:41 2005
@@ -18,14 +18,10 @@

package net.dpml.composition.builder;

-import java.net.URI;
import java.io.IOException;

-import net.dpml.automation.part.Part;
-import net.dpml.automation.part.PartReference;
-import net.dpml.automation.builder.PartBuilder;
import net.dpml.automation.builder.IntrospectionException;
-
+import net.dpml.automation.part.PartReference;
import net.dpml.meta.info.Type;

/**

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/SerializableObjectHelper.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/SerializableObjectHelper.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/SerializableObjectHelper.java
Tue Apr 19 17:02:41 2005
@@ -18,17 +18,13 @@

package net.dpml.composition.builder;

+import java.io.ByteArrayOutputStream;
import java.io.File;
-import java.io.Serializable;
-import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.net.URI;
-import java.rmi.MarshalledObject;
+import java.io.OutputStream;
+import java.io.Serializable;

import net.dpml.automation.builder.BuilderRuntimeException;


Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilderTask.java
Tue Apr 19 17:02:41 2005
@@ -18,57 +18,33 @@

package net.dpml.composition.builder;

-import java.io.File;
-import java.io.Serializable;
import java.io.IOException;
import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.net.URI;
import java.net.URISyntaxException;
-import java.util.Properties;
-import java.util.List;
-import java.util.LinkedList;
import java.util.ArrayList;
-import java.util.Properties;
import java.util.Map;
+import java.util.Properties;
import java.util.Map.Entry;
-import java.lang.reflect.Method;
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.net.URI;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.InfoDescriptor;
-import net.dpml.meta.info.ContextDescriptor;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.CategoryDescriptor;
-import net.dpml.meta.info.PartDescriptor;
-import net.dpml.meta.info.PartDescriptor.Operation;

import net.dpml.automation.builder.IntrospectionException;
-
import net.dpml.configuration.Configuration;
import net.dpml.configuration.impl.DefaultConfigurationBuilder;
-
-import net.dpml.parameters.Parameters;
-
-import net.dpml.magic.model.Policy;
-import net.dpml.magic.model.Definition;
-import net.dpml.magic.project.Context;
import net.dpml.magic.tasks.ProjectTask;
+import net.dpml.meta.info.CategoryDescriptor;
+import net.dpml.meta.info.ContextDescriptor;
+import net.dpml.meta.info.DependencyDescriptor;
+import net.dpml.meta.info.EntryDescriptor;
+import net.dpml.meta.info.InfoDescriptor;
+import net.dpml.meta.info.PartDescriptor;
+import net.dpml.meta.info.ServiceDescriptor;
+import net.dpml.meta.info.Type;
+import net.dpml.meta.info.PartDescriptor.Operation;

-import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.Path;
-
-import net.dpml.state.StateManager;

/**
* The TypeTask creates a serialized descriptor of a component type.

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeWriterTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeWriterTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeWriterTask.java
Tue Apr 19 17:02:41 2005
@@ -19,24 +19,16 @@
package net.dpml.composition.builder;

import java.io.File;
-import java.net.URI;

+import net.dpml.magic.model.Policy;
+import net.dpml.magic.tasks.ProjectTask;
import net.dpml.meta.info.Type;
import net.dpml.meta.info.builder.impl.TypeBuilder;
import net.dpml.meta.info.writer.impl.XMLTypeWriter;

-import net.dpml.parameters.Parameters;
-
-import net.dpml.magic.model.Policy;
-import net.dpml.magic.model.Definition;
-import net.dpml.magic.project.Context;
-import net.dpml.magic.tasks.ProjectTask;
-
import org.apache.tools.ant.AntClassLoader;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.ProjectComponent;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
+import org.apache.tools.ant.Project;
import org.apache.tools.ant.types.Path;

/**
@@ -68,11 +60,11 @@

public void execute()
{
- Project project = getProject();
- Path path = getDefinition().getPath( project, Policy.RUNTIME );
+ Project proj = getProject();
+ Path path = getDefinition().getPath( proj, Policy.RUNTIME );
File classes = getContext().getClassesDirectory();
path.createPathElement().setLocation( classes );
- ClassLoader classloader = new AntClassLoader( project, path );
+ ClassLoader classloader = new AntClassLoader( proj, path );
Class subject = loadSubjectClass( classloader );

TypeBuilder typeBuilder = new TypeBuilder();

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypesTask.java
Tue Apr 19 17:02:41 2005
@@ -19,40 +19,22 @@
package net.dpml.composition.builder;

import java.io.File;
-import java.io.Serializable;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Arrays;
-import java.util.Properties;
-import java.util.List;
import java.util.LinkedList;
-import java.util.ArrayList;
-
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.TypeHolder;
+import java.util.List;

import net.dpml.automation.builder.IntrospectionException;
-
-import net.dpml.magic.tasks.ProjectTask;
import net.dpml.magic.model.Policy;
-import net.dpml.magic.model.Definition;
-import net.dpml.magic.model.Resource;
-import net.dpml.magic.model.ResourceRef;
-import net.dpml.magic.project.Context;
+import net.dpml.magic.tasks.ProjectTask;
+import net.dpml.meta.info.Type;
+import net.dpml.meta.info.TypeHolder;

-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.types.Path;
-import org.apache.tools.ant.DirectoryScanner;
import org.apache.tools.ant.AntClassLoader;
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.DynamicElementNS;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.Path;

/**
* Task that handles the construction of catalog of type entries.
@@ -66,10 +48,10 @@

public TypeBuilder createType()
{
- Project project = getProject();
+ Project proj = getProject();
TypeBuilderTask builder = new TypeBuilderTask();
builder.setTaskName( "type" );
- builder.setProject( project );
+ builder.setProject( proj );
m_builders.add( builder );
return builder;
}
@@ -93,11 +75,11 @@

public void execute()
{
- Project project = getProject();
- Path path = getDefinition().getPath( project, Policy.RUNTIME );
+ Project proj = getProject();
+ Path path = getDefinition().getPath( proj, Policy.RUNTIME );
File classes = getContext().getClassesDirectory();
path.createPathElement().setLocation( classes );
- ClassLoader classloader = new AntClassLoader( project, path );
+ ClassLoader classloader = new AntClassLoader( proj, path );
buildTypes( classloader );
}

@@ -163,8 +145,8 @@
try
{
Thread.currentThread().setContextClassLoader(
getClass().getClassLoader() );
- Project project = getProject();
- builder = project.createDataType( urn );
+ Project proj = getProject();
+ builder = proj.createDataType( urn );
typeBuilder = (TypeBuilder) builder;
return typeBuilder ;
}

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ConfigurationDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ConfigurationDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ConfigurationDataType.java
Tue Apr 19 17:02:41 2005
@@ -18,20 +18,17 @@

package net.dpml.composition.builder.datatypes;

-import java.util.List;
+import java.util.Hashtable;
import java.util.LinkedList;
-import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
-import java.util.Hashtable;
-
-import net.dpml.composition.data.DependencyDirective;

import net.dpml.configuration.Configuration;
import net.dpml.configuration.impl.DefaultConfiguration;

-import org.apache.tools.ant.Project;
-import org.apache.tools.ant.DynamicConfiguratorNS;
import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DynamicConfiguratorNS;
+import org.apache.tools.ant.Project;


/**

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ContextDataType.java
Tue Apr 19 17:02:41 2005
@@ -18,21 +18,15 @@

package net.dpml.composition.builder.datatypes;

-import java.util.List;
-import java.util.LinkedList;
-import java.util.ArrayList;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;

-import net.dpml.automation.part.Part;
-import net.dpml.automation.part.PartReference;
-import net.dpml.automation.builder.PartBuilder;
import net.dpml.automation.builder.IntrospectionException;
-
-import net.dpml.composition.data.ContextDirective;
-
+import net.dpml.automation.part.PartReference;
import net.dpml.composition.builder.ComponentBuilderTask;
import net.dpml.composition.builder.PartReferenceBuilder;
-
+import net.dpml.composition.data.ContextDirective;
import net.dpml.meta.info.Type;

import org.apache.tools.ant.Task;

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/DependenciesDataType.java
Tue Apr 19 17:02:41 2005
@@ -18,17 +18,14 @@

package net.dpml.composition.builder.datatypes;

-import java.util.List;
-import java.util.LinkedList;
import java.util.ArrayList;
+import java.util.List;

import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-
-import net.dpml.composition.data.DependencyDirective;
-import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.builder.ConstructionException;
-
+import net.dpml.composition.builder.PartReferenceBuilder;
+import net.dpml.composition.data.DependencyDirective;
import net.dpml.meta.info.Type;

/**

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/EntryDataType.java
Tue Apr 19 17:02:41 2005
@@ -18,28 +18,18 @@

package net.dpml.composition.builder.datatypes;

-import java.util.List;
-import java.util.LinkedList;
-import java.util.ArrayList;
import java.net.URI;
import java.net.URISyntaxException;

import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-import net.dpml.automation.builder.PartBuilder;
-
-import net.dpml.composition.data.ReferenceDirective;
-import net.dpml.composition.data.ValueDirective;
-import net.dpml.composition.data.ValueDirective.Value;
import net.dpml.composition.builder.ConstructionException;
import net.dpml.composition.builder.PartReferenceBuilder;
-
-import net.dpml.meta.info.Type;
+import net.dpml.composition.data.ValueDirective;
+import net.dpml.composition.data.ValueDirective.Value;
import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.PartDescriptor;
-
-import org.apache.tools.ant.BuildException;
+import net.dpml.meta.info.Type;

/**
* A simple part datatype.

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ParametersDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ParametersDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ParametersDataType.java
Tue Apr 19 17:02:41 2005
@@ -18,11 +18,8 @@

package net.dpml.composition.builder.datatypes;

-import java.util.List;
-import java.util.LinkedList;
import java.util.ArrayList;
-
-import net.dpml.composition.data.DependencyDirective;
+import java.util.List;

import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartDataType.java
Tue Apr 19 17:02:41 2005
@@ -22,16 +22,13 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.meta.info.Type;
-
-import net.dpml.composition.builder.PartReferenceBuilder;
-import net.dpml.composition.control.CompositionPartHandler;
-
-import net.dpml.automation.control.PartNotFoundException;
import net.dpml.automation.control.DelegationException;
+import net.dpml.automation.control.PartNotFoundException;
import net.dpml.automation.part.Part;
-import net.dpml.automation.part.PartHolder;
import net.dpml.automation.part.PartReference;
+import net.dpml.composition.builder.PartReferenceBuilder;
+import net.dpml.composition.control.CompositionPartHandler;
+import net.dpml.meta.info.Type;

import org.apache.tools.ant.BuildException;


Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
Tue Apr 19 17:02:41 2005
@@ -19,29 +19,21 @@
package net.dpml.composition.builder.datatypes;

import java.io.IOException;
-import java.util.List;
import java.util.LinkedList;
-import java.net.URI;
+import java.util.List;

-import net.dpml.automation.part.Part;
-import net.dpml.automation.part.PartReference;
-import net.dpml.automation.builder.PartBuilder;
import net.dpml.automation.builder.IntrospectionException;
-
+import net.dpml.automation.part.PartReference;
import net.dpml.composition.builder.ComponentBuilderTask;
import net.dpml.composition.builder.PartReferenceBuilder;
-
import net.dpml.meta.info.Type;

-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.Target;
-import org.apache.tools.ant.ProjectHelper;
-import org.apache.tools.ant.ProjectComponent;
-import org.apache.tools.ant.DynamicElementNS;
-import org.apache.tools.ant.taskdefs.Sequential;
import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Project;
+import org.apache.tools.ant.DynamicElementNS;
import org.apache.tools.ant.Location;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.ProjectComponent;
+import org.apache.tools.ant.Task;

/**
* A datatype that enables custom part builders.
@@ -56,8 +48,8 @@

public PartsDataType( Task owner )
{
- Project project = owner.getProject();
- setProject( project );
+ Project proj = owner.getProject();
+ setProject( proj );
m_owner = owner;
}

@@ -114,8 +106,8 @@
try
{
Thread.currentThread().setContextClassLoader(
getClass().getClassLoader() );
- Project project = getProject();
- builder = project.createDataType( urn );
+ Project proj = getProject();
+ builder = proj.createDataType( urn );
partBuilder = (PartReferenceBuilder) builder;
return partBuilder ;
}

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ReferenceDataType.java
Tue Apr 19 17:02:41 2005
@@ -18,27 +18,15 @@

package net.dpml.composition.builder.datatypes;

-import java.util.List;
-import java.util.LinkedList;
-import java.util.ArrayList;
import java.net.URI;
import java.net.URISyntaxException;

import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-import net.dpml.automation.builder.PartBuilder;
-
-import net.dpml.composition.data.ReferenceDirective;
-import net.dpml.composition.data.ValueDirective;
-import net.dpml.composition.data.ValueDirective.Value;
import net.dpml.composition.builder.ConstructionException;
import net.dpml.composition.builder.PartReferenceBuilder;
-
+import net.dpml.composition.data.ReferenceDirective;
import net.dpml.meta.info.Type;
-import net.dpml.meta.info.EntryDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-
-import org.apache.tools.ant.BuildException;

/**
* A simple part datatype.

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ValueDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ValueDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/ValueDataType.java
Tue Apr 19 17:02:41 2005
@@ -18,10 +18,8 @@

package net.dpml.composition.builder.datatypes;

-import java.net.URI;
-import java.util.List;
-import java.util.LinkedList;
import java.util.ArrayList;
+import java.util.List;

import net.dpml.composition.data.ValueDirective.Value;


Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -18,16 +18,13 @@

package net.dpml.composition.control;

-import java.net.URI;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;
+import java.lang.reflect.UndeclaredThrowableException;
+import java.net.URI;

import net.dpml.automation.control.Disposable;
-import net.dpml.automation.control.LifecycleException;
-
-import net.dpml.composition.models.CompositionModel;
import net.dpml.composition.models.Holder;

/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
Tue Apr 19 17:02:41 2005
@@ -18,62 +18,39 @@

package net.dpml.composition.control;

+import java.io.IOException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Proxy;
import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.net.URISyntaxException;
-import java.io.IOException;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Collections;
-import java.util.WeakHashMap;
-import java.util.ArrayList;
-import java.util.Hashtable;
+import java.util.Observable;
+import java.util.Observer;
import java.util.Map.Entry;
import java.util.logging.Logger;
-import java.util.Observer;
-import java.util.Observable;
-import java.lang.reflect.Proxy;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-
-import javax.swing.event.ChangeEvent;
-
-import net.dpml.automation.part.Part;

-import net.dpml.automation.control.PartHandler;
-import net.dpml.automation.control.Controller;
import net.dpml.automation.control.ControlRuntimeException;
-import net.dpml.automation.control.Monitor;
-import net.dpml.automation.control.DuplicateNameException;
+import net.dpml.automation.control.Controller;
import net.dpml.automation.control.DelegationException;
-import net.dpml.automation.control.HandlerNotFoundException;
+import net.dpml.automation.control.Disposable;
+import net.dpml.automation.control.EntryNotFoundException;
import net.dpml.automation.control.LifecycleException;
-import net.dpml.automation.control.UnsupportedPartTypeException;
+import net.dpml.automation.control.Monitor;
import net.dpml.automation.control.PartNotFoundException;
-import net.dpml.automation.control.EntryNotFoundException;
-import net.dpml.automation.control.ControlException;
-import net.dpml.automation.control.Disposable;
import net.dpml.automation.control.UnknownSchemaException;
-
-import net.dpml.automation.model.ModelException;
import net.dpml.automation.model.Model;
-
-import net.dpml.composition.data.ComponentProfile;
-import net.dpml.composition.data.ClasspathDirective;
+import net.dpml.automation.model.ModelException;
+import net.dpml.automation.part.Part;
import net.dpml.composition.data.ClassLoaderDirective;
+import net.dpml.composition.data.ClasspathDirective;
+import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.ValueDirective;
-
-import net.dpml.composition.models.AbstractModel;
import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.models.ValueModel;
-import net.dpml.composition.models.Holder;
import net.dpml.composition.models.EntryTable;
-
+import net.dpml.composition.models.Holder;
+import net.dpml.composition.models.ValueModel;
import net.dpml.system.SystemContext;

-import net.dpml.transit.artifact.Handler;
-
/**
* A initial test controller.
*

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
Tue Apr 19 17:02:41 2005
@@ -18,52 +18,35 @@

package net.dpml.composition.control;

+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
-import java.io.IOException;
-import java.io.ByteArrayOutputStream;
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayInputStream;
-import java.io.ObjectInputStream;
-import java.util.Set;
+import java.util.Collections;
import java.util.HashSet;
-import java.util.Map;
import java.util.Hashtable;
-import java.util.Collections;
-import java.util.WeakHashMap;
-import java.util.ArrayList;
+import java.util.Map;
import java.util.Properties;
-import java.util.logging.Logger;
-import java.util.logging.Handler;
+import java.util.Set;
import java.util.logging.LogManager;

import net.dpml.activity.Startable;
-
-import net.dpml.automation.part.Part;
-
-import net.dpml.automation.control.SystemManager;
-import net.dpml.automation.control.PartHandler;
-import net.dpml.automation.control.Controller;
import net.dpml.automation.control.ControlRuntimeException;
-import net.dpml.automation.control.Monitor;
-import net.dpml.automation.control.DuplicateNameException;
-import net.dpml.automation.control.UnsupportedPartTypeException;
+import net.dpml.automation.control.Controller;
import net.dpml.automation.control.DelegationException;
-import net.dpml.automation.control.HandlerNotFoundException;
import net.dpml.automation.control.PartNotFoundException;
+import net.dpml.automation.control.SystemManager;
import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;
-
+import net.dpml.automation.part.Part;
import net.dpml.system.SystemContext;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.Option;
-import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
-import org.apache.commons.cli.ParseException;


/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -18,32 +18,13 @@

package net.dpml.composition.control;

-import java.net.URI;
import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Map.Entry;

-import net.dpml.automation.control.Controller;
import net.dpml.automation.control.LifecycleException;
-import net.dpml.automation.control.ControlRuntimeException;
-import net.dpml.automation.control.EntryNotFoundException;
import net.dpml.automation.model.ModelException;
-import net.dpml.automation.model.Model;
-
import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.models.ValueModel;
import net.dpml.composition.models.Holder;
-
-import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.ImportDirective;
-import net.dpml.composition.data.ValueDirective;
-
-import net.dpml.meta.info.Type;
-
import net.dpml.system.SystemContext;

/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextManagerInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextManagerInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextManagerInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -18,33 +18,12 @@

package net.dpml.composition.control;

-import java.net.URI;
-import java.lang.reflect.InvocationHandler;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;
-import java.util.Hashtable;
import java.util.Map;
-import java.util.Map.Entry;

-import net.dpml.automation.control.Controller;
import net.dpml.automation.control.LifecycleException;
-import net.dpml.automation.control.ControlRuntimeException;
-import net.dpml.automation.control.EntryNotFoundException;
import net.dpml.automation.model.ModelException;
-import net.dpml.automation.model.Model;
-
-import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.models.ValueModel;
-import net.dpml.composition.models.EntryTable;
import net.dpml.composition.models.Holder;
-
-import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.ImportDirective;
-import net.dpml.composition.data.ValueDirective;
-
-import net.dpml.meta.info.Type;
-
import net.dpml.system.SystemContext;

/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
Tue Apr 19 17:02:41 2005
@@ -18,32 +18,21 @@

package net.dpml.composition.control;

-import java.net.URI;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.UndeclaredThrowableException;
-import java.lang.reflect.Proxy;
import java.lang.reflect.Method;
-import java.util.Hashtable;
-import java.util.Map;
+import java.lang.reflect.Proxy;
+import java.net.URI;
import java.util.Map.Entry;

-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.PartDescriptor;
-
import net.dpml.automation.control.Controller;
import net.dpml.automation.control.DelegationException;
-import net.dpml.automation.control.EntryNotFoundException;
-import net.dpml.automation.control.UnknownSchemaException;
import net.dpml.automation.model.Model;
-
import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.models.EntryTable;
import net.dpml.composition.models.Holder;
-
-import net.dpml.system.SystemContext;
-
+import net.dpml.meta.info.PartDescriptor;
import net.dpml.state.StateManager;
+import net.dpml.system.SystemContext;

/**
* The parts invocation handler maps client request for 'get', 'create' and

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/AbstractModel.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/AbstractModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/AbstractModel.java
Tue Apr 19 17:02:41 2005
@@ -19,16 +19,11 @@
package net.dpml.composition.models;

import java.net.URI;
-import java.util.Map.Entry;

-import net.dpml.automation.model.Model;
-import net.dpml.automation.model.ModelException;
import net.dpml.automation.control.Controller;
-
+import net.dpml.automation.model.Model;
import net.dpml.composition.control.CompositionController;

-import net.dpml.meta.info.EntryDescriptor;
-
/**
* A context entry model.
*

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
Tue Apr 19 17:02:41 2005
@@ -20,45 +20,27 @@

import java.io.Serializable;
import java.net.URI;
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.WeakHashMap;
-import java.util.List;
import java.util.LinkedList;
-import java.util.Map.Entry;
+import java.util.List;

import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;
import net.dpml.automation.model.ModelRuntimeException;
import net.dpml.automation.model.ServiceClassNotFoundException;
import net.dpml.automation.model.TypeClassNotFoundException;
-import net.dpml.automation.control.Controller;
-import net.dpml.automation.control.DelegationException;
-import net.dpml.automation.control.PartNotFoundException;
-import net.dpml.automation.control.EntryNotFoundException;
-import net.dpml.automation.control.InvalidQueryException;
import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-
+import net.dpml.composition.control.CompositionController;
import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.ValueDirective;
-import net.dpml.composition.data.DependencyDirective;
-import net.dpml.composition.data.ReferenceDirective;
-
-import net.dpml.composition.control.CompositionController;
-
import net.dpml.configuration.Configuration;
import net.dpml.configuration.impl.DefaultConfiguration;
-
-import net.dpml.parameters.Parameters;
-import net.dpml.parameters.impl.DefaultParameters;
-
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.ServiceDescriptor;
import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.PartDescriptor;
import net.dpml.meta.info.EntryDescriptor;
+import net.dpml.meta.info.ServiceDescriptor;
+import net.dpml.meta.info.Type;
+import net.dpml.parameters.Parameters;
+import net.dpml.parameters.impl.DefaultParameters;

/**
* The implementation of a component model.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/ContextTable.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/ContextTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/ContextTable.java
Tue Apr 19 17:02:41 2005
@@ -18,39 +18,12 @@

package net.dpml.composition.models;

-import java.io.Serializable;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Hashtable;
-import java.util.WeakHashMap;
-import java.util.List;
-import java.util.LinkedList;
import java.net.URI;
+import java.util.Map.Entry;

-import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;
-import net.dpml.automation.model.ModelRuntimeException;
-import net.dpml.automation.model.ServiceClassNotFoundException;
-import net.dpml.automation.model.TypeClassNotFoundException;
-import net.dpml.automation.model.PartClassNotFoundException;
-
-import net.dpml.automation.control.EntryNotFoundException;
-import net.dpml.automation.control.Controller;
-import net.dpml.automation.control.DelegationException;
-
import net.dpml.automation.part.Part;
-
import net.dpml.composition.data.ReferenceDirective;
-import net.dpml.composition.data.ComponentProfile;
-import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.DependencyDirective;
-
-import net.dpml.composition.control.CompositionController;
-
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.PartDescriptor;

/**
* The parts model is a model of the set of parts maintained by a parent
model.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/DuplicateKeyException.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/DuplicateKeyException.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/DuplicateKeyException.java
Tue Apr 19 17:02:41 2005
@@ -20,8 +20,6 @@

import net.dpml.automation.model.ModelException;

-import net.dpml.composition.data.DependencyDirective;
-
/**
* Exception thrown in response to an attempt to register a part model
* under a key that is already assigned.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/EntryTable.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/EntryTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/EntryTable.java
Tue Apr 19 17:02:41 2005
@@ -18,40 +18,14 @@

package net.dpml.composition.models;

-import java.io.Serializable;
+import java.util.Hashtable;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.Hashtable;
-import java.util.WeakHashMap;
-import java.util.List;
-import java.util.LinkedList;
-import java.net.URI;

-import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;
-import net.dpml.automation.model.ModelRuntimeException;
-import net.dpml.automation.model.ServiceClassNotFoundException;
-import net.dpml.automation.model.TypeClassNotFoundException;
-import net.dpml.automation.model.PartClassNotFoundException;
-
-import net.dpml.automation.control.EntryNotFoundException;
-import net.dpml.automation.control.Controller;
-import net.dpml.automation.control.DelegationException;
-
import net.dpml.automation.part.Part;
-
-import net.dpml.composition.data.ReferenceDirective;
-import net.dpml.composition.data.ComponentProfile;
-import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.DependencyDirective;
-
import net.dpml.composition.control.CompositionController;

-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.PartDescriptor;
-
/**
* The parts model is a model of the set of parts maintained by a parent
model.
*

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/Holder.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/Holder.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/Holder.java
Tue Apr 19 17:02:41 2005
@@ -18,24 +18,22 @@

package net.dpml.composition.models;

-import java.net.URI;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Proxy;
-import java.util.WeakHashMap;
-import java.util.Map;
-import java.util.Map.Entry;
+import java.net.URI;
import java.util.Hashtable;
+import java.util.Map;
import java.util.Observable;
+import java.util.WeakHashMap;
+import java.util.Map.Entry;

import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

-import net.dpml.automation.control.Monitor;
-import net.dpml.automation.control.LifecycleException;
-import net.dpml.automation.control.ControlRuntimeException;
import net.dpml.automation.control.Identifiable;
-
+import net.dpml.automation.control.LifecycleException;
+import net.dpml.automation.control.Monitor;
import net.dpml.composition.control.CompositionController;

/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/PartsTable.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/PartsTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/PartsTable.java
Tue Apr 19 17:02:41 2005
@@ -18,39 +18,9 @@

package net.dpml.composition.models;

-import java.io.Serializable;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Hashtable;
-import java.util.WeakHashMap;
-import java.util.List;
-import java.util.LinkedList;
-import java.net.URI;
-
-import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;
-import net.dpml.automation.model.ModelRuntimeException;
-import net.dpml.automation.model.ServiceClassNotFoundException;
-import net.dpml.automation.model.TypeClassNotFoundException;
-import net.dpml.automation.model.PartClassNotFoundException;
-
-import net.dpml.automation.control.EntryNotFoundException;
-import net.dpml.automation.control.Controller;
-import net.dpml.automation.control.DelegationException;
-
import net.dpml.automation.part.Part;
-
import net.dpml.composition.data.ReferenceDirective;
-import net.dpml.composition.data.ComponentProfile;
-import net.dpml.composition.data.ContextDirective;
-import net.dpml.composition.data.DependencyDirective;
-
-import net.dpml.composition.control.CompositionController;
-
-import net.dpml.meta.info.Type;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.PartDescriptor;

/**
* The parts model is a model of the set of parts maintained by a parent
model.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/models/ValueModel.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/ValueModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/models/ValueModel.java
Tue Apr 19 17:02:41 2005
@@ -18,22 +18,17 @@

package net.dpml.composition.models;

-import java.net.URI;
import java.lang.reflect.Constructor;
-import java.util.Map;
+import java.net.URI;

import net.dpml.automation.control.Controller;
import net.dpml.automation.model.Model;
import net.dpml.automation.model.ModelException;
import net.dpml.automation.model.ModelRuntimeException;
-
+import net.dpml.composition.control.CompositionController;
import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.data.ValueDirective.Value;

-import net.dpml.composition.control.CompositionController;
-
-import net.dpml.meta.info.EntryDescriptor;
-
/**
* Default implementation of a the context entry constructor model.
*

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/ContainmentProfileBuilder.java
Tue Apr 19 17:02:41 2005
@@ -17,23 +17,18 @@

package net.dpml.composition.data.builder;

-import java.io.InputStream;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
-
+import java.io.InputStream;
import java.net.ContentHandler;
import java.net.URLConnection;

import net.dpml.composition.data.ContainmentProfile;
import net.dpml.configuration.Configuration;
import net.dpml.configuration.impl.DefaultConfigurationBuilder;
-
import net.dpml.io.CascadingIOException;

-import net.dpml.i18n.ResourceManager;
-import net.dpml.i18n.Resources;
-
import org.xml.sax.InputSource;



Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/data/builder/XMLComponentProfileCreator.java
Tue Apr 19 17:02:41 2005
@@ -19,31 +19,24 @@

import java.util.ArrayList;

-import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-
-import net.dpml.logging.data.CategoriesDirective;
-
-import net.dpml.parameters.ParameterException;
-import net.dpml.parameters.Parameters;
-import net.dpml.parameters.impl.DefaultParameters;
-
-import net.dpml.configuration.Configuration;
-import net.dpml.configuration.ConfigurationException;
-import net.dpml.configuration.impl.ConfigurationUtil;
-
import net.dpml.composition.data.ClassLoaderDirective;
-import net.dpml.composition.data.ClasspathDirective;
-import net.dpml.composition.data.DeploymentProfile;
import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.ContextDirective;
import net.dpml.composition.data.DependencyDirective;
+import net.dpml.composition.data.DeploymentProfile;
import net.dpml.composition.data.ImportDirective;
+import net.dpml.composition.data.Mode;
import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.data.ValueDirective.Value;
-import net.dpml.composition.data.Mode;
-
+import net.dpml.configuration.Configuration;
+import net.dpml.configuration.ConfigurationException;
+import net.dpml.configuration.impl.ConfigurationUtil;
+import net.dpml.logging.data.CategoriesDirective;
import net.dpml.meta.info.InfoDescriptor;
+import net.dpml.parameters.ParameterException;
+import net.dpml.parameters.Parameters;
+import net.dpml.parameters.impl.DefaultParameters;


/**

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultClassLoaderModel.java
Tue Apr 19 17:02:41 2005
@@ -20,50 +20,36 @@

import java.io.File;
import java.io.IOException;
-
-import java.net.JarURLConnection;
import java.net.URI;
import java.net.URL;
import java.net.URLClassLoader;
import java.net.URLStreamHandler;
import java.net.URLStreamHandlerFactory;
-
import java.security.CodeSource;
import java.security.cert.Certificate;
-
import java.util.ArrayList;
import java.util.List;

-import java.util.jar.Manifest;
-
import net.dpml.composition.data.ClassLoaderDirective;
import net.dpml.composition.data.ClasspathDirective;
import net.dpml.composition.data.ContainmentProfile;
import net.dpml.composition.data.FilesetDirective;
import net.dpml.composition.data.FilesetDirective.Exclude;
import net.dpml.composition.data.FilesetDirective.Include;
-
import net.dpml.composition.model.ClassLoaderModel;
import net.dpml.composition.model.ModelException;
import net.dpml.composition.model.ServiceRepository;
import net.dpml.composition.model.TypeRepository;
-
import net.dpml.composition.provider.ClassLoaderContext;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.system.SystemContext;
-
+import net.dpml.transit.TransitException;
import net.dpml.transit.artifact.Artifact;
import net.dpml.transit.artifact.Handler;

-import net.dpml.transit.TransitException;
-
/**
* <p>Implementation of a classloader model within which a
* repository, a base directory and a classloader directive

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultComponentModel.java
Tue Apr 19 17:02:41 2005
@@ -20,52 +20,37 @@

import java.io.InputStream;
import java.lang.reflect.Constructor;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.Properties;

+import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.ContextDirective;
import net.dpml.composition.data.DependencyDirective;
-import net.dpml.composition.data.ClassLoaderDirective;
-import net.dpml.composition.data.ClasspathDirective;
import net.dpml.composition.data.DeploymentProfile;
-import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.Mode;
-
import net.dpml.composition.model.ComponentModel;
import net.dpml.composition.model.ContextModel;
import net.dpml.composition.model.DependencyModel;
import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.ModelException;
import net.dpml.composition.model.ModelRuntimeException;
-
import net.dpml.composition.provider.ComponentContext;
-
import net.dpml.composition.util.XercesSchemaValidator;
-
import net.dpml.configuration.Configurable;
import net.dpml.configuration.Configuration;
-
import net.dpml.configuration.impl.CascadingConfiguration;
import net.dpml.configuration.impl.DefaultConfiguration;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.meta.info.ContextDescriptor;
import net.dpml.meta.info.DependencyDescriptor;
import net.dpml.meta.info.InfoDescriptor;
import net.dpml.meta.info.ReferenceDescriptor;
import net.dpml.meta.info.ServiceDescriptor;
import net.dpml.meta.info.Type;
-
import net.dpml.parameters.Parameterizable;
import net.dpml.parameters.Parameters;
import net.dpml.parameters.impl.DefaultParameters;
@@ -91,16 +76,16 @@
new DefaultConfiguration( "configuration",
ComponentModel.class.getName() );

private static final String AVALON_CONFIGURABLE_CLASSNAME =
- "org.apache.avalon.framework.configuration.Configurable";
+ "net.dpml.configuration.Configurable";

private static final String AVALON_CONFIGURATION_CLASSNAME =
- "org.apache.avalon.framework.configuration.Configuration";
+ "net.dpml.configuration.Configuration";

private static final String AVALON_PARAMETERIZABLE_CLASSNAME =
- "org.apache.avalon.framework.parameters.Parameterizable";
+ "net.dpml.parameters.Parameterizable";

private static final String AVALON_PARAMETERS_CLASSNAME =
- "org.apache.avalon.framework.parameters.Parameters";
+ "net.dpml.parameters.Parameters";

private static final String SCHEMA_TAG_W3CSCHEMA = "xmlschema";


Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionController.java
Tue Apr 19 17:02:41 2005
@@ -20,15 +20,13 @@

import net.dpml.activity.Disposable;
import net.dpml.activity.Startable;
-
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.ModelException;
-import net.dpml.composition.provider.ContainmentContext;
-import net.dpml.composition.provider.CompositionException;
-import net.dpml.composition.provider.CompositionRuntimeException;
import net.dpml.composition.provider.CompositionContext;
+import net.dpml.composition.provider.CompositionException;
import net.dpml.composition.provider.CompositionHelper;
-
+import net.dpml.composition.provider.CompositionRuntimeException;
+import net.dpml.composition.provider.ContainmentContext;
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;

@@ -250,7 +248,7 @@

private class State implements Disposable
{
- private int m_state = INITIALIZING;
+ private int m_State = INITIALIZING;

//private LinkedList m_listeners = new LinkedList();

@@ -285,15 +283,15 @@

public int getState()
{
- return m_state;
+ return m_State;
}

public synchronized void setState( int state )
{
- int oldValue = m_state;
+ int oldValue = m_State;
int newValue = state;

- m_state = newValue;
+ m_State = newValue;

if( getLogger().isDebugEnabled() )
{
@@ -352,7 +350,7 @@

public String toString()
{
- int s = m_state;
+ int s = m_State;
if( s < STATE_NAMES.length )
{
return STATE_NAMES[ s ];

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultCompositionFactory.java
Tue Apr 19 17:02:41 2005
@@ -20,37 +20,28 @@

import java.io.File;
import java.io.IOException;
-
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLConnection;
-
import java.util.Map;

import net.dpml.composition.data.builder.CompositionContentHandlerFactory;
-
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.ModelException;
-
import net.dpml.composition.provider.CompositionContext;
import net.dpml.composition.provider.CompositionCriteria;
import net.dpml.composition.provider.CompositionException;
import net.dpml.composition.provider.CompositionFactory;
import net.dpml.composition.provider.CompositionRuntimeException;
import net.dpml.composition.provider.ModelFactory;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.system.Factory;
import net.dpml.system.SystemContext;
-
import net.dpml.transit.artifact.Artifact;

import org.apache.commons.cli.CommandLine;
@@ -58,7 +49,6 @@
import org.apache.commons.cli.GnuParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionBuilder;
-import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;


Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultContextModel.java
Tue Apr 19 17:02:41 2005
@@ -24,24 +24,16 @@

import net.dpml.automation.part.Part;
import net.dpml.automation.part.PartReference;
-
-import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.data.ContextDirective;
import net.dpml.composition.data.ImportDirective;
-
+import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.model.ContextModel;
import net.dpml.composition.model.ModelException;
-import net.dpml.composition.model.ModelRuntimeException;
-
import net.dpml.composition.provider.ComponentContext;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.meta.info.ContextDescriptor;
import net.dpml.meta.info.EntryDescriptor;


Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultDependencyModel.java
Tue Apr 19 17:02:41 2005
@@ -18,22 +18,14 @@

package net.dpml.composition.model.impl;

-import java.util.ArrayList;
-
+import net.dpml.composition.data.DependencyDirective;
import net.dpml.composition.model.DependencyModel;
import net.dpml.composition.model.ModelException;
-
-import net.dpml.composition.data.DependencyDirective;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.ServiceDescriptor;

/**
* Default implementation of the deplendency model.

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultEntryModel.java
Tue Apr 19 17:02:41 2005
@@ -18,14 +18,8 @@

package net.dpml.composition.model.impl;

-import java.net.URI;
-import java.util.Map.Entry;
-
import net.dpml.composition.model.EntryModel;
-import net.dpml.composition.model.ModelException;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.meta.info.EntryDescriptor;

/**

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DefaultModelFactory.java
Tue Apr 19 17:02:41 2005
@@ -19,31 +19,19 @@
package net.dpml.composition.model.impl;

import java.io.InputStream;
-
import java.net.URI;
import java.net.URL;
import java.net.URLConnection;

-import java.util.HashMap;
-import java.util.Hashtable;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-
import net.dpml.composition.data.ClassLoaderDirective;
-import net.dpml.composition.data.ClasspathDirective;
import net.dpml.composition.data.ContainmentProfile;
-
import net.dpml.composition.data.builder.ContainmentProfileBuilder;
import net.dpml.composition.data.builder.XMLContainmentProfileCreator;
-
import net.dpml.composition.model.ClassLoaderModel;
import net.dpml.composition.model.ComponentModel;
import net.dpml.composition.model.ContainmentModel;
import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.ModelException;
-import net.dpml.composition.model.ModelRuntimeException;
-
import net.dpml.composition.provider.ClassLoaderContext;
import net.dpml.composition.provider.ComponentContext;
import net.dpml.composition.provider.CompositionContext;
@@ -51,22 +39,15 @@
import net.dpml.composition.provider.ContainmentContext;
import net.dpml.composition.provider.ModelFactory;
import net.dpml.composition.provider.Runtime;
-
import net.dpml.configuration.Configuration;
-
import net.dpml.configuration.impl.ConfigurationUtil;
import net.dpml.configuration.impl.DefaultConfigurationBuilder;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.system.Factory;
import net.dpml.system.SystemContext;
-
import net.dpml.transit.repository.Repository;

import org.xml.sax.InputSource;

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/DirectoryScanner.java
Tue Apr 19 17:02:41 2005
@@ -96,16 +96,16 @@
}

/** The base directory to be scanned. */
- private File basedir;
+ private File m_basedir;

/** The patterns for the files to be included. */
- protected String[] includes;
+ protected String[] m_includes;

/** The patterns for the files to be excluded. */
- protected String[] excludes;
+ protected String[] m_excludes;

/** Selectors that will filter which files are in our candidate list. */
- protected FileSelector[] selectors = null;
+ protected FileSelector[] m_selectors = null;

/** The files which matched at least one include and no excludes
* and were selected.
@@ -152,12 +152,12 @@
* Whether or not the file system should be treated as a case sensitive
* one.
*/
- protected boolean isCaseSensitive = true;
+ protected boolean m_isCaseSensitive = true;

/**
* Whether or not symbolic links should be followed.
*/
- private boolean followSymlinks = true;
+ private boolean m_followSymlinks = true;

/** Helper. */
private static final FileUtils fileUtils = FileUtils.newFileUtils();
@@ -381,7 +381,7 @@
*/
public void setBasedir(File basedir)
{
- this.basedir = basedir;
+ this.m_basedir = basedir;
}

/**
@@ -392,7 +392,7 @@
*/
public File getBasedir()
{
- return basedir;
+ return m_basedir;
}

/**
@@ -403,7 +403,7 @@
*/
public boolean isCaseSensitive()
{
- return isCaseSensitive;
+ return m_isCaseSensitive;
}
/**
* Sets whether or not include and exclude patterns are matched
@@ -414,7 +414,7 @@
*/
public void setCaseSensitive(boolean isCaseSensitive)
{
- this.isCaseSensitive = isCaseSensitive;
+ this.m_isCaseSensitive = isCaseSensitive;
}

/**
@@ -426,7 +426,7 @@
*/
public boolean isFollowSymlinks()
{
- return followSymlinks;
+ return m_followSymlinks;
}

/**
@@ -436,7 +436,7 @@
*/
public void setFollowSymlinks(boolean followSymlinks)
{
- this.followSymlinks = followSymlinks;
+ this.m_followSymlinks = followSymlinks;
}

/**
@@ -456,11 +456,11 @@
{
if (includes == null)
{
- this.includes = null;
+ this.m_includes = null;
}
else
{
- this.includes = new String[includes.length];
+ this.m_includes = new String[includes.length];
for (int i = 0; i < includes.length; i++)
{
String pattern;
@@ -470,7 +470,7 @@
{
pattern += "**";
}
- this.includes[i] = pattern;
+ this.m_includes[i] = pattern;
}
}
}
@@ -492,11 +492,11 @@
{
if( excludes == null)
{
- this.excludes = null;
+ this.m_excludes = null;
}
else
{
- this.excludes = new String[excludes.length];
+ this.m_excludes = new String[excludes.length];
for (int i = 0; i < excludes.length; i++)
{
String pattern;
@@ -506,7 +506,7 @@
{
pattern += "**";
}
- this.excludes[i] = pattern;
+ this.m_excludes[i] = pattern;
}
}
}
@@ -518,7 +518,7 @@
*/
public void setSelectors(FileSelector[] selectors)
{
- this.selectors = selectors;
+ this.m_selectors = selectors;
}


@@ -545,37 +545,37 @@
*/
public void scan() throws IllegalStateException, IOException
{
- if (basedir == null)
+ if (m_basedir == null)
{
throw new IllegalStateException("No basedir set");
}
- if (!basedir.exists())
+ if (!m_basedir.exists())
{
- System.out.println("basedir=[" + basedir + "]");
- throw new IllegalStateException("basedir " + basedir
+ System.out.println("basedir=[" + m_basedir + "]");
+ throw new IllegalStateException("basedir " + m_basedir
+ " does not exist");
}

- if (!basedir.isDirectory())
+ if (!m_basedir.isDirectory())
{
- throw new IllegalStateException("basedir " + basedir
+ throw new IllegalStateException("basedir " + m_basedir
+ " is not a directory");
}

- if (includes == null)
+ if (m_includes == null)
{
// No includes supplied, so set it to 'matches all'
- includes = new String[1];
- includes[0] = "*.jar";
+ m_includes = new String[1];
+ m_includes[0] = "*.jar";
}
- if (excludes == null)
+ if (m_excludes == null)
{
- excludes = new String[0];
+ m_excludes = new String[0];
}
- if (selectors == null)
+ if (m_selectors == null)
{
- selectors = new FileSelector[1];
- selectors[0] = new DefaultFileSelector();
+ m_selectors = new FileSelector[1];
+ m_selectors[0] = new DefaultFileSelector();
}

filesIncluded = new Vector();
@@ -591,7 +591,7 @@
{
if (!isExcluded(""))
{
- if (isSelected("", basedir))
+ if (isSelected("", m_basedir))
{
dirsIncluded.addElement("");
}
@@ -625,21 +625,21 @@
// put in the newroots vector the include patterns without
// wildcard tokens

- for( int icounter = 0; icounter < includes.length; icounter++ )
+ for( int icounter = 0; icounter < m_includes.length; icounter++ )
{
String newpattern =
- ScannerUtils.rtrimWildcardTokens(includes[icounter]);
- newroots.put(newpattern, includes[icounter]);
+ ScannerUtils.rtrimWildcardTokens(m_includes[icounter]);
+ newroots.put(newpattern, m_includes[icounter]);
getLogger().debug(
"newpattern=[" + newpattern + "]; "
+ "includes[" + icounter + "]=["
- + includes[icounter] + "]" );
+ + m_includes[icounter] + "]" );
}

if (newroots.containsKey(""))
{
// we are going to scan everything anyway
- scandir(basedir, "", true);
+ scandir(m_basedir, "", true);
}
else
{
@@ -648,7 +648,7 @@
Enumeration enum2 = newroots.keys();

File canonBase = null;
- canonBase = basedir.getCanonicalFile();
+ canonBase = m_basedir.getCanonicalFile();
getLogger().debug("canonBase=[" + canonBase + "]");

while (enum2.hasMoreElements())
@@ -657,7 +657,7 @@
getLogger().debug("currentelement=[" + currentelement + "]");
String originalpattern = (String)
newroots.get(currentelement);
getLogger().debug("originalpattern=[" + originalpattern +
"]");
- File myfile = new File(basedir, currentelement);
+ File myfile = new File(m_basedir, currentelement);
getLogger().debug("myfile=[" + myfile.getAbsolutePath() +
"]");

if (myfile.exists())
@@ -670,34 +670,34 @@
canonFile);
if (!path.equals(currentelement) || ON_VMS)
{
- myfile = findFile(basedir, currentelement);
+ myfile = findFile(m_basedir, currentelement);
if( null != myfile )
{
currentelement =
fileUtils.removeLeadingPath(
- basedir, myfile );
+ m_basedir, myfile );
}
}
}

- if( ( myfile == null || !myfile.exists() ) &&
!isCaseSensitive )
+ if( ( myfile == null || !myfile.exists() ) &&
!m_isCaseSensitive )
{
- File f = findFileCaseInsensitive(basedir,
currentelement);
+ File f = findFileCaseInsensitive(m_basedir,
currentelement);
if (f.exists())
{
// adapt currentelement to the case we've
// actually found
currentelement =
fileUtils.removeLeadingPath(
- basedir, f );
+ m_basedir, f );
myfile = f;
}
}

if( myfile != null && myfile.exists() )
{
- if (!followSymlinks
- && isSymlink(basedir, currentelement))
+ if (!m_followSymlinks
+ && isSymlink(m_basedir, currentelement))
{
continue;
}
@@ -739,12 +739,12 @@
}
else
{
- if( isCaseSensitive
+ if( m_isCaseSensitive
&& originalpattern.equals(currentelement) )
{
accountForIncludedFile(currentelement, myfile);
}
- else if( !isCaseSensitive
+ else if( !m_isCaseSensitive
&&
originalpattern.equalsIgnoreCase(currentelement) )
{
accountForIncludedFile(currentelement, myfile);
@@ -813,7 +813,7 @@
+ dir.getAbsolutePath());
}

- if (!followSymlinks)
+ if (!m_followSymlinks)
{
Vector noLinks = new Vector();
for (int i = 0; i < newfiles.length; i++)
@@ -999,9 +999,9 @@
*/
protected boolean isIncluded(String name)
{
- for (int i = 0; i < includes.length; i++)
+ for (int i = 0; i < m_includes.length; i++)
{
- if (matchPath(includes[i], name, isCaseSensitive))
+ if (matchPath(m_includes[i], name, m_isCaseSensitive))
{
return true;
}
@@ -1019,11 +1019,11 @@
*/
protected boolean couldHoldIncluded(String name)
{
- for (int i = 0; i < includes.length; i++)
+ for (int i = 0; i < m_includes.length; i++)
{
- if (matchPatternStart(includes[i], name, isCaseSensitive))
+ if (matchPatternStart(m_includes[i], name, m_isCaseSensitive))
{
- if (isMorePowerfulThanExcludes(name, includes[i]))
+ if (isMorePowerfulThanExcludes(name, m_includes[i]))
{
return true;
}
@@ -1050,9 +1050,9 @@
private boolean isMorePowerfulThanExcludes(String name, String
includepattern)
{
String soughtexclude = name + File.separator + "**";
- for (int counter = 0; counter < excludes.length; counter++)
+ for (int counter = 0; counter < m_excludes.length; counter++)
{
- if (excludes[counter].equals(soughtexclude))
+ if (m_excludes[counter].equals(soughtexclude))
{
return false;
}
@@ -1070,9 +1070,9 @@
*/
protected boolean isExcluded(String name)
{
- for (int i = 0; i < excludes.length; i++)
+ for (int i = 0; i < m_excludes.length; i++)
{
- if (matchPath(excludes[i], name, isCaseSensitive)) {
+ if (matchPath(m_excludes[i], name, m_isCaseSensitive)) {
return true;
}
}
@@ -1089,11 +1089,11 @@
*/
protected boolean isSelected(String name, File file)
{
- if (selectors != null)
+ if (m_selectors != null)
{
- for (int i = 0; i < selectors.length; i++)
+ for (int i = 0; i < m_selectors.length; i++)
{
- if (!selectors[i].isSelected(basedir, name, file))
+ if (!m_selectors[i].isSelected(m_basedir, name, file))
{
return false;
}
@@ -1333,20 +1333,20 @@
public String toString()
{
StringBuffer buffer = new StringBuffer();
- buffer.append("{basedir=[" + basedir.getAbsolutePath() + "];");
- buffer.append("isCaseSensitive=[" + isCaseSensitive + "];");
+ buffer.append("{basedir=[" + m_basedir.getAbsolutePath() + "];");
+ buffer.append("isCaseSensitive=[" + m_isCaseSensitive + "];");
buffer.append("includes=(");
- for (int i = 0; i < includes.length; i++)
+ for (int i = 0; i < m_includes.length; i++)
{
if (i != 0) buffer.append(",");
- buffer.append(includes[i]);
+ buffer.append(m_includes[i]);
}
buffer.append(");");
buffer.append("excludes=(");
- for (int i = 0; i < excludes.length; i++)
+ for (int i = 0; i < m_excludes.length; i++)
{
if (i != 0) buffer.append(",");
- buffer.append(excludes[i]);
+ buffer.append(m_excludes[i]);
}
buffer.append(")}");
return buffer.toString();

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/model/impl/Resource.java
Tue Apr 19 17:02:41 2005
@@ -30,10 +30,10 @@
* @version $Id$
*/
public class Resource {
- private String name = null;
- private boolean exists = true;
- private long lastmodified = 0;
- private boolean directory = false;
+ private String m_name = null;
+ private boolean m_exists = true;
+ private long m_lastmodified = 0;
+ private boolean m_directory = false;

/**
* default constructor
@@ -69,10 +69,10 @@
*/
public Resource(String name, boolean exists, long lastmodified,
boolean directory) {
- this.name = name;
- this.exists = exists;
- this.lastmodified = lastmodified;
- this.directory = directory;
+ this.m_name = name;
+ this.m_exists = exists;
+ this.m_lastmodified = lastmodified;
+ this.m_directory = directory;
}

/**
@@ -87,7 +87,7 @@
* <p>&quot;/&quot; will be used as the directory separator.</p>
*/
public String getName() {
- return name;
+ return m_name;
}

/**
@@ -95,17 +95,17 @@
* &quot;/&quot; to be used as the directory separator.
*/
public void setName(String name) {
- this.name = name;
+ this.m_name = name;
}
/**
* the exists attribute tells whether a file exists
*/
public boolean isExists() {
- return exists;
+ return m_exists;
}

public void setExists(boolean exists) {
- this.exists = exists;
+ this.m_exists = exists;
}

/**
@@ -115,22 +115,22 @@
* of {@link java.io.File File}.
*/
public long getLastModified() {
- return !exists || lastmodified < 0 ? 0 : lastmodified;
+ return !m_exists || m_lastmodified < 0 ? 0 : m_lastmodified;
}

public void setLastModified(long lastmodified) {
- this.lastmodified = lastmodified;
+ this.m_lastmodified = lastmodified;
}
/**
* tells if the resource is a directory
* @return boolean flag indicating if the resource is a directory
*/
public boolean isDirectory() {
- return directory;
+ return m_directory;
}

public void setDirectory(boolean directory) {
- this.directory = directory;
+ this.m_directory = directory;
}

/**

Modified:
development/main/metro/composition/impl/src/main/net/dpml/composition/util/Resource.java
==============================================================================
---
development/main/metro/composition/impl/src/main/net/dpml/composition/util/Resource.java
(original)
+++
development/main/metro/composition/impl/src/main/net/dpml/composition/util/Resource.java
Tue Apr 19 17:02:41 2005
@@ -31,10 +31,10 @@
*/
public class Resource
{
- private String name = null;
- private boolean exists = true;
- private long lastmodified = 0;
- private boolean directory = false;
+ private String m_Name = null;
+ private boolean m_Exists = true;
+ private long m_Lastmodified = 0;
+ private boolean m_Directory = false;

/**
* default constructor
@@ -48,36 +48,36 @@
*
* <p>This is a dummy, used for not existing resources.</p>
*
- * @param name relative path of the resource. Expects
+ * @param iName relative path of the resource. Expects
* &quot;/&quot; to be used as the directory separator.
*/
- public Resource( String name )
+ public Resource( String iName )
{
- this(name, false, 0, false);
+ this(iName, false, 0, false);
}

/**
* sets the name, lastmodified flag, and exists flag
*
- * @param name relative path of the resource. Expects
+ * @param iName relative path of the resource. Expects
* &quot;/&quot; to be used as the directory separator.
*/
- public Resource( String name, boolean exists, long lastmodified )
+ public Resource( String iName, boolean iExists, long iLastmodified )
{
- this( name, exists, lastmodified, false );
+ this( iName, iExists, iLastmodified, false );
}

/**
- * @param name relative path of the resource. Expects
+ * @param iName relative path of the resource. Expects
* &quot;/&quot; to be used as the directory separator.
*/
public Resource(
- String name, boolean exists, long lastmodified, boolean directory )
+ String iName, boolean iExists, long iLastmodified, boolean iDirectory
)
{
- this.name = name;
- this.exists = exists;
- this.lastmodified = lastmodified;
- this.directory = directory;
+ this.m_Name = iName;
+ this.m_Exists = iExists;
+ this.m_Lastmodified = iLastmodified;
+ this.m_Directory = iDirectory;
}

/**
@@ -93,7 +93,7 @@
*/
public String getName()
{
- return name;
+ return m_Name;
}

/**
@@ -102,7 +102,7 @@
*/
public void setName(String name)
{
- this.name = name;
+ this.m_Name = name;
}

/**
@@ -110,12 +110,12 @@
*/
public boolean isExists()
{
- return exists;
+ return m_Exists;
}

public void setExists( boolean exists )
{
- this.exists = exists;
+ this.m_Exists = exists;
}

/**
@@ -126,12 +126,12 @@
*/
public long getLastModified()
{
- return !exists || lastmodified < 0 ? 0 : lastmodified;
+ return !m_Exists || m_Lastmodified < 0 ? 0 : m_Lastmodified;
}

public void setLastModified(long lastmodified)
{
- this.lastmodified = lastmodified;
+ this.m_Lastmodified = lastmodified;
}

/**
@@ -140,12 +140,12 @@
*/
public boolean isDirectory()
{
- return directory;
+ return m_Directory;
}

public void setDirectory( boolean directory )
{
- this.directory = directory;
+ this.m_Directory = directory;
}

/**

Modified:
development/main/metro/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java
==============================================================================
---
development/main/metro/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java
(original)
+++
development/main/metro/composition/impl/src/test/net/dpml/composition/model/impl/SimpleDeploymentModel.java
Tue Apr 19 17:02:41 2005
@@ -20,21 +20,15 @@

import java.util.List;

-import java.security.AccessControlContext;
-
import net.dpml.composition.data.Mode;
-
-import net.dpml.composition.model.DeploymentModel;
import net.dpml.composition.model.AssemblyException;
import net.dpml.composition.model.Commissionable;
-
-import net.dpml.meta.info.DependencyDescriptor;
-import net.dpml.meta.info.ServiceDescriptor;
-import net.dpml.meta.info.ReferenceDescriptor;
-
+import net.dpml.composition.model.DeploymentModel;
import net.dpml.logging.Logger;
-
import net.dpml.logging.data.CategoriesDirective;
+import net.dpml.meta.info.DependencyDescriptor;
+import net.dpml.meta.info.ReferenceDescriptor;
+import net.dpml.meta.info.ServiceDescriptor;


public class SimpleDeploymentModel

Modified:
development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
==============================================================================
---
development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
(original)
+++
development/main/metro/composition/test/src/main/net/dpml/composition/test/CompositionTestCase.java
Tue Apr 19 17:02:41 2005
@@ -30,10 +30,8 @@
import net.dpml.exception.ExceptionHelper;
import net.dpml.system.Factory;
import net.dpml.system.SystemContext;
-import net.dpml.transit.artifact.Artifact;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;
-import net.dpml.transit.monitors.Monitor;


/**

Modified:
development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/AssemblyTestCase.java
==============================================================================
---
development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/AssemblyTestCase.java
(original)
+++
development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/AssemblyTestCase.java
Tue Apr 19 17:02:41 2005
@@ -23,7 +23,7 @@
import net.dpml.exception.ExceptionHelper;

public class AssemblyTestCase extends CompositionTestCase
-{
+{
//------------------------------------------------------------------
// static
//------------------------------------------------------------------

Modified:
development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java
==============================================================================
---
development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java
(original)
+++
development/main/metro/composition/test/src/test/net/dpml/composition/model/impl/test/ContextTestCase.java
Tue Apr 19 17:02:41 2005
@@ -104,7 +104,7 @@
}

public void executeHomeDirectory() throws Exception
- {
+ {
try
{
File home = (File) m_map.get( "urn:avalon:home" );

Modified:
development/main/metro/composition/testing/acme/src/main/net/dpml/composition/testing/ExampleComponent.java
==============================================================================
---
development/main/metro/composition/testing/acme/src/main/net/dpml/composition/testing/ExampleComponent.java
(original)
+++
development/main/metro/composition/testing/acme/src/main/net/dpml/composition/testing/ExampleComponent.java
Tue Apr 19 17:02:41 2005
@@ -18,8 +18,6 @@

package net.dpml.composition.testing;

-import java.io.File;
-import java.net.URI;
import java.util.logging.Logger;

/**

Modified:
development/main/metro/composition/testing/activity/src/main/net/dpml/test/Component.java
==============================================================================
---
development/main/metro/composition/testing/activity/src/main/net/dpml/test/Component.java
(original)
+++
development/main/metro/composition/testing/activity/src/main/net/dpml/test/Component.java
Tue Apr 19 17:02:41 2005
@@ -22,13 +22,11 @@
import java.net.URISyntaxException;
import java.util.logging.Logger;

-import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

import net.dpml.state.State;
-import net.dpml.state.StateManager;
-import net.dpml.state.impl.DefaultState;
import net.dpml.state.impl.AbstractStateManager;
+import net.dpml.state.impl.DefaultState;

/**
* Experimental component dealing with state management.

Modified:
development/main/metro/composition/testing/activity/src/main/net/dpml/test/Container.java
==============================================================================
---
development/main/metro/composition/testing/activity/src/main/net/dpml/test/Container.java
(original)
+++
development/main/metro/composition/testing/activity/src/main/net/dpml/test/Container.java
Tue Apr 19 17:02:41 2005
@@ -19,10 +19,8 @@
package net.dpml.test;

import java.util.logging.Logger;
-import java.util.logging.Level;

import net.dpml.activity.Executable;
-import net.dpml.state.State;
import net.dpml.state.StateManager;

/**

Modified:
development/main/metro/composition/testing/activity/src/test/net/dpml/test/ContainerTestCase.java
==============================================================================
---
development/main/metro/composition/testing/activity/src/test/net/dpml/test/ContainerTestCase.java
(original)
+++
development/main/metro/composition/testing/activity/src/test/net/dpml/test/ContainerTestCase.java
Tue Apr 19 17:02:41 2005
@@ -20,17 +20,11 @@
package net.dpml.test;

import java.net.URI;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Hashtable;
import java.util.Map.Entry;
-import java.lang.reflect.Method;

import junit.framework.TestCase;
-
import net.dpml.automation.model.Model;
import net.dpml.composition.unit.CompositionHelper;
-import net.dpml.composition.models.Holder;

/**
* Test a simple component case.

Modified:
development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionHelper.java
==============================================================================
---
development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionHelper.java
(original)
+++
development/main/metro/composition/unit/src/main/net/dpml/composition/unit/CompositionHelper.java
Tue Apr 19 17:02:41 2005
@@ -20,27 +20,17 @@

import java.io.File;
import java.io.IOException;
-
import java.net.URI;
-import java.net.URL;
-
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;

-import net.dpml.system.SystemCriteria;
+import net.dpml.composition.control.CompositionManager;
import net.dpml.system.SystemContext;
import net.dpml.system.SystemContextFactory;
-
-import net.dpml.transit.artifact.Artifact;
+import net.dpml.system.SystemCriteria;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;

-import net.dpml.automation.model.Model;
-import net.dpml.automation.control.Controller;
-
-import net.dpml.composition.control.CompositionManager;
-

/**
* A utility class used for the deployment of components in embedded
scenarios

Modified:
development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
==============================================================================
---
development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
(original)
+++
development/main/metro/logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test/LoggingManagerHelper.java
Tue Apr 19 17:02:41 2005
@@ -21,9 +21,8 @@
import java.net.URI;
import java.util.Map;

-import net.dpml.logging.provider.LoggingManager;
import net.dpml.logging.provider.Factory;
-import net.dpml.transit.artifact.Artifact;
+import net.dpml.logging.provider.LoggingManager;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;


Modified:
development/main/metro/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java
==============================================================================
---
development/main/metro/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java
(original)
+++
development/main/metro/logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog/SyslogTarget.java
Tue Apr 19 17:02:41 2005
@@ -99,11 +99,11 @@
public SyslogTarget( final InetAddress address,
final int port,
final Formatter formatter,
- final int facility )
+ final int iFacility )
throws IOException
{
super(address, port, formatter);
- this.facility = facility;
+ this.facility = iFacility;
}

/**

Modified:
development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
==============================================================================
---
development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
(original)
+++
development/main/metro/logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test/LoggingManagerHelper.java
Tue Apr 19 17:02:41 2005
@@ -27,7 +27,6 @@
import net.dpml.logging.provider.Factory;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;
-import net.dpml.transit.artifact.Artifact;

/**
*

Modified: development/main/metro/main/src/main/net/dpml/metro/Metro.java
==============================================================================
--- development/main/metro/main/src/main/net/dpml/metro/Metro.java
(original)
+++ development/main/metro/main/src/main/net/dpml/metro/Metro.java Tue
Apr 19 17:02:41 2005
@@ -19,44 +19,31 @@
package net.dpml.metro;

import java.io.File;
-import java.io.InputStream;
import java.io.FileInputStream;
import java.io.IOException;
-
+import java.io.InputStream;
import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLClassLoader;
-
import java.util.ArrayList;
+import java.util.Map;
import java.util.Properties;
import java.util.StringTokenizer;
-import java.util.Map;

import net.dpml.activity.Startable;
-
import net.dpml.cli.ArgumentHandler;
-
import net.dpml.exception.ExceptionHelper;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.system.Factory;
import net.dpml.system.SystemContext;
import net.dpml.system.SystemContextFactory;
import net.dpml.system.SystemException;
-
import net.dpml.transit.Transit;
-
import net.dpml.transit.artifact.Artifact;
-
-import net.dpml.transit.monitors.Monitor;
-
import net.dpml.transit.repository.Plugin;
import net.dpml.transit.repository.Repository;


Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/CategoryDescriptor.java
Tue Apr 19 17:02:41 2005
@@ -24,7 +24,7 @@
/**
* A descriptor describing an Avalon Logger
* child instances that the component will create using the
- * <code>org.apache.avalon.framework.logger.Logger#getChildLogger</code>
+ * <code>net.dpml.logging.Logger#getChildLogger</code>
* method. The name of each category is relative to the component. For
* example, a component with an internal logging category named "data"
* would aquire a logger for that category using the

Modified:
development/main/metro/meta/api/src/main/net/dpml/meta/info/TypeHolder.java
==============================================================================
---
development/main/metro/meta/api/src/main/net/dpml/meta/info/TypeHolder.java
(original)
+++
development/main/metro/meta/api/src/main/net/dpml/meta/info/TypeHolder.java
Tue Apr 19 17:02:41 2005
@@ -20,7 +20,6 @@

import java.net.URI;
import java.util.Arrays;
-import java.util.Properties;
import java.io.Serializable;

/**

Modified:
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java
==============================================================================
---
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java
(original)
+++
development/main/metro/meta/api/src/test/net/dpml/meta/info/test/AbstractDescriptorTestCase.java
Tue Apr 19 17:02:41 2005
@@ -21,14 +21,11 @@

import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.io.IOException;
import java.io.ObjectInputStream;
import java.io.ObjectOutputStream;
-
import java.util.Properties;

import junit.framework.TestCase;
-
import net.dpml.meta.info.Descriptor;

/**

Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/TypeBuilder.java
Tue Apr 19 17:02:41 2005
@@ -20,9 +20,6 @@
package net.dpml.meta.info.builder.impl;

import java.io.InputStream;
-import java.io.IOException;
-
-import java.util.Properties;

import net.dpml.configuration.Configuration;
import net.dpml.configuration.ConfigurationException;
@@ -42,10 +39,6 @@

import net.dpml.meta.info.impl.ConfigurationBuilder;

-import net.dpml.parameters.Parameters;
-import net.dpml.parameters.ParameterException;
-
-import net.dpml.parameters.impl.DefaultParameters;

import org.xml.sax.InputSource;


Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/builder/impl/XMLServiceCreator.java
Tue Apr 19 17:02:41 2005
@@ -32,7 +32,6 @@
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;

-import net.dpml.lang.NullArgumentException;

import net.dpml.meta.info.Version;
import net.dpml.meta.info.Service;

Modified:
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
==============================================================================
---
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
(original)
+++
development/main/metro/meta/impl/src/main/net/dpml/meta/info/writer/impl/XMLTypeWriter.java
Tue Apr 19 17:02:41 2005
@@ -45,7 +45,7 @@
implements TypeWriter
{
private static final String AVALON_CONTEXT_CLASS =
- "org.apache.avalon.framework.context.Context";
+ "net.dpml.context.Context";

private static final String METRO_CONTEXT_CLASS =
"net.dpml.context.Context";

Modified:
development/main/metro/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java
==============================================================================
---
development/main/metro/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java
(original)
+++
development/main/metro/meta/spi/src/main/net/dpml/meta/info/builder/TypeFactory.java
Tue Apr 19 17:02:41 2005
@@ -21,7 +21,6 @@

import net.dpml.meta.info.Type;
import net.dpml.configuration.Configuration;
-import net.dpml.parameters.Parameters;

/**
* Simple interface used to create {@link Type}

Modified:
development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java
==============================================================================
---
development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java
(original)
+++
development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/FormatEnum.java
Tue Apr 19 17:02:41 2005
@@ -37,8 +37,8 @@
*/
public int getTypeCode()
{
- final String value = super.getValue();
- if( value.equals( "serial" ) )
+ final String val = super.getValue();
+ if( val.equals( "serial" ) )
{
return MetaTask.SER_TYPE;
}

Modified:
development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java
==============================================================================
---
development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java
(original)
+++
development/main/metro/meta/tools/src/main/net/dpml/meta/info/ant/MetaTask.java
Tue Apr 19 17:02:41 2005
@@ -37,7 +37,6 @@
import net.dpml.meta.info.writer.impl.XMLTypeWriter;

import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.Task;
import org.apache.tools.ant.types.FileSet;

import com.thoughtworks.qdox.ant.AbstractQdoxTask;

Modified:
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java
==============================================================================
---
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java
(original)
+++
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ContextTag.java
Tue Apr 19 17:02:41 2005
@@ -48,17 +48,13 @@
* The avalon context class.
*/
protected static final String AVALON_CONTEXT_CLASS =
- "org.apache.avalon.framework.context.Context";
+ "net.dpml.context.Context";

/**
* The javadoc key for the context tag.
*/
public static final String KEY = "context";

- /**
- * The javadoc context tag key parameter.
- */
- public static final String TYPE_PARAM = "type";

/**
* The javadoc context tag key parameter.

Modified:
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java
==============================================================================
---
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java
(original)
+++
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/DependencyTag.java
Tue Apr 19 17:02:41 2005
@@ -64,7 +64,7 @@
* The avalon service manager class.
*/
protected static final String AVALON_SERVICE_MANAGER =
- "org.apache.avalon.framework.service.ServiceManager";
+ "net.dpml.service.ServiceManager";

private JavaMethod[] m_methods;


Modified:
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java
==============================================================================
---
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java
(original)
+++
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/LoggerTag.java
Tue Apr 19 17:02:41 2005
@@ -57,7 +57,7 @@
* The avalon logger class.
*/
protected static final String AVALON_LOGGER_CLASS =
- "org.apache.avalon.framework.logger.Logger";
+ "net.dpml.logging.Logger";

private JavaMethod[] m_methods;


Modified:
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java
==============================================================================
---
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java
(original)
+++
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/ServiceTag.java
Tue Apr 19 17:02:41 2005
@@ -42,12 +42,6 @@
public static final String KEY = "service";

/**
- * The version parameter
- */
- public static final String VERSION_PARAM = "version";
-
-
- /**
* Type tag constructor.
* @param clazz the javadoc class descriptor
*/

Modified:
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java
==============================================================================
---
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java
(original)
+++
development/main/metro/meta/tools/src/main/net/dpml/meta/info/tags/TypeTag.java
Tue Apr 19 17:02:41 2005
@@ -72,10 +72,6 @@
*/
public static final String NAME_PARAM = "name";

- /**
- * The version parameter
- */
- public static final String VERSION_PARAM = "version";

/**
* The lifestyle parameter

Modified:
development/main/metro/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java
==============================================================================
---
development/main/metro/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java
(original)
+++
development/main/metro/parameters/impl/src/main/net/dpml/parameters/impl/DefaultParameters.java
Tue Apr 19 17:02:41 2005
@@ -25,7 +25,6 @@
import java.util.Properties;

import net.dpml.configuration.Configuration;
-import net.dpml.configuration.ConfigurationException;

import net.dpml.lang.NullArgumentException;


Modified:
development/main/metro/state/impl/src/main/net/dpml/state/impl/AbstractStateManager.java
==============================================================================
---
development/main/metro/state/impl/src/main/net/dpml/state/impl/AbstractStateManager.java
(original)
+++
development/main/metro/state/impl/src/main/net/dpml/state/impl/AbstractStateManager.java
Tue Apr 19 17:02:41 2005
@@ -18,25 +18,20 @@

package net.dpml.state.impl;

-import java.util.Map;
-import java.util.Hashtable;
-import java.util.TreeMap;
-import java.util.ArrayList;
-import java.util.logging.Logger;
-import java.util.logging.Level;
import java.lang.reflect.Method;
import java.net.URI;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.logging.Level;
+import java.util.logging.Logger;

import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;

-import net.dpml.state.State;
-import net.dpml.state.Transition;
-import net.dpml.state.StateManager;
import net.dpml.state.DuplicateKeyException;
import net.dpml.state.NoSuchTransitionException;
-import net.dpml.state.NoSuchOperationException;
-import net.dpml.state.Operation;
+import net.dpml.state.State;
+import net.dpml.state.StateManager;

/**
* The State interface is an interface representing an immutable state of

Modified:
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultOperation.java
==============================================================================
---
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultOperation.java
(original)
+++
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultOperation.java
Tue Apr 19 17:02:41 2005
@@ -18,13 +18,8 @@

package net.dpml.state.impl;

-import java.util.Map;
-import java.util.Hashtable;
-import java.util.TreeMap;
-import java.util.ArrayList;
import java.net.URI;

-import net.dpml.state.State;
import net.dpml.state.Operation;

/**

Modified:
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultState.java
==============================================================================
---
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultState.java
(original)
+++
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultState.java
Tue Apr 19 17:02:41 2005
@@ -20,16 +20,15 @@

import java.util.Map;
import java.util.Hashtable;
-import java.util.TreeMap;
import java.util.ArrayList;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Proxy;
import java.net.URI;

+import net.dpml.state.NoSuchOperationException;
import net.dpml.state.State;
import net.dpml.state.NoSuchStateException;
import net.dpml.state.NoSuchTransitionException;
-import net.dpml.state.NoSuchOperationException;
import net.dpml.state.DuplicateKeyException;
import net.dpml.state.Operation;
import net.dpml.state.Transition;

Modified:
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultTransition.java
==============================================================================
---
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultTransition.java
(original)
+++
development/main/metro/state/impl/src/main/net/dpml/state/impl/DefaultTransition.java
Tue Apr 19 17:02:41 2005
@@ -17,11 +17,7 @@
*/

package net.dpml.state.impl;
-
-import java.util.Map;
-import java.util.Hashtable;
-import java.util.TreeMap;
-import java.util.ArrayList;
+
import java.net.URI;

import net.dpml.state.State;

Modified:
development/main/metro/state/impl/src/test/net/dpml/state/impl/DefaultStateTestCase.java
==============================================================================
---
development/main/metro/state/impl/src/test/net/dpml/state/impl/DefaultStateTestCase.java
(original)
+++
development/main/metro/state/impl/src/test/net/dpml/state/impl/DefaultStateTestCase.java
Tue Apr 19 17:02:41 2005
@@ -21,9 +21,10 @@
import java.net.URI;
import java.util.logging.Logger;

+import net.dpml.state.State;
+
import junit.framework.TestCase;

-import net.dpml.state.State;

/**
* Test creation of a state model.

Modified:
development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java
==============================================================================
---
development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java
(original)
+++
development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemContextFactory.java
Tue Apr 19 17:02:41 2005
@@ -19,53 +19,35 @@
package net.dpml.system.impl;

import java.io.File;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.FileInputStream;
-
import java.net.URI;
import java.net.URL;
-
import java.util.Map;
import java.util.Properties;

import net.dpml.cli.ArgumentHandler;
-
import net.dpml.defaults.Defaults;
-import net.dpml.defaults.DefaultsBuilder;
-
import net.dpml.i18n.ResourceManager;
import net.dpml.i18n.Resources;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.logging.Logger;
-
import net.dpml.logging.provider.LoggingCriteria;
import net.dpml.logging.provider.LoggingFactory;
import net.dpml.logging.provider.LoggingManager;
-
import net.dpml.system.Factory;
import net.dpml.system.SystemContext;
import net.dpml.system.SystemContextFactory;
import net.dpml.system.SystemCriteria;
import net.dpml.system.SystemException;
import net.dpml.system.SystemRuntimeException;
-
import net.dpml.system.monitors.CacheMonitorLoggerAdapter;
-import net.dpml.system.monitors.RepositoryMonitorLoggerAdapter;
import net.dpml.system.monitors.NetworkMonitorLoggerAdapter;
-
+import net.dpml.system.monitors.RepositoryMonitorLoggerAdapter;
import net.dpml.transit.Transit;
import net.dpml.transit.TransitException;
-
-import net.dpml.transit.artifact.Artifact;
-
import net.dpml.transit.monitors.Monitor;
-import net.dpml.transit.monitors.CacheMonitor;
-import net.dpml.transit.monitors.NetworkMonitor;
-import net.dpml.transit.monitors.RepositoryMonitor;
-
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;


Modified:
development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java
==============================================================================
---
development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java
(original)
+++
development/main/metro/system/impl/src/main/net/dpml/system/impl/DefaultSystemCriteria.java
Tue Apr 19 17:02:41 2005
@@ -19,22 +19,16 @@
package net.dpml.system.impl;

import java.io.File;
-import java.io.IOException;
-
import java.net.URI;
import java.net.URL;
-
import java.util.Properties;

import net.dpml.criteria.Criteria;
import net.dpml.criteria.CriteriaRuntimeException;
import net.dpml.criteria.Parameter;
-
import net.dpml.lang.NullArgumentException;
-
import net.dpml.system.SystemContext;
import net.dpml.system.SystemCriteria;
-
import net.dpml.transit.Transit;

/**

Modified:
development/main/metro/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java
==============================================================================
---
development/main/metro/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java
(original)
+++
development/main/metro/system/impl/src/main/net/dpml/system/monitors/CacheMonitorLoggerAdapter.java
Tue Apr 19 17:02:41 2005
@@ -19,13 +19,10 @@
package net.dpml.system.monitors;

import java.io.File;
-
import java.net.URL;

import net.dpml.logging.Logger;
-
import net.dpml.transit.artifact.Artifact;
-import net.dpml.transit.monitors.Monitor;
import net.dpml.transit.monitors.CacheMonitor;

/**

Modified:
development/main/metro/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java
==============================================================================
---
development/main/metro/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java
(original)
+++
development/main/metro/system/impl/src/main/net/dpml/system/monitors/ConnectionMonitorLoggerAdapter.java
Tue Apr 19 17:02:41 2005
@@ -21,8 +21,6 @@
import java.net.URL;

import net.dpml.logging.Logger;
-
-import net.dpml.transit.monitors.Monitor;
import net.dpml.transit.monitors.ConnectionMonitor;

/**

Modified:
development/main/metro/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java
==============================================================================
---
development/main/metro/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java
(original)
+++
development/main/metro/system/impl/src/main/net/dpml/system/monitors/NetworkMonitorLoggerAdapter.java
Tue Apr 19 17:02:41 2005
@@ -22,7 +22,6 @@

import net.dpml.logging.Logger;

-import net.dpml.transit.monitors.Monitor;
import net.dpml.transit.monitors.NetworkMonitor;

/**

Modified:
development/main/metro/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java
==============================================================================
---
development/main/metro/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java
(original)
+++
development/main/metro/system/test/src/test/net/dpml/system/impl/test/SystemContextFactoryTestCase.java
Tue Apr 19 17:02:41 2005
@@ -19,16 +19,14 @@
package net.dpml.system.impl.test;

import java.net.URI;
-import java.util.Map;
import java.util.Hashtable;
+import java.util.Map;

import junit.framework.TestCase;
import net.dpml.system.Factory;
import net.dpml.system.SystemContext;
import net.dpml.transit.repository.Repository;
import net.dpml.transit.repository.StandardLoader;
-import net.dpml.transit.monitors.Monitor;
-import net.dpml.transit.artifact.Artifact;

/**
* SystemContextFactoryTestCase



  • svn commit: r2323 - in development/main/metro: activation/providers/avalon/src/main/net/dpml/activation/avalon activation/providers/metro/src/main/net/dpml/activation/metro automation/builder/src/main/net/dpml/automation/builder automation/control/src/main/net/dpml/automation/control automation/control/src/main/net/dpml/automation/model automation/control/src/main/net/dpml/automation/part composition/api/src/main/net/dpml/composition/data composition/api/src/main/net/dpml/composition/event composition/api/src/main/net/dpml/composition/model composition/api/src/test/net/dpml/composition/data/test composition/builder/src/main/net/dpml/composition/builder composition/builder/src/main/net/dpml/composition/builder/datatypes composition/control/src/main/net/dpml/composition/control composition/control/src/main/net/dpml/composition/models composition/impl/src/main/net/dpml/composition/data/builder composition/impl/src/main/net/dpml/composition/model/impl composition/impl/src/main/net/dpml/composition/util composition/impl/src/test/net/dpml/composition/model/impl composition/test/src/main/net/dpml/composition/test composition/test/src/test/net/dpml/composition/model/impl/test composition/testing/acme/src/main/net/dpml/composition/testing composition/testing/activity/src/main/net/dpml/test composition/testing/activity/src/test/net/dpml/test composition/unit/src/main/net/dpml/composition/unit logging/providers/log4j/test/src/test/net/dpml/logging/log4j/test logging/providers/logkit/plugins/syslog/src/main/net/dpml/logging/logkit/syslog logging/providers/logkit/test/src/test/net/dpml/logging/logkit/test main/src/main/net/dpml/metro meta/api/src/main/net/dpml/meta/info meta/api/src/test/net/dpml/meta/info/test meta/impl/src/main/net/dpml/meta/info/builder/impl meta/impl/src/main/net/dpml/meta/info/writer/impl meta/spi/src/main/net/dpml/meta/info/builder meta/tools/src/main/net/dpml/meta/info/ant meta/tools/src/main/net/dpml/meta/info/tags parameters/impl/src/main/net/dpml/parameters/impl state/impl/src/main/net/dpml/state/impl state/impl/src/test/net/dpml/state/impl system/impl/src/main/net/dpml/system/impl system/impl/src/main/net/dpml/system/monitors system/test/src/test/net/dpml/system/impl/test, peter, 04/19/2005

Archive powered by MHonArc 2.6.24.

Top of Page