donaldp 2002/08/17 20:46:08
Modified: containerkit/src/java/org/apache/excalibur/containerkit/ant
SerializeInfoTask.java
containerkit/src/java/org/apache/excalibur/containerkit/dependency
DependencyMap.java
containerkit/src/java/org/apache/excalibur/containerkit/factory
ComponentFactory.java DefaultComponentFactory.java
containerkit/src/java/org/apache/excalibur/containerkit/infobuilder
ComponentInfoBuilder.java InfoCreator.java
SerializedInfoCreator.java XMLInfoCreator.java
containerkit/src/java/org/apache/excalibur/containerkit/kernel
AbstractServiceKernel.java ComponentEntry.java
containerkit/src/java/org/apache/excalibur/containerkit/lifecycle/impl
AbstractResourceProvider.java
containerkit/src/java/org/apache/excalibur/containerkit/metadata
DependencyMetaData.java
containerkit/src/java/org/apache/excalibur/containerkit/verifier
AssemblyVerifier.java MetaDataVerifier.java
Added: containerkit/src/java/org/apache/avalon/framework/info
ComponentDescriptor.java ComponentInfo.java
ContextDescriptor.java DependencyDescriptor.java
EntryDescriptor.java FeatureDescriptor.java
LoggerDescriptor.java ServiceDescriptor.java
ServiceDesignator.java package.html
containerkit/src/java/org/apache/avalon/framework/info/doc-files
uml.gif
Removed: containerkit/src/java/org/apache/excalibur/containerkit/metainfo
ComponentDescriptor.java ComponentInfo.java
ContextDescriptor.java DependencyDescriptor.java
EntryDescriptor.java FeatureDescriptor.java
LoggerDescriptor.java Resources.properties
ServiceDescriptor.java ServiceDesignator.java
package.html
containerkit/src/java/org/apache/excalibur/containerkit/metainfo/doc-files
uml.gif
Log:
Start migration of info files.
Revision Changes Path
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/ComponentDescriptor.java
Index: ComponentDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.util.Properties;
import org.apache.avalon.framework.Version;
/**
* This class is used to provide explicit information to assembler
* and administrator about the Component. It includes information
* such as;
*
* <ul>
* <li>a symbolic name</li>
* <li>classname</li>
* <li>version</li>
* </ul>
*
* <p>The ComponentDescriptor also includes an arbitrary set
* of attributes about component. Usually these are container
* specific attributes that can store arbitrary information.
* The attributes should be stored with keys based on package
* name of container. ie You could use the following</p>
*
* <pre>
* public class CocoonKeys
* {
* private final static String PACKAGE =
* CocoonKeys.class.getPackage().getName();
*
* //Is object Multi-thread safe, sharable between components
* public final static String LIFESTYLE = PACKAGE + ".Lifestyle";
*
* //Is object scoped per-request, per-session, per-page etc
* public final static String SCOPE = PACKAGE + ".Scope";
* }
*
* ...
*
* ComponentDescriptor cd = ...;
* String lifestyle = cd.getAttribute( LIFESTYLE, "single-threaded" );
* String scope = cd.getAttribute( LIFESTYLE, null );
* </pre>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public final class ComponentDescriptor
extends FeatureDescriptor
{
/**
* The short name of the Component Type. Useful for displaying
* human readable strings describing the type in
* assembly tools or generators.
*/
private final String m_name;
/**
* The implementation key for component (usually classname).
*/
private final String m_implementationKey;
/**
* The version of component that descriptor describes.
*/
private final Version m_version;
public ComponentDescriptor( final String name,
final String implementationKey,
final Version version,
final Properties attributes )
{
super( attributes );
if( implementationKey.indexOf("/") > -1 )
{
throw new IllegalArgumentException( "implementationKey: " +
implementationKey );
}
m_name = name;
m_implementationKey = implementationKey;
m_version = version;
}
/**
* Return the symbolic name of component.
*
* @return the symbolic name of component.
*/
public String getName()
{
return m_name;
}
/**
* Return the implementation key for component (usually classname).
*
* @return the implementation key for component (usually classname).
*/
public String getImplementationKey()
{
return m_implementationKey;
}
/**
* Return the version of component.
*
* @return the version of component.
*/
public Version getVersion()
{
return m_version;
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/ComponentInfo.java
Index: ComponentInfo.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.io.Serializable;
import org.apache.avalon.framework.info.ServiceDesignator;
import org.apache.avalon.framework.info.ContextDescriptor;
/**
* This class contains the meta information about a particular
* component type. It describes;
*
* <ul>
* <li>Human presentable meta data such as name, version, description etc
* useful when assembling the system.</li>
* <li>the context object capabilities that this component requires</li>
* <li>the services that this component type is capable of providing</li>
* <li>the services that this component type requires to operate (and the
* names via which services are accessed)</li>
* </ul>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public class ComponentInfo
implements Serializable
{
private final ComponentDescriptor m_descriptor;
private final ContextDescriptor m_context;
private final ServiceDescriptor[] m_services;
private final DependencyDescriptor[] m_dependencies;
private final LoggerDescriptor[] m_loggers;
/**
* Basic constructor that takes as parameters all parts.
*/
public ComponentInfo( final ComponentDescriptor descriptor,
final LoggerDescriptor[] loggers,
final ContextDescriptor context,
final ServiceDescriptor[] services,
final DependencyDescriptor[] dependencies )
{
if( null == descriptor )
{
throw new NullPointerException( "descriptor" );
}
if( null == loggers )
{
throw new NullPointerException( "loggers" );
}
if( null == context )
{
throw new NullPointerException( "context" );
}
if( null == services )
{
throw new NullPointerException( "services" );
}
if( null == dependencies )
{
throw new NullPointerException( "dependencies" );
}
m_descriptor = descriptor;
m_loggers = loggers;
m_context = context;
m_services = services;
m_dependencies = dependencies;
}
/**
* Return the Component descriptor.
*
* @return the Component descriptor.
*/
public ComponentDescriptor getComponentDescriptor()
{
return m_descriptor;
}
/**
* Return the set of Logger that this Component will use.
*
* @return the set of Logger that this Component will use.
*/
public LoggerDescriptor[] getLoggers()
{
return m_loggers;
}
/**
* Return the ContextDescriptor for Component, may be null.
* If null then this component does not implement Contextualizable.
*
* @return the ContextDescriptor for Component, may be null.
*/
public ContextDescriptor getContextDescriptor()
{
return m_context;
}
/**
* Return the set of Services that this Component is capable of providing.
*
* @return the set of Services that this Component is capable of providing.
*/
public ServiceDescriptor[] getServices()
{
return m_services;
}
/**
* Return the set of Dependencies that this Component requires to operate.
*
* @return the set of Dependencies that this Component requires to operate.
*/
public DependencyDescriptor[] getDependencies()
{
return m_dependencies;
}
/**
* Retrieve a dependency with a particular role.
*
* @param role the role
* @return the dependency or null if it does not exist
*/
public DependencyDescriptor getDependency( final String role )
{
for( int i = 0; i < m_dependencies.length; i++ )
{
if( m_dependencies[ i ].getRole().equals( role ) )
{
return m_dependencies[ i ];
}
}
return null;
}
/**
* Retrieve a service matching the supplied classname.
*
* @param classname the service classname
* @return the service descriptor or null if it does not exist
*/
public ServiceDescriptor getService( final String classname )
{
for( int i = 0; i < m_services.length; i++ )
{
final ServiceDesignator service =
m_services[ i ].getServiceDesignator();
if( service.getClassname().equals( classname ) )
{
return m_services[ i ];
}
}
return null;
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/ContextDescriptor.java
Index: ContextDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.util.Properties;
/**
* A descriptor describing the Context that the Component
* is passed to describe information about Runtime environment
* of Component. It contains information such as;
* <ul>
* <li>classname: the classname of the Context type if it
* differs from base Context class (ie BlockContext).</li>
* <li>entrys: a list of entrys contained in context</li>
* </ul>
*
* <p>Also associated with each Context is a set of arbitrary
* attributes that can be used to store extra information
* about Context requirements.</p>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public class ContextDescriptor
extends FeatureDescriptor
{
private final String m_type;
private final EntryDescriptor[] m_entrys;
/**
* Create a descriptor sans attributes.
*/
public ContextDescriptor( final String type,
final EntryDescriptor[] entrys )
{
this( type, entrys, null );
}
/**
* Create a descriptor.
* @exception java.lang.NullPointerException if type or entrys argument is null
* @exception java.lang.IllegalArgumentException if the classname format is
invalid
*/
public ContextDescriptor( final String type,
final EntryDescriptor[] entrys,
final Properties attributes )
{
super( attributes );
if( null == type )
{
throw new NullPointerException( "type" );
}
if( null == entrys )
{
throw new NullPointerException( "entrys" );
}
if( type.indexOf("/") > -1 )
{
throw new IllegalArgumentException( "classname: " + type );
}
m_type = type;
m_entrys = entrys;
}
/**
* Return the type of Context class.
*
* @return the type of Context class.
*/
public String getType()
{
return m_type;
}
/**
* Return the entrys contained in the context.
*
* @return the entrys contained in the context.
*/
public EntryDescriptor[] getEntrys()
{
return m_entrys;
}
/**
* Return the entry with specified key.
*
* @return the entry with specified key.
*/
public EntryDescriptor getEntry( final String key )
{
for( int i = 0; i < m_entrys.length; i++ )
{
final EntryDescriptor entry = m_entrys[ i ];
if( entry.getKey().equals( key ) )
{
return entry;
}
}
return null;
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/DependencyDescriptor.java
Index: DependencyDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.util.Properties;
import org.apache.avalon.framework.info.ServiceDesignator;
/**
* A descriptor that describes dependency information for
* a particular Component. This class contains information
* about;
* <ul>
* <li>role: the name component uses to look up dependency</li>
* <li>service: the class/interface that the dependency must provide</li>
* </ul>
*
* <p>Also associated with each dependency is a set of arbitrary
* attributes that can be used to store extra information
* about dependency. See {@link
org.apache.avalon.framework.info.ComponentDescriptor} for example
* of how to declare the container specific attributes.</p>
*
* <p>Possible uses for the attributes are to declare container
* specific constraints of component. For example a dependency on
* a Corba ORB may also require that the Corba ORB contain the
* TimeServer and PersistenceStateService at initialization. Or it
* may require that the componenet be multi-thread safe or that
* it is persistent etc. These are all container specific
* demands.</p>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public final class DependencyDescriptor
extends FeatureDescriptor
{
/**
* The name the component uses to lookup dependency.
*/
private final String m_role;
/**
* The service class/interface that the dependency must provide.
*/
private final ServiceDesignator m_service;
/**
* True if dependency is optional, false otherwise.
*/
private final boolean m_optional;
/**
* Constructor a dependency sans Attributes.
*/
public DependencyDescriptor( final String role,
final ServiceDesignator service )
{
this( role, service, false, null );
}
/**
* Constructor that has all parts sans parent.
*/
public DependencyDescriptor( final String role,
final ServiceDesignator service,
final boolean optional,
final Properties attributes )
{
super( attributes );
if( null == role )
{
throw new NullPointerException( "role" );
}
if( null == service )
{
throw new NullPointerException( "service" );
}
m_role = role;
m_service = service;
m_optional = optional;
}
/**
* Return the name the component uses to lookup dependency.
*
* @return the name the component uses to lookup dependency.
*/
public String getRole()
{
return m_role;
}
/**
* Return the service class/interface descriptor that describes the
* dependency must fulfilled by a provider.
*
* @return a reference to service descriptor that describes the fulfillment
* obligations that must be met by a service provider.
*/
public ServiceDesignator getService()
{
return m_service;
}
/**
* Return true if dependency is optional, false otherwise.
*
* @return true if dependency is optional, false otherwise.
*/
public boolean isOptional()
{
return m_optional;
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/EntryDescriptor.java
Index: EntryDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.io.Serializable;
/**
* A descriptor that describes a value that must be placed
* in components Context. It contains information about;
* <ul>
* <li>key: the key that component uses to look up entry</li>
* <li>type: the class/interface of the entry</li>
* <li>isOptional: true if entry is optional rather than required</li>
* </ul>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public final class EntryDescriptor
implements Serializable
{
/**
* The name the component uses to lookup entry.
*/
private final String m_key;
/**
* The class/interface of the Entry.
*/
private final String m_type;
/**
* True if entry is optional, false otherwise.
*/
private final boolean m_optional;
/**
* Construct an Entry.
*/
public EntryDescriptor( final String key,
final String type )
{
this( key, type, false );
}
/**
* Construct an Entry.
*/
public EntryDescriptor( final String key,
final String type,
final boolean optional )
{
if( null == key )
{
throw new NullPointerException( "key" );
}
if( null == type )
{
throw new NullPointerException( "type" );
}
m_key = key;
m_type = type;
m_optional = optional;
}
/**
* Return the key that Component uses to lookup entry.
*
* @return the key that Component uses to lookup entry.
*/
public String getKey()
{
return m_key;
}
/**
* Return the key type of value that is stored in Context.
*
* @return the key type of value that is stored in Context.
*/
public String getType()
{
return m_type;
}
/**
* Return true if entry is optional, false otherwise.
*
* @return true if entry is optional, false otherwise.
*/
public boolean isOptional()
{
return m_optional;
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/FeatureDescriptor.java
Index: FeatureDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.util.Properties;
import java.io.Serializable;
/**
* This is the Abstract class for all feature feature descriptors.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public abstract class FeatureDescriptor
implements Serializable
{
private static final String[] EMPTY_SET = new String[0];
/**
* The arbitrary set of attributes associated with Component.
*/
private final Properties m_attributes;
protected FeatureDescriptor( final Properties attributes )
{
m_attributes = attributes;
}
/**
* Return the attribute for specified key.
*
* @return the attribute for specified key.
*/
public String getAttribute( final String key )
{
if( null == m_attributes )
{
return null;
}
else
{
return m_attributes.getProperty( key );
}
}
/**
* Return the attribute for specified key.
*
* @return the attribute for specified key.
*/
public String getAttribute( final String key,
final String defaultValue )
{
if( null == m_attributes )
{
return defaultValue;
}
else
{
return m_attributes.getProperty( key, defaultValue );
}
}
/**
* Returns the set of attribute names available under this descriptor.
*
* @return an array of the properties names held by the descriptor.
*/
public String[] getAttributeNames()
{
if( null == m_attributes )
{
return EMPTY_SET;
}
else
{
return (String[]) m_attributes.keySet().toArray( EMPTY_SET );
}
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/LoggerDescriptor.java
Index: LoggerDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.util.Properties;
/**
* A descriptor describing the Loggers that the Component
* will use. The name of each Logger is relative to the
* Logger passed to the component (namespace separator is '.').
* "" names root logger.
*
* <p>Also associated with each Logger is a set of arbitrary
* attributes that can be used to store extra information
* about Logger requirements.</p>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public class LoggerDescriptor
extends FeatureDescriptor
{
private final String m_name;
/**
* Create a descriptor for Logger.
*
* @exception java.lang.NullPointerException if name argument is null
*/
public LoggerDescriptor( final String name,
final Properties attributes )
{
super( attributes );
if( null == name )
{
throw new NullPointerException( "name" );
}
m_name = name;
}
/**
* Return the name of logger.
*
* @return the name of Logger.
*/
public String getName()
{
return m_name;
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/ServiceDescriptor.java
Index: ServiceDescriptor.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import java.util.Properties;
import org.apache.avalon.framework.info.ServiceDesignator;
/**
* This descriptor defines the type of service offerend or required
* by a component. The type corresponds to the class name of the
* class/interface implemented by component. Associated with each
* classname is a version object so that different versions of same
* interface can be represented.
*
* <p>Also associated with each service is a set of arbitrary
* attributes that can be used to store extra information
* about service. See {@link org.apache.avalon.framework.info.ComponentDescriptor}
for example
* of how to declare the container specific attributes.</p>
*
* <p>Possible uses for the attributes are to declare a service
* as "stateless", "pass-by-value", "remotable" or even to attach
* attributes such as security or transaction constraints. These
* attributes are container specific and should not be relied
* upon to work in all containers.</p>
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public final class ServiceDescriptor
extends FeatureDescriptor
{
/**
* The service reference that descriptor is describing.
*/
private final ServiceDesignator m_designator;
/**
* Construct a service descriptor for specified ServiceDesignator.
*
* @param designator the ServiceDesignator
*/
public ServiceDescriptor( final ServiceDesignator designator )
{
this( designator, null );
}
/**
* Construct a service with specified name, version and attributes.
*
* @param designator the ServiceDesignator
* @param attributes the attributes of service
*/
public ServiceDescriptor( final ServiceDesignator designator,
final Properties attributes )
{
super( attributes );
if( null == designator )
{
throw new NullPointerException( "designator" );
}
m_designator = designator;
}
/**
* Retrieve the service that service descriptor refers to.
*
* @return the service that service descriptor refers to.
*/
public ServiceDesignator getServiceDesignator()
{
return m_designator;
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/ServiceDesignator.java
Index: ServiceDesignator.java
===================================================================
/*
* Copyright (C) The Apache Software Foundation. All rights reserved.
*
* This software is published under the terms of the Apache Software License
* version 1.1, a copy of which has been included with this distribution in
* the LICENSE.txt file.
*/
package org.apache.avalon.framework.info;
import org.apache.avalon.framework.Version;
import java.io.Serializable;
/**
* This service reference defines the type of service required
* by a component. The type corresponds to the class name of the
* class/interface implemented by component. Associated with each
* classname is a version object so that different versions of same
* interface can be represented.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Stephen McConnell</a>
* @version $Revision: 1.1 $ $Date: 2002/08/18 03:46:07 $
*/
public final class ServiceDesignator
implements Serializable
{
/**
* The name of service class.
*/
private final String m_classname;
/**
* The version of service class.
*/
private final Version m_version;
/**
* Construct a service with specified name, version and attributes.
*
* @param classname the name of the service
* @param version the version of service
*/
public ServiceDesignator( final String classname,
final Version version )
{
if( null == classname )
{
throw new NullPointerException( "classname" );
}
if( null == version )
{
throw new NullPointerException( "version" );
}
m_classname = classname;
m_version = version;
}
/**
* Return classname of Service (which coresponds to the interface
* name eg org.apache.block.WebServer)
*
* @return the classname of the Service
*/
public String getClassname()
{
return m_classname;
}
/**
* Return the version of interface
*
* @return the version of interface
*/
public Version getVersion()
{
return m_version;
}
/**
* Determine if specified service will match this service.
* To match a service has to have same name and must comply with version.
*
* @param other the other ServiceInfo
* @return true if matches, false otherwise
*/
public boolean matches( final ServiceDesignator other )
{
return
other.getClassname().equals( getClassname() ) &&
other.getVersion().complies( getVersion() );
}
/**
* Convert to a string of format name/version
*
* @return string describing service
*/
public String toString()
{
return getClassname() + "/" + getVersion();
}
}
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/package.html
Index: package.html
===================================================================
<body>
A set of classes supporting the representation of information about a
component type.
<h3>Overview</h3>
<p>This package includes a set of classes supporting the representation of
information about a component type. This information is refered to as
component meta-info. Component meta-info deals primarily with the
declaration of the services implemented by a component type, the service
dependecies that a component type has on other components, and lastly,
general information of the component including its name, implementation
version and related attributes.<p>
<h3>Package Structure (UML)</h3>
<p><img src=doc-files/uml.gif border=0></p>
</body>
1.1
jakarta-avalon-excalibur/containerkit/src/java/org/apache/avalon/framework/info/doc-files/uml.gif
<<Binary file>>
1.5 +3 -3
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/ant/SerializeInfoTask.java
Index: SerializeInfoTask.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/ant/SerializeInfoTask.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SerializeInfoTask.java 17 Aug 2002 06:46:38 -0000 1.4
+++ SerializeInfoTask.java 18 Aug 2002 03:46:07 -0000 1.5
@@ -7,7 +7,7 @@
*/
package org.apache.excalibur.containerkit.ant;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.excalibur.containerkit.infobuilder.XMLInfoCreator;
import org.apache.tools.ant.Task;
import org.apache.tools.ant.BuildException;
@@ -23,7 +23,7 @@
import java.io.OutputStream;
/**
- * Simple task to load an XML descriptor into {@link ComponentInfo}
+ * Simple task to load an XML descriptor into {@link
org.apache.avalon.framework.info.ComponentInfo}
* object and then serialize object to file.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
1.12 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/dependency/DependencyMap.java
Index: DependencyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/dependency/DependencyMap.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DependencyMap.java 18 Aug 2002 03:34:27 -0000 1.11
+++ DependencyMap.java 18 Aug 2002 03:46:07 -0000 1.12
@@ -10,7 +10,7 @@
import java.util.ArrayList;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
-import org.apache.excalibur.containerkit.metainfo.DependencyDescriptor;
+import org.apache.avalon.framework.info.DependencyDescriptor;
import org.apache.excalibur.containerkit.kernel.ComponentEntry;
/**
1.5 +4 -4
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/ComponentFactory.java
Index: ComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/ComponentFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ComponentFactory.java 17 Aug 2002 06:44:54 -0000 1.4
+++ ComponentFactory.java 18 Aug 2002 03:46:07 -0000 1.5
@@ -7,11 +7,11 @@
*/
package org.apache.excalibur.containerkit.factory;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
/**
* This interface defines the mechanism via which a
- * component or its associated {@link
org.apache.excalibur.containerkit.metainfo.ComponentInfo} can
+ * component or its associated {@link
org.apache.avalon.framework.info.ComponentInfo} can
* be created.
*
* <p>Usually the component or componentInfo will just be loaded
@@ -32,7 +32,7 @@
public interface ComponentFactory
{
/**
- * Create a {@link ComponentInfo} for component
+ * Create a {@link org.apache.avalon.framework.info.ComponentInfo} for component
* specified by implementationKey.
*
* @param implementationKey the key indicating type of component (usually
classname)
1.7 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/DefaultComponentFactory.java
Index: DefaultComponentFactory.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/factory/DefaultComponentFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultComponentFactory.java 17 Aug 2002 06:44:55 -0000 1.6
+++ DefaultComponentFactory.java 18 Aug 2002 03:46:07 -0000 1.7
@@ -12,7 +12,7 @@
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
import org.apache.excalibur.containerkit.infobuilder.ComponentInfoBuilder;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
/**
* The default implementation of {@link ComponentFactory}
1.17 +5 -5
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/ComponentInfoBuilder.java
Index: ComponentInfoBuilder.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/ComponentInfoBuilder.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- ComponentInfoBuilder.java 17 Aug 2002 06:52:42 -0000 1.16
+++ ComponentInfoBuilder.java 18 Aug 2002 03:46:07 -0000 1.17
@@ -13,10 +13,10 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
/**
- * A ComponentInfoBuilder is responsible for building {@link ComponentInfo}
+ * A ComponentInfoBuilder is responsible for building {@link
org.apache.avalon.framework.info.ComponentInfo}
* objects from Configuration objects. The format for Configuration object
* is specified in the <a href="package-summary.html#external">package summary</a>.
*
@@ -47,7 +47,7 @@
}
/**
- * Create a {@link ComponentInfo} object for specified Class.
+ * Create a {@link org.apache.avalon.framework.info.ComponentInfo} object for
specified Class.
*
* @param clazz The class of Component
* @return the created ComponentInfo
@@ -60,7 +60,7 @@
}
/**
- * Create a {@link ComponentInfo} object for specified
+ * Create a {@link org.apache.avalon.framework.info.ComponentInfo} object for
specified
* classname, in specified ClassLoader.
*
* @param classname The classname of Component
1.4 +5 -5
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/InfoCreator.java
Index: InfoCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/InfoCreator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- InfoCreator.java 17 Aug 2002 06:52:42 -0000 1.3
+++ InfoCreator.java 18 Aug 2002 03:46:07 -0000 1.4
@@ -7,11 +7,11 @@
*/
package org.apache.excalibur.containerkit.infobuilder;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
import java.io.InputStream;
/**
- * Simple interface used to create {@link ComponentInfo}
+ * Simple interface used to create {@link
org.apache.avalon.framework.info.ComponentInfo}
* from stream. This abstraction was primarily created so
* that the ComponentInfo could be built from non-XML
* sources and no XML classes need be in the classpath.
@@ -22,11 +22,11 @@
public interface InfoCreator
{
/**
- * Create a {@link ComponentInfo} from stream
+ * Create a {@link org.apache.avalon.framework.info.ComponentInfo} from stream
*
* @param implementationKey the name of component type that we are looking up
* @param inputStream the stream that the resource is loaded from
- * @return the newly created {@link ComponentInfo}
+ * @return the newly created {@link
org.apache.avalon.framework.info.ComponentInfo}
* @throws Exception
*/
ComponentInfo createComponentInfo( String implementationKey,
1.4 +3 -3
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/SerializedInfoCreator.java
Index: SerializedInfoCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/SerializedInfoCreator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- SerializedInfoCreator.java 17 Aug 2002 06:52:42 -0000 1.3
+++ SerializedInfoCreator.java 18 Aug 2002 03:46:07 -0000 1.4
@@ -7,12 +7,12 @@
*/
package org.apache.excalibur.containerkit.infobuilder;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
import java.io.InputStream;
import java.io.ObjectInputStream;
/**
- * Create {@link ComponentInfo} from stream made up of
+ * Create {@link org.apache.avalon.framework.info.ComponentInfo} from stream made
up of
* serialized object.
*
* @author <a href="mailto:peter at apache.org">Peter Donald</a>
1.7 +24 -24
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/XMLInfoCreator.java
Index: XMLInfoCreator.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/infobuilder/XMLInfoCreator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XMLInfoCreator.java 17 Aug 2002 06:52:42 -0000 1.6
+++ XMLInfoCreator.java 18 Aug 2002 03:46:07 -0000 1.7
@@ -17,18 +17,18 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.excalibur.containerkit.metainfo.ComponentDescriptor;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
-import org.apache.excalibur.containerkit.metainfo.ContextDescriptor;
-import org.apache.excalibur.containerkit.metainfo.DependencyDescriptor;
-import org.apache.excalibur.containerkit.metainfo.EntryDescriptor;
-import org.apache.excalibur.containerkit.metainfo.LoggerDescriptor;
-import org.apache.excalibur.containerkit.metainfo.ServiceDescriptor;
-import org.apache.excalibur.containerkit.metainfo.ServiceDesignator;
+import org.apache.avalon.framework.info.ComponentDescriptor;
+import org.apache.avalon.framework.info.ComponentInfo;
+import org.apache.avalon.framework.info.ContextDescriptor;
+import org.apache.avalon.framework.info.DependencyDescriptor;
+import org.apache.avalon.framework.info.EntryDescriptor;
+import org.apache.avalon.framework.info.LoggerDescriptor;
+import org.apache.avalon.framework.info.ServiceDescriptor;
+import org.apache.avalon.framework.info.ServiceDesignator;
import org.xml.sax.InputSource;
/**
- * A ComponentInfoBuilder is responsible for building {@link ComponentInfo}
+ * A ComponentInfoBuilder is responsible for building {@link
org.apache.avalon.framework.info.ComponentInfo}
* objects from Configuration objects. The format for Configuration object
* is specified in the <a href="package-summary.html#external">package summary</a>.
*
@@ -44,7 +44,7 @@
ResourceManager.getPackageResources( XMLInfoCreator.class );
/**
- * Create a {@link ComponentInfo} object for specified
+ * Create a {@link org.apache.avalon.framework.info.ComponentInfo} object for
specified
* classname, loaded from specified {@link InputStream}.
*
* @param implementationKey The classname of Component
@@ -62,7 +62,7 @@
}
/**
- * Create a {@link ComponentInfo} object for specified classname from
+ * Create a {@link org.apache.avalon.framework.info.ComponentInfo} object for
specified classname from
* specified configuration data.
*
* @param classname The classname of Component
@@ -126,7 +126,7 @@
}
/**
- * A utility method to build an array of {@link LoggerDescriptor} objects
+ * A utility method to build an array of {@link
org.apache.avalon.framework.info.LoggerDescriptor} objects
* from specified configuraiton.
*
* @param configuration the loggers configuration
@@ -149,7 +149,7 @@
}
/**
- * A utility method to build a {@link LoggerDescriptor}
+ * A utility method to build a {@link
org.apache.avalon.framework.info.LoggerDescriptor}
* object from specified configuraiton.
*
* @param logger the Logger configuration
@@ -165,7 +165,7 @@
}
/**
- * A utility method to build an array of {@link DependencyDescriptor}
+ * A utility method to build an array of {@link
org.apache.avalon.framework.info.DependencyDescriptor}
* objects from specified configuration and classname.
*
* @param classname The classname of Component (used for logging purposes)
@@ -191,7 +191,7 @@
}
/**
- * A utility method to build a {@link DependencyDescriptor}
+ * A utility method to build a {@link
org.apache.avalon.framework.info.DependencyDescriptor}
* object from specified configuraiton.
*
* @param classname The classname of Component (used for logging purposes)
@@ -236,7 +236,7 @@
}
/**
- * A utility method to build a {@link ContextDescriptor}
+ * A utility method to build a {@link
org.apache.avalon.framework.info.ContextDescriptor}
* object from specified configuraiton.
*
* @param context the dependency configuration
@@ -260,11 +260,11 @@
}
/**
- * A utility method to build an array of {@link EntryDescriptor}
+ * A utility method to build an array of {@link
org.apache.avalon.framework.info.EntryDescriptor}
* objects from specified configuraiton.
*
* @param entrySet the set of entrys to build
- * @return the created {@link EntryDescriptor}s
+ * @return the created {@link org.apache.avalon.framework.info.EntryDescriptor}s
* @throws ConfigurationException if an error occurs
*/
private EntryDescriptor[] buildEntrys( final Configuration[] entrySet )
@@ -282,10 +282,10 @@
}
/**
- * Create a {@link EntryDescriptor} from configuration.
+ * Create a {@link org.apache.avalon.framework.info.EntryDescriptor} from
configuration.
*
* @param config the configuration
- * @return the created {@link EntryDescriptor}
+ * @return the created {@link org.apache.avalon.framework.info.EntryDescriptor}
* @throws ConfigurationException if an error occurs
*/
private EntryDescriptor buildEntry( final Configuration config )
@@ -300,7 +300,7 @@
}
/**
- * A utility method to build an array of {@link ServiceDescriptor}
+ * A utility method to build an array of {@link
org.apache.avalon.framework.info.ServiceDescriptor}
* objects from specified configuraiton.
*
* @param servicesSet the services configuration
@@ -323,7 +323,7 @@
}
/**
- * A utility method to build a {@link ServiceDesignator}
+ * A utility method to build a {@link
org.apache.avalon.framework.info.ServiceDesignator}
* object from specified configuraiton data.
*
* @param service the service Configuration
@@ -379,7 +379,7 @@
}
/**
- * A utility method to build a {@link ComponentDescriptor}
+ * A utility method to build a {@link
org.apache.avalon.framework.info.ComponentDescriptor}
* object from specified configuraiton data and classname.
*
* @param classname The classname of Component (used to create descriptor)
1.20 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/AbstractServiceKernel.java
Index: AbstractServiceKernel.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/AbstractServiceKernel.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractServiceKernel.java 18 Aug 2002 03:34:28 -0000 1.19
+++ AbstractServiceKernel.java 18 Aug 2002 03:46:08 -0000 1.20
@@ -21,7 +21,7 @@
import org.apache.excalibur.containerkit.lifecycle.LifecycleHelper;
import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
/**
* The <code>AbstractServiceKernel</code> defines an application scope through
1.13 +4 -4
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/ComponentEntry.java
Index: ComponentEntry.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/kernel/ComponentEntry.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ComponentEntry.java 18 Aug 2002 03:34:28 -0000 1.12
+++ ComponentEntry.java 18 Aug 2002 03:46:08 -0000 1.13
@@ -8,7 +8,7 @@
package org.apache.excalibur.containerkit.kernel;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
+import org.apache.avalon.framework.info.ComponentInfo;
/**
* This is the structure that components are contained within when
@@ -20,7 +20,7 @@
public class ComponentEntry
{
/**
- * The {@link ComponentInfo} that describes
+ * The {@link org.apache.avalon.framework.info.ComponentInfo} that describes
* the type of this component.
*/
private final ComponentInfo m_info;
@@ -48,7 +48,7 @@
}
/**
- * Returns the underlying {@link ComponentInfo} instance.
+ * Returns the underlying {@link
org.apache.avalon.framework.info.ComponentInfo} instance.
*
* @return the component info instance
*/
1.15 +4 -4
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/lifecycle/impl/AbstractResourceProvider.java
Index: AbstractResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/lifecycle/impl/AbstractResourceProvider.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- AbstractResourceProvider.java 18 Aug 2002 03:34:28 -0000 1.14
+++ AbstractResourceProvider.java 18 Aug 2002 03:46:08 -0000 1.15
@@ -25,9 +25,9 @@
import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
-import org.apache.excalibur.containerkit.metainfo.ContextDescriptor;
-import org.apache.excalibur.containerkit.metainfo.EntryDescriptor;
+import org.apache.avalon.framework.info.ComponentInfo;
+import org.apache.avalon.framework.info.ContextDescriptor;
+import org.apache.avalon.framework.info.EntryDescriptor;
import org.apache.excalibur.containerkit.factory.ComponentFactory;
/**
1.9 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/DependencyMetaData.java
Index: DependencyMetaData.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/DependencyMetaData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DependencyMetaData.java 17 Aug 2002 06:59:02 -0000 1.8
+++ DependencyMetaData.java 18 Aug 2002 03:46:08 -0000 1.9
@@ -10,7 +10,7 @@
/**
* The {@link DependencyMetaData} is the mapping of a component as a dependency
* of another component. Each component declares dependencies (via
- * {@link org.apache.excalibur.containerkit.metainfo.ComponentInfo})
+ * {@link org.apache.avalon.framework.info.ComponentInfo})
* and for each dependency there must be a coressponding DependencyMetaData which
* has a matching role. The name value in {@link DependencyMetaData} object must
refer
* to another Component that implements a service as specified in DependencyInfo.
1.30 +5 -5
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java
Index: AssemblyVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/AssemblyVerifier.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- AssemblyVerifier.java 18 Aug 2002 03:34:28 -0000 1.29
+++ AssemblyVerifier.java 18 Aug 2002 03:46:08 -0000 1.30
@@ -15,10 +15,10 @@
import org.apache.excalibur.containerkit.factory.ComponentFactory;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
-import org.apache.excalibur.containerkit.metainfo.DependencyDescriptor;
-import org.apache.excalibur.containerkit.metainfo.ServiceDescriptor;
-import org.apache.excalibur.containerkit.metainfo.ServiceDesignator;
+import org.apache.avalon.framework.info.ComponentInfo;
+import org.apache.avalon.framework.info.DependencyDescriptor;
+import org.apache.avalon.framework.info.ServiceDescriptor;
+import org.apache.avalon.framework.info.ServiceDesignator;
/**
* This Class verifies that Sars are valid. It performs a number
1.11 +5 -5
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/MetaDataVerifier.java
Index: MetaDataVerifier.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/verifier/MetaDataVerifier.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MetaDataVerifier.java 18 Aug 2002 03:34:28 -0000 1.10
+++ MetaDataVerifier.java 18 Aug 2002 03:46:08 -0000 1.11
@@ -15,10 +15,10 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
-import org.apache.excalibur.containerkit.metainfo.ContextDescriptor;
-import org.apache.excalibur.containerkit.metainfo.ServiceDescriptor;
-import org.apache.excalibur.containerkit.metainfo.ServiceDesignator;
+import org.apache.avalon.framework.info.ComponentInfo;
+import org.apache.avalon.framework.info.ContextDescriptor;
+import org.apache.avalon.framework.info.ServiceDescriptor;
+import org.apache.avalon.framework.info.ServiceDesignator;
import org.apache.excalibur.containerkit.factory.ComponentFactory;
/**
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
