Skip to Content.
Sympa Menu

notify-dpml - svn commit: r2991 - in development/main: metro metro/central/src/main/net/dpml/metro/central 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/info metro/composition/control/src/main/net/dpml/composition/runtime 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/manager metro/part/src/main/net/dpml/part/part test/components/plus/src/main/net/dpml/test/acme/plus test/unit/plus/src/test/net/dpml/test/acme/plus test/unit/simple/src/test/net/dpml/test/acme transit/core/handler/src/main/net/dpml/transit/model

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: r2991 - in development/main: metro metro/central/src/main/net/dpml/metro/central 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/info metro/composition/control/src/main/net/dpml/composition/runtime 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/manager metro/part/src/main/net/dpml/part/part test/components/plus/src/main/net/dpml/test/acme/plus test/unit/plus/src/test/net/dpml/test/acme/plus test/unit/simple/src/test/net/dpml/test/acme transit/core/handler/src/main/net/dpml/transit/model
  • Date: Wed, 06 Jul 2005 20:00:04 -0400

Author: mcconnell AT dpml.net
Date: Wed Jul 6 20:00:04 2005
New Revision: 2991

Added:
development/main/metro/part/src/main/net/dpml/part/DelegationException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/control/DelegationException.java
development/main/metro/part/src/main/net/dpml/part/Part.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/part/Part.java
development/main/metro/part/src/main/net/dpml/part/PartHandler.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/control/PartHandler.java

development/main/metro/part/src/main/net/dpml/part/PartHandlerNotFoundException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/control/HandlerNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/PartHandlerRuntimeException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/control/PartHandlerRuntimeException.java
development/main/metro/part/src/main/net/dpml/part/PartHolder.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/part/PartHolder.java

development/main/metro/part/src/main/net/dpml/part/PartNotFoundException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/control/PartNotFoundException.java
development/main/metro/part/src/main/net/dpml/part/PartReference.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/part/PartReference.java

development/main/metro/part/src/main/net/dpml/part/control/AvailabilityEvent.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/AvailabilityEvent.java

development/main/metro/part/src/main/net/dpml/part/control/AvailabilityListener.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/AvailabilityListener.java

development/main/metro/part/src/main/net/dpml/part/control/ClassLoadingContext.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ClassLoadingContext.java
development/main/metro/part/src/main/net/dpml/part/control/Component.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/Component.java

development/main/metro/part/src/main/net/dpml/part/control/ComponentException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ComponentException.java

development/main/metro/part/src/main/net/dpml/part/control/ComponentNotFoundException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ComponentNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/control/ComponentRuntimeException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ComponentRuntimeException.java
development/main/metro/part/src/main/net/dpml/part/control/Consumer.java
- copied, changed from r2983,
development/main/metro/part/src/main/net/dpml/part/manager/Consumer.java
development/main/metro/part/src/main/net/dpml/part/control/Container.java
- copied, changed from r2983,
development/main/metro/part/src/main/net/dpml/part/manager/Container.java

development/main/metro/part/src/main/net/dpml/part/control/ContainmentException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ContainmentException.java

development/main/metro/part/src/main/net/dpml/part/control/DuplicateKeyException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/DuplicateKeyException.java

development/main/metro/part/src/main/net/dpml/part/control/PartClassNotFoundException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/PartClassNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/control/ResourceUnavailableException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ResourceUnavailableException.java

development/main/metro/part/src/main/net/dpml/part/control/ServiceClassNotFoundException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ServiceClassNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/control/TypeClassNotFoundException.java
- copied, changed from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/TypeClassNotFoundException.java
development/main/metro/part/src/main/net/dpml/part/package.html
- copied unchanged from r2980,
development/main/metro/part/src/main/net/dpml/part/part/package.html
Removed:

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

development/main/metro/part/src/main/net/dpml/part/control/HandlerNotFoundException.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/manager/AvailabilityEvent.java

development/main/metro/part/src/main/net/dpml/part/manager/AvailabilityListener.java

development/main/metro/part/src/main/net/dpml/part/manager/ClassLoadingContext.java
development/main/metro/part/src/main/net/dpml/part/manager/Component.java

development/main/metro/part/src/main/net/dpml/part/manager/ComponentException.java

development/main/metro/part/src/main/net/dpml/part/manager/ComponentNotFoundException.java

development/main/metro/part/src/main/net/dpml/part/manager/ComponentRuntimeException.java
development/main/metro/part/src/main/net/dpml/part/manager/Consumer.java
development/main/metro/part/src/main/net/dpml/part/manager/Container.java

development/main/metro/part/src/main/net/dpml/part/manager/ContainmentException.java

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

development/main/metro/part/src/main/net/dpml/part/manager/PartClassNotFoundException.java

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

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

development/main/metro/part/src/main/net/dpml/part/manager/TypeClassNotFoundException.java
development/main/metro/part/src/main/net/dpml/part/manager/package.html
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/part/package.html
Modified:

development/main/metro/central/src/main/net/dpml/metro/central/MetroHelper.java

development/main/metro/central/src/main/net/dpml/metro/central/PartContentHandler.java

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

development/main/metro/composition/builder/src/main/net/dpml/composition/builder/PartReferenceBuilder.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/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/CompositionController.java

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

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/AbstractHandler.java

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

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentController.java

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java

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

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ContextMap.java

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/DependencyGraph.java

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/LoggingHandler.java

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/Manager.java

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

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

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

development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
development/main/metro/module.xml
development/main/metro/part/src/main/net/dpml/part/builder/PartBuilder.java
development/main/metro/part/src/main/net/dpml/part/control/Controller.java

development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ConfigurableContainer.java

development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ManagingContainer.java

development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ConfigurationTestCase.java

development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ManagementTestCase.java

development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java

development/main/test/unit/simple/src/test/net/dpml/test/acme/CompositeTestCase.java

development/main/test/unit/simple/src/test/net/dpml/test/acme/ContainerTestCase.java

development/main/test/unit/simple/src/test/net/dpml/test/acme/ExampleTestCase.java

development/main/test/unit/simple/src/test/net/dpml/test/acme/SimpleTestCase.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java

development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
Log:
o Consolidation in the parts package and general improvements to class
package names.

Modified:
development/main/metro/central/src/main/net/dpml/metro/central/MetroHelper.java
==============================================================================
---
development/main/metro/central/src/main/net/dpml/metro/central/MetroHelper.java
(original)
+++
development/main/metro/central/src/main/net/dpml/metro/central/MetroHelper.java
Wed Jul 6 20:00:04 2005
@@ -76,7 +76,7 @@
this( new LoggingAdapter( "metro" ) );
}

- public MetroHelper( Logger ) throws Exception
+ public MetroHelper( Logger logger ) throws Exception
{
String title = "Metro Part Handler.";
String type = "part";

Modified:
development/main/metro/central/src/main/net/dpml/metro/central/PartContentHandler.java
==============================================================================
---
development/main/metro/central/src/main/net/dpml/metro/central/PartContentHandler.java
(original)
+++
development/main/metro/central/src/main/net/dpml/metro/central/PartContentHandler.java
Wed Jul 6 20:00:04 2005
@@ -39,8 +39,8 @@
import net.dpml.part.control.Controller;
import net.dpml.part.control.ControllerContext;

-import net.dpml.part.part.Part;
-import net.dpml.part.manager.Component;
+import net.dpml.part.Part;
+import net.dpml.part.control.Component;

import net.dpml.transit.Transit;
import net.dpml.transit.model.ContentModel;

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
Wed Jul 6 20:00:04 2005
@@ -30,12 +30,12 @@
import java.net.URL;
import java.util.ArrayList;

-import net.dpml.part.part.Part;
-import net.dpml.part.part.PartHolder;
-import net.dpml.part.part.PartReference;
+import net.dpml.part.Part;
+import net.dpml.part.PartHolder;
+import net.dpml.part.PartReference;
import net.dpml.part.control.ControllerContext;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.Container;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.Container;

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
Wed Jul 6 20:00:04 2005
@@ -21,7 +21,7 @@
import java.io.IOException;
import java.beans.IntrospectionException;

-import net.dpml.part.part.PartReference;
+import net.dpml.part.PartReference;
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
Wed Jul 6 20:00:04 2005
@@ -23,7 +23,7 @@
import java.util.List;
import java.beans.IntrospectionException;

-import net.dpml.part.part.PartReference;
+import net.dpml.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/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
Wed Jul 6 20:00:04 2005
@@ -21,8 +21,8 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.part.part.Part;
-import net.dpml.part.part.PartReference;
+import net.dpml.part.Part;
+import net.dpml.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
Wed Jul 6 20:00:04 2005
@@ -28,10 +28,10 @@
import net.dpml.composition.info.Type;

import net.dpml.part.control.ControllerContext;
-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.part.DelegationException;
+import net.dpml.part.PartNotFoundException;
+import net.dpml.part.Part;
+import net.dpml.part.PartReference;

import org.apache.tools.ant.BuildException;


Modified:
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
==============================================================================
---
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
(original)
+++
development/main/metro/composition/builder/src/main/net/dpml/composition/builder/datatypes/PartsDataType.java
Wed Jul 6 20:00:04 2005
@@ -23,7 +23,7 @@
import java.util.List;
import java.beans.IntrospectionException;

-import net.dpml.part.part.PartReference;
+import net.dpml.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
Wed Jul 6 20:00:04 2005
@@ -21,8 +21,8 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.part.part.Part;
-import net.dpml.part.part.PartReference;
+import net.dpml.part.Part;
+import net.dpml.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/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
Wed Jul 6 20:00:04 2005
@@ -44,21 +44,21 @@
import net.dpml.composition.runtime.CompositionHandler;
import net.dpml.composition.runtime.DefaultLogger;

+import net.dpml.part.DelegationException;
+import net.dpml.part.Part;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.PartNotFoundException;
import net.dpml.part.control.ControllerContext;
-import net.dpml.part.control.HandlerNotFoundException;
import net.dpml.part.control.ControlException;
import net.dpml.part.control.ControllerRuntimeException;
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.PartNotFoundException;
import net.dpml.part.control.UnsupportedPartTypeException;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.ClassLoadingContext;
-import net.dpml.part.manager.ComponentException;
-import net.dpml.part.manager.Container;
-import net.dpml.part.part.Part;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.ClassLoadingContext;
+import net.dpml.part.control.ComponentException;
+import net.dpml.part.control.Container;

import net.dpml.transit.adapter.LoggingAdapter;
import net.dpml.transit.model.ContentModel;
@@ -154,12 +154,12 @@
* @exception ComponentException is an error occurs during component
establishment
* @exception IOException if an error occurs while attempting to resolve
the component part uri
* @exception PartNotFoundException if the uri could not be resolved to a
physical resource
- * @exception HandlerNotFoundException if the part references a handler
but the handler could not be found
+ * @exception PartHandlerNotFoundException if the part references a
handler but the handler could not be found
* @exception DelegationException if an error occurs following handover
of control to a foreign controller
*/
public Component newComponent( URI uri )
throws IOException, ComponentException, PartNotFoundException,
- HandlerNotFoundException, DelegationException
+ PartHandlerNotFoundException, DelegationException
{
m_logger.debug( "loading part " + uri );
Part part = loadPart( uri );
@@ -175,12 +175,12 @@
* @param name the name to assign to the new component
* @return a new component
* @exception ComponentException is an error occurs during component
establishment
- * @exception HandlerNotFoundException if the part references a handler
but the handler could not be found
+ * @exception PartHandlerNotFoundException if the part references a
handler but the handler could not be found
* @exception DelegationException if an error occurs following handover
of control to a foreign controller
* @exception UnsupportedPartTypeException if the component type is
recognized but not supported
*/
public Component newComponent( Component parent, Part part, String name )
- throws ComponentException, HandlerNotFoundException,
DelegationException
+ throws ComponentException, PartHandlerNotFoundException,
DelegationException
{
URI partition = getPartition( parent );
if( isRecognizedPart( part ) )
@@ -234,12 +234,12 @@
* @param part component definition including type and deployment data
* @return a new component
* @exception ComponentException is an error occurs during component
establishment
- * @exception HandlerNotFoundException if the part references a handler
but the handler could not be found
+ * @exception PartHandlerNotFoundException if the part references a
handler but the handler could not be found
* @exception DelegationException if an error occurs following handover
of control to a foreign controller
* @exception UnsupportedPartTypeException if the component type is
recognized but not supported
*/
public Container newContainer( ClassLoader parent, Part part )
- throws ComponentException, HandlerNotFoundException,
DelegationException
+ throws ComponentException, PartHandlerNotFoundException,
DelegationException
{
URI partition = getPartition();
if( isRecognizedPart( part ) )

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
Wed Jul 6 20:00:04 2005
@@ -30,16 +30,16 @@
import java.util.Properties ;
import java.util.WeakHashMap ;

-import net.dpml.part.part.Part;
-import net.dpml.part.part.PartHolder;
-import net.dpml.part.control.PartNotFoundException;
+import net.dpml.part.Part;
+import net.dpml.part.PartHolder;
+import net.dpml.part.PartHandler;
+import net.dpml.part.PartHandlerRuntimeException;
+import net.dpml.part.PartNotFoundException;
import net.dpml.part.control.Controller;
import net.dpml.part.control.ControllerContext;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.DelegationException;
import net.dpml.part.control.ControlException;
-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.logging.Logger;

@@ -131,7 +131,7 @@
* @return the part handler
*/
public Controller getPrimaryController( URI uri )
- throws HandlerNotFoundException, DelegationException
+ throws PartHandlerNotFoundException, DelegationException
{
if( false == getURI().equals( uri ) )
{
@@ -198,7 +198,7 @@
}
}

- protected PartHandler resolvePartHandler( URI uri ) throws
HandlerNotFoundException
+ protected PartHandler resolvePartHandler( URI uri ) throws
PartHandlerNotFoundException
{
if( getURI().equals( uri ) )
{
@@ -236,7 +236,7 @@
}
}

- private PartHandler loadHandler( URI uri ) throws
HandlerNotFoundException
+ private PartHandler loadHandler( URI uri ) throws
PartHandlerNotFoundException
{
ClassLoader classloader = Type.class.getClassLoader();
DefaultLogger logger = new DefaultLogger( "handler" );
@@ -246,7 +246,7 @@
}
catch( IOException e )
{
- throw new HandlerNotFoundException( uri, e );
+ throw new PartHandlerNotFoundException( uri, e );
}
}


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
Wed Jul 6 20:00:04 2005
@@ -18,7 +18,7 @@

package net.dpml.composition.data;

-import net.dpml.part.part.PartReference;
+import net.dpml.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
Wed Jul 6 20:00:04 2005
@@ -20,7 +20,7 @@

import java.io.Serializable;

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

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

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
Wed Jul 6 20:00:04 2005
@@ -23,7 +23,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.part.part.Part;
+import net.dpml.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
Wed Jul 6 20:00:04 2005
@@ -22,7 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.part.part.Part;
+import net.dpml.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
Wed Jul 6 20:00:04 2005
@@ -22,7 +22,7 @@
import java.net.URI;
import java.net.URISyntaxException;

-import net.dpml.part.part.Part;
+import net.dpml.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/info/Type.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/info/Type.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/info/Type.java
Wed Jul 6 20:00:04 2005
@@ -28,7 +28,7 @@
import net.dpml.configuration.Configuration;

import net.dpml.part.state.State;
-import net.dpml.part.manager.ComponentException;
+import net.dpml.part.control.ComponentException;

/**
* This class contains the meta information about a particular

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/AbstractHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/AbstractHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/AbstractHandler.java
Wed Jul 6 20:00:04 2005
@@ -26,9 +26,9 @@

import net.dpml.logging.Logger;

-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.AvailabilityEvent;
-import net.dpml.part.manager.AvailabilityListener;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.AvailabilityEvent;
+import net.dpml.part.control.AvailabilityListener;

import net.dpml.part.state.StateEvent;
import net.dpml.part.state.StateListener;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/Appliance.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/Appliance.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/Appliance.java
Wed Jul 6 20:00:04 2005
@@ -26,8 +26,8 @@
import java.rmi.RemoteException;

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

/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentController.java
Wed Jul 6 20:00:04 2005
@@ -46,9 +46,9 @@
import net.dpml.part.control.ControlException;
import net.dpml.part.control.ControllerRuntimeException;
import net.dpml.part.control.Disposable;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.Container;
-import net.dpml.part.manager.DuplicateKeyException;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.Container;
+import net.dpml.part.control.DuplicateKeyException;
import net.dpml.part.state.State;
import net.dpml.part.state.Transition;
import net.dpml.part.state.ResourceUnavailableException;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ComponentHandler.java
Wed Jul 6 20:00:04 2005
@@ -58,24 +58,24 @@
import net.dpml.parameters.impl.DefaultParameters;

import net.dpml.part.control.LifecycleException;
-import net.dpml.part.control.HandlerNotFoundException;
-import net.dpml.part.control.DelegationException;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.DelegationException;
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.manager.Consumer;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.ClassLoadingContext;
-import net.dpml.part.manager.ComponentException;
-import net.dpml.part.manager.ComponentRuntimeException;
-import net.dpml.part.manager.AvailabilityEvent;
-import net.dpml.part.manager.AvailabilityListener;
-import net.dpml.part.manager.TypeClassNotFoundException;
-import net.dpml.part.manager.ServiceClassNotFoundException;
-import net.dpml.part.manager.ComponentNotFoundException;
-import net.dpml.part.part.Part;
-import net.dpml.part.part.PartReference;
+import net.dpml.part.control.Consumer;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.ClassLoadingContext;
+import net.dpml.part.control.ComponentException;
+import net.dpml.part.control.ComponentRuntimeException;
+import net.dpml.part.control.AvailabilityEvent;
+import net.dpml.part.control.AvailabilityListener;
+import net.dpml.part.control.TypeClassNotFoundException;
+import net.dpml.part.control.ServiceClassNotFoundException;
+import net.dpml.part.control.ComponentNotFoundException;
+import net.dpml.part.Part;
+import net.dpml.part.PartReference;

/**
*
@@ -114,7 +114,7 @@
public ComponentHandler(
Logger logger, CompositionController controller, ClassLoader
classloader,
URI uri, ComponentProfile profile, Component parent )
- throws ComponentException, HandlerNotFoundException,
DelegationException
+ throws ComponentException, PartHandlerNotFoundException,
DelegationException
{
super();


Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/CompositionHandler.java
Wed Jul 6 20:00:04 2005
@@ -31,19 +31,19 @@
import net.dpml.composition.control.CompositionController;
import net.dpml.composition.data.ComponentProfile;

-import net.dpml.part.control.DelegationException;
-import net.dpml.part.control.HandlerNotFoundException;
-import net.dpml.part.control.PartNotFoundException;
-
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.ComponentException;
-import net.dpml.part.manager.ComponentNotFoundException;
-import net.dpml.part.manager.Container;
+import net.dpml.part.DelegationException;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.PartNotFoundException;
+
+import net.dpml.part.control.Component;
+import net.dpml.part.control.ComponentException;
+import net.dpml.part.control.ComponentNotFoundException;
+import net.dpml.part.control.Container;

import net.dpml.part.state.NoSuchOperationException;
import net.dpml.part.state.NoSuchTransitionException;
import net.dpml.part.state.State;
-import net.dpml.part.part.Part;
+import net.dpml.part.Part;

import net.dpml.logging.Logger;

@@ -59,7 +59,7 @@
public CompositionHandler(
Logger logger, CompositionController controller, ClassLoader
classloader, URI uri,
ComponentProfile profile, Component parent )
- throws ComponentException, HandlerNotFoundException,
DelegationException
+ throws ComponentException, PartHandlerNotFoundException,
DelegationException
{
super( logger, controller, classloader, uri, profile, parent );
}
@@ -73,7 +73,7 @@
*/
public Component addComponent( URI uri, String key )
throws IOException, ComponentException, PartNotFoundException,
- DelegationException, HandlerNotFoundException
+ DelegationException, PartHandlerNotFoundException
{
CompositionController controller = getController();
Part part = controller.loadPart( uri );

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ContextInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ContextInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ContextInvocationHandler.java
Wed Jul 6 20:00:04 2005
@@ -22,7 +22,7 @@
import java.lang.reflect.Method;
import java.util.Observer;

-import net.dpml.part.manager.AvailabilityListener;
+import net.dpml.part.control.AvailabilityListener;
import net.dpml.part.state.StateListener;

import net.dpml.composition.control.CompositionController;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ContextMap.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ContextMap.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ContextMap.java
Wed Jul 6 20:00:04 2005
@@ -26,16 +26,16 @@
import java.util.ArrayList;

import net.dpml.part.control.Controller;
-import net.dpml.part.control.DelegationException;
-import net.dpml.part.control.HandlerNotFoundException;
-import net.dpml.part.control.DelegationException;
-import net.dpml.part.manager.Container;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.ComponentException;
-import net.dpml.part.manager.ComponentRuntimeException;
-import net.dpml.part.manager.DuplicateKeyException;
-import net.dpml.part.manager.ComponentNotFoundException;
-import net.dpml.part.part.Part;
+import net.dpml.part.DelegationException;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.DelegationException;
+import net.dpml.part.control.Container;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.ComponentException;
+import net.dpml.part.control.ComponentRuntimeException;
+import net.dpml.part.control.DuplicateKeyException;
+import net.dpml.part.control.ComponentNotFoundException;
+import net.dpml.part.Part;

import net.dpml.composition.control.CompositionController;
import net.dpml.composition.data.ReferenceDirective;
@@ -77,7 +77,7 @@
}

public void addEntry( String key, Part part )
- throws ComponentException, HandlerNotFoundException,
DelegationException
+ throws ComponentException, PartHandlerNotFoundException,
DelegationException
{
if( null == key )
{

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/DependencyGraph.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/DependencyGraph.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/DependencyGraph.java
Wed Jul 6 20:00:04 2005
@@ -21,8 +21,8 @@

import java.util.ArrayList;

-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.Consumer;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.Consumer;

/**
* <p>Utility class to aquire an ordered graph of

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/LoggingHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/LoggingHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/LoggingHandler.java
Wed Jul 6 20:00:04 2005
@@ -32,7 +32,7 @@

import net.dpml.parameters.Parameters;

-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;


/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/Manager.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/Manager.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/Manager.java
Wed Jul 6 20:00:04 2005
@@ -20,8 +20,8 @@

import java.net.URI;

-import net.dpml.part.manager.ResourceUnavailableException;
-import net.dpml.part.manager.Component;
+import net.dpml.part.control.ResourceUnavailableException;
+import net.dpml.part.control.Component;
import net.dpml.part.state.State;

/**

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/PartsInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/PartsInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/PartsInvocationHandler.java
Wed Jul 6 20:00:04 2005
@@ -29,8 +29,8 @@
import net.dpml.composition.control.CompositionController;

import net.dpml.part.control.Controller;
-import net.dpml.part.control.DelegationException;
-import net.dpml.part.manager.Component;
+import net.dpml.part.DelegationException;
+import net.dpml.part.control.Component;

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

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/PartsTable.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/PartsTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/PartsTable.java
Wed Jul 6 20:00:04 2005
@@ -22,12 +22,12 @@
import java.util.Map;
import java.util.Hashtable;

-import net.dpml.part.control.DelegationException;
-import net.dpml.part.control.HandlerNotFoundException;
-import net.dpml.part.manager.DuplicateKeyException;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.ComponentException;
-import net.dpml.part.part.Part;
+import net.dpml.part.DelegationException;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.control.DuplicateKeyException;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.ComponentException;
+import net.dpml.part.Part;

import net.dpml.composition.data.ReferenceDirective;
import net.dpml.composition.control.CompositionController;
@@ -55,7 +55,7 @@
}

public Component addComponent( String key, Part part )
- throws ComponentException, DelegationException,
HandlerNotFoundException
+ throws ComponentException, DelegationException,
PartHandlerNotFoundException
{
if( null == key )
{

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueController.java
Wed Jul 6 20:00:04 2005
@@ -24,7 +24,7 @@

import net.dpml.composition.control.CompositionController;

-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;
import net.dpml.part.state.NoSuchOperationException;
import net.dpml.part.state.NoSuchTransitionException;
import net.dpml.part.state.State;

Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/runtime/ValueHandler.java
Wed Jul 6 20:00:04 2005
@@ -30,10 +30,10 @@

import net.dpml.part.control.Controller;
import net.dpml.part.control.ControllerContext;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.ClassLoadingContext;
-import net.dpml.part.manager.ComponentException;
-import net.dpml.part.manager.ComponentRuntimeException;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.ClassLoadingContext;
+import net.dpml.part.control.ComponentException;
+import net.dpml.part.control.ComponentRuntimeException;
import net.dpml.part.state.State;

/**

Modified: development/main/metro/module.xml
==============================================================================
--- development/main/metro/module.xml (original)
+++ development/main/metro/module.xml Wed Jul 6 20:00:04 2005
@@ -158,9 +158,9 @@
<group title="Part SPI">
<package name="net.dpml.part.builder"/>
<package name="net.dpml.part.control"/>
- <package name="net.dpml.part.manager"/>
+ <package name="net.dpml.part.control"/>
<package name="net.dpml.part.model"/>
- <package name="net.dpml.part.part"/>
+ <package name="net.dpml.part"/>
<package name="net.dpml.part.state"/>
</group>
<group title="Metro">

Copied:
development/main/metro/part/src/main/net/dpml/part/DelegationException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/control/DelegationException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/control/DelegationException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/DelegationException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

import java.net.URI;


Copied: development/main/metro/part/src/main/net/dpml/part/Part.java (from
r2980, development/main/metro/part/src/main/net/dpml/part/part/Part.java)
==============================================================================
--- development/main/metro/part/src/main/net/dpml/part/part/Part.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/Part.java Wed
Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied: development/main/metro/part/src/main/net/dpml/part/PartHandler.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/control/PartHandler.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/control/PartHandler.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/PartHandler.java Wed
Jul 6 20:00:04 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/

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

import java.rmi.Remote;
import java.rmi.RemoteException;
import java.io.IOException;
import java.net.URI;

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

/**
* Definition of a part handler.
@@ -44,7 +44,7 @@
* @return the part handler
*/
Controller getPrimaryController( URI uri )
- throws HandlerNotFoundException, IOException, DelegationException,
RemoteException;
+ throws PartHandlerNotFoundException, IOException, DelegationException,
RemoteException;

/**
* Load a part from serialized form. The uri is assumed to be a uri that

Copied:
development/main/metro/part/src/main/net/dpml/part/PartHandlerNotFoundException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/control/HandlerNotFoundException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/control/HandlerNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/PartHandlerNotFoundException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

import java.net.URI;

@@ -26,16 +26,16 @@
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
* @version $Revision: 1.2 $ $Date: 2004/03/17 10:30:09 $
*/
-public class HandlerNotFoundException extends Exception
+public class PartHandlerNotFoundException extends Exception
{
private URI m_uri;

- public HandlerNotFoundException( URI uri )
+ public PartHandlerNotFoundException( URI uri )
{
this( uri, null );
}

- public HandlerNotFoundException( URI uri, Throwable cause )
+ public PartHandlerNotFoundException( URI uri, Throwable cause )
{
super( uri.toString(), cause );
m_uri = uri;

Copied:
development/main/metro/part/src/main/net/dpml/part/PartHandlerRuntimeException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/control/PartHandlerRuntimeException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/control/PartHandlerRuntimeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/PartHandlerRuntimeException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied: development/main/metro/part/src/main/net/dpml/part/PartHolder.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/part/PartHolder.java)
==============================================================================
--- development/main/metro/part/src/main/net/dpml/part/part/PartHolder.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/PartHolder.java Wed
Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied:
development/main/metro/part/src/main/net/dpml/part/PartNotFoundException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/control/PartNotFoundException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/control/PartNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/PartNotFoundException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

import java.net.URI;


Copied: development/main/metro/part/src/main/net/dpml/part/PartReference.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/part/PartReference.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/part/PartReference.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/PartReference.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

import java.io.Serializable;


Modified:
development/main/metro/part/src/main/net/dpml/part/builder/PartBuilder.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/builder/PartBuilder.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/builder/PartBuilder.java
Wed Jul 6 20:00:04 2005
@@ -22,7 +22,7 @@
import java.net.URI;
import java.beans.IntrospectionException;

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

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

Copied:
development/main/metro/part/src/main/net/dpml/part/control/AvailabilityEvent.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/AvailabilityEvent.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/AvailabilityEvent.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/AvailabilityEvent.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

import java.util.EventObject;


Copied:
development/main/metro/part/src/main/net/dpml/part/control/AvailabilityListener.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/AvailabilityListener.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/AvailabilityListener.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/AvailabilityListener.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

import java.util.EventListener;


Copied:
development/main/metro/part/src/main/net/dpml/part/control/ClassLoadingContext.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ClassLoadingContext.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/ClassLoadingContext.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ClassLoadingContext.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

/**
* Interfact implemented by local components.

Copied:
development/main/metro/part/src/main/net/dpml/part/control/Component.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/Component.java)
==============================================================================
--- development/main/metro/part/src/main/net/dpml/part/manager/Component.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/control/Component.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied:
development/main/metro/part/src/main/net/dpml/part/control/ComponentException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ComponentException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/ComponentException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ComponentException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

/**
* Exception raised by a component.

Copied:
development/main/metro/part/src/main/net/dpml/part/control/ComponentNotFoundException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ComponentNotFoundException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/ComponentNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ComponentNotFoundException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied:
development/main/metro/part/src/main/net/dpml/part/control/ComponentRuntimeException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ComponentRuntimeException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/ComponentRuntimeException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ComponentRuntimeException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

/**
* Exception raised by a component.

Copied:
development/main/metro/part/src/main/net/dpml/part/control/Consumer.java
(from r2983,
development/main/metro/part/src/main/net/dpml/part/manager/Consumer.java)
==============================================================================
--- development/main/metro/part/src/main/net/dpml/part/manager/Consumer.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/control/Consumer.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

/**
* The Consumer interface exposes an operation through which provider

Copied:
development/main/metro/part/src/main/net/dpml/part/control/Container.java
(from r2983,
development/main/metro/part/src/main/net/dpml/part/manager/Container.java)
==============================================================================
--- development/main/metro/part/src/main/net/dpml/part/manager/Container.java
(original)
+++ development/main/metro/part/src/main/net/dpml/part/control/Container.java
Wed Jul 6 20:00:04 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/

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

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

-import net.dpml.part.control.DelegationException;
-import net.dpml.part.control.HandlerNotFoundException;
-import net.dpml.part.control.PartNotFoundException;
+import net.dpml.part.DelegationException;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.PartNotFoundException;

/**
* The Container interface defines the a contract for a component that
@@ -43,7 +43,7 @@
*/
Component addComponent( URI part, String key )
throws IOException, ComponentException, PartNotFoundException,
- HandlerNotFoundException, DelegationException;
+ PartHandlerNotFoundException, DelegationException;

/**
* Retrieve a component using a supplied key.

Copied:
development/main/metro/part/src/main/net/dpml/part/control/ContainmentException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ContainmentException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/ContainmentException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ContainmentException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

/**
* Exception raised by a container.

Modified:
development/main/metro/part/src/main/net/dpml/part/control/Controller.java
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/control/Controller.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/Controller.java
Wed Jul 6 20:00:04 2005
@@ -23,10 +23,10 @@
import java.net.URI;
import java.rmi.RemoteException;

-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.Container;
-import net.dpml.part.manager.ComponentException;
-import net.dpml.part.part.Part;
+import net.dpml.part.Part;
+import net.dpml.part.PartNotFoundException;
+import net.dpml.part.PartHandlerNotFoundException;
+import net.dpml.part.DelegationException;

/**
* The Controller interface defines the a contract for an object that
provides general
@@ -60,11 +60,11 @@
* @exception ComponentException is an error occurs during component
establishment
* @exception IOException if an error occurs while attempting to resolve
the component part uri
* @exception PartNotFoundException if the uri could not be resolved to a
physical resource
- * @exception HandlerNotFoundException if the part references a handler
but the handler could not be found
+ * @exception PartHandlerNotFoundException if the part references a
handler but the handler could not be found
* @exception DelegationException if an error occurs following handover
of control to a foreign controller
*/
Component newComponent( URI uri ) throws
- ComponentException, IOException, PartNotFoundException,
HandlerNotFoundException,
+ ComponentException, IOException, PartNotFoundException,
PartHandlerNotFoundException,
DelegationException;

/**
@@ -76,11 +76,11 @@
* @param name the name to assign to the new component
* @return a new component
* @exception ComponentException is an error occurs during component
establishment
- * @exception HandlerNotFoundException if the part references a handler
but the handler could not be found
+ * @exception PartHandlerNotFoundException if the part references a
handler but the handler could not be found
* @exception DelegationException if an error occurs following handover
of control to a foreign controller
* @exception UnsupportedPartTypeException if the component type is
recognized but not supported
*/
Component newComponent( Component parent, Part part, String name )
- throws ComponentException, HandlerNotFoundException,
DelegationException;
+ throws ComponentException, PartHandlerNotFoundException,
DelegationException;

}

Copied:
development/main/metro/part/src/main/net/dpml/part/control/DuplicateKeyException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/DuplicateKeyException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/DuplicateKeyException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/DuplicateKeyException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

/**
* Exception thrown when a operation attempts to overrite an existing key.

Copied:
development/main/metro/part/src/main/net/dpml/part/control/PartClassNotFoundException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/PartClassNotFoundException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/PartClassNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/PartClassNotFoundException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied:
development/main/metro/part/src/main/net/dpml/part/control/ResourceUnavailableException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ResourceUnavailableException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/ResourceUnavailableException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ResourceUnavailableException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied:
development/main/metro/part/src/main/net/dpml/part/control/ServiceClassNotFoundException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/ServiceClassNotFoundException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/ServiceClassNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/ServiceClassNotFoundException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Copied:
development/main/metro/part/src/main/net/dpml/part/control/TypeClassNotFoundException.java
(from r2980,
development/main/metro/part/src/main/net/dpml/part/manager/TypeClassNotFoundException.java)
==============================================================================
---
development/main/metro/part/src/main/net/dpml/part/manager/TypeClassNotFoundException.java
(original)
+++
development/main/metro/part/src/main/net/dpml/part/control/TypeClassNotFoundException.java
Wed Jul 6 20:00:04 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/

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

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

Modified:
development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ConfigurableContainer.java
==============================================================================
---
development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ConfigurableContainer.java
(original)
+++
development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ConfigurableContainer.java
Wed Jul 6 20:00:04 2005
@@ -27,7 +27,7 @@
import net.dpml.activity.Executable;

import net.dpml.part.control.Controller;
-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;

/**
* Demonstration of a component that uses a supplied configuration to

Modified:
development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ManagingContainer.java
==============================================================================
---
development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ManagingContainer.java
(original)
+++
development/main/test/components/plus/src/main/net/dpml/test/acme/plus/ManagingContainer.java
Wed Jul 6 20:00:04 2005
@@ -21,7 +21,7 @@
import java.net.URI;
import java.util.logging.Logger;

-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;
import net.dpml.part.state.State;

import net.dpml.activity.Startable;

Modified:
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ConfigurationTestCase.java
==============================================================================
---
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ConfigurationTestCase.java
(original)
+++
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ConfigurationTestCase.java
Wed Jul 6 20:00:04 2005
@@ -26,7 +26,7 @@
import junit.framework.TestCase;

import net.dpml.part.control.Controller;
-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;

import net.dpml.metro.central.MetroHelper;


Modified:
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ManagementTestCase.java
==============================================================================
---
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ManagementTestCase.java
(original)
+++
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/ManagementTestCase.java
Wed Jul 6 20:00:04 2005
@@ -28,7 +28,7 @@

import net.dpml.metro.central.MetroHelper;

-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;
import net.dpml.part.state.State;

/**

Modified:
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java
==============================================================================
---
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java
(original)
+++
development/main/test/unit/plus/src/test/net/dpml/test/acme/plus/URLTestCase.java
Wed Jul 6 20:00:04 2005
@@ -25,8 +25,8 @@

import junit.framework.TestCase;

-import net.dpml.part.part.Part;
-import net.dpml.part.manager.Component;
+import net.dpml.part.Part;
+import net.dpml.part.control.Component;

import net.dpml.test.acme.Dimension;


Modified:
development/main/test/unit/simple/src/test/net/dpml/test/acme/CompositeTestCase.java
==============================================================================
---
development/main/test/unit/simple/src/test/net/dpml/test/acme/CompositeTestCase.java
(original)
+++
development/main/test/unit/simple/src/test/net/dpml/test/acme/CompositeTestCase.java
Wed Jul 6 20:00:04 2005
@@ -26,7 +26,7 @@
import junit.framework.TestCase;

import net.dpml.part.control.Controller;
-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;

import net.dpml.metro.central.MetroHelper;


Modified:
development/main/test/unit/simple/src/test/net/dpml/test/acme/ContainerTestCase.java
==============================================================================
---
development/main/test/unit/simple/src/test/net/dpml/test/acme/ContainerTestCase.java
(original)
+++
development/main/test/unit/simple/src/test/net/dpml/test/acme/ContainerTestCase.java
Wed Jul 6 20:00:04 2005
@@ -26,8 +26,8 @@
import junit.framework.TestCase;

import net.dpml.part.control.Controller;
-import net.dpml.part.manager.Component;
-import net.dpml.part.manager.Container;
+import net.dpml.part.control.Component;
+import net.dpml.part.control.Container;

import net.dpml.metro.central.MetroHelper;


Modified:
development/main/test/unit/simple/src/test/net/dpml/test/acme/ExampleTestCase.java
==============================================================================
---
development/main/test/unit/simple/src/test/net/dpml/test/acme/ExampleTestCase.java
(original)
+++
development/main/test/unit/simple/src/test/net/dpml/test/acme/ExampleTestCase.java
Wed Jul 6 20:00:04 2005
@@ -25,7 +25,7 @@

import junit.framework.TestCase;

-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;
import net.dpml.part.control.Controller;

import net.dpml.metro.central.MetroHelper;

Modified:
development/main/test/unit/simple/src/test/net/dpml/test/acme/SimpleTestCase.java
==============================================================================
---
development/main/test/unit/simple/src/test/net/dpml/test/acme/SimpleTestCase.java
(original)
+++
development/main/test/unit/simple/src/test/net/dpml/test/acme/SimpleTestCase.java
Wed Jul 6 20:00:04 2005
@@ -26,7 +26,7 @@
import junit.framework.TestCase;

import net.dpml.part.control.Controller;
-import net.dpml.part.manager.Component;
+import net.dpml.part.control.Component;

import net.dpml.metro.central.MetroHelper;


Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/CacheModel.java
Wed Jul 6 20:00:04 2005
@@ -49,7 +49,7 @@
/**
* Update the value the local cache directory path.
*
- * @param file the cache directory
+ * @param path the cache directory path
*/
void setCacheDirectoryPath( final String path ) throws RemoteException;


Modified:
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
==============================================================================
---
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
(original)
+++
development/main/transit/core/handler/src/main/net/dpml/transit/model/DefaultCacheModel.java
Wed Jul 6 20:00:04 2005
@@ -144,9 +144,9 @@
}

/**
- * Update the value the local cache directory.
+ * Update the value the local cache directory path.
*
- * @param file the cache directory
+ * @param path the cache directory path
*/
public void setCacheDirectoryPath( final String path ) throws
RemoteException
{
@@ -154,11 +154,12 @@
}

/**
- * Update the value the local cache directory.
+ * Update the value the local cache directory path.
*
- * @param file the cache directory
+ * @param path the cache directory path
+ * @param notify if true then notify listeners
*/
- public void setCacheDirectoryPath( final String path, boolean notify )
throws RemoteException
+ protected void setCacheDirectoryPath( final String path, boolean notify
) throws RemoteException
{
synchronized( m_lock )
{



  • svn commit: r2991 - in development/main: metro metro/central/src/main/net/dpml/metro/central 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/info metro/composition/control/src/main/net/dpml/composition/runtime 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/manager metro/part/src/main/net/dpml/part/part test/components/plus/src/main/net/dpml/test/acme/plus test/unit/plus/src/test/net/dpml/test/acme/plus test/unit/simple/src/test/net/dpml/test/acme transit/core/handler/src/main/net/dpml/transit/model, mcconnell, 07/06/2005

Archive powered by MHonArc 2.6.24.

Top of Page