Author: niclas
Date: Fri Oct 1 07:53:25 2004
New Revision: 47649
Modified:
avalon/trunk/planet/tutorials/dependencies/manual/build.xml
avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
Log:
Patch for proper Gump build.
Modified: avalon/trunk/planet/tutorials/dependencies/manual/build.xml
==============================================================================
--- avalon/trunk/planet/tutorials/dependencies/manual/build.xml (original)
+++ avalon/trunk/planet/tutorials/dependencies/manual/build.xml Fri Oct 1 07:53:25
2004
@@ -8,6 +8,8 @@
<target name="build" depends="standard.build">
<x:block name="tutorial" embed="MAIN">
+ <x:component name="gloria" class="tutorial.IdentifiableComponent"/>
+ <x:component name="nancy" class="tutorial.IdentifiableComponent"/>
<x:component name="hello" class="tutorial.HelloComponent">
<x:dependencies>
<x:dependency key="primary" source="gloria"/>
Modified:
avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
==============================================================================
---
avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
(original)
+++
avalon/trunk/runtime/composition/api/src/java/org/apache/avalon/composition/data/ComponentProfile.java
Fri Oct 1 07:53:25 2004
@@ -129,7 +129,7 @@
/**
* The configuration for component (if any).
*/
- private ContextDirective m_context;
+ private ContextDirective m_context = new ContextDirective( new EntryDirective[0]
);
/**
* The dependency directives.
Modified:
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
==============================================================================
---
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
(original)
+++
avalon/trunk/runtime/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModelAssemblyHelper.java
Fri Oct 1 07:53:25 2004
@@ -351,8 +351,10 @@
DeploymentModel model = m_model.getModel( path );
if( null == model )
{
- final String error = "Could not locate a model at the address: ["
- + path + "] in " + this + ".";
+ final String error =
+ "The supplied dependency path ["
+ + path
+ + "] does not reference a known component.";
throw new AssemblyException( error );
}
assembleModel( model, subjects );
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
