mcconnell 2004/01/11 18:11:25
Modified: merlin Tag: Ver_3_4 maven.xml
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: Ver_3_4 DefaultBlock.java
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
Tag: Ver_3_4 DefaultContainmentModel.java
Log:
Correct filtering error in dist goals.
Revision Changes Path
No revision
No revision
1.31.2.4 +5 -0 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.31.2.3
retrieving revision 1.31.2.4
diff -u -r1.31.2.3 -r1.31.2.4
--- maven.xml 9 Jan 2004 20:29:48 -0000 1.31.2.3
+++ maven.xml 12 Jan 2004 02:11:24 -0000 1.31.2.4
@@ -144,6 +144,8 @@
<ant:copy toDir="${merlin.build.inst.dir}">
<fileset dir="${basedir}/platform/src">
<include name="bin/**/*"/>
+ <exclude name="bin/**/*.jar"/>
+ <exclude name="bin/**/*.exe"/>
</fileset>
<fileset dir="${basedir}">
<include name="README.TXT"/>
@@ -156,9 +158,12 @@
</ant:copy>
<ant:copy toDir="${merlin.build.inst.dir}">
+ </fileset>
<fileset dir="${basedir}/platform/src">
<include name="config/**/*"/>
<include name="system/**/*"/>
+ <include name="bin/**/*.jar"/>
+ <include name="bin/**/*.exe"/>
</fileset>
<fileset dir="${basedir}">
<include name="LICENSE.txt"/>
No revision
No revision
1.7.2.6 +11 -2
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Attic/DefaultBlock.java
Index: DefaultBlock.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/Attic/DefaultBlock.java,v
retrieving revision 1.7.2.5
retrieving revision 1.7.2.6
diff -u -r1.7.2.5 -r1.7.2.6
--- DefaultBlock.java 12 Jan 2004 00:17:19 -0000 1.7.2.5
+++ DefaultBlock.java 12 Jan 2004 02:11:24 -0000 1.7.2.6
@@ -244,8 +244,17 @@
//
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.2.15 +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.2.14
retrieving revision 1.13.2.15
diff -u -r1.13.2.14 -r1.13.2.15
--- DefaultContainmentModel.java 12 Jan 2004 00:17:19 -0000 1.13.2.14
+++ DefaultContainmentModel.java 12 Jan 2004 02:11:24 -0000 1.13.2.15
@@ -1572,6 +1572,11 @@
*/
public ServiceDirective getExportDirective( Class clazz )
{
+ // ##
+ // ## BUG
+ // ## need to resolve class agaisnt class loaded from
+ // ## service export classname
+ // ##
return m_context.getContainmentProfile().getExportDirective( clazz );
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
