mcconnell 2003/08/16 23:35:52
Modified: merlin/activation/src/java/org/apache/avalon/activation/appliance/impl
DefaultBlock.java
merlin/activation/src/java/org/apache/avalon/activation/lifestyle/impl
AbstractLifestyleHandler.java
merlin/activation-spi/src/java/org/apache/avalon/activation/appliance
ApplianceEvent.java ApplianceListener.java
ApplianceRepository.java
merlin/activation-spi/src/java/org/apache/avalon/activation/lifecycle
Factory.java
merlin/composition/src/java/org/apache/avalon/composition/data/writer
XMLContainmentProfileWriter.java
merlin/composition/src/java/org/apache/avalon/composition/model/impl
DefaultConstructorModel.java
DefaultContainmentContext.java
DefaultContextModel.java
DefaultDeploymentModel.java
DefaultModelFactory.java
DefaultServiceRepository.java
DefaultStageModel.java DefaultSystemContext.java
merlin/composition-spi/src/java/org/apache/avalon/composition/data
BlockCompositionDirective.java Parameter.java
merlin/composition-spi/src/java/org/apache/avalon/composition/model
ProfileSelector.java ServiceRepository.java
merlin/extension-spi/src/java/org/apache/avalon/extension/manager
PackageManager.java
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernelContext.java package.html
merlin/repository/spi/src/java/org/apache/avalon/repository
RepositoryException.java
Log:
Housekeeping.
Revision Changes Path
1.4 +4 -4
avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlock.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultBlock.java 11 Aug 2003 22:58:46 -0000 1.3
+++ DefaultBlock.java 17 Aug 2003 06:35:51 -0000 1.4
@@ -164,6 +164,7 @@
* @param context the service context
* @param engine the parent engine
* @param repository the parent repository
+ * @exception ApplianceException if a block creation error occurs
*/
DefaultBlock(
Logger logger, ContainmentModel model, DependencyGraph graph,
@@ -365,7 +366,7 @@
/**
* Return an appliance relative to a specific path.
- * @param path the appliance path
+ * @param source the appliance path
* @return the appliance
*/
public Appliance resolveAppliance( String source )
@@ -694,7 +695,7 @@
/**
* Resolve a object to a value.
*
- * @param source the context within which the resolution is applied
+ * @param consumer the consumer
* @return the resolved object
* @throws Exception if an error occurs
*/
@@ -851,7 +852,6 @@
/**
* Create a new appliance.
* @param model the component model
- * @param graph the depedency graph into which the appliance will be included
* @return the appliance
*/
public Appliance createAppliance( Model model ) throws ApplianceException
1.3 +2 -2
avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java
Index: AbstractLifestyleHandler.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation/src/java/org/apache/avalon/activation/lifestyle/impl/AbstractLifestyleHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractLifestyleHandler.java 16 Aug 2003 11:19:48 -0000 1.2
+++ AbstractLifestyleHandler.java 17 Aug 2003 06:35:51 -0000 1.3
@@ -66,7 +66,7 @@
/**
* Creation of a new instance.
- * @param the logging channel
+ * @param logger the logging channel
*/
public AbstractLifestyleHandler( Logger logger )
{
1.2 +3 -3
avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/ApplianceEvent.java
Index: ApplianceEvent.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/ApplianceEvent.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplianceEvent.java 7 Aug 2003 17:09:16 -0000 1.1
+++ ApplianceEvent.java 17 Aug 2003 06:35:51 -0000 1.2
@@ -92,7 +92,7 @@
/**
* Get the state of the appliance.
*
- * @param the state value
+ * @return the state value
*/
public int getState()
{
@@ -102,7 +102,7 @@
/**
* Get the appliance url.
*
- * @param the appliance url
+ * @return the appliance url
*/
public URL getURL()
{
1.2 +2 -2
avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/ApplianceListener.java
Index: ApplianceListener.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/ApplianceListener.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplianceListener.java 7 Aug 2003 17:09:17 -0000 1.1
+++ ApplianceListener.java 17 Aug 2003 06:35:51 -0000 1.2
@@ -65,7 +65,7 @@
/**
* Notification of a state change by a provider appliance.
*
- * @param the appliance event
+ * @param event the appliance event
*/
void applianceEvent( ApplianceEvent event );
1.2 +2 -2
avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java
Index: ApplianceRepository.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/appliance/ApplianceRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApplianceRepository.java 7 Aug 2003 17:09:17 -0000 1.1
+++ ApplianceRepository.java 17 Aug 2003 06:35:51 -0000 1.2
@@ -81,5 +81,5 @@
* @param stage a component stage dependency
* @return the appliance
*/
- Appliance getAppliance( StageDescriptor dependency );
+ Appliance getAppliance( StageDescriptor stage );
}
1.2 +2 -2
avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/lifecycle/Factory.java
Index: Factory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/activation-spi/src/java/org/apache/avalon/activation/lifecycle/Factory.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Factory.java 7 Aug 2003 17:09:22 -0000 1.1
+++ Factory.java 17 Aug 2003 06:35:51 -0000 1.2
@@ -71,7 +71,7 @@
/**
* Decommission and dispose of the supplied component.
*
- * @param object the object to decommission
+ * @param instance the object to decommission
*/
void destroy( Object instance );
1.9 +27 -17
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java
Index: XMLContainmentProfileWriter.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/data/writer/XMLContainmentProfileWriter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XMLContainmentProfileWriter.java 12 Aug 2003 05:30:44 -0000 1.8
+++ XMLContainmentProfileWriter.java 17 Aug 2003 06:35:51 -0000 1.9
@@ -70,10 +70,8 @@
import org.apache.avalon.meta.info.DependencyDescriptor;
/**
- * Write [EMAIL PROTECTED] Type} objects to a stream as xml documents.
+ * Write [EMAIL PROTECTED] ContainmentProfile} objects to a stream as xml documents.
*
- * @todo Address configuration schema support
- * @todo Add context entry alias
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
@@ -99,8 +97,9 @@
/**
* Write out a containment profile to xml.
*
- * @param profile the type object
- * @param output the stream to write to
+ * @param writer the stream to write to
+ * @param profile the containment profile to write
+ * @param pad character offset
* @throws Exception if unable to write xml
*/
protected void writeContainmentProfile(
@@ -113,8 +112,10 @@
/**
* Write out a containment profile to xml.
*
- * @param profile the type object
- * @param output the stream to write to
+ * @param writer the stream to write to
+ * @param profile the containment profile to write
+ * @param flag not used !
+ * @param pad character offset
* @throws Exception if unable to write xml
*/
protected void writeContainmentProfile(
@@ -134,7 +135,8 @@
/**
* Write the XML header.
* @param writer the writer
- * @throws IOException if unable to write xml
+ * @param profile the containment profile
+ * @throws IOException if unable to write xml
*/
private void writeHeader(
final Writer writer, ContainmentProfile profile )
@@ -147,7 +149,8 @@
* Write out xml representation of the info descriptor from a Type.
*
* @param writer the writer
- * @param info the type info descriptor
+ * @param services the service directives
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeServiceDirectives(
@@ -184,7 +187,8 @@
* Write out xml representation of the classloader
*
* @param writer the writer
- * @param info the type info descriptor
+ * @param classloader the classloader directive
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeClassLoader(
@@ -209,7 +213,8 @@
* Write out xml representation of a set of includes.
*
* @param writer the writer
- * @param includes the include directives
+ * @param library the library directives
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeLibrary(
@@ -241,7 +246,8 @@
* Write out xml representation of a classpath.
*
* @param writer the writer
- * @param includes the include directives
+ * @param classpath the classpath directives
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeClasspathDirective(
@@ -280,7 +286,8 @@
* Write out xml representation of a repository.
*
* @param writer the writer
- * @param repository the include directives
+ * @param repository the repository directives
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeRepositoryDirective(
@@ -306,7 +313,8 @@
* Write out xml representation of a fileset.
*
* @param writer the writer
- * @param includes the include directives
+ * @param fileset the fileset directives
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeFilesetDirective(
@@ -334,7 +342,8 @@
* Write out xml representation of the classloader
*
* @param writer the writer
- * @param info the type info descriptor
+ * @param resource a resource directive
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeResourceDirective(
@@ -358,7 +367,8 @@
* Write out xml representation of the embedded profiles
*
* @param writer the writer
- * @param info the type info descriptor
+ * @param profiles the nested profiles
+ * @param pad character offset
* @throws IOException if unable to write xml
*/
private void writeProfiles(
1.5 +5 -2
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java
Index: DefaultConstructorModel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultConstructorModel.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultConstructorModel.java 17 Jul 2003 21:21:57 -0000 1.4
+++ DefaultConstructorModel.java 17 Aug 2003 06:35:51 -0000 1.5
@@ -108,6 +108,7 @@
* @param descriptor the context entry descriptor
* @param directive the context entry directive
* @param context the containment context
+ * @param map a map of available context entries
*/
public DefaultConstructorModel(
EntryDescriptor descriptor, ConstructorDirective directive,
@@ -260,7 +261,9 @@
/**
* Return the derived parameter value.
* @param loader the classloader to use
- * @param map a map of context values from which import directives may be
resolved
+ * @param clazz the constructor class
+ * @param argument a single string constructor argument
+ * @param parameters an alternative sequence of arguments
* @return the value
* @exception ModelException if the parameter value cannot be resolved
*/
1.5 +4 -9
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java
Index: DefaultContainmentContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultContainmentContext.java 31 Jul 2003 22:52:47 -0000 1.4
+++ DefaultContainmentContext.java 17 Aug 2003 06:35:51 -0000 1.5
@@ -108,14 +108,9 @@
* Creation of a new containment context.
*
* @param logger the logging channel to assign
- * @param parent the parent containment model (null if this is
- * a root containment context)
+ * @param system the system context
* @param model the classloader model
- * @param home the directory for the container
- * @param temp a temporary directory for the container
* @param profile the containment profile
- * @param partition the partition that this containment
- * context is established within
*/
public DefaultContainmentContext(
Logger logger, SystemContext system, ClassLoaderModel model,
@@ -130,14 +125,14 @@
* Creation of a new containment context.
*
* @param logger the logging channel to assign
- * @param parent the parent containment model (null if this is
- * a root containment context)
+ * @param system the system context
* @param model the classloader model
* @param home the directory for the container
* @param temp a temporary directory for the container
* @param profile the containment profile
* @param partition the partition that this containment
* context is established within
+ * @param name the assigned containment context name
*/
public DefaultContainmentContext(
Logger logger, SystemContext system, ClassLoaderModel model,
1.8 +9 -8
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java
Index: DefaultContextModel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultContextModel.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DefaultContextModel.java 28 Jul 2003 13:26:53 -0000 1.7
+++ DefaultContextModel.java 17 Aug 2003 06:35:51 -0000 1.8
@@ -121,10 +121,10 @@
* takes an inital system context as the base for context value
* establishment and uses this to set standard context entries.</p>
*
+ * @param logger the logging channel
* @param descriptor the contextualization stage descriptor
* @param directive the contextualization directive
- * @param classLoader the classloader
- * @param system the system context
+ * @param context the deployment context
*/
public DefaultContextModel(
Logger logger, ContextDescriptor descriptor,
@@ -258,11 +258,11 @@
/**
* Load the contextualization strategy class.
* @param descriptor the context descriptor
- * @param classLoader the classloader
+ * @param classloader the classloader
* @return the strategy class
*/
private Class loadStrategyClass(
- ContextDescriptor descriptor, ClassLoader classLoader )
+ ContextDescriptor descriptor, ClassLoader classloader )
throws ModelException
{
final String strategy = m_descriptor.getAttribute(
@@ -271,7 +271,7 @@
{
try
{
- Class clazz = classLoader.loadClass( strategy );
+ Class clazz = classloader.loadClass( strategy );
if( getLogger().isDebugEnabled() )
{
final String message =
@@ -297,7 +297,7 @@
{
try
{
- Class clazz = classLoader.loadClass( DEFAULT_STRATEGY_CLASSNAME );
+ Class clazz = classloader.loadClass( DEFAULT_STRATEGY_CLASSNAME );
if( getLogger().isDebugEnabled() )
{
final String message =
@@ -330,7 +330,8 @@
* has been pre-populated with constom context entry models.
*
* @param context the deployment context
- * @param clazz the context implmentation class
+ * @param descriptor the context descriptor
+ * @param directive the context directive
* @return the context object compliant with the context casting
* constraints declared by the component type
* @exception ModelException if an error occurs while attempting to
1.20 +13 -13
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
Index: DefaultDeploymentModel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DefaultDeploymentModel.java 11 Aug 2003 22:58:50 -0000 1.19
+++ DefaultDeploymentModel.java 17 Aug 2003 06:35:51 -0000 1.20
@@ -142,12 +142,7 @@
/**
* Creation of a new deployment model.
*
- * @param base the base directory from which relative references
- * shall be resolved
- * @param repository a local cache of jar files addressable
- * relative to group/name/version identifiers
- * @param profile the deployment profile
- * @param path the partition name
+ * @param context the deployment context
*/
public DefaultDeploymentModel( DeploymentContext context )
throws ModelException
@@ -253,10 +248,7 @@
m_stages[i] =
new DefaultStageModel(
context.getLogger().getChildLogger( "stages" ),
- context.getPartitionName(),
- context.getProfile().getName(),
- descriptor,
- directive );
+ context.getPartitionName(), descriptor, directive );
}
}
@@ -276,6 +268,8 @@
/**
* Return TRUE is this model is capable of supporting a supplied
* depedendency.
+ *
+ * @param dependency the dependency descriptor
* @return true if this model can fulfill the dependency
*/
public boolean isaCandidate( DependencyDescriptor dependency )
@@ -286,7 +280,9 @@
/**
* Return TRUE is this model is capable of supporting a supplied
* stage dependency.
- * @return true if this model can fulfill the dependency
+ *
+ * @param stage the stage descriptor
+ * @return true if this model can fulfill the stage dependency
*/
public boolean isaCandidate( StageDescriptor stage )
{
@@ -317,7 +313,7 @@
/**
* Set the activation policy for the model.
- * @param the activaltion policy
+ * @param policy the activaltion policy
*/
public void setActivationPolicy( boolean policy )
{
@@ -339,6 +335,10 @@
}
}
+ /**
+ * Return the component type descriptor.
+ * @return the type descriptor
+ */
public Type getType()
{
return m_context.getType();
1.10 +4 -6
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java
Index: DefaultModelFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultModelFactory.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultModelFactory.java 12 Aug 2003 05:30:44 -0000 1.9
+++ DefaultModelFactory.java 17 Aug 2003 06:35:51 -0000 1.10
@@ -189,11 +189,9 @@
/**
* Creation of a new root containment model using
- * a supplied system context and containment profile
- * using the context classloader.
+ * a supplied profile.
*
- * @param system the system context
- * @param profile a composition profile
+ * @param profile a containment profile
* @return the containment model
*/
public ContainmentModel createContainmentModel( ContainmentProfile profile )
@@ -215,7 +213,7 @@
/**
* Creation of a new root containment context.
*
- * @param profile a composition profile
+ * @param profile a containment profile
* @return the containment model
*/
public ContainmentContext createContainmentContext( ContainmentProfile profile
)
1.3 +3 -3
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultServiceRepository.java
Index: DefaultServiceRepository.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultServiceRepository.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultServiceRepository.java 6 Jul 2003 03:00:25 -0000 1.2
+++ DefaultServiceRepository.java 17 Aug 2003 06:35:51 -0000 1.3
@@ -155,12 +155,12 @@
* found locally, the implementation redirects the request to
* the parent service manager.
*
- * @param classname the service class name
* @param reference the reference descriptor
* @return the service matching the supplied descriptor.
* @exception UnknownServiceException if a matching service cannot be found
*/
- public Service getService( final ReferenceDescriptor reference ) throws
ServiceUnknownException
+ public Service getService( final ReferenceDescriptor reference )
+ throws ServiceUnknownException
{
Service service = getLocalService( reference );
if( service == null )
1.2 +7 -12
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java
Index: DefaultStageModel.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultStageModel.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultStageModel.java 24 Jul 2003 22:14:55 -0000 1.1
+++ DefaultStageModel.java 17 Aug 2003 06:35:51 -0000 1.2
@@ -93,10 +93,6 @@
private final StageDirective m_directive;
- private final String m_partition;
-
- private final String m_name;
-
private final String m_source;
//==============================================================
@@ -107,11 +103,12 @@
* Creation of a new stage model.
*
* @param logger the logging channel
- * @param descriptors the dependency descriptors
- * @param directives the dependency directives (possibly null)
+ * @param partition the partition name
+ * @param descriptor the stage descriptors
+ * @param directive the stage directive (possibly null)
*/
public DefaultStageModel(
- final Logger logger, final String partition, final String name,
+ final Logger logger, String partition,
final StageDescriptor descriptor, StageDirective directive )
throws ModelException
{
@@ -121,8 +118,6 @@
enableLogging( logger );
m_descriptor = descriptor;
m_directive = directive;
- m_partition = partition;
- m_name = name;
//
// a stage directive is either declaring with an explicitly
@@ -202,8 +197,8 @@
* Filter a set of candidate service descriptors and return the
* set of acceptable stage providers as a ordered sequence.
*
- * @param key the dependency directive
- * @param candidates the set of candidate services for the dependency
+ * @param directive the stage directive
+ * @param providers the set of candidate extension descriptors
* @return the accepted candidates in ranked order
*/
private ExtensionDescriptor[] filter(
1.10 +12 -11
avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java
Index: DefaultSystemContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition/src/java/org/apache/avalon/composition/model/impl/DefaultSystemContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DefaultSystemContext.java 11 Aug 2003 22:58:50 -0000 1.9
+++ DefaultSystemContext.java 17 Aug 2003 06:35:51 -0000 1.10
@@ -94,6 +94,7 @@
* @param base the base directory from which relative references
* within a classpath or library directive shall be resolved
* @param root a repository root directory
+ * @param priority logging manager default priority
* @return a system context
*/
public static SystemContext createSystemContext(
@@ -195,8 +196,7 @@
/**
* Creation of a new system context.
*
- * @param logger the logging channel
- * @param common the common classloader
+ * @param logging the logging manager
* @param base the base directory from which relative references
* within a classpath or library directive shall be resolved
* @param repository a resource repository to be used when resolving
@@ -214,10 +214,11 @@
/**
* Creation of a new system context.
*
- * @param logger the logging channel
- * @param common the common classloader
+ * @param logging the logging manager
* @param base the base directory from which relative references
* within a classpath or library directive shall be resolved
+ * @param working the working directory from which a home and temp directory
+ * can be resolved
* @param repository a resource repository to be used when resolving
* resource directives
*/
@@ -234,10 +235,11 @@
/**
* Creation of a new system context.
*
- * @param logger the logging channel
- * @param common the common classloader
+ * @param logging the logging manager
* @param base the base directory from which relative references
* within a classpath or library directive shall be resolved
+ * @param home the home directory
+ * @param temp the temp directory
* @param repository a resource repository to be used when resolving
* resource directives
*/
@@ -252,12 +254,11 @@
/**
* Creation of a new system context.
*
- * @param logger the logging channel
+ * @param logging the logging manager
* @param base the base directory from which relative references
* within a classpath or library directive shall be resolved
- * @param home the directory from which persistent content may be created
- * @param temp a temporary directory that will be destroyed on completion
- * of the session
+ * @param home the home directory
+ * @param temp the temp directory
* @param repository a resource repository to be used when resolving
* resource directives
* @param trace flag indicating if internal logging is enabled
1.2 +3 -3
avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java
Index: BlockCompositionDirective.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/data/BlockCompositionDirective.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockCompositionDirective.java 30 Jul 2003 14:43:58 -0000 1.1
+++ BlockCompositionDirective.java 17 Aug 2003 06:35:52 -0000 1.2
@@ -67,8 +67,8 @@
/**
* Creation of a new resource directive.
- * @param group the artifact group
- * @param name the artifact name
+ * @param name the name to assign to the container
+ * established by the include directive
* @param version the artifact version
*/
public BlockCompositionDirective(
1.2 +5 -4
avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/data/Parameter.java
Index: Parameter.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/data/Parameter.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Parameter.java 17 Jul 2003 21:21:58 -0000 1.1
+++ Parameter.java 17 Aug 2003 06:35:52 -0000 1.2
@@ -83,13 +83,14 @@
* </param>
* </pre>
*
+ * <p>TODO: Fix usage of basic type (int, float, long, etc.) - how do we return
+ * basic types - can't use getValue() becuase it returns an Object unless
+ * have some way of packing the basic type into a carrier</p>
+ *
* @see EntryDirective
* @see ImportDirective
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @version $Revision$ $Date$
- * @todo Fix usage of basic type (int, float, long, etc.) - how do we return
- * basic types - can't use getValue() becuase it returns an Object unless
- * have some way of packing the basic type into a carrier
*/
public class Parameter implements Serializable
{
1.4 +2 -2
avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/model/ProfileSelector.java
Index: ProfileSelector.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/model/ProfileSelector.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProfileSelector.java 27 Jul 2003 03:16:17 -0000 1.3
+++ ProfileSelector.java 17 Aug 2003 06:35:52 -0000 1.4
@@ -78,7 +78,7 @@
* candidates profiles.
*
* @param profiles the set of candidate profiles
- * @param dependency a stage dependency
+ * @param stage a stage dependency
* @return the preferred extension provider profile or null if
* no satisfactory profile can be established
*/
1.2 +1 -2
avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/model/ServiceRepository.java
Index: ServiceRepository.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/composition-spi/src/java/org/apache/avalon/composition/model/ServiceRepository.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ServiceRepository.java 5 Jul 2003 04:02:30 -0000 1.1
+++ ServiceRepository.java 17 Aug 2003 06:35:52 -0000 1.2
@@ -82,7 +82,6 @@
* found locally, the implementation redirects the request to
* the parent service manager.
*
- * @param classname the service class name
* @param reference the reference descriptor
* @return the service matching the supplied descriptor.
* @exception UnknownServiceException if a matching service cannot be found
1.2 +9 -8
avalon-sandbox/merlin/extension-spi/src/java/org/apache/avalon/extension/manager/PackageManager.java
Index: PackageManager.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/extension-spi/src/java/org/apache/avalon/extension/manager/PackageManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- PackageManager.java 23 Jun 2003 02:29:29 -0000 1.1
+++ PackageManager.java 17 Aug 2003 06:35:52 -0000 1.2
@@ -55,18 +55,19 @@
import org.apache.avalon.extension.Extension;
/**
- * Basic Implementation Of PackageManager Interface used to manage
+ * <p>Basic Implementation Of PackageManager Interface used to manage
* "Optional Packages" (formerly known as "Standard Extensions").
* The "Optional Packages" are stored on file system in a number of
- * directories.
+ * directories.</p>
*
- * @author <a href="mailto:peter at apache.org">Peter Donald</a>
+ * <p>TODO: Determine an appropriate interface to this service and
+ * an appropriate mechanism via which to do searching and
+ * expansion of a package set. At that point separate out
+ * implementation and interface for mechanism.</p>
+ *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @version $Revision$ $Date$
* @see ExtensionManager
- * @todo Determine an appropriate interface to this service and
- * an appropriate mechanism via which to do searching and
- * expansion of a package set. At that point separate out
- * implementation and interface for mechanism.
*/
public class PackageManager
{
1.5 +2 -3
avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java
Index: DefaultKernelContext.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernelContext.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DefaultKernelContext.java 17 Aug 2003 00:51:57 -0000 1.4
+++ DefaultKernelContext.java 17 Aug 2003 06:35:52 -0000 1.5
@@ -83,12 +83,11 @@
import org.apache.excalibur.configuration.ConfigurationUtil;
/**
+ * Default implementation of a kernel context.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @version $Revision$ $Date$
- * @see Block
*/
-
public class DefaultKernelContext extends AbstractLogEnabled implements
KernelContext
{
//==============================================================
1.2 +8 -3
avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/package.html
Index: package.html
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 11 Aug 2003 22:34:50 -0000 1.1
+++ package.html 17 Aug 2003 06:35:52 -0000 1.2
@@ -1,15 +1,20 @@
<body>
<p>
-The kernel package defines a top level Kernel that serves as a host to a set of
Blocks. The default kernel implementation handles the setup of supporting
infrastructure and deployment of declared blocks.
+The kernel package defines a top level Kernel that serves as a host to a set
+of Blocks. The default kernel implementation handles the setup of supporting
+infrastructure and deployment of declared blocks.
</p>
<p>
<table border="1" cellpadding="3" cellspacing="0" width="100%">
<tr bgcolor="#ccccff">
<td colspan="2"><font size="+2"><b>Component Summary</b></font></td>
<tr>
- <td width="20%" valign="top"><strong>[EMAIL PROTECTED]
org.apache.avalon.merlin.kernel.impl.DefaultKernel}</strong></td>
- <td>A <code>[EMAIL PROTECTED] org.apache.avalon.merlin.kernel.Kernel}</code>
implementation that provides support the establishment, deployment and decommissioning
of a set of [EMAIL PROTECTED] org.apache.avalon.merlin.block.Block }
instances.</td></tr>
+ <td width="20%" valign="top"><strong>
+ [EMAIL PROTECTED]
org.apache.avalon.merlin.kernel.impl.DefaultKernel}</strong></td>
+ <td>A <code>[EMAIL PROTECTED] org.apache.avalon.merlin.kernel.Kernel}</code>
implementation
+ that provides support the establishment, deployment and decommissioning of a
set
+ of [EMAIL PROTECTED] org.apache.avalon.activation.appliance.Block }
instances.</td></tr>
</tr>
</table>
</p>
1.2 +6 -2
avalon-sandbox/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryException.java
Index: RepositoryException.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/merlin/repository/spi/src/java/org/apache/avalon/repository/RepositoryException.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RepositoryException.java 11 Aug 2003 22:37:16 -0000 1.1
+++ RepositoryException.java 17 Aug 2003 06:35:52 -0000 1.2
@@ -74,7 +74,7 @@
* Construct a new <code>RepositoryException</code> instance.
*
* @param message The detail message for this exception.
- * @param throwable the root cause of the exception
+ * @param cause the root cause of the exception
*/
public RepositoryException( final String message, final Throwable cause )
{
@@ -82,6 +82,10 @@
m_cause = cause;
}
+ /**
+ * Return the causal exception.
+ * @return the causal exception (possibly null)
+ */
public Throwable getCause()
{
return m_cause;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
