donaldp 2002/08/24 01:55:07
Modified: containerkit/src/java/org/apache/excalibur/containerkit/processor
DependencyMap.java
containerkit/src/java/org/apache/excalibur/containerkit/kernel
ComponentEntry.java AbstractServiceKernel.java
containerkit/src/java/org/apache/excalibur/containerkit/demo
SimpleResourceProvider.java
containerkit/src/java/org/apache/excalibur/containerkit/verifier
AssemblyVerifier.java MetaDataVerifier.java
containerkit/src/java/org/apache/excalibur/containerkit/store
ComponentStore.java
Log:
Entry contains a profile.
Revision Changes Path
1.3 +6 -5
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/processor/DependencyMap.java
Index: DependencyMap.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/processor/DependencyMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DependencyMap.java 19 Aug 2002 13:32:44 -0000 1.2
+++ DependencyMap.java 24 Aug 2002 08:55:07 -0000 1.3
@@ -11,6 +11,7 @@
import java.util.Collection;
import java.util.List;
import org.apache.avalon.framework.info.DependencyDescriptor;
+import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.excalibur.containerkit.kernel.ComponentEntry;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
@@ -177,8 +178,8 @@
final ComponentStore store )
{
final DependencyDescriptor[] descriptors =
- component.getInfo().getDependencies();
- final ComponentMetaData metaData = component.getMetaData();
+ component.getProfile().getInfo().getDependencies();
+ final ComponentMetaData metaData =
component.getProfile().getMetaData();
for( int i = 0; i < descriptors.length; i++ )
{
@@ -209,7 +210,7 @@
final ArrayList order,
final ComponentStore store )
{
- final String name = component.getMetaData().getName();
+ final String name = component.getProfile().getMetaData().getName();
final Collection components = store.getComponents();
final ComponentEntry[] entrySet =
@@ -218,7 +219,7 @@
{
final ComponentEntry other = entrySet[ i ];
final DependencyMetaData[] roles =
- other.getMetaData().getDependencies();
+ other.getProfile().getMetaData().getDependencies();
for( int j = 0; j < roles.length; j++ )
{
1.15 +17 -31
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ComponentEntry.java 18 Aug 2002 06:06:09 -0000 1.14
+++ ComponentEntry.java 24 Aug 2002 08:55:07 -0000 1.15
@@ -7,8 +7,7 @@
*/
package org.apache.excalibur.containerkit.kernel;
-import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
-import org.apache.avalon.framework.info.ComponentInfo;
+import org.apache.excalibur.containerkit.registry.ComponentProfile;
/**
* This is the structure that components are contained within when
@@ -20,17 +19,10 @@
public class ComponentEntry
{
/**
- * The [EMAIL PROTECTED] ComponentInfo} that describes
- * the type of this component.
- */
- private final ComponentInfo m_info;
-
- /**
- * The [EMAIL PROTECTED] ComponentMetaData} that describes
+ * The [EMAIL PROTECTED] ComponentProfile} that describes
* this component.
*/
- private final ComponentMetaData m_metaData;
-
+ private final ComponentProfile m_profile;
/**
* The instance of this component.
*/
@@ -38,32 +30,26 @@
/**
* Creation of a new <code>ComponentEntry</code> instance.
- * @param metaData the [EMAIL PROTECTED] ComponentMetaData} instance
defining the component.
- */
- public ComponentEntry( final ComponentInfo info,
- final ComponentMetaData metaData )
- {
- m_info = info;
- m_metaData = metaData;
- }
-
- /**
- * Returns the underlying [EMAIL PROTECTED]
org.apache.avalon.framework.info.ComponentInfo} instance.
*
- * @return the component info instance
+ * @param profile the [EMAIL PROTECTED] ComponentProfile} instance
defining the component.
*/
- public ComponentInfo getInfo()
+ public ComponentEntry( final ComponentProfile profile )
{
- return m_info;
+ if( null == profile )
+ {
+ throw new NullPointerException( "profile" );
+ }
+ m_profile = profile;
}
/**
- * Returns the underlying [EMAIL PROTECTED] ComponentMetaData} instance.
- * @return the component meta data instance
+ * Returns the [EMAIL PROTECTED] ComponentProfile} for this component.
+ *
+ * @return the [EMAIL PROTECTED] ComponentProfile} for this component.
*/
- public ComponentMetaData getMetaData()
+ public ComponentProfile getProfile()
{
- return m_metaData;
+ return m_profile;
}
/**
@@ -90,6 +76,6 @@
*/
public boolean isActive()
{
- return ( null != getObject() );
+ return (null != getObject());
}
}
1.26 +7 -4
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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- AbstractServiceKernel.java 23 Aug 2002 08:47:20 -0000 1.25
+++ AbstractServiceKernel.java 24 Aug 2002 08:55:07 -0000 1.26
@@ -21,6 +21,7 @@
import org.apache.excalibur.containerkit.lifecycle.ResourceProvider;
import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.store.ComponentStore;
+import org.apache.excalibur.containerkit.registry.ComponentProfile;
import org.apache.avalon.framework.info.ComponentInfo;
/**
@@ -189,7 +190,8 @@
throws Exception
{
final ComponentInfo info = m_factory.createInfo(
component.getImplementationKey() );
- final ComponentEntry entry = new ComponentEntry( info, component );
+ final ComponentProfile profile = new ComponentProfile( info,
component );
+ final ComponentEntry entry = new ComponentEntry( profile );
m_store.addComponent( entry );
}
@@ -268,7 +270,7 @@
final boolean startup )
throws Exception
{
- final String name = component.getMetaData().getName();
+ final String name = component.getProfile().getMetaData().getName();
if( startup == component.isActive() )
{
@@ -329,7 +331,8 @@
final List pathList = new ArrayList();
for( int i = 0; i < order.length; i++ )
{
- pathList.add( order[ i ].getMetaData().getName() );
+ ComponentEntry componentEntry = order[ i ];
+ pathList.add(
componentEntry.getProfile().getMetaData().getName() );
}
final String message =
1.2 +2 -2
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/SimpleResourceProvider.java
Index: SimpleResourceProvider.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/demo/SimpleResourceProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SimpleResourceProvider.java 23 Aug 2002 08:51:15 -0000 1.1
+++ SimpleResourceProvider.java 24 Aug 2002 08:55:07 -0000 1.2
@@ -32,7 +32,7 @@
protected ComponentMetaData getMetaData( final Object entry )
{
- return ((ComponentEntry)entry).getMetaData();
+ return ((ComponentEntry)entry).getProfile().getMetaData();
}
protected Object getService( final String name,
1.33 +26 -21
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.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- AssemblyVerifier.java 18 Aug 2002 04:45:22 -0000 1.32
+++ AssemblyVerifier.java 24 Aug 2002 08:55:07 -0000 1.33
@@ -13,6 +13,7 @@
import org.apache.avalon.excalibur.i18n.Resources;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.excalibur.containerkit.metadata.DependencyMetaData;
+import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
import org.apache.excalibur.containerkit.kernel.ComponentEntry;
import org.apache.avalon.framework.info.ComponentInfo;
import org.apache.avalon.framework.info.DependencyDescriptor;
@@ -143,7 +144,7 @@
final String trace = getDependencyTrace( dependency, stack );
final String message =
REZ.getString( "assembly.circular-dependency.error",
- component.getMetaData().getName(),
+
component.getProfile().getMetaData().getName(),
trace );
throw new VerifyException( message );
}
@@ -168,7 +169,7 @@
final StringBuffer sb = new StringBuffer();
sb.append( "[ " );
- final String name = component.getMetaData().getName();
+ final String name = component.getProfile().getMetaData().getName();
final int size = stack.size();
final int top = size - 1;
for( int i = top; i >= 0; i-- )
@@ -178,9 +179,9 @@
{
sb.append( ", " );
}
- sb.append( other.getMetaData().getName() );
+ sb.append( other.getProfile().getMetaData().getName() );
- if( other.getMetaData().getName().equals( name ) )
+ if( other.getProfile().getMetaData().getName().equals( name ) )
{
break;
}
@@ -206,7 +207,7 @@
{
final ArrayList dependencies = new ArrayList();
final DependencyMetaData[] deps =
- component.getMetaData().getDependencies();
+ component.getProfile().getMetaData().getDependencies();
for( int i = 0; i < deps.length; i++ )
{
@@ -244,8 +245,8 @@
final ComponentEntry[] others
)
throws VerifyException
{
- final ComponentInfo info = component.getInfo();
- final DependencyMetaData[] roles =
component.getMetaData().getDependencies();
+ final ComponentInfo info = component.getProfile().getInfo();
+ final DependencyMetaData[] roles =
component.getProfile().getMetaData().getDependencies();
for( int i = 0; i < roles.length; i++ )
{
@@ -262,13 +263,13 @@
REZ.getString( "assembly.missing-dependency.error",
roleName,
providerName,
- component.getMetaData().getName() );
+
component.getProfile().getMetaData().getName() );
throw new VerifyException( message );
}
//make sure that the component offers service
//that user expects it to be providing
- final ComponentInfo providerInfo = provider.getInfo();
+ final ComponentInfo providerInfo =
provider.getProfile().getInfo();
final ServiceDescriptor[] services = providerInfo.getServices();
if( !hasMatchingService( service, services ) )
{
@@ -276,7 +277,7 @@
REZ.getString(
"assembly.dependency-missing-service.error",
providerName,
service,
- component.getMetaData().getName() );
+
component.getProfile().getMetaData().getName() );
throw new VerifyException( message );
}
}
@@ -294,7 +295,8 @@
{
for( int i = 0; i < components.length; i++ )
{
- if( components[ i ].getMetaData().getName().equals( name ) )
+ ComponentEntry componentEntry = components[ i ];
+ if( componentEntry.getProfile().getMetaData().getName().equals(
name ) )
{
return components[ i ];
}
@@ -314,7 +316,8 @@
{
for( int i = 0; i < components.length; i++ )
{
- final String name = components[ i ].getMetaData().getName();
+ ComponentEntry componentEntry = components[ i ];
+ final String name =
componentEntry.getProfile().getMetaData().getName();
if( !isValidName( name ) )
{
final String message =
@@ -359,7 +362,8 @@
{
for( int i = 0; i < components.length; i++ )
{
- final String name = components[ i ].getMetaData().getName();
+ ComponentEntry componentEntry = components[ i ];
+ final String name =
componentEntry.getProfile().getMetaData().getName();
verifyUniqueName( components, name, i );
}
}
@@ -379,8 +383,9 @@
{
for( int i = 0; i < components.length; i++ )
{
+ ComponentEntry componentEntry = components[ i ];
final String other =
- components[ i ].getMetaData().getName();
+ componentEntry.getProfile().getMetaData().getName();
if( index != i && other.equals( name ) )
{
final String message =
@@ -403,12 +408,12 @@
{
//Make sure all role entries specified in config file are valid
final DependencyMetaData[] dependencySet =
- component.getMetaData().getDependencies();
+ component.getProfile().getMetaData().getDependencies();
for( int i = 0; i < dependencySet.length; i++ )
{
final String roleName = dependencySet[ i ].getRole();
- final ComponentInfo info = component.getInfo();
+ final ComponentInfo info = component.getProfile().getInfo();
final DependencyDescriptor descriptor = info.getDependency(
roleName );
//If there is no dependency descriptor in ComponentInfo then
@@ -419,19 +424,19 @@
REZ.getString( "assembly.unknown-dependency.error",
roleName,
roleName,
- component.getMetaData().getName() );
+
component.getProfile().getMetaData().getName() );
throw new VerifyException( message );
}
}
//Make sure all dependencies in ComponentInfo file are satisfied
- final ComponentInfo info = component.getInfo();
+ final ComponentInfo info = component.getProfile().getInfo();
final DependencyDescriptor[] dependencies = info.getDependencies();
for( int i = 0; i < dependencies.length; i++ )
{
final DependencyDescriptor dependency = dependencies[ i ];
final DependencyMetaData role =
- component.getMetaData().getDependency( dependency.getRole()
);
+ component.getProfile().getMetaData().getDependency(
dependency.getRole() );
//If there is no Role then the user has failed
//to specify a needed dependency.
@@ -440,7 +445,7 @@
final String message =
REZ.getString( "assembly.unspecified-dependency.error",
dependency.getRole(),
- component.getMetaData().getName() );
+
component.getProfile().getMetaData().getName() );
throw new VerifyException( message );
}
}
1.13 +8 -8
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- MetaDataVerifier.java 18 Aug 2002 03:51:28 -0000 1.12
+++ MetaDataVerifier.java 24 Aug 2002 08:55:07 -0000 1.13
@@ -106,8 +106,8 @@
final Class clazz )
throws VerifyException
{
- final String name = component.getMetaData().getName();
- final ComponentInfo info = component.getInfo();
+ final String name = component.getProfile().getMetaData().getName();
+ final ComponentInfo info = component.getProfile().getInfo();
final Class[] interfaces =
getServiceClasses( name,
info.getServices(),
@@ -141,7 +141,7 @@
{
final String message =
REZ.getString( "metadata.declare-uneeded-entrys.error",
- component.getMetaData().getName(),
+
component.getProfile().getMetaData().getName(),
getClassname( component ) );
throw new VerifyException( message );
}
@@ -163,7 +163,7 @@
final Class clazz )
throws VerifyException
{
- final int count = component.getMetaData().getDependencies().length;
+ final int count =
component.getProfile().getMetaData().getDependencies().length;
final boolean aquiresServices =
Composable.class.isAssignableFrom( clazz ) ||
Serviceable.class.isAssignableFrom( clazz );
@@ -173,7 +173,7 @@
{
final String message =
REZ.getString( "metadata.declare-uneeded-deps.error",
- component.getMetaData().getName(),
+
component.getProfile().getMetaData().getName(),
getClassname( component ) );
throw new VerifyException( message );
}
@@ -240,7 +240,7 @@
{
final String message =
REZ.getString( "assembly.bad-class.error",
- component.getMetaData().getName(),
+
component.getProfile().getMetaData().getName(),
getClassname( component ),
e.toString() );
throw new VerifyException( message );
@@ -256,6 +256,6 @@
*/
private String getClassname( final ComponentEntry component )
{
- return component.getMetaData().getImplementationKey();
+ return component.getProfile().getMetaData().getImplementationKey();
}
}
1.3 +4 -3
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/store/ComponentStore.java
Index: ComponentStore.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/store/ComponentStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ComponentStore.java 19 Aug 2002 12:39:38 -0000 1.2
+++ ComponentStore.java 24 Aug 2002 08:55:07 -0000 1.3
@@ -13,6 +13,7 @@
import java.util.List;
import java.util.Map;
import org.apache.excalibur.containerkit.kernel.ComponentEntry;
+import org.apache.excalibur.containerkit.metadata.ComponentMetaData;
/**
*
@@ -104,7 +105,7 @@
public void addComponent( final ComponentEntry component )
{
final String name =
- component.getMetaData().getName();
+ component.getProfile().getMetaData().getName();
m_components.put( name, component );
}
@@ -116,7 +117,7 @@
public void removeComponent( final ComponentEntry component )
{
final String name =
- component.getMetaData().getName();
+ component.getProfile().getMetaData().getName();
m_components.remove( name );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
