notify-dpml AT lists.ibiblio.org
Subject: DPML Notify
List archive
svn commit: r2413 - in development/main/metro/composition/control/src/main/net/dpml/composition: control event management model models
- From: mcconnell AT dpml.net
- To: notify-dpml AT lists.ibiblio.org
- Subject: svn commit: r2413 - in development/main/metro/composition/control/src/main/net/dpml/composition: control event management model models
- Date: Tue, 26 Apr 2005 07:36:53 -0400
Author: mcconnell AT dpml.net
Date: Tue Apr 26 07:36:49 2005
New Revision: 2413
Added:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/management/DefaultManager.java
development/main/metro/composition/control/src/main/net/dpml/composition/control/ValueController.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/management/ValueManager.java
development/main/metro/composition/control/src/main/net/dpml/composition/event/
- copied from r2396,
development/main/metro/composition/control/src/main/net/dpml/composition/management/
development/main/metro/composition/control/src/main/net/dpml/composition/event/AvailabilityEvent.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/management/AvailabilityEvent.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/
- copied from r2396,
development/main/metro/composition/control/src/main/net/dpml/composition/models/
development/main/metro/composition/control/src/main/net/dpml/composition/model/AbstractModel.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/AbstractModel.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/CompositionModel.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/ContextTable.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/DuplicateKeyException.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/DuplicateKeyException.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/InvalidModelException.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/InvalidModelException.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/PartsTable.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/ReferenceModel.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/ReferenceModel.java
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueModel.java
- copied, changed from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/ValueModel.java
Removed:
development/main/metro/composition/control/src/main/net/dpml/composition/event/DefaultManager.java
development/main/metro/composition/control/src/main/net/dpml/composition/event/ValueManager.java
development/main/metro/composition/control/src/main/net/dpml/composition/management/
development/main/metro/composition/control/src/main/net/dpml/composition/models/
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java
development/main/metro/composition/control/src/main/net/dpml/composition/control/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/Holder.java
development/main/metro/composition/control/src/main/net/dpml/composition/control/InstanceTable.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
Log:
updating internal FT package names
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ApplianceInvocationHandler.java
Tue Apr 26 07:36:49 2005
@@ -26,8 +26,6 @@
import net.dpml.parts.control.Disposable;
-import net.dpml.composition.management.DefaultManager;
-
/**
* The ApplianceInvocationHandler class represents an instance of a
component.
* It is responsible for the incarnation, runtime management, execution, and
@@ -43,7 +41,7 @@
// state
//-------------------------------------------------------------------
- private final DefaultManager m_manager;
+ private final ComponentController m_manager;
private boolean m_disposed = false;
//-------------------------------------------------------------------
@@ -55,7 +53,7 @@
*
* @param holder the instance holder
*/
- ApplianceInvocationHandler( DefaultManager manager )
+ ApplianceInvocationHandler( ComponentController manager )
throws Exception
{
assertNotNull( manager, "manager" );
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/management/DefaultManager.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/management/DefaultManager.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ComponentController.java
Tue Apr 26 07:36:49 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.management;
+package net.dpml.composition.control;
import java.util.Map;
import java.util.Hashtable;
@@ -38,12 +38,13 @@
import javax.swing.event.ChangeEvent;
import net.dpml.composition.state.*;
-import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.control.Holder;
+import net.dpml.composition.model.CompositionModel;
+import net.dpml.composition.event.AvailabilityEvent;
import net.dpml.activity.Executable;
import net.dpml.activity.Startable;
+import net.dpml.parts.control.Monitor;
import net.dpml.parts.state.State;
import net.dpml.parts.state.Transition;
import net.dpml.parts.state.Manager;
@@ -53,19 +54,16 @@
import net.dpml.parts.state.NoSuchOperationException;
import net.dpml.parts.state.ValidationException;
import net.dpml.parts.state.Operation;
-
-import net.dpml.parts.control.Monitor;
-import net.dpml.parts.control.LifecycleException;
import net.dpml.parts.state.StateEvent;
import net.dpml.parts.state.StateListener;
+
/**
- * The State interface is an interface representing an immutable state of
- * a component instance.
+ * The ComponentController class is a controller of a component instance.
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
*/
-public class DefaultManager extends Holder implements Manager
+public class ComponentController extends Holder implements Manager
{
private final Vector m_listeners = new Vector();
private final Map m_handlers = new Hashtable();
@@ -76,7 +74,7 @@
private DefaultState m_state;
private Object m_instance;
- public DefaultManager(
+ public ComponentController(
Monitor monitor, CompositionModel model, Object key, Object owner )
throws Exception
{
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionController.java
Tue Apr 26 07:36:49 2005
@@ -29,6 +29,13 @@
import java.util.Map.Entry;
import java.util.logging.Logger;
+import net.dpml.composition.data.ClassLoaderDirective;
+import net.dpml.composition.data.ClasspathDirective;
+import net.dpml.composition.data.ComponentProfile;
+import net.dpml.composition.data.ValueDirective;
+import net.dpml.composition.model.CompositionModel;
+import net.dpml.composition.model.ValueModel;
+
import net.dpml.parts.control.ControlRuntimeException;
import net.dpml.parts.control.Controller;
import net.dpml.parts.control.DelegationException;
@@ -43,17 +50,6 @@
import net.dpml.parts.state.Manager;
import net.dpml.parts.part.Part;
-import net.dpml.composition.data.ClassLoaderDirective;
-import net.dpml.composition.data.ClasspathDirective;
-import net.dpml.composition.data.ComponentProfile;
-import net.dpml.composition.data.ValueDirective;
-
-import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.models.ValueModel;
-
-import net.dpml.composition.management.DefaultManager;
-import net.dpml.composition.management.ValueManager;
-
import net.dpml.system.SystemContext;
/**
@@ -313,13 +309,13 @@
if( model instanceof CompositionModel )
{
CompositionModel componentModel = (CompositionModel) model;
- return (Manager) getDefaultManager( componentModel , key,
controller );
+ return (Manager) getComponentController( componentModel , key,
controller );
}
else if(( model instanceof ValueModel ) )
{
if( null == key )
{
- return new ValueManager( (ValueModel) model );
+ return new ValueController( (ValueModel) model );
}
else
{
@@ -385,7 +381,7 @@
if( model instanceof CompositionModel )
{
CompositionModel componentModel = (CompositionModel) model;
- DefaultManager manager = getDefaultManager( componentModel ,
key, null );
+ ComponentController manager = getComponentController(
componentModel , key, null );
if( policy )
{
InvocationHandler handler = new ApplianceInvocationHandler(
manager );
@@ -406,16 +402,16 @@
}
}
- private DefaultManager getDefaultManager( CompositionModel model, Object
key, Object owner )
+ private ComponentController getComponentController( CompositionModel
model, Object key, Object owner )
throws Exception
{
if( null == key )
{
- return (DefaultManager) m_lifestyleHandler.aquire( model, owner );
+ return (ComponentController) m_lifestyleHandler.aquire( model,
owner );
}
else
{
- return (DefaultManager) m_lifestyleHandler.aquire( model, key,
owner );
+ return (ComponentController) m_lifestyleHandler.aquire( model,
key, owner );
}
}
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/CompositionManager.java
Tue Apr 26 07:36:49 2005
@@ -32,6 +32,7 @@
import java.util.logging.LogManager;
import net.dpml.activity.Startable;
+
import net.dpml.parts.control.ControlRuntimeException;
import net.dpml.parts.control.Controller;
import net.dpml.parts.control.DelegationException;
@@ -40,6 +41,7 @@
import net.dpml.parts.model.Model;
import net.dpml.parts.model.ModelException;
import net.dpml.parts.part.Part;
+
import net.dpml.system.SystemContext;
import org.apache.commons.cli.CommandLine;
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
Tue Apr 26 07:36:49 2005
@@ -22,9 +22,9 @@
import java.io.IOException;
import java.io.ByteArrayInputStream;
import java.io.ObjectInputStream;
-import java.util.WeakHashMap ;
import java.net.URI;
import java.net.URL;
+import java.util.WeakHashMap ;
import net.dpml.parts.part.Part;
import net.dpml.parts.part.PartHolder;
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
Tue Apr 26 07:36:49 2005
@@ -20,7 +20,6 @@
import net.dpml.parts.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
Tue Apr 26 07:36:49 2005
@@ -18,15 +18,15 @@
package net.dpml.composition.control;
-import java.util.Observer;
import java.lang.reflect.InvocationHandler;
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.state.StateListener;
-import net.dpml.composition.models.CompositionModel;
+import net.dpml.composition.model.CompositionModel;
import net.dpml.system.SystemContext;
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextManagerInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextManagerInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ContextManagerInvocationHandler.java
Tue Apr 26 07:36:49 2005
@@ -22,6 +22,7 @@
import java.util.Map;
import net.dpml.parts.control.LifecycleException;
+
import net.dpml.parts.model.ModelException;
import net.dpml.system.SystemContext;
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
Tue Apr 26 07:36:49 2005
@@ -19,8 +19,8 @@
package net.dpml.composition.control;
import net.dpml.logging.Logger;
-import net.dpml.parts.control.Monitor;
+import net.dpml.parts.control.Monitor;
/**
* Monitor supplied to a startable controller.
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/Holder.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/Holder.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/Holder.java
Tue Apr 26 07:36:49 2005
@@ -31,8 +31,8 @@
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
-import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.models.ContextTable;
+import net.dpml.composition.model.CompositionModel;
+import net.dpml.composition.model.ContextTable;
import net.dpml.lang.ResourceUnavailableException;
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/InstanceTable.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/InstanceTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/InstanceTable.java
Tue Apr 26 07:36:49 2005
@@ -22,7 +22,7 @@
import java.util.Map;
import java.util.WeakHashMap;
-import net.dpml.composition.models.CompositionModel;
+import net.dpml.composition.model.CompositionModel;
/**
* The parts model is a model of the set of parts maintained by a parent
model.
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/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
Tue Apr 26 07:36:49 2005
@@ -31,23 +31,23 @@
import net.dpml.activity.Startable;
import net.dpml.activity.Executable;
-import net.dpml.parts.control.LifecycleException;
-import net.dpml.parts.control.LifecycleRuntimeException;
-import net.dpml.parts.control.Monitor;
-import net.dpml.parts.state.Manager;
+import net.dpml.composition.info.Type;
+import net.dpml.composition.model.CompositionModel;
-import net.dpml.composition.models.CompositionModel;
+import net.dpml.configuration.Configuration;
-import net.dpml.composition.info.Type;
+import net.dpml.lang.DefaultInvocationHandler;
import net.dpml.logging.Logger;
-import net.dpml.configuration.Configuration;
import net.dpml.parameters.Parameters;
-import net.dpml.system.SystemContext;
+import net.dpml.parts.control.LifecycleException;
+import net.dpml.parts.control.LifecycleRuntimeException;
+import net.dpml.parts.control.Monitor;
+import net.dpml.parts.state.Manager;
-import net.dpml.lang.DefaultInvocationHandler;
+import net.dpml.system.SystemContext;
/**
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
Tue Apr 26 07:36:49 2005
@@ -20,12 +20,11 @@
import java.lang.reflect.InvocationTargetException;
+import net.dpml.composition.model.CompositionModel;
+
import net.dpml.parts.control.LifecycleException;
import net.dpml.parts.control.Monitor;
-import net.dpml.composition.models.CompositionModel;
-import net.dpml.composition.management.DefaultManager;
-
/**
* A lifestyle handler provides support for the aquisition and release
* of component instances. An implementation is responsible for the
@@ -67,7 +66,7 @@
{
synchronized( model )
{
- Holder holder = new DefaultManager( m_monitor, model, null,
owner );
+ Holder holder = new ComponentController( m_monitor, model,
null, owner );
Object key = holder.getKey();
if( getMonitor().isDebugEnabled() )
{
@@ -135,7 +134,7 @@
+ "].";
getMonitor().debug( message );
}
- holder = new DefaultManager( m_monitor, model, key, owner );
+ holder = new ComponentController( m_monitor, model, key, owner );
if( getMonitor().isDebugEnabled() )
{
final String message =
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
Tue Apr 26 07:36:49 2005
@@ -30,7 +30,6 @@
import net.dpml.activity.Disposable;
import net.dpml.composition.data.ValueDirective;
-
import net.dpml.composition.state.DefaultState;
import net.dpml.lang.DelegationRuntimeException;
Modified:
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/PartsInvocationHandler.java
Tue Apr 26 07:36:49 2005
@@ -29,7 +29,7 @@
import net.dpml.parts.control.DelegationException;
import net.dpml.parts.model.Model;
-import net.dpml.composition.models.CompositionModel;
+import net.dpml.composition.model.CompositionModel;
import net.dpml.composition.info.PartDescriptor;
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/control/ValueController.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/management/ValueManager.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/management/ValueManager.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/control/ValueController.java
Tue Apr 26 07:36:49 2005
@@ -16,30 +16,30 @@
* limitations under the License.
*/
-package net.dpml.composition.management;
+package net.dpml.composition.control;
import java.net.URI;
import java.util.Map.Entry;
+import net.dpml.composition.model.ValueModel;
+
import net.dpml.parts.state.Manager;
import net.dpml.parts.state.NoSuchOperationException;
import net.dpml.parts.state.NoSuchTransitionException;
import net.dpml.parts.state.State;
-import net.dpml.composition.models.ValueModel;
-
/**
- * The Manager interface is an interface representing a component controller.
+ * The ValueController class manages value instances.
*
* @author <a href="mailto:dev-dpml AT lists.ibiblio.org";>The Digital Product
Meta Library</a>
*/
-public class ValueManager implements Manager
+public class ValueController implements Manager
{
private final ValueModel m_model;
private boolean m_initialized = false;
- public ValueManager( ValueModel model )
+ public ValueController( ValueModel model )
{
m_model = model;
}
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/event/AvailabilityEvent.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/management/AvailabilityEvent.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/management/AvailabilityEvent.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/event/AvailabilityEvent.java
Tue Apr 26 07:36:49 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.management;
+package net.dpml.composition.event;
import java.util.EventObject;
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/AbstractModel.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/AbstractModel.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/AbstractModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/AbstractModel.java
Tue Apr 26 07:36:49 2005
@@ -16,14 +16,14 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import java.net.URI;
-import net.dpml.parts.control.Controller;
-import net.dpml.parts.model.Model;
import net.dpml.composition.control.CompositionController;
+import net.dpml.parts.control.Controller;
+import net.dpml.parts.model.Model;
import net.dpml.parts.state.Manager;
/**
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/CompositionModel.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/CompositionModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/CompositionModel.java
Tue Apr 26 07:36:49 2005
@@ -16,37 +16,39 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import java.io.Serializable;
import java.net.URI;
import java.util.LinkedList;
import java.util.List;
-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.composition.control.CompositionController;
+
import net.dpml.composition.data.ComponentProfile;
import net.dpml.composition.data.ContextDirective;
-import net.dpml.configuration.Configuration;
-import net.dpml.configuration.Configurable;
-import net.dpml.configuration.impl.DefaultConfiguration;
import net.dpml.composition.info.DependencyDescriptor;
import net.dpml.composition.info.EntryDescriptor;
import net.dpml.composition.info.ServiceDescriptor;
import net.dpml.composition.info.Type;
+import net.dpml.configuration.Configuration;
+import net.dpml.configuration.Configurable;
+import net.dpml.configuration.impl.DefaultConfiguration;
+
import net.dpml.parameters.Parameters;
import net.dpml.parameters.Parameterizable;
import net.dpml.parameters.impl.DefaultParameters;
+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;
+
/**
* The implementation of a component model.
*
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/ContextTable.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/ContextTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ContextTable.java
Tue Apr 26 07:36:49 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import java.net.URI;
import java.util.Hashtable;
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/DuplicateKeyException.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/DuplicateKeyException.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/DuplicateKeyException.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/DuplicateKeyException.java
Tue Apr 26 07:36:49 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import net.dpml.parts.model.ModelException;
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/InvalidModelException.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/InvalidModelException.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/InvalidModelException.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/InvalidModelException.java
Tue Apr 26 07:36:49 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import java.net.URI;
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/PartsTable.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/PartsTable.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/PartsTable.java
Tue Apr 26 07:36:49 2005
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import java.util.Map;
import java.util.Hashtable;
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ReferenceModel.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/ReferenceModel.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/ReferenceModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ReferenceModel.java
Tue Apr 26 07:36:49 2005
@@ -16,18 +16,19 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import java.lang.reflect.Constructor;
import java.net.URI;
+import net.dpml.composition.control.CompositionController;
+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.composition.control.CompositionController;
-import net.dpml.composition.data.ValueDirective;
-import net.dpml.composition.data.ValueDirective.Value;
/**
* Default implementation of a the context entry constructor model.
Copied:
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueModel.java
(from r2412,
development/main/metro/composition/control/src/main/net/dpml/composition/models/ValueModel.java)
==============================================================================
---
development/main/metro/composition/control/src/main/net/dpml/composition/models/ValueModel.java
(original)
+++
development/main/metro/composition/control/src/main/net/dpml/composition/model/ValueModel.java
Tue Apr 26 07:36:49 2005
@@ -16,18 +16,19 @@
* limitations under the License.
*/
-package net.dpml.composition.models;
+package net.dpml.composition.model;
import java.lang.reflect.Constructor;
import java.net.URI;
+import net.dpml.composition.control.CompositionController;
+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.composition.control.CompositionController;
-import net.dpml.composition.data.ValueDirective;
-import net.dpml.composition.data.ValueDirective.Value;
/**
* Default implementation of a the context entry constructor model.
- svn commit: r2413 - in development/main/metro/composition/control/src/main/net/dpml/composition: control event management model models, mcconnell, 04/25/2005
Archive powered by MHonArc 2.6.24.