cziegeler 2004/04/05 03:16:56
Modified:
fortress/container-impl/src/java/org/apache/avalon/fortress/impl/role
ECMRoleManager.java
fortress/container-impl/src/java/org/apache/avalon/fortress/impl
DefaultECMContainer.java
Log:
Bug fixing for configuration evaluation
Revision Changes Path
1.3 +5 -7
avalon-excalibur/fortress/container-impl/src/java/org/apache/avalon/fortress/impl/role/ECMRoleManager.java
Index: ECMRoleManager.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/container-impl/src/java/org/apache/avalon/fortress/impl/role/ECMRoleManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ECMRoleManager.java 5 Apr 2004 08:46:06 -0000 1.2
+++ ECMRoleManager.java 5 Apr 2004 10:16:56 -0000 1.3
@@ -18,10 +18,8 @@
package org.apache.avalon.fortress.impl.role;
import org.apache.avalon.excalibur.pool.Poolable;
+import org.apache.avalon.fortress.MetaInfoEntry;
import org.apache.avalon.fortress.RoleManager;
-import org.apache.avalon.fortress.impl.handler.FactoryComponentHandler;
-import org.apache.avalon.fortress.impl.handler.PerThreadComponentHandler;
-import org.apache.avalon.fortress.impl.handler.PoolableComponentHandler;
import org.apache.avalon.fortress.impl.role.AbstractRoleManager;
import org.apache.avalon.framework.configuration.Configurable;
import org.apache.avalon.framework.configuration.Configuration;
@@ -135,15 +133,15 @@
if ( ThreadSafe.class.isAssignableFrom( clazz ) )
{
- return PerThreadComponentHandler.class.getName();
+ return MetaInfoEntry.THREADSAFE_HANDLER;
}
else if ( Poolable.class.isAssignableFrom( clazz ) )
{
- return PoolableComponentHandler.class.getName();
+ return MetaInfoEntry.POOLABLE_HANDLER;
}
else if ( SingleThreaded.class.isAssignableFrom( clazz) )
{
- return FactoryComponentHandler.class.getName();
+ return MetaInfoEntry.FACTORY_HANDLER;
}
// Don't know, use default
1.3 +263 -15
avalon-excalibur/fortress/container-impl/src/java/org/apache/avalon/fortress/impl/DefaultECMContainer.java
Index: DefaultECMContainer.java
===================================================================
RCS file:
/home/cvs/avalon-excalibur/fortress/container-impl/src/java/org/apache/avalon/fortress/impl/DefaultECMContainer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DefaultECMContainer.java 5 Apr 2004 09:15:56 -0000 1.2
+++ DefaultECMContainer.java 5 Apr 2004 10:16:56 -0000 1.3
@@ -15,11 +15,24 @@
*/
package org.apache.avalon.fortress.impl;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.apache.avalon.excalibur.pool.Poolable;
import org.apache.avalon.fortress.MetaInfoEntry;
import org.apache.avalon.fortress.impl.ComponentHandlerMetaData;
import org.apache.avalon.fortress.impl.DefaultContainer;
+import org.apache.avalon.fortress.impl.handler.ComponentHandler;
+import org.apache.avalon.fortress.impl.handler.LEAwareComponentHandler;
+import org.apache.avalon.fortress.impl.lookup.FortressServiceSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
+import org.apache.avalon.framework.container.ContainerUtil;
+import org.apache.avalon.framework.service.DefaultServiceManager;
+import org.apache.avalon.framework.thread.SingleThreaded;
+import org.apache.avalon.framework.thread.ThreadSafe;
+import org.apache.excalibur.instrument.Instrumentable;
+import org.apache.excalibur.mpool.ObjectFactory;
/**
* Customize the Fortress container to handle ECM compatibility
@@ -30,32 +43,77 @@
public class DefaultECMContainer extends DefaultContainer {
/**
- * Retrieve the classname for component configuration.
+ * Retrieve the role for the component.
*
* @param config the component configuration
* @return the class name
*/
- private String getClassname( final Configuration config )
+ private String getRole( final Configuration config )
throws ConfigurationException {
final String className;
- if ( "component".equals( config.getName() ) ) {
- className = config.getAttribute( "class" );
- } else {
+ if ( "component".equals( config.getName() ) )
+ {
+ className = config.getAttribute( "role" );
+ }
+ else
+ {
final MetaInfoEntry roleEntry =
m_metaManager.getMetaInfoForShortName( config.getName() );
if ( null == roleEntry )
{
-
+
final String message = "No class found matching
configuration name " +
- "[name: " + config.getName() + ", location: " +
config.getLocation() + "]";
+ "[name: " + config.getName() + ", location: " +
config.getLocation() + "]";
throw new ConfigurationException( message );
}
-
- className = roleEntry.getComponentClass().getName();
+
+ Iterator roleIterator = roleEntry.getRoles();
+ if ( roleIterator.hasNext() )
+ {
+ className = (String)roleIterator.next();
+ }
+ else
+ {
+ className = roleEntry.getComponentClass().getName();
+ }
}
- if ( getLogger().isDebugEnabled() ) {
- getLogger().debug( "Configuration processed for: " + className );
+ return className;
+ }
+
+ /**
+ * Retrieve the classname (impl) for the component.
+ *
+ * @param config the component configuration
+ * @return the class name
+ */
+ private String getClassname( final Configuration config )
+ throws ConfigurationException {
+ final String className;
+
+ if ( "component".equals( config.getName() ) )
+ {
+ className = config.getAttribute( "class" );
+ }
+ else
+ {
+ if ( config.getAttribute("class", null) != null )
+ {
+ className = config.getAttribute("class");
+ }
+ else
+ {
+ final MetaInfoEntry roleEntry =
m_metaManager.getMetaInfoForShortName( config.getName() );
+ if ( null == roleEntry )
+ {
+
+ final String message = "No class found matching
configuration name " +
+ "[name: " + config.getName() + ", location: " +
config.getLocation() + "]";
+ throw new ConfigurationException( message );
+ }
+
+ className = roleEntry.getComponentClass().getName();
+ }
}
return className;
@@ -80,19 +138,209 @@
// Fortress requires a hint, so we just give it one :)
hint = element.getLocation();
}
- //final String role = getRole( element );
final String className = getClassname( element );
final int activation =
ComponentHandlerMetaData.ACTIVATION_BACKGROUND;
final ComponentHandlerMetaData metaData =
new ComponentHandlerMetaData( hint, className, element,
activation );
- try {
- addComponent( metaData );
- } catch ( Exception e ) {
+ // figure out Role
+ final String role = getRole( element );
+
+ try
+ {
+ final MetaInfoEntry metaEntry =
m_metaManager.getMetaInfoForClassname( className );
+ if ( null == metaEntry )
+ {
+ final String message = "No role defined for " +
className;
+ throw new IllegalArgumentException( message );
+ }
+
+ if ( DEFAULT_ENTRY.equals( metaData.getName() ) ||
+ SELECTOR_ENTRY.equals( metaData.getName() ) )
+ {
+ throw new IllegalArgumentException( "Using a reserved id
name" + metaData.getName() );
+ }
+
+ // create a handler for the combo of Role+MetaData
+ final ComponentHandler handler =
+ getComponentHandler( className,
+ getComponentHandlerClassName(
className, element),
+ metaData );
+
+ // put the role into our role mapper. If the role doesn't
exist
+ // yet, just stuff it in as DEFAULT_ENTRY. If it does, we
create a
+ // ServiceSelector and put that in as SELECTOR_ENTRY.
+ Map hintMap = (Map) m_mapper.get( role );
+
+ // Initialize the hintMap if it doesn't exist yet.
+ if ( null == hintMap )
+ {
+ hintMap = createHintMap();
+ hintMap.put( DEFAULT_ENTRY, handler );
+ hintMap.put( SELECTOR_ENTRY,
+ new FortressServiceSelector( this, role ) );
+ m_mapper.put( role, hintMap );
+ }
+
+ hintMap.put( hint, handler );
+
+ if ( element.getAttributeAsBoolean( "default", false ) )
+ {
+ hintMap.put( DEFAULT_ENTRY, handler );
+ }
+ }
+ catch ( ConfigurationException ce )
+ {
+ throw ce;
+ }
+ catch ( Exception e )
+ {
throw new ConfigurationException( "Could not add component",
e );
}
+
+ if ( getLogger().isDebugEnabled() )
+ {
+ getLogger().debug( "Configuration processed for: " + role );
+ }
+ }
+ }
+
+ /**
+ * Get a ComponentHandler with the default constructor for the component
class passed in.
+ *
+ * @param metaEntry the description of the Role this handler will be for
+ * @param metaData the information needed to construct a
ComponentHandler for the component
+ * @return the component handler
+ * @throws Exception if unable to provide a componenthandler
+ */
+ private ComponentHandler getComponentHandler( final String classname,
+ final Class handlerClass,
+ final
ComponentHandlerMetaData metaData)
+ throws Exception
+ {
+ final Configuration configuration = metaData.getConfiguration();
+
+ // get info from params
+ final ComponentHandler handler;
+
+ try
+ {
+ final ObjectFactory factory =
+ createObjectFactory( classname, configuration );
+
+ // create the appropriate handler instance
+ final ComponentHandler targetHandler =
+ (ComponentHandler) handlerClass.newInstance();
+
+ // do the handler lifecycle
+ ContainerUtil.enableLogging( targetHandler, getLogger() );
+ ContainerUtil.contextualize( targetHandler, m_context );
+ final DefaultServiceManager serviceManager =
+ new DefaultServiceManager( getServiceManager() );
+ serviceManager.put( ObjectFactory.ROLE, factory );
+ serviceManager.makeReadOnly();
+
+ ContainerUtil.service( targetHandler, serviceManager );
+ ContainerUtil.configure( targetHandler, configuration );
+ ContainerUtil.initialize( targetHandler );
+
+ if ( targetHandler instanceof Instrumentable )
+ {
+ final Instrumentable instrumentable = (Instrumentable)
targetHandler;
+ final String name = instrumentable.getInstrumentableName();
+ m_instrumentManager.registerInstrumentable( instrumentable,
name );
+ }
+
+ // no other lifecycle stages supported for ComponentHandler;
+ // ComponentHandler is not a "true" avalon component
+
+ handler = new LEAwareComponentHandler( targetHandler,
m_extManager, m_context );
}
+ catch ( final Exception e )
+ {
+ // if anything went wrong, the component cannot be worked with
+ // and it cannot be added into the impl, so don't provide
+ // a handler
+ if ( getLogger().isDebugEnabled() )
+ {
+ final String message =
+ "Could not create the handler for the '" +
+ classname + "' component.";
+ getLogger().debug( message, e );
+ }
+ throw e;
+ }
+
+ if ( getLogger().isDebugEnabled() )
+ {
+ final String message =
+ "Component " + classname +
+ " uses handler " + handlerClass.getName();
+ getLogger().debug( message );
+ }
+
+ // we're still here, so everything went smooth. Register the handler
+ // and return it
+ final ComponentHandlerEntry entry =
+ new ComponentHandlerEntry( handler, metaData );
+ m_components.add( entry );
+
+ return handler;
}
+ protected Class getComponentHandlerClassName(final String
defaultClassName, Configuration config )
+ throws Exception
+ {
+ if ( "component".equals( config.getName() ) )
+ {
+ String handlerClassName = null;
+
+ Class clazz;
+ try
+ {
+ clazz = m_classLoader.loadClass( defaultClassName );
+
+ if ( ThreadSafe.class.isAssignableFrom( clazz ) )
+ {
+ handlerClassName = MetaInfoEntry.THREADSAFE_HANDLER;
+ }
+ else if ( Poolable.class.isAssignableFrom( clazz ) )
+ {
+ handlerClassName = MetaInfoEntry.POOLABLE_HANDLER;
+ }
+ else if ( SingleThreaded.class.isAssignableFrom( clazz) )
+ {
+ handlerClassName = MetaInfoEntry.FACTORY_HANDLER;
+ }
+ }
+ catch ( final Exception e )
+ {
+ final String message =
+ "Unable to load class " + defaultClassName + ". Using
dfault component handler.";
+ getLogger().warn( message );
+ }
+
+ // Don't know, use default
+ if ( handlerClassName == null )
+ {
+ handlerClassName = MetaInfoEntry.THREADSAFE_HANDLER;
+ }
+ return m_classLoader.loadClass( handlerClassName ) ;
+ }
+ else
+ {
+ final MetaInfoEntry roleEntry =
m_metaManager.getMetaInfoForShortName( config.getName() );
+ if ( null == roleEntry )
+ {
+
+ final String message = "No class found matching
configuration name " +
+ "[name: " + config.getName() + ", location: " +
config.getLocation() + "]";
+ throw new ConfigurationException( message );
+ }
+
+ return roleEntry.getHandlerClass();
+ }
+ }
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
