mcconnell 2004/01/08 08:48:12
Modified: merlin project.xml
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
CompositeBlock.java
Removed:
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
NullComponent.java NullComponent.xinfo
Log:
Correct missplaced update (change to 3-4 branch applied to 3.2 by mistake).
Revision Changes Path
1.20 +1 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 4 Jan 2004 15:23:01 -0000 1.19
+++ project.xml 8 Jan 2004 16:48:12 -0000 1.20
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Avalon Merlin</name>
- <currentVersion>3.2.4</currentVersion>
+ <currentVersion>3.2.5-dev</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.4 +4 -3
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CompositeBlock.java 8 Jan 2004 09:44:57 -0000 1.3
+++ CompositeBlock.java 8 Jan 2004 16:48:12 -0000 1.4
@@ -52,6 +52,7 @@
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.UndeclaredThrowableException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import java.net.URL;
@@ -284,7 +285,7 @@
Throwable cause = e.getUndeclaredThrowable();
if( cause != null ) throw cause;
final String error =
- "Delegation error raised by component: " +
m_model.getQualifiedName();
+ "Delegation error raised by component: " + m_block;
throw new ApplianceException( error, e );
}
catch( InvocationTargetException e )
@@ -292,7 +293,7 @@
Throwable cause = e.getTargetException();
if( cause != null ) throw cause;
final String error =
- "Delegation error raised by component: " +
m_model.getQualifiedName();
+ "Delegation error raised by component: " + m_block;
throw new ApplianceException( error, e );
}
catch( Throwable e )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
