You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/01/04 22:29:00 UTC
cvs commit: avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test AssemblyTestCase.java TargetsTestCase.java
mcconnell 2004/01/04 13:29:00
Modified: merlin/activation/api/src/java/org/apache/avalon/activation/appliance
Tag: Ver_3_4 Appliance.java Block.java
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: Ver_3_4 AbstractAppliance.java
AbstractBlock.java
merlin/activation/spi/src/java/org/apache/avalon/activation/appliance
Tag: Ver_3_4 ApplianceFactory.java
merlin/composition/api/src/java/org/apache/avalon/composition/event
Tag: Ver_3_4 CompositionEvent.java ModelEvent.java
merlin/composition/api/src/java/org/apache/avalon/composition/model
Tag: Ver_3_4 ComponentModel.java
ContainmentModel.java DependencyGraph.java
Dependent.java ModelRepository.java
ModelSelector.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 DefaultComponentModel.java
DefaultContainmentModel.java
DefaultContextModel.java
DefaultDependencyModel.java DefaultDependent.java
DefaultModelRepository.java
DefaultModelSelector.java DefaultStageModel.java
merlin/composition/impl/src/test/org/apache/avalon/composition/model/test
Tag: Ver_3_4 AssemblyTestCase.java
TargetsTestCase.java
Added: merlin/composition/api/src/java/org/apache/avalon/composition/model
Tag: Ver_3_4 DeploymentContext.java
DeploymentModel.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 DefaultDeploymentContext.java
DefaultDeploymentModel.java
Removed: merlin/composition/api/src/java/org/apache/avalon/composition/model
Tag: Ver_3_4 Model.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 DefaultModel.java
Log:
Rename Model to DeploymentModel and DefaultModel to DefaultDeploymentModel.
Revision Changes Path
No revision
No revision
1.2.2.1 +3 -3 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java
Index: Appliance.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Appliance.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- Appliance.java 18 Oct 2003 00:34:19 -0000 1.2
+++ Appliance.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -50,7 +50,7 @@
package org.apache.avalon.activation.appliance;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
/**
* An Appliance is the basic tool merlin wraps around a component to
@@ -82,7 +82,7 @@
* Return the model backing the appliance.
* @return the model that the appliance is managing
*/
- Model getModel();
+ DeploymentModel getModel();
/**
* Test if this appliance is enabled. An appliance is enabled unless
1.3.2.2 +1 -2 avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Block.java
Index: Block.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/src/java/org/apache/avalon/activation/appliance/Block.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -r1.3.2.1 -r1.3.2.2
--- Block.java 3 Jan 2004 15:38:49 -0000 1.3.2.1
+++ Block.java 4 Jan 2004 21:28:59 -0000 1.3.2.2
@@ -52,7 +52,6 @@
import java.net.URL;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.ContainmentModel;
/**
No revision
No revision
1.2.2.1 +9 -6 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java
Index: AbstractAppliance.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractAppliance.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- AbstractAppliance.java 18 Oct 2003 00:34:19 -0000 1.2
+++ AbstractAppliance.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -51,7 +51,7 @@
package org.apache.avalon.activation.appliance.impl;
import org.apache.avalon.activation.appliance.Appliance;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
@@ -84,7 +84,7 @@
// immutable state
//-------------------------------------------------------------------
- private Model m_model;
+ private DeploymentModel m_model;
private boolean m_enabled = true;
@@ -92,7 +92,7 @@
// constructor
//-------------------------------------------------------------------
- public AbstractAppliance( Logger logger, Model model )
+ public AbstractAppliance( Logger logger, DeploymentModel model )
{
enableLogging( logger );
m_model = model;
@@ -106,9 +106,12 @@
* Return the model backing the appliance.
* @return the type that the appliance is managing
*/
- public Model getModel()
+ public DeploymentModel getModel()
{
- if( null == m_model ) throw new NullPointerException( "model" );
+ if( null == m_model )
+ {
+ throw new NullPointerException( "model" );
+ }
return m_model;
}
1.10.2.2 +7 -7 avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java
Index: AbstractBlock.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/AbstractBlock.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- AbstractBlock.java 4 Jan 2004 17:23:16 -0000 1.10.2.1
+++ AbstractBlock.java 4 Jan 2004 21:28:59 -0000 1.10.2.2
@@ -74,7 +74,7 @@
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.logger.Logger;
@@ -158,7 +158,7 @@
synchronized( model )
{
model.addCompositionListener( this );
- Model[] models = model.getModels();
+ DeploymentModel[] models = model.getModels();
for( int i=0; i<models.length; i++ )
{
Appliance appliance = createAppliance( models[i] );
@@ -218,7 +218,7 @@
public void modelRemoved( CompositionEvent event )
{
getLogger().debug( "event/removal: " + event );
- final Model model = event.getChild();
+ final DeploymentModel model = event.getChild();
final String name = model.getName();
final Appliance appliance = getLocalAppliance( name );
m_context.getDependencyGraph().remove( appliance );
@@ -282,7 +282,7 @@
// from the model and add the appliance to the repository
//
- Model model =
+ DeploymentModel model =
m_context.getContainmentModel().getModel( dependency );
if( model != null )
{
@@ -368,7 +368,7 @@
// try to establish the model locally
//
- Model model = m_context.getContainmentModel().getModel( stage );
+ DeploymentModel model = m_context.getContainmentModel().getModel( stage );
if( model != null )
{
appliance = createAppliance( model );
@@ -906,7 +906,7 @@
* @param model the component model
* @return the appliance
*/
- public Appliance createAppliance( Model model ) throws ApplianceException
+ public Appliance createAppliance( DeploymentModel model ) throws ApplianceException
{
Appliance appliance = null;
No revision
No revision
1.2.2.1 +3 -3 avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java
Index: ApplianceFactory.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/src/java/org/apache/avalon/activation/appliance/ApplianceFactory.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ApplianceFactory.java 18 Oct 2003 00:34:20 -0000 1.2
+++ ApplianceFactory.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -50,7 +50,7 @@
package org.apache.avalon.activation.appliance;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
/**
* An appliance factory is a service that provides support for the creation
@@ -71,7 +71,7 @@
* @return the appliance for scenario deployment
* @exception ApplianceException if an appliance creation failure occurs
*/
- Appliance createAppliance( Model model )
+ Appliance createAppliance( DeploymentModel model )
throws ApplianceException;
}
No revision
No revision
1.2.2.1 +5 -5 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/CompositionEvent.java
Index: CompositionEvent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/CompositionEvent.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- CompositionEvent.java 1 Jan 2004 13:06:54 -0000 1.2
+++ CompositionEvent.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -50,7 +50,7 @@
package org.apache.avalon.composition.event;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ContainmentModel;
@@ -66,7 +66,7 @@
/**
* The model added or removed from the containment model.
*/
- private final Model m_child;
+ private final DeploymentModel m_child;
/**
* Create a CompositionEvent event.
@@ -74,7 +74,7 @@
* @param source the comtainment model raising the event
* @param child the model that is the subject of composition
*/
- public CompositionEvent( final ContainmentModel source, Model child )
+ public CompositionEvent( final ContainmentModel source, DeploymentModel child )
{
super( source );
m_child = child;
@@ -86,7 +86,7 @@
*
* @return the source containment model
*/
- public Model getChild()
+ public DeploymentModel getChild()
{
return m_child;
}
1.2.2.1 +5 -5 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/ModelEvent.java
Index: ModelEvent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/event/ModelEvent.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ModelEvent.java 1 Jan 2004 13:06:54 -0000 1.2
+++ ModelEvent.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -52,7 +52,7 @@
import java.util.EventObject;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
/**
@@ -66,14 +66,14 @@
/**
* The source model.
*/
- private final Model m_model;
+ private final DeploymentModel m_model;
/**
* Create a ModelEvent instance.
*
* @param model the model raising the event
*/
- public ModelEvent( final Model model )
+ public ModelEvent( final DeploymentModel model )
{
super( model );
if( null == model )
@@ -86,7 +86,7 @@
*
* @return the source model
*/
- public Model getModel()
+ public DeploymentModel getModel()
{
return m_model;
}
No revision
No revision
1.1.2.2 +2 -2 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/ComponentModel.java
Index: ComponentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/ComponentModel.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ComponentModel.java 4 Jan 2004 17:23:16 -0000 1.1.2.1
+++ ComponentModel.java 4 Jan 2004 21:28:59 -0000 1.1.2.2
@@ -61,7 +61,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public interface ComponentModel extends Model
+public interface ComponentModel extends DeploymentModel
{
/**
1.9.2.5 +10 -10 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java
Index: ContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ContainmentModel.java,v
retrieving revision 1.9.2.4
retrieving revision 1.9.2.5
diff -u -r1.9.2.4 -r1.9.2.5
--- ContainmentModel.java 4 Jan 2004 20:19:27 -0000 1.9.2.4
+++ ContainmentModel.java 4 Jan 2004 21:28:59 -0000 1.9.2.5
@@ -68,17 +68,17 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public interface ContainmentModel extends Model
+public interface ContainmentModel extends DeploymentModel
{
/**
* Get the startup sequence for the model.
*/
- Model[] getStartupGraph();
+ DeploymentModel[] getStartupGraph();
/**
* Get the shutdown sequence for the model.
*/
- Model[] getShutdownGraph();
+ DeploymentModel[] getShutdownGraph();
/**
* Return the logging categories.
@@ -110,20 +110,20 @@
* Return the set of models nested within this model.
* @return the classloader model
*/
- Model[] getModels();
+ DeploymentModel[] getModels();
/**
* Return a model relative to a supplied name.
* @return the named model or null if the name is unknown
*/
- Model getModel( String name );
+ DeploymentModel getModel( String name );
/**
* Return a model relative to a supplied dependency.
* @return a matching model or null if the dependency is unresolvable
* @exception ModelRuntimeException if an error occurs during model establishment
*/
- Model getModel( DependencyDescriptor dependency )
+ DeploymentModel getModel( DependencyDescriptor dependency )
throws ModelRuntimeException;
/**
@@ -132,7 +132,7 @@
* @return model of a an stage handler or null if the stage is unresolvable
* @exception ModelRuntimeException if an error occurs during model establishment
*/
- Model getModel( StageDescriptor stage )
+ DeploymentModel getModel( StageDescriptor stage )
throws ModelRuntimeException;
/**
@@ -143,7 +143,7 @@
* @return the model based on the derived profile
* @exception ModelException if an error occurs during model establishment
*/
- Model addModel( URL url ) throws ModelException;
+ DeploymentModel addModel( URL url ) throws ModelException;
/**
* Addition of a new subsidiary containment model within
@@ -165,7 +165,7 @@
* @return the model based on the supplied profile
* @exception ModelException if an error occurs during model establishment
*/
- Model addModel( Profile profile ) throws ModelException;
+ DeploymentModel addModel( Profile profile ) throws ModelException;
/**
* Removal of a named model for the containment model.
1.1.2.3 +32 -32 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/DependencyGraph.java
Index: DependencyGraph.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/DependencyGraph.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DependencyGraph.java 4 Jan 2004 17:23:16 -0000 1.1.2.2
+++ DependencyGraph.java 4 Jan 2004 21:28:59 -0000 1.1.2.3
@@ -96,7 +96,7 @@
/**
* Creation of a new dependecy graph holding a reference to a parent
- * graph. Model instances in the parent graph are potential providers
+ * graph. DeploymentModel instances in the parent graph are potential providers
* for services if no model in current assembly satisfies a dependency.
*
* @param parent the parent graph
@@ -131,7 +131,7 @@
*
* @param model the model to add to the graph
*/
- public void add( final Model model )
+ public void add( final DeploymentModel model )
{
if( !m_models.contains( model ) )
{
@@ -142,22 +142,22 @@
/**
* Remove a model from the dependency graph.
*
- * @param appliance the appliance
+ * @param model the model to remove
*/
- public void remove( final Model model )
+ public void remove( final DeploymentModel model )
{
m_models.remove( model );
}
/**
- * Get the serilized graph of {@link Model} objects
+ * Get the serilized graph of {@link DeploymentModel} objects
* required when starting up the target. This makes sure
* that all providers are established before their coresponding
* consumers in the graph.
*
* @return the ordered list of models
*/
- public Model[] getStartupGraph()
+ public DeploymentModel[] getStartupGraph()
{
try
{
@@ -172,14 +172,14 @@
}
/**
- * Get the serilized graph of {@link Model} instances
+ * Get the serilized graph of {@link DeploymentModel} instances
* required when shutting down all the components. This makes
* sure that all consumer shutdown actions occur before their
* coresponding providers in graph.
*
* @return the ordered list of model instances
*/
- public Model[] getShutdownGraph()
+ public DeploymentModel[] getShutdownGraph()
{
try
{
@@ -193,13 +193,13 @@
}
/**
- * Get the serilized graph of {@link Model} instances
+ * Get the serilized graph of {@link DeploymentModel} instances
* that use services of the specified model.
*
* @param model the model
* @return the ordered list of consumer model instances
*/
- public Model[] getConsumerGraph( final Model model )
+ public DeploymentModel[] getConsumerGraph( final DeploymentModel model )
{
try
{
@@ -214,13 +214,13 @@
}
/**
- * Get the serilized graph of {@link Model} istances
+ * Get the serilized graph of {@link DeploymentModel} istances
* that provide specified model with services.
*
* @param model the model
* @return the ordered list of providers
*/
- public Model[] getProviderGraph( final Model model )
+ public DeploymentModel[] getProviderGraph( final DeploymentModel model )
{
try
{
@@ -237,7 +237,7 @@
/**
* Return an model array that does not include the provided model.
*/
- private Model[] referencedModels( final Model model, Model[] models )
+ private DeploymentModel[] referencedModels( final DeploymentModel model, DeploymentModel[] models )
{
ArrayList list = new ArrayList();
for( int i = 0; i < models.length; i++ )
@@ -247,7 +247,7 @@
list.add( models[i] );
}
}
- return (Model[]) list.toArray( new Model[0] );
+ return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
}
/**
@@ -257,7 +257,7 @@
* @param providers true if traversing providers, false if consumers
* @return the list of models
*/
- private Model[] getComponentGraph( final Model model, final boolean providers )
+ private DeploymentModel[] getComponentGraph( final DeploymentModel model, final boolean providers )
{
final ArrayList result = new ArrayList();
visitcomponent( model,
@@ -265,8 +265,8 @@
new ArrayList(),
result );
- final Model[] returnValue = new Model[result.size()];
- return (Model[]) result.toArray( returnValue );
+ final DeploymentModel[] returnValue = new DeploymentModel[result.size()];
+ return (DeploymentModel[]) result.toArray( returnValue );
}
/**
@@ -277,7 +277,7 @@
* @param direction true if forward dependencys traced, false if dependencies reversed
* @return the ordered model list
*/
- private Model[] walkGraph( final boolean direction )
+ private DeploymentModel[] walkGraph( final boolean direction )
{
final ArrayList result = new ArrayList();
final ArrayList done = new ArrayList();
@@ -285,8 +285,8 @@
final int size = m_models.size();
for( int i = 0; i < size; i++ )
{
- final Model model =
- (Model) m_models.get( i );
+ final DeploymentModel model =
+ (DeploymentModel) m_models.get( i );
visitcomponent( model,
direction,
@@ -294,8 +294,8 @@
result );
}
- final Model[] returnValue = new Model[result.size()];
- return (Model[]) result.toArray( returnValue );
+ final DeploymentModel[] returnValue = new DeploymentModel[result.size()];
+ return (DeploymentModel[]) result.toArray( returnValue );
}
/**
@@ -307,7 +307,7 @@
* @param order the order in which nodes have already been
* traversed
*/
- private void visitcomponent( final Model model,
+ private void visitcomponent( final DeploymentModel model,
final boolean direction,
final ArrayList done,
final ArrayList order )
@@ -337,11 +337,11 @@
*
* @param model the model
*/
- private void visitProviders( final Model model,
+ private void visitProviders( final DeploymentModel model,
final ArrayList done,
final ArrayList order )
{
- Model[] providers = model.getProviders();
+ DeploymentModel[] providers = model.getProviders();
for( int i = (providers.length - 1); i > -1; i-- )
{
visitcomponent( providers[i], true, done, order );
@@ -352,9 +352,9 @@
* Traverse all consumers of a model. I.e. all models that use
* service provided by the supplied model.
*
- * @param model the Model
+ * @param model the DeploymentModel
*/
- private void visitConsumers( final Model model,
+ private void visitConsumers( final DeploymentModel model,
final ArrayList done,
final ArrayList order )
{
@@ -364,13 +364,13 @@
final int size = m_models.size();
for( int i = 0; i < size; i++ )
{
- final Model other =
- (Model) m_models.get( i );
+ final DeploymentModel other =
+ (DeploymentModel) m_models.get( i );
- final Model[] providers = other.getProviders();
+ final DeploymentModel[] providers = other.getProviders();
for( int j = 0; j < providers.length; j++ )
{
- Model provider = providers[j];
+ DeploymentModel provider = providers[j];
if( provider.equals( model ) )
{
visitcomponent( other, false, done, order );
1.1.2.2 +4 -4 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/Dependent.java
Index: Dependent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/Dependent.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Dependent.java 3 Jan 2004 22:08:21 -0000 1.1.2.1
+++ Dependent.java 4 Jan 2004 21:28:59 -0000 1.1.2.2
@@ -63,16 +63,16 @@
/**
* Set the provider model.
*
- * @param the provider model
+ * @param model the provider model
*/
- void setProvider( Model model );
+ void setProvider( DeploymentModel model );
/**
* Return the assigned provider model.
*
* @return the provider model
*/
- Model getProvider();
+ DeploymentModel getProvider();
/**
* Clean the assigned provider.
1.1.2.2 +9 -9 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/ModelRepository.java
Index: ModelRepository.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/Attic/ModelRepository.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- ModelRepository.java 3 Jan 2004 15:38:50 -0000 1.1.2.1
+++ ModelRepository.java 4 Jan 2004 21:28:59 -0000 1.1.2.2
@@ -69,7 +69,7 @@
* @param name the model name
* @return the model or null if the model name is unknown
*/
- Model getModel( String name );
+ DeploymentModel getModel( String name );
/**
* Locate a model meeting the supplied criteria.
@@ -77,7 +77,7 @@
* @param dependency a component service dependency
* @return the model
*/
- Model getModel( DependencyDescriptor dependency );
+ DeploymentModel getModel( DependencyDescriptor dependency );
/**
* Locate a model meeting the supplied criteria.
@@ -85,35 +85,35 @@
* @param stage a component stage dependency
* @return the model
*/
- Model getModel( StageDescriptor stage );
+ DeploymentModel getModel( StageDescriptor stage );
/**
* Add an model to the repository.
*
* @param model the model to add
*/
- void addModel( Model model );
+ void addModel( DeploymentModel model );
/**
* Add an model to the repository.
*
- * @param the name to register the model under
+ * @param name the name to register the model under
* @param model the model to add
*/
- void addModel( String name, Model model );
+ void addModel( String name, DeploymentModel model );
/**
* Remove an model from the repository.
*
* @param model the model to remove
*/
- void removeModel( Model model );
+ void removeModel( DeploymentModel model );
/**
* Locate an model meeting the supplied criteria.
*
* @return the model
*/
- public Model[] getModels();
+ public DeploymentModel[] getModels();
}
1.2.2.1 +3 -3 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java
Index: ModelSelector.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ModelSelector.java 28 Oct 2003 12:53:48 -0000 1.2
+++ ModelSelector.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -76,7 +76,7 @@
* @return the preferred model or null if no satisfactory provider
* can be established
*/
- Model select( Model[] models, DependencyDescriptor dependency );
+ DeploymentModel select( DeploymentModel[] models, DependencyDescriptor dependency );
/**
* Returns the preferred model from an available selection of candidates
@@ -85,5 +85,5 @@
* @return the preferred provider or null if no satisfactory provider
* can be established
*/
- Model select( Model[] models, StageDescriptor stage );
+ DeploymentModel select( DeploymentModel[] models, StageDescriptor stage );
}
No revision
Index: ModelSelector.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ModelSelector.java 28 Oct 2003 12:53:48 -0000 1.2
+++ ModelSelector.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -76,7 +76,7 @@
* @return the preferred model or null if no satisfactory provider
* can be established
*/
- Model select( Model[] models, DependencyDescriptor dependency );
+ DeploymentModel select( DeploymentModel[] models, DependencyDescriptor dependency );
/**
* Returns the preferred model from an available selection of candidates
@@ -85,5 +85,5 @@
* @return the preferred provider or null if no satisfactory provider
* can be established
*/
- Model select( Model[] models, StageDescriptor stage );
+ DeploymentModel select( DeploymentModel[] models, StageDescriptor stage );
}
No revision
Index: ModelSelector.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/ModelSelector.java,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- ModelSelector.java 28 Oct 2003 12:53:48 -0000 1.2
+++ ModelSelector.java 4 Jan 2004 21:28:59 -0000 1.2.2.1
@@ -76,7 +76,7 @@
* @return the preferred model or null if no satisfactory provider
* can be established
*/
- Model select( Model[] models, DependencyDescriptor dependency );
+ DeploymentModel select( DeploymentModel[] models, DependencyDescriptor dependency );
/**
* Returns the preferred model from an available selection of candidates
@@ -85,5 +85,5 @@
* @return the preferred provider or null if no satisfactory provider
* can be established
*/
- Model select( Model[] models, StageDescriptor stage );
+ DeploymentModel select( DeploymentModel[] models, StageDescriptor stage );
}
1.2.2.2 +22 -101 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentContext.java
1.7.2.3 +66 -147 avalon/merlin/composition/api/src/java/org/apache/avalon/composition/model/DeploymentModel.java
No revision
No revision
1.1.2.4 +11 -10 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultComponentModel.java
Index: DefaultComponentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultComponentModel.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- DefaultComponentModel.java 4 Jan 2004 20:20:52 -0000 1.1.2.3
+++ DefaultComponentModel.java 4 Jan 2004 21:28:59 -0000 1.1.2.4
@@ -59,7 +59,7 @@
import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.ComponentContext;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ModelRepository;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.SystemContext;
@@ -91,7 +91,8 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class DefaultComponentModel extends DefaultModel implements ComponentModel
+public class DefaultComponentModel extends DefaultDeploymentModel
+ implements ComponentModel
{
//--------------------------------------------------------------
// static
@@ -302,7 +303,7 @@
StageDescriptor stage =
new StageDescriptor( clazz.getName() );
- Model provider = repository.getModel( stage );
+ DeploymentModel provider = repository.getModel( stage );
if( null == provider )
{
final String error =
@@ -351,7 +352,7 @@
{
DependencyModel dependency = dependencies[i];
final String key = dependency.getDependency().getKey();
- final Model model =
+ final DeploymentModel model =
repository.getModel( dependency.getDependency() );
if( null == model )
{
@@ -383,7 +384,7 @@
{
StageModel stage = stages[i];
final String key = stage.getStage().getKey();
- final Model model =
+ final DeploymentModel model =
repository.getModel( stage.getStage() );
if( null == model )
{
@@ -452,7 +453,7 @@
* @return the providers consumed by the model
* @exception IllegalStateException if the model is not in an assembled state
*/
- public Model[] getProviders()
+ public DeploymentModel[] getProviders()
{
if( !isAssembled() )
{
@@ -464,7 +465,7 @@
final ArrayList list = new ArrayList();
if( null != getContextModel() )
{
- Model provider = getContextModel().getProvider();
+ DeploymentModel provider = getContextModel().getProvider();
if( provider != null )
{
list.add( provider );
@@ -485,11 +486,11 @@
list.add( dependency.getProvider() );
}
- return (Model[]) list.toArray( new Model[0] );
+ return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
}
//--------------------------------------------------------------
- // Model
+ // DeploymentModel
//--------------------------------------------------------------
/**
1.13.2.9 +34 -34 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.13.2.8
retrieving revision 1.13.2.9
diff -u -r1.13.2.8 -r1.13.2.9
--- DefaultContainmentModel.java 4 Jan 2004 20:19:27 -0000 1.13.2.8
+++ DefaultContainmentModel.java 4 Jan 2004 21:28:59 -0000 1.13.2.9
@@ -84,7 +84,7 @@
import org.apache.avalon.composition.model.ContainmentContext;
import org.apache.avalon.composition.model.DependencyGraph;
import org.apache.avalon.composition.model.ComponentModel;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ModelRuntimeException;
import org.apache.avalon.composition.model.ModelRepository;
@@ -116,7 +116,7 @@
* @author <a href="mailto:dev@avalon.apache.org">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class DefaultContainmentModel extends DefaultModel
+public class DefaultContainmentModel extends DefaultDeploymentModel
implements ContainmentModel
{
//--------------------------------------------------------------
@@ -139,7 +139,7 @@
{
if( context.getPartitionName() == null )
{
- return SEPERATOR;
+ return SEPARATOR;
}
else
{
@@ -183,13 +183,13 @@
if( null == context.getPartitionName() )
{
- m_partition = Model.SEPERATOR;
+ m_partition = DeploymentModel.SEPARATOR;
}
else
{
m_partition = context.getPartitionName()
+ context.getName()
- + Model.SEPERATOR;
+ + DeploymentModel.SEPARATOR;
}
Profile[] profiles = context.getContainmentProfile().getProfiles();
@@ -200,7 +200,7 @@
}
//--------------------------------------------------------------
- // Model
+ // DeploymentModel
//--------------------------------------------------------------
/**
@@ -282,10 +282,10 @@
}
getLogger().debug( "assembly phase" );
- Model[] models = m_context.getModelRepository().getModels();
+ DeploymentModel[] models = m_context.getModelRepository().getModels();
for( int i=0; i<models.length; i++ )
{
- Model model = models[i];
+ DeploymentModel model = models[i];
model.assemble();
}
@@ -306,10 +306,10 @@
}
getLogger().debug( "dissassembly phase" );
- Model[] models = m_context.getModelRepository().getModels();
+ DeploymentModel[] models = m_context.getModelRepository().getModels();
for( int i=0; i<models.length; i++ )
{
- Model model = models[i];
+ DeploymentModel model = models[i];
model.disassemble();
}
m_assembly.setEnabled( false );
@@ -321,7 +321,7 @@
* @return the providers consumed by the model
* @exception IllegalStateException if the model is not in an assembled state
*/
- public Model[] getProviders()
+ public DeploymentModel[] getProviders()
{
if( !isAssembled() )
{
@@ -331,14 +331,14 @@
}
ArrayList list = new ArrayList();
- Model[] models = m_context.getModelRepository().getModels();
+ DeploymentModel[] models = m_context.getModelRepository().getModels();
for( int i=0; i<models.length; i++ )
{
- Model model = models[i];
- Model[] providers = model.getProviders();
+ DeploymentModel model = models[i];
+ DeploymentModel[] providers = model.getProviders();
for( int j=0; j<providers.length; j++ )
{
- Model provider = providers[j];
+ DeploymentModel provider = providers[j];
final String path = provider.getPath();
final String root = getPartition();
if( !path.startsWith( root ) )
@@ -347,7 +347,7 @@
}
}
}
- return (Model[]) list.toArray( new Model[0] );
+ return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
}
//--------------------------------------------------------------
@@ -381,7 +381,7 @@
/**
* Get the startup sequence for the model.
*/
- public Model[] getStartupGraph()
+ public DeploymentModel[] getStartupGraph()
{
return m_context.getDependencyGraph().getStartupGraph();
}
@@ -389,7 +389,7 @@
/**
* Get the shutdown sequence for the model.
*/
- public Model[] getShutdownGraph()
+ public DeploymentModel[] getShutdownGraph()
{
return m_context.getDependencyGraph().getShutdownGraph();
}
@@ -420,7 +420,7 @@
* @return the model
* @exception ModelException if a model related error occurs
*/
- public Model addModel( URL url ) throws ModelException
+ public DeploymentModel addModel( URL url ) throws ModelException
{
return addContainmentModel( url, null );
}
@@ -434,12 +434,12 @@
return model;
}
- public Model addModel( Profile profile ) throws ModelException
+ public DeploymentModel addModel( Profile profile ) throws ModelException
{
if( null == profile )
throw new NullPointerException( "profile" );
- Model model = null;
+ DeploymentModel model = null;
final String name = profile.getName();
if( profile instanceof ContainmentProfile )
{
@@ -484,7 +484,7 @@
return addModel( name, model );
}
- private Model addModel( String name, Model model ) throws ModelException
+ private DeploymentModel addModel( String name, DeploymentModel model ) throws ModelException
{
ModelRepository repository = m_context.getModelRepository();
synchronized( repository )
@@ -531,7 +531,7 @@
ModelRepository repository = m_context.getModelRepository();
synchronized( repository )
{
- Model model = (Model) repository.getModel( name );
+ DeploymentModel model = (DeploymentModel) repository.getModel( name );
if( null == name )
{
final String error =
@@ -773,7 +773,7 @@
for( int i=0; i<targets.length; i++ )
{
TargetDirective target = targets[i];
- Model child = model.getModel( target.getPath() );
+ DeploymentModel child = model.getModel( target.getPath() );
if( child != null )
{
if( target.getConfiguration() != null )
@@ -1032,7 +1032,7 @@
*
* @return the nested model
*/
- public Model[] getModels()
+ public DeploymentModel[] getModels()
{
return m_context.getModelRepository().getModels();
}
@@ -1044,7 +1044,7 @@
* @return the named model or null if the name is unknown
* @exception IllegalArgumentException if the name if badly formed
*/
- public Model getModel( String path )
+ public DeploymentModel getModel( String path )
{
if( path.startsWith( "/" ) )
{
@@ -1062,7 +1062,7 @@
else
{
String remainder = path.substring( j+1 );
- Model model = getModel( key );
+ DeploymentModel model = getModel( key );
if( model == null )
{
return null;
@@ -1098,16 +1098,16 @@
* @param dependency the service dependency descriptor
* @exception ModelRuntimeException if an error occurs during model establishment
*/
- public Model getModel( DependencyDescriptor dependency )
+ public DeploymentModel getModel( DependencyDescriptor dependency )
throws ModelRuntimeException
{
//
// if an existing model exists return it
//
- Model[] models = getModels();
+ DeploymentModel[] models = getModels();
ModelSelector modelSelector = new DefaultModelSelector();
- Model model = modelSelector.select( models, dependency );
+ DeploymentModel model = modelSelector.select( models, dependency );
if( model != null ) return model;
//
@@ -1165,16 +1165,16 @@
* @exception ModelRuntimeException if an error occurs
* during model establishment
*/
- public Model getModel( StageDescriptor stage )
+ public DeploymentModel getModel( StageDescriptor stage )
throws ModelRuntimeException
{
//
// if an existing model exists return it
//
- Model[] models = getModels();
+ DeploymentModel[] models = getModels();
ModelSelector modelSelector = new DefaultModelSelector();
- Model model = modelSelector.select( models, stage );
+ DeploymentModel model = modelSelector.select( models, stage );
if( model != null ) return model;
//
1.3.2.4 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
Index: DefaultContextModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java,v
retrieving revision 1.3.2.3
retrieving revision 1.3.2.4
diff -u -r1.3.2.3 -r1.3.2.4
--- DefaultContextModel.java 4 Jan 2004 20:19:27 -0000 1.3.2.3
+++ DefaultContextModel.java 4 Jan 2004 21:28:59 -0000 1.3.2.4
@@ -55,7 +55,6 @@
import java.lang.reflect.Constructor;
import org.apache.avalon.composition.model.ContextModel;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.model.ComponentContext;
import org.apache.avalon.excalibur.i18n.ResourceManager;
1.4.2.2 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java
Index: DefaultDependencyModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDependencyModel.java,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -r1.4.2.1 -r1.4.2.2
--- DefaultDependencyModel.java 3 Jan 2004 18:14:58 -0000 1.4.2.1
+++ DefaultDependencyModel.java 4 Jan 2004 21:28:59 -0000 1.4.2.2
@@ -52,7 +52,6 @@
import java.util.ArrayList;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.DependencyModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.data.DependencyDirective;
1.1.2.3 +6 -9 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultDependent.java
Index: DefaultDependent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultDependent.java,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- DefaultDependent.java 4 Jan 2004 20:19:27 -0000 1.1.2.2
+++ DefaultDependent.java 4 Jan 2004 21:28:59 -0000 1.1.2.3
@@ -52,7 +52,7 @@
import java.util.ArrayList;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.Dependent;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
@@ -69,7 +69,7 @@
// immutable state
//--------------------------------------------------------------
- private Model m_provider;
+ private DeploymentModel m_provider;
//--------------------------------------------------------------
// constructor
@@ -79,9 +79,6 @@
* Creation of a new stage model.
*
* @param logger the logging channel
- * @param partition the partition name
- * @param descriptor the stage descriptors
- * @param directive the stage directive (possibly null)
*/
public DefaultDependent( final Logger logger )
{
@@ -99,9 +96,9 @@
/**
* Set the provider model.
*
- * @param the provider model
+ * @param model the provider model
*/
- public void setProvider( Model model )
+ public void setProvider( DeploymentModel model )
{
m_provider = model;
}
@@ -111,7 +108,7 @@
*
* @return the stage provider model
*/
- public Model getProvider()
+ public DeploymentModel getProvider()
{
return m_provider;
}
1.1.2.2 +14 -14 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultModelRepository.java
Index: DefaultModelRepository.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/Attic/DefaultModelRepository.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- DefaultModelRepository.java 3 Jan 2004 22:08:21 -0000 1.1.2.1
+++ DefaultModelRepository.java 4 Jan 2004 21:28:59 -0000 1.1.2.2
@@ -54,7 +54,7 @@
import java.util.Hashtable;
import java.util.Iterator;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ModelRepository;
import org.apache.avalon.framework.logger.Logger;
@@ -114,7 +114,7 @@
* @param dependency a component service dependency
* @return the model or null if no matching model is resolved
*/
- public Model getModel( DependencyDescriptor dependency )
+ public DeploymentModel getModel( DependencyDescriptor dependency )
{
//
// attempt to locate a solution locally
@@ -123,7 +123,7 @@
Iterator iterator = m_models.values().iterator();
while( iterator.hasNext() )
{
- Model model = (Model) iterator.next();
+ DeploymentModel model = (DeploymentModel) iterator.next();
if( model.isaCandidate( dependency ) )
{
return model;
@@ -148,12 +148,12 @@
* @param stage a component stage dependency
* @return the model
*/
- public Model getModel( StageDescriptor stage )
+ public DeploymentModel getModel( StageDescriptor stage )
{
Iterator iterator = m_models.values().iterator();
while( iterator.hasNext() )
{
- Model model = (Model) iterator.next();
+ DeploymentModel model = (DeploymentModel) iterator.next();
if( model.isaCandidate( stage ) )
{
@@ -178,7 +178,7 @@
*
* @param model the model to add
*/
- public void addModel( Model model )
+ public void addModel( DeploymentModel model )
{
m_models.put( model.getName(), model );
}
@@ -186,10 +186,10 @@
/**
* Add an model to the repository.
*
- * @param the name to register the model under
+ * @param name the name to register the model under
* @param model the model to add
*/
- public void addModel( String name, Model model )
+ public void addModel( String name, DeploymentModel model )
{
m_models.put( name, model );
}
@@ -199,7 +199,7 @@
*
* @param model the model to remove
*/
- public void removeModel( Model model )
+ public void removeModel( DeploymentModel model )
{
m_models.remove( model.getName() );
}
@@ -209,9 +209,9 @@
*
* @return the model
*/
- public Model[] getModels()
+ public DeploymentModel[] getModels()
{
- return (Model[]) m_models.values().toArray( new Model[0] );
+ return (DeploymentModel[]) m_models.values().toArray( new DeploymentModel[0] );
}
/**
@@ -220,9 +220,9 @@
* @param name the model name
* @return the model or null if the model name is unknown
*/
- public Model getModel( String name )
+ public DeploymentModel getModel( String name )
{
- Model model = (Model) m_models.get( name );
+ DeploymentModel model = (DeploymentModel) m_models.get( name );
if( model == null && m_logger != null )
{
m_logger.debug(
1.1.1.1.2.1 +15 -15 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelSelector.java
Index: DefaultModelSelector.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultModelSelector.java,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- DefaultModelSelector.java 24 Sep 2003 09:32:11 -0000 1.1.1.1
+++ DefaultModelSelector.java 4 Jan 2004 21:28:59 -0000 1.1.1.1.2.1
@@ -57,7 +57,7 @@
import java.util.ArrayList;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ModelSelector;
import org.apache.avalon.meta.info.DependencyDescriptor;
import org.apache.avalon.meta.info.StageDescriptor;
@@ -87,9 +87,9 @@
* @return the preferred model or null if no satisfactory
* provider can be established
*/
- public Model select( Model[] models, DependencyDescriptor dependency )
+ public DeploymentModel select( DeploymentModel[] models, DependencyDescriptor dependency )
{
- Model[] candidates = filterCandidateProviders( models, dependency );
+ DeploymentModel[] candidates = filterCandidateProviders( models, dependency );
return select( candidates );
}
@@ -100,9 +100,9 @@
* @return the preferred provider or null if no satisfactory
* provider can be established
*/
- public Model select( Model[] models, StageDescriptor stage )
+ public DeploymentModel select( DeploymentModel[] models, StageDescriptor stage )
{
- Model[] candidates = filterCandidateProviders( models, stage );
+ DeploymentModel[] candidates = filterCandidateProviders( models, stage );
return select( candidates );
}
@@ -110,34 +110,34 @@
// implementation
//==============================================================
- private Model[] filterCandidateProviders(
- Model[] models, DependencyDescriptor dependency )
+ private DeploymentModel[] filterCandidateProviders(
+ DeploymentModel[] models, DependencyDescriptor dependency )
{
ArrayList list = new ArrayList();
for( int i = 0; i < models.length; i++ )
{
- Model model = models[i];
+ DeploymentModel model = models[i];
if( model.isaCandidate( dependency ) )
{
list.add( model );
}
}
- return (Model[]) list.toArray( new Model[0] );
+ return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
}
- private Model[] filterCandidateProviders(
- Model[] models, StageDescriptor stage )
+ private DeploymentModel[] filterCandidateProviders(
+ DeploymentModel[] models, StageDescriptor stage )
{
ArrayList list = new ArrayList();
for( int i = 0; i < models.length; i++ )
{
- Model model = models[i];
+ DeploymentModel model = models[i];
if( model.isaCandidate( stage ) )
{
list.add( model );
}
}
- return (Model[]) list.toArray( new Model[0] );
+ return (DeploymentModel[]) list.toArray( new DeploymentModel[0] );
}
/**
@@ -150,7 +150,7 @@
* @return the preferred profile or null if no satisfactory
* provider can be established
*/
- private Model select( Model[] models )
+ private DeploymentModel select( DeploymentModel[] models )
{
if( models.length == 0 )
{
1.2.2.2 +1 -2 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java
Index: DefaultStageModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- DefaultStageModel.java 3 Jan 2004 18:14:58 -0000 1.2.2.1
+++ DefaultStageModel.java 4 Jan 2004 21:28:59 -0000 1.2.2.2
@@ -52,7 +52,6 @@
import java.util.ArrayList;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.data.StageDirective;
No revision
Index: DefaultStageModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- DefaultStageModel.java 3 Jan 2004 18:14:58 -0000 1.2.2.1
+++ DefaultStageModel.java 4 Jan 2004 21:28:59 -0000 1.2.2.2
@@ -52,7 +52,6 @@
import java.util.ArrayList;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.data.StageDirective;
No revision
Index: DefaultStageModel.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- DefaultStageModel.java 3 Jan 2004 18:14:58 -0000 1.2.2.1
+++ DefaultStageModel.java 4 Jan 2004 21:28:59 -0000 1.2.2.2
@@ -52,7 +52,6 @@
import java.util.ArrayList;
-import org.apache.avalon.composition.model.Model;
import org.apache.avalon.composition.model.StageModel;
import org.apache.avalon.composition.model.ModelException;
import org.apache.avalon.composition.data.StageDirective;
1.2.2.2 +59 -256 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentContext.java
1.9.2.5 +49 -908 avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
No revision
No revision
1.1.2.4 +10 -10 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/Attic/AssemblyTestCase.java
Index: AssemblyTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/Attic/AssemblyTestCase.java,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- AssemblyTestCase.java 4 Jan 2004 17:23:17 -0000 1.1.2.3
+++ AssemblyTestCase.java 4 Jan 2004 21:29:00 -0000 1.1.2.4
@@ -2,7 +2,7 @@
package org.apache.avalon.composition.model.test;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.DependencyModel;
@@ -44,7 +44,7 @@
}
}
- private void printModel( String lead, Model model )
+ private void printModel( String lead, DeploymentModel model )
{
if( model instanceof ContainmentModel )
{
@@ -60,13 +60,13 @@
{
System.out.println( lead + "model:" + model );
printCompositeModel( "\t" + lead, model );
- Model[] models = model.getModels();
+ DeploymentModel[] models = model.getModels();
if( models.length > 0 )
{
System.out.println( lead + "\tchildren:" );
for( int i=0; i<models.length; i++ )
{
- Model m = models[i];
+ DeploymentModel m = models[i];
printModel( "\t\t" + lead, m );
}
}
@@ -76,7 +76,7 @@
System.out.println( lead + "\tstartup:" );
for( int i=0; i<models.length; i++ )
{
- Model m = models[i];
+ DeploymentModel m = models[i];
System.out.println( "\t\t" + lead + (i+1) + ": " + m );
}
}
@@ -86,7 +86,7 @@
System.out.println( lead + "\tshutdown:" );
for( int i=0; i<models.length; i++ )
{
- Model m = models[i];
+ DeploymentModel m = models[i];
System.out.println( "\t\t" + lead + (i+1) + ": " + m );
}
}
@@ -98,18 +98,18 @@
printCompositeModel( lead, model );
}
- private void printCompositeModel( String lead, Model model )
+ private void printCompositeModel( String lead, DeploymentModel model )
{
- Model[] models = model.getProviderGraph();
+ DeploymentModel[] models = model.getProviderGraph();
for( int i=0; i<models.length; i++ )
{
- Model m = models[i];
+ DeploymentModel m = models[i];
System.out.println( "\t" + lead + (i+1) + ": " + m + " (provider)" );
}
models = model.getConsumerGraph();
for( int i=0; i<models.length; i++ )
{
- Model m = models[i];
+ DeploymentModel m = models[i];
System.out.println( "\t" + lead + (i+1) + ": " + m + " (consumer)" );
}
}
1.2.2.2 +2 -2 avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java
Index: TargetsTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/src/test/org/apache/avalon/composition/model/test/TargetsTestCase.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -u -r1.2.2.1 -r1.2.2.2
--- TargetsTestCase.java 4 Jan 2004 17:23:17 -0000 1.2.2.1
+++ TargetsTestCase.java 4 Jan 2004 21:29:00 -0000 1.2.2.2
@@ -4,7 +4,7 @@
import java.io.File;
-import org.apache.avalon.composition.model.Model;
+import org.apache.avalon.composition.model.DeploymentModel;
import org.apache.avalon.composition.model.ComponentModel;
import org.apache.avalon.composition.model.AbstractTestCase;
import org.apache.avalon.composition.data.Targets;
@@ -44,7 +44,7 @@
{
TargetDirective target = targets[i];
final String path = target.getPath();
- Model model = m_model.getModel( path );
+ DeploymentModel model = m_model.getModel( path );
if( model instanceof ComponentModel )
{
ComponentModel deployment = (ComponentModel) model;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org