donaldp 2002/07/03 20:54:41
Modified: containerkit/src/java/org/apache/excalibur/containerkit/lifecycle/impl
AbstractResourceProvider.java
containerkit/src/java/org/apache/excalibur/containerkit/metadata
ComponentMetaData.java
Log:
Revert
Revision Changes Path
1.8 +2 -5
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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AbstractResourceProvider.java 4 Jul 2002 03:46:17 -0000 1.7
+++ AbstractResourceProvider.java 4 Jul 2002 03:54:41 -0000 1.8
@@ -130,11 +130,8 @@
*/
protected Context createContextImpl( final Map contextData )
{
- // leave this one to Pete
final DefaultContext context = new DefaultContext( contextData );
- //final ComponentMetaData component = getMetaData( entry );
- //context.makeReadOnly();
- //return component.getContext( context );
+ context.makeReadOnly();
return context;
}
1.9 +5 -21
jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/ComponentMetaData.java
Index: ComponentMetaData.java
===================================================================
RCS file:
/home/cvs/jakarta-avalon-excalibur/containerkit/src/java/org/apache/excalibur/containerkit/metadata/ComponentMetaData.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ComponentMetaData.java 4 Jul 2002 03:35:56 -0000 1.8
+++ ComponentMetaData.java 4 Jul 2002 03:54:41 -0000 1.9
@@ -7,10 +7,9 @@
*/
package org.apache.excalibur.containerkit.metadata;
-import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.context.Context;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.excalibur.containerkit.metainfo.ComponentInfo;
/**
* Each component declared in the application is represented by
@@ -68,11 +67,7 @@
{
if( null == name )
{
- m_name = "" + System.identityHashCode( this );
- }
- else
- {
- m_name = name;
+ throw new NullPointerException( "name" );
}
if( null == dependencies )
{
@@ -83,6 +78,7 @@
throw new NullPointerException( "componentInfo" );
}
+ m_name = name;
m_dependencies = dependencies;
m_parameters = parameters;
m_configuration = configuration;
@@ -108,18 +104,6 @@
{
return m_componentInfo;
}
-
- /**
- * Return the context for the component.
- *
- * @param the parent context.
- * @return the context for component type.
- */
- public Context getContext( Context parent )
- {
- return parent;
- }
-
/**
* Return the dependency metadata for component type.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
