CVS: jcontainer/loom/engine/src/java/org/jcontainer/loom/components/application BlockEntry.java,1.6,1.7 BlockResourceProvider.java,1.10,1.11 DefaultApplication.java,1.14,1.15 DependencyGraph.java,1.4,1.5 ListenerSupport.java,1.4,1.5
Peter Donald <pdonald-yCVjj/[email protected]> Mon, 3 Nov 2003 00:43:17 -0600
| Newsgroups | gmane.comp.java.jcontainer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/application
In directory hogshead.codehaus.org:/tmp/cvs-serv22178/engine/src/java/org/jcontainer/loom/components/application
Modified Files:
BlockEntry.java BlockResourceProvider.java
DefaultApplication.java DependencyGraph.java
ListenerSupport.java
Log Message:
Rename the MetaData away from standard MetaData postfix to use more readily accesisble names
Index: BlockEntry.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/application/BlockEntry.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- BlockEntry.java 16 Oct 2003 14:45:44 -0000 1.6
+++ BlockEntry.java 3 Nov 2003 06:43:15 -0000 1.7
@@ -89,6 +89,7 @@
import org.jcontainer.loom.components.util.info.ComponentInfo;
import org.jcontainer.loom.components.util.info.ServiceDescriptor;
import org.jcontainer.loom.components.util.profile.ComponentProfile;
+import org.jcontainer.loom.components.util.metadata.ComponentTemplate;
/**
* This is the structure describing each block before it is loaded.
@@ -109,14 +110,19 @@
m_componentProfile = componentProfile;
}
- public String getName()
+ public ComponentInfo getInfo()
{
- return getProfile().getMetaData().getName();
+ return m_componentProfile.getInfo();
}
- public ComponentProfile getProfile()
+ public ComponentTemplate getTemplate()
{
- return m_componentProfile;
+ return m_componentProfile.getTemplate();
+ }
+
+ public String getName()
+ {
+ return m_componentProfile.getTemplate().getName();
}
public synchronized Object getObject()
@@ -128,7 +134,7 @@
{
invalidate();
- if( null != object && !getProfile().getMetaData().isDisableProxy() )
+ if( null != object && !m_componentProfile.getTemplate().isDisableProxy() )
{
final ComponentInfo blockInfo = m_componentProfile.getInfo();
final Class[] interfaces = getServiceClasses( object, blockInfo.getServices() );
@@ -139,7 +145,7 @@
public synchronized Object getProxy()
{
- if( getProfile().getMetaData().isDisableProxy() )
+ if( m_componentProfile.getTemplate().isDisableProxy() )
{
return m_object;
}
Index: BlockResourceProvider.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/application/BlockResourceProvider.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- BlockResourceProvider.java 16 Oct 2003 14:45:44 -0000 1.10
+++ BlockResourceProvider.java 3 Nov 2003 06:43:15 -0000 1.11
@@ -104,10 +104,11 @@
import org.apache.excalibur.instrument.InstrumentManager;
import org.jcontainer.dna.AbstractLogEnabled;
import org.jcontainer.loom.components.util.ConfigurationConverter;
+import org.jcontainer.loom.components.util.info.ComponentInfo;
import org.jcontainer.loom.components.util.info.DependencyDescriptor;
import org.jcontainer.loom.components.util.lifecycle.ResourceProvider;
-import org.jcontainer.loom.components.util.metadata.DependencyMetaData;
-import org.jcontainer.loom.components.util.profile.ComponentProfile;
+import org.jcontainer.loom.components.util.metadata.ComponentTemplate;
+import org.jcontainer.loom.components.util.metadata.DependencyDirective;
import org.jcontainer.loom.interfaces.Application;
import org.jcontainer.loom.interfaces.ApplicationContext;
@@ -160,8 +161,7 @@
public Object createObject( final Object entry )
throws Exception
{
- final ComponentProfile profile = getProfileFor( entry );
- final Class clazz = profile.getInfo().getType();
+ final Class clazz = getBlockEntry( entry ).getInfo().getType();
return clazz.newInstance();
}
@@ -175,8 +175,7 @@
public Logger createLogger( final Object entry )
throws Exception
{
- final ComponentProfile profile = getProfileFor( entry );
- final String name = profile.getMetaData().getName();
+ final String name = getBlockEntry( entry ).getName();
return m_context.getLogger( name );
}
@@ -203,8 +202,7 @@
public String createInstrumentableName( Object entry )
throws Exception
{
- final ComponentProfile profile = getProfileFor( entry );
- final String name = profile.getMetaData().getName();
+ final String name = getBlockEntry( entry ).getName();
return m_context.getInstrumentableName( name );
}
@@ -217,13 +215,12 @@
public Context createContext( final Object entry )
throws Exception
{
- final ComponentProfile profile = getProfileFor( entry );
- return new DefaultBlockContext( profile.getMetaData().getName(),
+ return new DefaultBlockContext( getBlockEntry( entry ).getName(),
m_context );
}
/**
- * Create a {@link ComponentManager} object for a
+ * Create a ComponentManager object for a
* specific Block. This requires that for
* each dependency a reference to providing Block
* is aaqiured from the Application and placing it in
@@ -269,20 +266,21 @@
private Map createServiceMap( final Object entry )
throws Exception
{
- final ComponentProfile metaData = getProfileFor( entry );
+ final BlockEntry blockEntry = getBlockEntry(entry );
final HashMap map = new HashMap();
final HashMap sets = new HashMap();
- final DependencyMetaData[] roles = metaData.getMetaData().getDependencies();
+ final ComponentInfo info = blockEntry.getInfo();
+ final DependencyDirective[] roles = blockEntry.getTemplate().getDependencies();
for( int i = 0; i < roles.length; i++ )
{
- final DependencyMetaData role = roles[ i ];
+ final DependencyDirective role = roles[ i ];
final Object dependency = m_application.getBlock( role.getProviderName() );
final String key = role.getKey();
final DependencyDescriptor candidate =
- metaData.getInfo().getDependency( key );
+ info.getDependency( key );
if( candidate.isArray() )
{
@@ -320,7 +318,7 @@
if( value instanceof List )
{
final List list = (List)value;
- final DependencyDescriptor dependency = metaData.getInfo().getDependency( key );
+ final DependencyDescriptor dependency = info.getDependency( key );
final Object[] result = toArray( list, dependency.getComponentType() );
map.put( key, result );
@@ -367,8 +365,8 @@
public Configuration createConfiguration( final Object entry )
throws Exception
{
- final ComponentProfile metaData = getProfileFor( entry );
- return ConfigurationConverter.toConfiguration( metaData.getMetaData().getConfiguration() );
+ final ComponentTemplate template = getBlockEntry( entry ).getTemplate();
+ return ConfigurationConverter.toConfiguration( template.getConfiguration() );
}
public Parameters createParameters( final Object entry )
@@ -382,14 +380,8 @@
return parameters;
}
- /**
- * Retrieve metadata for entry.
- *
- * @param entry the entry
- * @return the MetaData for entry
- */
- private ComponentProfile getProfileFor( final Object entry )
+ private BlockEntry getBlockEntry( final Object entry )
{
- return (ComponentProfile)entry;
+ return (BlockEntry)entry;
}
}
Index: DefaultApplication.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/application/DefaultApplication.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- DefaultApplication.java 26 Oct 2003 08:11:31 -0000 1.14
+++ DefaultApplication.java 3 Nov 2003 06:43:15 -0000 1.15
@@ -178,7 +178,7 @@
final ComponentProfile[] blocks = partition.getComponents();
for( int i = 0; i < blocks.length; i++ )
{
- final String blockName = blocks[ i ].getMetaData().getName();
+ final String blockName = blocks[ i ].getTemplate().getName();
final BlockEntry blockEntry = new BlockEntry( blocks[ i ] );
m_entries.put( blockName, blockEntry );
}
@@ -321,7 +321,7 @@
}
catch( final Exception e )
{
- final String name = listeners[ i ].getMetaData().getName();
+ final String name = listeners[ i ].getTemplate().getName();
final String message =
REZ.format( "bad-listener", "startup", name, e.getMessage() );
getLogger().error( message, e );
@@ -478,7 +478,7 @@
{
final Object block =
m_lifecycleHelper.startup( entry.getName(),
- entry.getProfile(),
+ entry,
m_blockAccessor );
m_context.exportObject( entry.getName(), block );
@@ -534,7 +534,7 @@
private void startupListener( final ComponentProfile profile )
throws Exception
{
- final String name = profile.getMetaData().getName();
+ final String name = profile.getTemplate().getName();
final Object listener =
m_lifecycleHelper.startup( name,
profile,
@@ -554,7 +554,7 @@
final String message =
REZ.format( "helper.isa-blocklistener.error",
name,
- profile.getMetaData().getImplementationKey() );
+ profile.getTemplate().getImplementationKey() );
getLogger().error( message );
System.err.println( message );
}
Index: DependencyGraph.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/application/DependencyGraph.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DependencyGraph.java 3 Nov 2003 05:53:27 -0000 1.4
+++ DependencyGraph.java 3 Nov 2003 06:43:15 -0000 1.5
@@ -88,7 +88,7 @@
import java.util.ArrayList;
import org.jcontainer.loom.components.util.info.DependencyDescriptor;
-import org.jcontainer.loom.components.util.metadata.DependencyMetaData;
+import org.jcontainer.loom.components.util.metadata.DependencyDirective;
import org.jcontainer.loom.components.util.profile.ComponentProfile;
/**
@@ -136,7 +136,7 @@
final ArrayList order )
{
//If already visited this block then bug out early
- final String name = block.getMetaData().getName();
+ final String name = block.getTemplate().getName();
if( done.contains( name ) )
{
return;
@@ -169,10 +169,10 @@
for( int i = 0; i < descriptors.length; i++ )
{
final String key = descriptors[ i ].getKey();
- final DependencyMetaData[] dependencySet = block.getMetaData().getDependencies( key );
+ final DependencyDirective[] dependencySet = block.getTemplate().getDependencies( key );
for( int j = 0; j < dependencySet.length; j++ )
{
- final DependencyMetaData dependency = dependencySet[ j ];
+ final DependencyDirective dependency = dependencySet[ j ];
final ComponentProfile other = getBlock( dependency.getProviderName(), blocks );
visitBlock( other, blocks, true, done, order );
}
@@ -190,12 +190,12 @@
final ArrayList done,
final ArrayList order )
{
- final String name = block.getMetaData().getName();
+ final String name = block.getTemplate().getName();
for( int i = 0; i < blocks.length; i++ )
{
final ComponentProfile other = blocks[ i ];
- final DependencyMetaData[] roles = other.getMetaData().getDependencies();
+ final DependencyDirective[] roles = other.getTemplate().getDependencies();
for( int j = 0; j < roles.length; j++ )
{
@@ -220,7 +220,7 @@
{
for( int i = 0; i < blocks.length; i++ )
{
- if( blocks[ i ].getMetaData().getName().equals( name ) )
+ if( blocks[ i ].getTemplate().getName().equals( name ) )
{
return blocks[ i ];
}
Index: ListenerSupport.java
===================================================================
RCS file: /cvsroot/jcontainer/jcontainer/loom/engine/src/java/org/jcontainer/loom/components/application/ListenerSupport.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ListenerSupport.java 3 Nov 2003 05:53:44 -0000 1.4
+++ ListenerSupport.java 3 Nov 2003 06:43:15 -0000 1.5
@@ -156,13 +156,11 @@
*/
private BlockEvent createEvent( final BlockEntry entry )
{
- final ComponentProfile profile = entry.getProfile();
- final BlockInfo blockInfo = ComponentInfoConverter.toBlockInfo( profile.getInfo() );
- final BlockEvent event =
- new BlockEvent( profile.getMetaData().getName(),
+ final BlockInfo blockInfo =
+ ComponentInfoConverter.toBlockInfo( entry.getInfo() );
+ return new BlockEvent( entry.getName(),
entry.getProxy(),
blockInfo );
- return event;
}
/**