Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2871 - in development/main: . metro metro/composition/builder/src/main/net/dpml/composition/builder metro/composition/builder/src/main/net/dpml/composition/builder/datatypes metro/composition/control/src/main/net/dpml/composition/control metro/composition/control/src/main/net/dpml/composition/data metro/composition/control/src/main/net/dpml/composition/model metro/composition/part/src/main/net/dpml/composition/part metro/part/src/main/net/dpml/part metro/part/src/main/net/dpml/part/builder metro/part/src/main/net/dpml/part/control metro/part/src/main/net/dpml/part/model metro/part/src/main/net/dpml/part/part metro/part/src/main/net/dpml/part/state metro/part/src/main/net/dpml/parts metro/part/src/test/net/dpml/part metro/part/src/test/net/dpml/part/state metro/part/src/test/net/dpml/parts

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell AT dpml.net
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: svn commit: r2871 - in development/main: . metro metro/composition/builder/src/main/net/dpml/composition/builder metro/composition/builder/src/main/net/dpml/composition/builder/datatypes metro/composition/control/src/main/net/dpml/composition/control metro/composition/control/src/main/net/dpml/composition/data metro/composition/control/src/main/net/dpml/composition/model metro/composition/part/src/main/net/dpml/composition/part metro/part/src/main/net/dpml/part metro/part/src/main/net/dpml/part/builder metro/part/src/main/net/dpml/part/control metro/part/src/main/net/dpml/part/model metro/part/src/main/net/dpml/part/part metro/part/src/main/net/dpml/part/state metro/part/src/main/net/dpml/parts metro/part/src/test/net/dpml/part metro/part/src/test/net/dpml/part/state metro/part/src/test/net/dpml/parts
  • Date: Fri, 17 Jun 2005 14:56:23 -0400

Author: mcconnell AT dpml.net
Date: Fri Jun 17 14:56:23 2005
New Revision: 2871

Added:
development/main/metro/part/src/main/net/dpml/part/
- copied from r2870,
development/main/metro/part/src/main/net/dpml/parts/
development/main/metro/part/src/test/net/dpml/part/
- copied from r2870,
development/main/metro/part/src/test/net/dpml/parts/
Removed:
development/main/metro/part/src/main/net/dpml/parts/
development/main/metro/part/src/test/net/dpml/parts/
Modified:
development/main/ (props changed)

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/ComponentBuilderTask.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/TypeBuilder.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/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/control/src/main/net/dpml/composition/control/ComponentController.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.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/CompositionPartHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/control/ConsoleMonitor.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/DefaultMonitor.java

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

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

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

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

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

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

development/main/metro/composition/control/src/main/net/dpml/composition/data/ContextDirective.java

development/main/metro/composition/control/src/main/net/dpml/composition/data/DependencyDirective.java

development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java

development/main/metro/composition/control/src/main/net/dpml/composition/data/ReferenceDirective.java

development/main/metro/composition/control/src/main/net/dpml/composition/data/ValueDirective.java

development/main/metro/composition/control/src/main/net/dpml/composition/model/AbstractComponent.java

development/main/metro/composition/control/src/main/net/dpml/composition/model/Appliance.java

development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentEntry.java

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

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

development/main/metro/composition/control/src/main/net/dpml/composition/model/InvalidModelException.java

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

development/main/metro/composition/control/src/main/net/dpml/composition/model/ReferenceEntry.java

development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueEntry.java

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

development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java

development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
development/main/metro/module.xml
development/main/metro/part/src/main/net/dpml/part/builder/Builder.java

development/main/metro/part/src/main/net/dpml/part/builder/BuilderRuntimeException.java
development/main/metro/part/src/main/net/dpml/part/builder/PartBuilder.java
development/main/metro/part/src/main/net/dpml/part/control/Control.java

development/main/metro/part/src/main/net/dpml/part/control/ControlException.java

development/main/metro/part/src/main/net/dpml/part/control/ControlRuntimeException.java
development/main/metro/part/src/main/net/dpml/part/control/Controller.java

development/main/metro/part/src/main/net/dpml/part/control/ControllerContext.java

development/main/metro/part/src/main/net/dpml/part/control/ControllerContextEvent.java

development/main/metro/part/src/main/net/dpml/part/control/ControllerContextListener.java

development/main/metro/part/src/main/net/dpml/part/control/DelegationException.java
development/main/metro/part/src/main/net/dpml/part/control/Disposable.java

development/main/metro/part/src/main/net/dpml/part/control/DuplicateNameException.java

development/main/metro/part/src/main/net/dpml/part/control/EntryNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/control/HandlerNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/control/Identifiable.java

development/main/metro/part/src/main/net/dpml/part/control/InvalidQueryException.java

development/main/metro/part/src/main/net/dpml/part/control/LifecycleException.java

development/main/metro/part/src/main/net/dpml/part/control/LifecycleRuntimeException.java

development/main/metro/part/src/main/net/dpml/part/control/LifestyleException.java
development/main/metro/part/src/main/net/dpml/part/control/Manageable.java
development/main/metro/part/src/main/net/dpml/part/control/Manager.java
development/main/metro/part/src/main/net/dpml/part/control/Monitor.java

development/main/metro/part/src/main/net/dpml/part/control/NoSuchControlException.java
development/main/metro/part/src/main/net/dpml/part/control/PartHandler.java

development/main/metro/part/src/main/net/dpml/part/control/PartHandlerRuntimeException.java

development/main/metro/part/src/main/net/dpml/part/control/PartNotFoundException.java

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

development/main/metro/part/src/main/net/dpml/part/control/UnknownSchemaException.java

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

development/main/metro/part/src/main/net/dpml/part/model/AvailabilityEvent.java

development/main/metro/part/src/main/net/dpml/part/model/AvailabilityListener.java
development/main/metro/part/src/main/net/dpml/part/model/Component.java

development/main/metro/part/src/main/net/dpml/part/model/DuplicateKeyException.java
development/main/metro/part/src/main/net/dpml/part/model/Model.java

development/main/metro/part/src/main/net/dpml/part/model/ModelException.java

development/main/metro/part/src/main/net/dpml/part/model/ModelRuntimeException.java

development/main/metro/part/src/main/net/dpml/part/model/PartClassNotFoundException.java
development/main/metro/part/src/main/net/dpml/part/model/Provider.java

development/main/metro/part/src/main/net/dpml/part/model/ResourceUnavailableException.java

development/main/metro/part/src/main/net/dpml/part/model/ServiceClassNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/model/TypeClassNotFoundException.java
development/main/metro/part/src/main/net/dpml/part/part/Part.java
development/main/metro/part/src/main/net/dpml/part/part/PartHolder.java
development/main/metro/part/src/main/net/dpml/part/part/PartReference.java

development/main/metro/part/src/main/net/dpml/part/state/DuplicateKeyException.java

development/main/metro/part/src/main/net/dpml/part/state/NoSuchHandlerException.java

development/main/metro/part/src/main/net/dpml/part/state/NoSuchOperationException.java

development/main/metro/part/src/main/net/dpml/part/state/NoSuchStateException.java

development/main/metro/part/src/main/net/dpml/part/state/NoSuchTransitionException.java
development/main/metro/part/src/main/net/dpml/part/state/Operation.java

development/main/metro/part/src/main/net/dpml/part/state/RecursiveInitializationException.java

development/main/metro/part/src/main/net/dpml/part/state/RecursiveTerminationException.java

development/main/metro/part/src/main/net/dpml/part/state/ResourceUnavailableException.java
development/main/metro/part/src/main/net/dpml/part/state/State.java
development/main/metro/part/src/main/net/dpml/part/state/StateEvent.java
development/main/metro/part/src/main/net/dpml/part/state/StateListener.java
development/main/metro/part/src/main/net/dpml/part/state/Transition.java

development/main/metro/part/src/main/net/dpml/part/state/ValidationException.java

development/main/metro/part/src/test/net/dpml/part/state/OperationTestCase.java
development/main/metro/part/src/test/net/dpml/part/state/StateTestCase.java

development/main/metro/part/src/test/net/dpml/part/state/TransitionTestCase.java
Log:
Rename 'parts' to 'part'.

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
Fri Jun 17 14:56:23 2005
@@ -29,9 +29,9 @@
import java.net.URL;
import java.util.ArrayList;

-import net.dpml.parts.part.Part;
-import net.dpml.parts.part.PartHolder;
-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.Part;
+import net.dpml.part.part.PartHolder;
+import net.dpml.part.part.PartReference;

import net.dpml.composition.builder.datatypes.CategoriesDataType;
import net.dpml.composition.builder.datatypes.ConfigurationDataType;

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
Fri Jun 17 14:56:23 2005
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.beans.IntrospectionException;

-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.PartReference;
import net.dpml.composition.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
Fri Jun 17 14:56:23 2005
@@ -26,7 +26,7 @@
import java.io.OutputStream;
import java.io.Serializable;

-import net.dpml.parts.builder.BuilderRuntimeException;
+import net.dpml.part.builder.BuilderRuntimeException;

/**
* A datatype that enables custom part builders.

Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilder.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilder.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/TypeBuilder.java
Fri Jun 17 14:56:23 2005
@@ -22,7 +22,7 @@
import java.net.URI;
import java.beans.IntrospectionException;

-import net.dpml.parts.builder.Builder;
+import net.dpml.part.builder.Builder;

import net.dpml.composition.info.Type;


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
Fri Jun 17 14:56:23 2005
@@ -23,7 +23,7 @@
import java.util.List;
import java.beans.IntrospectionException;

-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.PartReference;
import net.dpml.composition.builder.ComponentBuilderTask;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.ContextDirective;

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
Fri Jun 17 14:56:23 2005
@@ -21,8 +21,8 @@
import java.util.ArrayList;
import java.util.List;

-import net.dpml.parts.part.Part;
-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.Part;
+import net.dpml.part.part.PartReference;
import net.dpml.composition.builder.ConstructionException;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.DependencyDirective;

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
Fri Jun 17 14:56:23 2005
@@ -21,8 +21,8 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.parts.part.Part;
-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.Part;
+import net.dpml.part.part.PartReference;
import net.dpml.composition.builder.ConstructionException;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.ValueDirective;

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
Fri Jun 17 14:56:23 2005
@@ -22,10 +22,10 @@
import java.net.URI;
import java.net.URISyntaxException;

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

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
Fri Jun 17 14:56:23 2005
@@ -23,7 +23,7 @@
import java.util.List;
import java.beans.IntrospectionException;

-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.PartReference;
import net.dpml.composition.builder.ComponentBuilderTask;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.info.Type;

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
Fri Jun 17 14:56:23 2005
@@ -21,8 +21,8 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.parts.part.Part;
-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.Part;
+import net.dpml.part.part.PartReference;
import net.dpml.composition.builder.ConstructionException;
import net.dpml.composition.builder.PartReferenceBuilder;
import net.dpml.composition.data.ReferenceDirective;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
Fri Jun 17 14:56:23 2005
@@ -43,24 +43,24 @@
import net.dpml.composition.model.CompositionModel;
import net.dpml.composition.model.ComponentEntry;

-import net.dpml.parts.control.Monitor;
-import net.dpml.parts.control.Manager;
-import net.dpml.parts.control.ControlRuntimeException;
-import net.dpml.parts.control.Disposable;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.DuplicateKeyException;
-import net.dpml.parts.state.State;
-import net.dpml.parts.state.Transition;
-import net.dpml.parts.state.ResourceUnavailableException;
-import net.dpml.parts.state.NoSuchTransitionException;
-import net.dpml.parts.state.NoSuchOperationException;
-import net.dpml.parts.state.ValidationException;
-import net.dpml.parts.state.Operation;
-import net.dpml.parts.state.StateEvent;
-import net.dpml.parts.state.StateListener;
-import net.dpml.parts.state.NoSuchHandlerException;
-import net.dpml.parts.state.RecursiveInitializationException;
-import net.dpml.parts.state.RecursiveTerminationException;
+import net.dpml.part.control.Monitor;
+import net.dpml.part.control.Manager;
+import net.dpml.part.control.ControlRuntimeException;
+import net.dpml.part.control.Disposable;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.DuplicateKeyException;
+import net.dpml.part.state.State;
+import net.dpml.part.state.Transition;
+import net.dpml.part.state.ResourceUnavailableException;
+import net.dpml.part.state.NoSuchTransitionException;
+import net.dpml.part.state.NoSuchOperationException;
+import net.dpml.part.state.ValidationException;
+import net.dpml.part.state.Operation;
+import net.dpml.part.state.StateEvent;
+import net.dpml.part.state.StateListener;
+import net.dpml.part.state.NoSuchHandlerException;
+import net.dpml.part.state.RecursiveInitializationException;
+import net.dpml.part.state.RecursiveTerminationException;

/**
* The ComponentController class is a controller of a component instance.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionClassLoader.java
Fri Jun 17 14:56:23 2005
@@ -22,8 +22,8 @@
import java.net.URL;
import java.net.URLClassLoader;

-import net.dpml.parts.control.ControlRuntimeException;
-import net.dpml.parts.control.Monitor;
+import net.dpml.part.control.ControlRuntimeException;
+import net.dpml.part.control.Monitor;

import net.dpml.transit.repository.StandardClassLoader;


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
Fri Jun 17 14:56:23 2005
@@ -43,23 +43,23 @@
import net.dpml.composition.model.CompositionModel;
import net.dpml.composition.model.ValueModel;

-import net.dpml.parts.control.ControllerContext;
-import net.dpml.parts.control.HandlerNotFoundException;
-import net.dpml.parts.control.ControlRuntimeException;
-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.DelegationException;
-import net.dpml.parts.control.Disposable;
-import net.dpml.parts.control.LifecycleException;
-import net.dpml.parts.control.Monitor;
-import net.dpml.parts.control.PartNotFoundException;
-import net.dpml.parts.control.Manager;
-
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.Provider;
+import net.dpml.part.control.ControllerContext;
+import net.dpml.part.control.HandlerNotFoundException;
+import net.dpml.part.control.ControlRuntimeException;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.DelegationException;
+import net.dpml.part.control.Disposable;
+import net.dpml.part.control.LifecycleException;
+import net.dpml.part.control.Monitor;
+import net.dpml.part.control.PartNotFoundException;
+import net.dpml.part.control.Manager;
+
+import net.dpml.part.model.Model;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.Provider;

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

/**
* A initial test controller.
@@ -279,7 +279,7 @@
{
m_logger.fine( "loading part " + uri );
Part part = loadPart( uri );
- ClassLoader anchor = net.dpml.parts.part.Part.class.getClassLoader();
+ ClassLoader anchor = net.dpml.part.part.Part.class.getClassLoader();
//ClassLoader anchor =
net.dpml.composition.info.Type.class.getClassLoader();
return getModel( anchor, part, key );
}

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
Fri Jun 17 14:56:23 2005
@@ -33,17 +33,17 @@

import net.dpml.activity.Startable;

-import net.dpml.parts.control.ControlRuntimeException;
-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.ControllerContext;
-import net.dpml.parts.control.DelegationException;
-import net.dpml.parts.control.HandlerNotFoundException;
-import net.dpml.parts.control.PartNotFoundException;
-import net.dpml.parts.control.SystemManager;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.part.Part;
+import net.dpml.part.control.ControlRuntimeException;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.ControllerContext;
+import net.dpml.part.control.DelegationException;
+import net.dpml.part.control.HandlerNotFoundException;
+import net.dpml.part.control.PartNotFoundException;
+import net.dpml.part.control.SystemManager;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.part.Part;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.CommandLineParser;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionPartHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionPartHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionPartHandler.java
Fri Jun 17 14:56:23 2005
@@ -26,14 +26,14 @@
import java.net.URL;
import java.util.WeakHashMap ;

-import net.dpml.parts.part.Part;
-import net.dpml.parts.part.PartHolder;
-import net.dpml.parts.control.PartNotFoundException;
-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.PartHandler;
-import net.dpml.parts.control.PartHandlerRuntimeException;
-import net.dpml.parts.control.HandlerNotFoundException;
-import net.dpml.parts.control.DelegationException;
+import net.dpml.part.part.Part;
+import net.dpml.part.part.PartHolder;
+import net.dpml.part.control.PartNotFoundException;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.PartHandler;
+import net.dpml.part.control.PartHandlerRuntimeException;
+import net.dpml.part.control.HandlerNotFoundException;
+import net.dpml.part.control.DelegationException;

import net.dpml.composition.info.Type;
import net.dpml.composition.info.TypeHolder;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ConsoleMonitor.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ConsoleMonitor.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ConsoleMonitor.java
Fri Jun 17 14:56:23 2005
@@ -18,7 +18,7 @@

package net.dpml.composition.control;

-import net.dpml.parts.control.Monitor;
+import net.dpml.part.control.Monitor;

/**
* Monitor supplied to a startable controller.

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
Fri Jun 17 14:56:23 2005
@@ -22,10 +22,10 @@
import java.lang.reflect.Method;
import java.util.Observer;

-import net.dpml.parts.control.LifecycleException;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.AvailabilityListener;
-import net.dpml.parts.state.StateListener;
+import net.dpml.part.control.LifecycleException;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.AvailabilityListener;
+import net.dpml.part.state.StateListener;

import net.dpml.composition.model.ComponentEntry;
import net.dpml.composition.model.CompositionModel;

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
Fri Jun 17 14:56:23 2005
@@ -23,9 +23,9 @@

import net.dpml.composition.model.ComponentEntry;

-import net.dpml.parts.control.LifecycleException;
+import net.dpml.part.control.LifecycleException;

-import net.dpml.parts.model.ModelException;
+import net.dpml.part.model.ModelException;

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

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/DefaultMonitor.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/DefaultMonitor.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/DefaultMonitor.java
Fri Jun 17 14:56:23 2005
@@ -21,7 +21,7 @@
import java.util.logging.Level;
import java.util.logging.Logger;

-import net.dpml.parts.control.Monitor;
+import net.dpml.part.control.Monitor;

/**
* Monitor supplied to a startable controller.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifecycleHandler.java
Fri Jun 17 14:56:23 2005
@@ -33,9 +33,9 @@

import net.dpml.parameters.Parameters;

-import net.dpml.parts.control.LifecycleException;
-import net.dpml.parts.control.LifecycleRuntimeException;
-import net.dpml.parts.control.Monitor;
+import net.dpml.part.control.LifecycleException;
+import net.dpml.part.control.LifecycleRuntimeException;
+import net.dpml.part.control.Monitor;


/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifestyleHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifestyleHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/LifestyleHandler.java
Fri Jun 17 14:56:23 2005
@@ -20,7 +20,7 @@

import net.dpml.composition.model.ComponentEntry;
import net.dpml.composition.model.CompositionModel;
-import net.dpml.parts.control.Monitor;
+import net.dpml.part.control.Monitor;

/**
* A lifestyle handler provides support for the aquisition and release

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ManagerInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ManagerInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ManagerInvocationHandler.java
Fri Jun 17 14:56:23 2005
@@ -25,7 +25,7 @@

import net.dpml.composition.model.ComponentEntry;

-import net.dpml.parts.state.State;
+import net.dpml.part.state.State;

/**
* This makes a dynamic proxy for an component manager.

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
Fri Jun 17 14:56:23 2005
@@ -28,11 +28,11 @@
import net.dpml.composition.model.ComponentEntry;
import net.dpml.composition.model.CompositionModel;

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.DelegationException;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.control.Manager;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.DelegationException;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.Model;
+import net.dpml.part.control.Manager;

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

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ValueController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ValueController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ValueController.java
Fri Jun 17 14:56:23 2005
@@ -22,11 +22,11 @@

import net.dpml.composition.model.ValueEntry;

-import net.dpml.parts.control.Manager;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.state.NoSuchOperationException;
-import net.dpml.parts.state.NoSuchTransitionException;
-import net.dpml.parts.state.State;
+import net.dpml.part.control.Manager;
+import net.dpml.part.model.Component;
+import net.dpml.part.state.NoSuchOperationException;
+import net.dpml.part.state.NoSuchTransitionException;
+import net.dpml.part.state.State;

/**
* The ValueController class manages value instances.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/data/ComponentProfile.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/data/ComponentProfile.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/data/ComponentProfile.java
Fri Jun 17 14:56:23 2005
@@ -18,7 +18,7 @@

package net.dpml.composition.data;

-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.PartReference;
import net.dpml.configuration.Configuration;
import net.dpml.composition.info.InfoDescriptor;
import net.dpml.parameters.Parameters;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/data/ContextDirective.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/data/ContextDirective.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/data/ContextDirective.java
Fri Jun 17 14:56:23 2005
@@ -20,7 +20,7 @@

import java.io.Serializable;

-import net.dpml.parts.part.PartReference;
+import net.dpml.part.part.PartReference;

/**
* A context descriptor declares the context creation criteria for

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/data/DependencyDirective.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/data/DependencyDirective.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/data/DependencyDirective.java
Fri Jun 17 14:56:23 2005
@@ -22,7 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

/**
* A DependencyDirective is a reference to another part within the scope of
the

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/data/DeploymentProfile.java
Fri Jun 17 14:56:23 2005
@@ -23,7 +23,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

/**
* Abstract base class for ComponentProfile and ContainmentProfile.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/data/ReferenceDirective.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/data/ReferenceDirective.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/data/ReferenceDirective.java
Fri Jun 17 14:56:23 2005
@@ -22,7 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

/**
* A reference directive is a reference to a part within the enclosing part's

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/data/ValueDirective.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/data/ValueDirective.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/data/ValueDirective.java
Fri Jun 17 14:56:23 2005
@@ -22,7 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

/**
* A <code>Value</code> represents a single constructor typed argument
value. The directive

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/AbstractComponent.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/AbstractComponent.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/AbstractComponent.java
Fri Jun 17 14:56:23 2005
@@ -23,14 +23,14 @@

import net.dpml.composition.event.WeakEventProducer;

-import net.dpml.parts.control.Monitor;
-import net.dpml.parts.control.Manager;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.AvailabilityEvent;
-import net.dpml.parts.model.AvailabilityListener;
-import net.dpml.parts.state.StateEvent;
-import net.dpml.parts.state.StateListener;
-import net.dpml.parts.state.State;
+import net.dpml.part.control.Monitor;
+import net.dpml.part.control.Manager;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.AvailabilityEvent;
+import net.dpml.part.model.AvailabilityListener;
+import net.dpml.part.state.StateEvent;
+import net.dpml.part.state.StateListener;
+import net.dpml.part.state.State;

/**
* A lifestyle handler provides support for the aquisition and release

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/Appliance.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/Appliance.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/Appliance.java
Fri Jun 17 14:56:23 2005
@@ -26,10 +26,10 @@

import net.dpml.composition.model.ComponentEntry;

-import net.dpml.parts.control.Disposable;
-import net.dpml.parts.model.AvailabilityEvent;
-import net.dpml.parts.model.AvailabilityListener;
-import net.dpml.parts.state.ResourceUnavailableException;
+import net.dpml.part.control.Disposable;
+import net.dpml.part.model.AvailabilityEvent;
+import net.dpml.part.model.AvailabilityListener;
+import net.dpml.part.state.ResourceUnavailableException;

/**
* An appliance is an invocation handler maintained by a component. It is
used

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentEntry.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentEntry.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ComponentEntry.java
Fri Jun 17 14:56:23 2005
@@ -41,18 +41,18 @@
import net.dpml.composition.event.EventProducer;
import net.dpml.composition.event.WeakEventProducer;

-import net.dpml.parts.control.Identifiable;
-import net.dpml.parts.control.LifecycleException;
-import net.dpml.parts.control.Monitor;
-
-import net.dpml.parts.state.StateEvent;
-import net.dpml.parts.state.StateListener;
-import net.dpml.parts.state.State;
-import net.dpml.parts.state.ResourceUnavailableException;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.AvailabilityEvent;
-import net.dpml.parts.model.AvailabilityListener;
-import net.dpml.parts.control.Manager;
+import net.dpml.part.control.Identifiable;
+import net.dpml.part.control.LifecycleException;
+import net.dpml.part.control.Monitor;
+
+import net.dpml.part.state.StateEvent;
+import net.dpml.part.state.StateListener;
+import net.dpml.part.state.State;
+import net.dpml.part.state.ResourceUnavailableException;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.AvailabilityEvent;
+import net.dpml.part.model.AvailabilityListener;
+import net.dpml.part.control.Manager;

/**
* A lifestyle handler provides support for the aquisition and release
@@ -562,7 +562,7 @@
{
final String error =
"The component is declaring a STATE_GRAPH member "
- + "that is not an instance of net.dpml.parts.state.State."
+ + "that is not an instance of net.dpml.part.state.State."
+ "\nObject: " + getURI();
throw new IllegalArgumentException( error );
}

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/CompositionModel.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/CompositionModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/CompositionModel.java
Fri Jun 17 14:56:23 2005
@@ -41,17 +41,17 @@
import net.dpml.parameters.Parameterizable;
import net.dpml.parameters.impl.DefaultParameters;

-import net.dpml.parts.control.Controller;
+import net.dpml.part.control.Controller;

-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.Provider;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.ModelRuntimeException;
-import net.dpml.parts.model.ServiceClassNotFoundException;
-import net.dpml.parts.model.TypeClassNotFoundException;
-import net.dpml.parts.part.Part;
-import net.dpml.parts.part.PartReference;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.Provider;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.ModelRuntimeException;
+import net.dpml.part.model.ServiceClassNotFoundException;
+import net.dpml.part.model.TypeClassNotFoundException;
+import net.dpml.part.part.Part;
+import net.dpml.part.part.PartReference;

/**
* The implementation of a component model.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
Fri Jun 17 14:56:23 2005
@@ -23,16 +23,16 @@
import java.util.Map;
import java.util.Map.Entry;

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.DelegationException;
-import net.dpml.parts.control.HandlerNotFoundException;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.Provider;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.ModelRuntimeException;
-import net.dpml.parts.model.DuplicateKeyException;
-import net.dpml.parts.part.Part;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.DelegationException;
+import net.dpml.part.control.HandlerNotFoundException;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.Provider;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.ModelRuntimeException;
+import net.dpml.part.model.DuplicateKeyException;
+import net.dpml.part.part.Part;

import net.dpml.composition.control.CompositionController;
import net.dpml.composition.data.ReferenceDirective;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/InvalidModelException.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/InvalidModelException.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/InvalidModelException.java
Fri Jun 17 14:56:23 2005
@@ -20,7 +20,7 @@

import java.net.URI;

-import net.dpml.parts.model.ModelRuntimeException;
+import net.dpml.part.model.ModelRuntimeException;

/**
* Unexpected runtime exception indicating an internal model error.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
Fri Jun 17 14:56:23 2005
@@ -21,11 +21,11 @@
import java.util.Map;
import java.util.Hashtable;

-import net.dpml.parts.control.ControlRuntimeException;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.DuplicateKeyException;
-import net.dpml.parts.part.Part;
+import net.dpml.part.control.ControlRuntimeException;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.DuplicateKeyException;
+import net.dpml.part.part.Part;

import net.dpml.composition.data.ReferenceDirective;
import net.dpml.composition.control.CompositionController;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ReferenceEntry.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/ReferenceEntry.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ReferenceEntry.java
Fri Jun 17 14:56:23 2005
@@ -26,15 +26,15 @@
import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.data.ValueDirective.Value;

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.ModelRuntimeException;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.Provider;
-import net.dpml.parts.model.AvailabilityListener;
-import net.dpml.parts.state.State;
-import net.dpml.parts.state.StateListener;
+import net.dpml.part.control.Controller;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.ModelRuntimeException;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.Provider;
+import net.dpml.part.model.AvailabilityListener;
+import net.dpml.part.state.State;
+import net.dpml.part.state.StateListener;

/**
* Default implementation of a the context entry constructor model.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueEntry.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueEntry.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueEntry.java
Fri Jun 17 14:56:23 2005
@@ -25,15 +25,15 @@
import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.data.ValueDirective.Value;

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.Manager;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.Manager;

-import net.dpml.parts.control.Monitor;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.ModelRuntimeException;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.state.State;
+import net.dpml.part.control.Monitor;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.ModelRuntimeException;
+import net.dpml.part.model.Component;
+import net.dpml.part.state.State;

/**
* Default implementation of a the context entry constructor model.

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueModel.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueModel.java
Fri Jun 17 14:56:23 2005
@@ -25,14 +25,14 @@
import net.dpml.composition.data.ValueDirective;
import net.dpml.composition.data.ValueDirective.Value;

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.Monitor;
-import net.dpml.parts.control.Manager;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.model.ModelRuntimeException;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.Provider;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.Monitor;
+import net.dpml.part.control.Manager;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.model.ModelRuntimeException;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.Provider;

/**
* Default implementation of a the context entry constructor model.

Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandler.java
Fri Jun 17 14:56:23 2005
@@ -33,14 +33,14 @@

import net.dpml.transit.repository.Repository;

-import net.dpml.parts.control.ControlException;
-import net.dpml.parts.control.ControlRuntimeException;
-import net.dpml.parts.control.ControllerContext;
-
-import net.dpml.parts.part.Part;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.Provider;
-import net.dpml.parts.model.Component;
+import net.dpml.part.control.ControlException;
+import net.dpml.part.control.ControlRuntimeException;
+import net.dpml.part.control.ControllerContext;
+
+import net.dpml.part.part.Part;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.Provider;
+import net.dpml.part.model.Component;

import net.dpml.transit.model.ContentModel;


Modified:
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
==============================================================================
---
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
(original)
+++
development/main/metro/composition/part/src/main/net/dpml/composition/part/CompositionContentHandlerModel.java
Fri Jun 17 14:56:23 2005
@@ -31,9 +31,9 @@
import java.util.prefs.PreferenceChangeListener;
import java.util.prefs.PreferenceChangeEvent;

-import net.dpml.parts.control.ControllerContext;
-import net.dpml.parts.control.ControllerContextListener;
-import net.dpml.parts.control.ControllerContextEvent;
+import net.dpml.part.control.ControllerContext;
+import net.dpml.part.control.ControllerContextListener;
+import net.dpml.part.control.ControllerContextEvent;

import net.dpml.transit.home.ContentHome;
import net.dpml.transit.model.ContentRegistryModel;

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Fri Jun 17 14:56:23 2005
@@ -149,11 +149,11 @@
<package name="net.dpml.parameters"/>
</group>
<group title="Containment SPI">
- <package name="net.dpml.parts.builder"/>
- <package name="net.dpml.parts.control"/>
- <package name="net.dpml.parts.model"/>
- <package name="net.dpml.parts.part"/>
- <package name="net.dpml.parts.state"/>
+ <package name="net.dpml.part.builder"/>
+ <package name="net.dpml.part.control"/>
+ <package name="net.dpml.part.model"/>
+ <package name="net.dpml.part.part"/>
+ <package name="net.dpml.part.state"/>
</group>
<group title="Composition Package">
<package name="net.dpml.composition.builder"/>

Modified:
development/main/metro/part/src/main/net/dpml/part/builder/Builder.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/builder/Builder.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/builder/Builder.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.builder;
+package net.dpml.part.builder;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/builder/BuilderRuntimeException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/builder/BuilderRuntimeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/builder/BuilderRuntimeException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.builder;
+package net.dpml.part.builder;

/**
* An exception throws if an internal error occurs during builder execution.

Modified:
development/main/metro/part/src/main/net/dpml/part/builder/PartBuilder.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/builder/PartBuilder.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/builder/PartBuilder.java
Fri Jun 17 14:56:23 2005
@@ -16,13 +16,13 @@
* limitations under the License.
*/

-package net.dpml.parts.builder;
+package net.dpml.part.builder;

import java.io.IOException;
import java.net.URI;
import java.beans.IntrospectionException;

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

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

Modified:
development/main/metro/part/src/main/net/dpml/part/control/Control.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/control/Control.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/control/Control.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;


/**

Modified:
development/main/metro/part/src/main/net/dpml/part/control/ControlException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/ControlException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ControlException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/ControlRuntimeException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/ControlRuntimeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ControlRuntimeException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/Controller.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/Controller.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/Controller.java
Fri Jun 17 14:56:23 2005
@@ -16,15 +16,15 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;

-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.Provider;
-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.ModelException;
-import net.dpml.parts.part.Part;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.Provider;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.ModelException;
+import net.dpml.part.part.Part;

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

Modified:
development/main/metro/part/src/main/net/dpml/part/control/ControllerContext.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/ControllerContext.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ControllerContext.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.rmi.Remote;
import java.rmi.RemoteException;

Modified:
development/main/metro/part/src/main/net/dpml/part/control/ControllerContextEvent.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/ControllerContextEvent.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ControllerContextEvent.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.io.File;
import java.util.EventObject;

Modified:
development/main/metro/part/src/main/net/dpml/part/control/ControllerContextListener.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/ControllerContextListener.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ControllerContextListener.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.util.EventListener;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/DelegationException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/DelegationException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/DelegationException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/Disposable.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/Disposable.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/Disposable.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;


/**

Modified:
development/main/metro/part/src/main/net/dpml/part/control/DuplicateNameException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/DuplicateNameException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/DuplicateNameException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

/**
* Exception thrown when an attempt is made to reference an unknown handler.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/EntryNotFoundException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/EntryNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/EntryNotFoundException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/HandlerNotFoundException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/HandlerNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/HandlerNotFoundException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/Identifiable.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/Identifiable.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/Identifiable.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/InvalidQueryException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/InvalidQueryException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/InvalidQueryException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/LifecycleException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/LifecycleException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/LifecycleException.java
Fri Jun 17 14:56:23 2005
@@ -16,9 +16,9 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

-import net.dpml.parts.model.Model;
+import net.dpml.part.model.Model;


/**

Modified:
development/main/metro/part/src/main/net/dpml/part/control/LifecycleRuntimeException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/LifecycleRuntimeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/LifecycleRuntimeException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

/**
* Exception to indicate that there was a lifecycle runtime related error.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/LifestyleException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/LifestyleException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/LifestyleException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

/**
* Exception to indicate that there was a lifecycle related error.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/Manageable.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/Manageable.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/Manageable.java
Fri Jun 17 14:56:23 2005
@@ -16,9 +16,9 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

-import net.dpml.parts.model.Model;
+import net.dpml.part.model.Model;

/**
* The Manager interface is an interface representing a component controller.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/Manager.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/control/Manager.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/control/Manager.java
Fri Jun 17 14:56:23 2005
@@ -16,11 +16,11 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.ResourceUnavailableException;
-import net.dpml.parts.state.State;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.ResourceUnavailableException;
+import net.dpml.part.state.State;

/**
* The Manager interface is an interface representing a component controller.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/Monitor.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/control/Monitor.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/control/Monitor.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

/**
* Monitor supplied to a startable controller.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/NoSuchControlException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/NoSuchControlException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/NoSuchControlException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

/**
* An exception thrown in responde to a request for an unknown control.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/PartHandler.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/PartHandler.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/PartHandler.java
Fri Jun 17 14:56:23 2005
@@ -16,12 +16,12 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

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

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

/**
* Definition of a part handler.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/PartHandlerRuntimeException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/PartHandlerRuntimeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/PartHandlerRuntimeException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

/**
* Unexpected runtime exception indicating an internal part handler error.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/PartNotFoundException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/PartNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/PartNotFoundException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/SystemManager.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/SystemManager.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/SystemManager.java
Fri Jun 17 14:56:23 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

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

-import net.dpml.parts.model.Component;
-import net.dpml.parts.model.Model;
-import net.dpml.parts.model.ModelException;
+import net.dpml.part.model.Component;
+import net.dpml.part.model.Model;
+import net.dpml.part.model.ModelException;

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

Modified:
development/main/metro/part/src/main/net/dpml/part/control/UnknownSchemaException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/UnknownSchemaException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/UnknownSchemaException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/control/UnsupportedPartTypeException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/control/UnsupportedPartTypeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/UnsupportedPartTypeException.java
Fri Jun 17 14:56:23 2005
@@ -16,9 +16,9 @@
* limitations under the License.
*/

-package net.dpml.parts.control;
+package net.dpml.part.control;

-import net.dpml.parts.part.Part;
+import net.dpml.part.part.Part;

/**
* Exception thrown when an strategy handler attempts to handle an

Modified:
development/main/metro/part/src/main/net/dpml/part/model/AvailabilityEvent.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/AvailabilityEvent.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/AvailabilityEvent.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

import java.util.EventObject;


Modified:
development/main/metro/part/src/main/net/dpml/part/model/AvailabilityListener.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/AvailabilityListener.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/AvailabilityListener.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

import java.util.EventListener;


Modified:
development/main/metro/part/src/main/net/dpml/part/model/Component.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/model/Component.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/model/Component.java
Fri Jun 17 14:56:23 2005
@@ -16,18 +16,18 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

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

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.Identifiable;
-import net.dpml.parts.control.Manager;
-
-import net.dpml.parts.state.State;
-import net.dpml.parts.state.StateEvent;
-import net.dpml.parts.state.StateListener;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.Identifiable;
+import net.dpml.part.control.Manager;
+
+import net.dpml.part.state.State;
+import net.dpml.part.state.StateEvent;
+import net.dpml.part.state.StateListener;

/**
*

Modified:
development/main/metro/part/src/main/net/dpml/part/model/DuplicateKeyException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/DuplicateKeyException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/DuplicateKeyException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;


/**

Modified: development/main/metro/part/src/main/net/dpml/part/model/Model.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/model/Model.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/model/Model.java Fri
Jun 17 14:56:23 2005
@@ -16,13 +16,13 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

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

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.Identifiable;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.Identifiable;

/**
* The Model interface defines a common view of a component part. Operations

Modified:
development/main/metro/part/src/main/net/dpml/part/model/ModelException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/ModelException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/ModelException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

/**
* Unexpected runtime exception indicating an internal model error.

Modified:
development/main/metro/part/src/main/net/dpml/part/model/ModelRuntimeException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/ModelRuntimeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/ModelRuntimeException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

/**
* Unexpected runtime exception indicating an internal model error.

Modified:
development/main/metro/part/src/main/net/dpml/part/model/PartClassNotFoundException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/PartClassNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/PartClassNotFoundException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

/**
* Exception thrown when an attempt is made to locate a class declared

Modified:
development/main/metro/part/src/main/net/dpml/part/model/Provider.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/model/Provider.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/model/Provider.java
Fri Jun 17 14:56:23 2005
@@ -16,18 +16,18 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

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

-import net.dpml.parts.control.Controller;
-import net.dpml.parts.control.Identifiable;
-import net.dpml.parts.control.Manager;
-
-import net.dpml.parts.state.State;
-import net.dpml.parts.state.StateEvent;
-import net.dpml.parts.state.StateListener;
+import net.dpml.part.control.Controller;
+import net.dpml.part.control.Identifiable;
+import net.dpml.part.control.Manager;
+
+import net.dpml.part.state.State;
+import net.dpml.part.state.StateEvent;
+import net.dpml.part.state.StateListener;

/**
*

Modified:
development/main/metro/part/src/main/net/dpml/part/model/ResourceUnavailableException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/ResourceUnavailableException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/ResourceUnavailableException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

/**
* Exception thrown in response to an attempt to register a part model

Modified:
development/main/metro/part/src/main/net/dpml/part/model/ServiceClassNotFoundException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/ServiceClassNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/ServiceClassNotFoundException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

/**
* Unexpected runtime exception indicating an internal model error.

Modified:
development/main/metro/part/src/main/net/dpml/part/model/TypeClassNotFoundException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/model/TypeClassNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/model/TypeClassNotFoundException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.model;
+package net.dpml.part.model;

/**
* Unexpected runtime exception indicating an internal model error.

Modified: development/main/metro/part/src/main/net/dpml/part/part/Part.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/part/Part.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/part/Part.java Fri
Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.part;
+package net.dpml.part.part;

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

Modified:
development/main/metro/part/src/main/net/dpml/part/part/PartHolder.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/part/PartHolder.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/part/PartHolder.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.part;
+package net.dpml.part.part;

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

Modified:
development/main/metro/part/src/main/net/dpml/part/part/PartReference.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/part/PartReference.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/part/PartReference.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.part;
+package net.dpml.part.part;

import java.io.Serializable;


Modified:
development/main/metro/part/src/main/net/dpml/part/state/DuplicateKeyException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/DuplicateKeyException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/DuplicateKeyException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;


/**

Modified:
development/main/metro/part/src/main/net/dpml/part/state/NoSuchHandlerException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/NoSuchHandlerException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/NoSuchHandlerException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

/**
* Exception thrown when a request for a handler could not be resolved.

Modified:
development/main/metro/part/src/main/net/dpml/part/state/NoSuchOperationException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/NoSuchOperationException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/NoSuchOperationException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;


/**

Modified:
development/main/metro/part/src/main/net/dpml/part/state/NoSuchStateException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/NoSuchStateException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/NoSuchStateException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;


/**

Modified:
development/main/metro/part/src/main/net/dpml/part/state/NoSuchTransitionException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/NoSuchTransitionException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/NoSuchTransitionException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;


/**

Modified:
development/main/metro/part/src/main/net/dpml/part/state/Operation.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/state/Operation.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/state/Operation.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/state/RecursiveInitializationException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/RecursiveInitializationException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/RecursiveInitializationException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

/**
* Exception thrown when a recursive initialization sequence is encountered.

Modified:
development/main/metro/part/src/main/net/dpml/part/state/RecursiveTerminationException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/RecursiveTerminationException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/RecursiveTerminationException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

/**
* Exception thrown when a recursive termination sequence is encountered.

Modified:
development/main/metro/part/src/main/net/dpml/part/state/ResourceUnavailableException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/ResourceUnavailableException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/ResourceUnavailableException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;


/**

Modified: development/main/metro/part/src/main/net/dpml/part/state/State.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/state/State.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/state/State.java Fri
Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.util.Map;
import java.util.Hashtable;

Modified:
development/main/metro/part/src/main/net/dpml/part/state/StateEvent.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/state/StateEvent.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/state/StateEvent.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.util.EventObject;


Modified:
development/main/metro/part/src/main/net/dpml/part/state/StateListener.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/StateListener.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/StateListener.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.util.EventListener;


Modified:
development/main/metro/part/src/main/net/dpml/part/state/Transition.java
==============================================================================
--- development/main/metro/part/src/main/net/dpml/parts/state/Transition.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/state/Transition.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.net.URI;


Modified:
development/main/metro/part/src/main/net/dpml/part/state/ValidationException.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/parts/state/ValidationException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/state/ValidationException.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;


/**

Modified:
development/main/metro/part/src/test/net/dpml/part/state/OperationTestCase.java
==============================================================================
---
development/main/metro/part/src/test/net/dpml/parts/state/OperationTestCase.java
(original)
+++
development/main/metro/part/src/test/net/dpml/part/state/OperationTestCase.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.net.URI;


Modified:
development/main/metro/part/src/test/net/dpml/part/state/StateTestCase.java
==============================================================================
---
development/main/metro/part/src/test/net/dpml/parts/state/StateTestCase.java
(original)
+++
development/main/metro/part/src/test/net/dpml/part/state/StateTestCase.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.net.URI;


Modified:
development/main/metro/part/src/test/net/dpml/part/state/TransitionTestCase.java
==============================================================================
---
development/main/metro/part/src/test/net/dpml/parts/state/TransitionTestCase.java
(original)
+++
development/main/metro/part/src/test/net/dpml/part/state/TransitionTestCase.java
Fri Jun 17 14:56:23 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

-package net.dpml.parts.state;
+package net.dpml.part.state;

import java.net.URI;




  • svn commit: r2871 - in development/main: . metro metro/composition/builder/src/main/net/dpml/composition/builder metro/composition/builder/src/main/net/dpml/composition/builder/datatypes metro/composition/control/src/main/net/dpml/composition/control metro/composition/control/src/main/net/dpml/composition/data metro/composition/control/src/main/net/dpml/composition/model metro/composition/part/src/main/net/dpml/composition/part metro/part/src/main/net/dpml/part metro/part/src/main/net/dpml/part/builder metro/part/src/main/net/dpml/part/control metro/part/src/main/net/dpml/part/model metro/part/src/main/net/dpml/part/part metro/part/src/main/net/dpml/part/state metro/part/src/main/net/dpml/parts metro/part/src/test/net/dpml/part metro/part/src/test/net/dpml/part/state metro/part/src/test/net/dpml/parts, mcconnell, 06/17/2005

Archive powered by MHonArc 2.6.24.

Top of Page