mcconnell 2004/01/11 18:12:12
Modified:
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: RELEASE_3-2-3-BIS CompositeBlock.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: RELEASE_3-2-3-BIS DefaultContainmentModel.java
merlin/platform/tutorials/composition/application/impl Tag:
RELEASE_3-2-3-BIS maven.xml
Log:
Add null provider check and not re. existing bug.
Revision Changes Path
No revision
No revision
1.2.4.3 +12 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java
Index: CompositeBlock.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/CompositeBlock.java,v
retrieving revision 1.2.4.2
retrieving revision 1.2.4.3
diff -u -r1.2.4.2 -r1.2.4.3
--- CompositeBlock.java 12 Jan 2004 01:12:11 -0000 1.2.4.2
+++ CompositeBlock.java 12 Jan 2004 02:12:12 -0000 1.2.4.3
@@ -239,8 +239,18 @@
if( method == null ) throw new NullPointerException( "method" );
final ContainmentModel model = m_context.getContainmentModel();
+ Class source = method.getDeclaringClass();
ServiceDirective service =
- model.getExportDirective( method.getDeclaringClass() );
+ model.getExportDirective( source );
+
+ if( null == service )
+ {
+ final String error =
+ "Unable to resolve an provider for the class ["
+ + source.getName()
+ + "].";
+ throw new IllegalStateException( error );
+ }
String path = service.getPath();
Appliance provider = (Appliance) m_block.locate( path );
No revision
No revision
1.13.4.1 +6 -1
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java
Index: DefaultContainmentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultContainmentModel.java,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- DefaultContainmentModel.java 1 Jan 2004 13:08:56 -0000 1.13
+++ DefaultContainmentModel.java 12 Jan 2004 02:12:12 -0000 1.13.4.1
@@ -1110,6 +1110,11 @@
*/
public ServiceDirective getExportDirective( Class clazz )
{
+ // ##
+ // ## BUG
+ // ## need to resolve class agaisnt class loaded from
+ // ## service export classname
+ // ##
return m_context.getContainmentProfile().getExportDirective( clazz );
}
No revision
No revision
1.1.1.1.4.1 +1 -1
avalon/merlin/platform/tutorials/composition/application/impl/maven.xml
Index: maven.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/composition/application/impl/maven.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.4.1
diff -u -r1.1.1.1 -r1.1.1.1.4.1
--- maven.xml 24 Sep 2003 09:33:41 -0000 1.1.1.1
+++ maven.xml 12 Jan 2004 02:12:12 -0000 1.1.1.1.4.1
@@ -1,4 +1,4 @@
-<project default="jar:jar" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
+<project default="jar:install" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util">
<preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
