mcconnell 2004/01/09 07:08:00
Modified: merlin Tag: RELEASE_3-2-3-BIS maven.xml platform.xml
project.xml
merlin/activation/impl Tag: RELEASE_3-2-3-BIS project.xml
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: RELEASE_3-2-3-BIS CompositeBlock.java
DefaultAppliance.java
merlin/kernel/cli Tag: RELEASE_3-2-3-BIS project.xml
merlin/kernel/impl Tag: RELEASE_3-2-3-BIS project.xml
merlin/kernel/plugin Tag: RELEASE_3-2-3-BIS project.xml
merlin/kernel/servlet Tag: RELEASE_3-2-3-BIS project.xml
merlin/kernel/unit Tag: RELEASE_3-2-3-BIS project.xml
merlin/platform/src/bin Tag: RELEASE_3-2-3-BIS merlin
merlin-server.sh merlin.bat merlin.sh merlinx.bat
merlinx.sh
merlin/platform/src/bin/nt Tag: RELEASE_3-2-3-BIS
wrapper.conf
merlin/platform/tutorials/hello Tag: RELEASE_3-2-3-BIS
project.xml
merlin/platform/tutorials/parameterization Tag:
RELEASE_3-2-3-BIS project.xml
merlin/platform/xdocs/starting/installation/3.2 Tag:
RELEASE_3-2-3-BIS binary.xml
Log:
Update to the 3.2.3 candidate release to include correct handling of a
UndeclaredThrowableException raised by the composite proxy (bug reported by Timothy
Bennett). Update applies to the activation impl package - version bumped from 1.2.4
-> 1.2.5. Cascading bumps include kernel imp 3.2.2->3.2.3, CLI 2.3.2->3.2.3, plugin
3.2.3->3.2.4, unit 3.2.8->3.2.9.
Revision Changes Path
No revision
No revision
1.31.4.1 +2 -2 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.31
retrieving revision 1.31.4.1
diff -u -r1.31 -r1.31.4.1
--- maven.xml 1 Jan 2004 23:34:45 -0000 1.31
+++ maven.xml 9 Jan 2004 15:07:57 -0000 1.31.4.1
@@ -2,10 +2,10 @@
<maven:snapshot project="${pom}"/>
- <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.2.jar"/>
+ <ant:property name="merlin.cli.jar" value="merlin-cli-3.2.3.jar"/>
<ant:property name="avalon.plugin.jar" value="avalon-plugin-1.0.jar"/>
<ant:property name="meta.plugin.jar" value="avalon-meta-plugin-1.3.1.jar"/>
- <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2.3.jar"/>
+ <ant:property name="merlin.plugin.jar" value="merlin-plugin-3.2.4.jar"/>
<ant:property file="project.properties"/>
<ant:property name="maven.docs.src" value="${basedir}/platform/xdocs"/>
1.20.4.1 +1 -1 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.20
retrieving revision 1.20.4.1
diff -u -r1.20 -r1.20.4.1
--- platform.xml 1 Jan 2004 23:45:41 -0000 1.20
+++ platform.xml 9 Jan 2004 15:07:57 -0000 1.20.4.1
@@ -135,7 +135,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
</dependency>
<dependency>
1.18.4.1 +1 -1 avalon/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/project.xml,v
retrieving revision 1.18
retrieving revision 1.18.4.1
diff -u -r1.18 -r1.18.4.1
--- project.xml 1 Jan 2004 23:34:45 -0000 1.18
+++ project.xml 9 Jan 2004 15:07:57 -0000 1.18.4.1
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Avalon Merlin</name>
- <currentVersion>3.2.3</currentVersion>
+ <currentVersion>3.2.4</currentVersion>
<organization>
<name>Apache Software Foundation</name>
No revision
No revision
1.13.4.1 +1 -1 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- project.xml 1 Jan 2004 23:34:45 -0000 1.13
+++ project.xml 9 Jan 2004 15:07:58 -0000 1.13.4.1
@@ -8,7 +8,7 @@
<id>avalon-activation-impl</id>
<name>Avalon Activation Framework</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.4</currentVersion>
+ <currentVersion>1.2.5</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Runtime activation framework.</shortDescription>
No revision
No revision
1.2.4.1 +14 -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.2
retrieving revision 1.2.4.1
diff -u -r1.2 -r1.2.4.1
--- CompositeBlock.java 4 Nov 2003 01:07:52 -0000 1.2
+++ CompositeBlock.java 9 Jan 2004 15:07:58 -0000 1.2.4.1
@@ -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;
@@ -279,11 +280,21 @@
Object object = provider.resolve();
return method.invoke( object, args );
}
+ catch( UndeclaredThrowableException e )
+ {
+ Throwable cause = e.getUndeclaredThrowable();
+ if( cause != null ) throw cause;
+ final String error =
+ "Delegation error raised by component: " + m_block;
+ throw new ApplianceException( error, e );
+ }
catch( InvocationTargetException e )
{
+ Throwable cause = e.getTargetException();
+ if( cause != null ) throw cause;
final String error =
- "Delegation error raised by provider: " + provider;
- throw new ApplianceException( error, e.getTargetException() );
+ "Delegation error raised by component: " + m_block;
+ throw new ApplianceException( error, e );
}
catch( Throwable e )
{
1.15.4.1 +7 -1
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java
Index: DefaultAppliance.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultAppliance.java,v
retrieving revision 1.15
retrieving revision 1.15.4.1
diff -u -r1.15 -r1.15.4.1
--- DefaultAppliance.java 22 Dec 2003 21:28:09 -0000 1.15
+++ DefaultAppliance.java 9 Jan 2004 15:07:58 -0000 1.15.4.1
@@ -1164,6 +1164,12 @@
private Object createProvider( Object instance ) throws ApplianceException
{
+ if( m_model.getType().getInfo().
+ getAttribute( "urn:activation:proxy", "true" ).equals( "false" ) )
+ {
+ return instance;
+ }
+
Class[] classes = m_model.getInterfaces();
try
{
No revision
No revision
1.4.4.1 +1 -1 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- project.xml 1 Jan 2004 23:34:45 -0000 1.4
+++ project.xml 9 Jan 2004 15:07:59 -0000 1.4.4.1
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-cli</id>
<name>Merlin CLI</name>
- <currentVersion>3.2.2</currentVersion>
+ <currentVersion>3.2.3</currentVersion>
<package>org.apache.avalon.merlin.cli</package>
No revision
No revision
1.16.4.1 +2 -2 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -u -r1.16 -r1.16.4.1
--- project.xml 1 Jan 2004 23:34:45 -0000 1.16
+++ project.xml 9 Jan 2004 15:07:59 -0000 1.16.4.1
@@ -9,7 +9,7 @@
<name>Merlin Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.2</currentVersion>
+ <currentVersion>3.2.3</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Implementation.</shortDescription>
@@ -51,7 +51,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.4</version>
+ <version>1.2.5</version>
</dependency>
<dependency>
No revision
No revision
1.16.4.1 +1 -1 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.16
retrieving revision 1.16.4.1
diff -u -r1.16 -r1.16.4.1
--- project.xml 1 Jan 2004 23:34:45 -0000 1.16
+++ project.xml 9 Jan 2004 15:07:59 -0000 1.16.4.1
@@ -10,7 +10,7 @@
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.3</currentVersion>
+ <currentVersion>3.2.4</currentVersion>
<dependencies>
<dependency>
No revision
No revision
1.3.4.1 +1 -1 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- project.xml 1 Jan 2004 23:34:45 -0000 1.3
+++ project.xml 9 Jan 2004 15:07:59 -0000 1.3.4.1
@@ -9,7 +9,7 @@
<name>Merlin Servlet</name>
<package>org.apache.avalon.merlin.servlet</package>
- <currentVersion>3.2.2</currentVersion>
+ <currentVersion>3.2.3</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Servlet</shortDescription>
No revision
No revision
1.21.4.1 +1 -1 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.21
retrieving revision 1.21.4.1
diff -u -r1.21 -r1.21.4.1
--- project.xml 1 Jan 2004 23:34:45 -0000 1.21
+++ project.xml 9 Jan 2004 15:07:59 -0000 1.21.4.1
@@ -7,7 +7,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit Test</name>
- <currentVersion>3.2.8</currentVersion>
+ <currentVersion>3.2.9</currentVersion>
<package>org.apache.avalon.merlin</package>
No revision
No revision
1.6.4.1 +1 -1 avalon/merlin/platform/src/bin/merlin
Index: merlin
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin,v
retrieving revision 1.6
retrieving revision 1.6.4.1
diff -u -r1.6 -r1.6.4.1
--- merlin 1 Jan 2004 23:34:45 -0000 1.6
+++ merlin 9 Jan 2004 15:07:59 -0000 1.6.4.1
@@ -1,7 +1,7 @@
#!/bin/sh
#
-export MERLIN_VERSION="3.2.2"
+export MERLIN_VERSION="3.2.3"
# Checking for JAVA_HOME is required on *nix due
# to some distributions stupidly including kaffe in /usr/bin
1.9.4.1 +1 -1 avalon/merlin/platform/src/bin/merlin-server.sh
Index: merlin-server.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin-server.sh,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- merlin-server.sh 1 Jan 2004 23:34:45 -0000 1.9
+++ merlin-server.sh 9 Jan 2004 15:07:59 -0000 1.9.4.1
@@ -107,7 +107,7 @@
JVM_EXT_DIRS="$MERLIN_HOME/ext"
JVM_OPTS="-Djava.security.policy=$MERLIN_HOME/bin/security.policy
-Djava.ext.dirs=$JVM_EXT_DIRS"
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.3.jar
# Get the run cmd
RUN_CMD="$JAVA_HOME/bin/java $JVM_OPTS $DEBUG $MERLIN_JVM_OPTS -jar
$MERLIN_BOOTSTRAP_JAR $ARGS"
1.10.4.1 +1 -1 avalon/merlin/platform/src/bin/merlin.bat
Index: merlin.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.bat,v
retrieving revision 1.10
retrieving revision 1.10.4.1
diff -u -r1.10 -r1.10.4.1
--- merlin.bat 1 Jan 2004 23:34:45 -0000 1.10
+++ merlin.bat 9 Jan 2004 15:07:59 -0000 1.10.4.1
@@ -1,7 +1,7 @@
@echo off
if "%MERLIN_HOME%" == "" set MERLIN_HOME=%USERPROFILE%\.merlin
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.2.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.3.jar
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR%
%MERLIN_CMD_LINE_ARGS%
goto EndOfScript
1.13.4.1 +1 -1 avalon/merlin/platform/src/bin/merlin.sh
Index: merlin.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlin.sh,v
retrieving revision 1.13
retrieving revision 1.13.4.1
diff -u -r1.13 -r1.13.4.1
--- merlin.sh 1 Jan 2004 23:34:45 -0000 1.13
+++ merlin.sh 9 Jan 2004 15:07:59 -0000 1.13.4.1
@@ -42,7 +42,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.3.jar
echo "Starting Merlin."
echo "================"
1.12.4.1 +1 -1 avalon/merlin/platform/src/bin/merlinx.bat
Index: merlinx.bat
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.bat,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -r1.12 -r1.12.4.1
--- merlinx.bat 1 Jan 2004 23:34:45 -0000 1.12
+++ merlinx.bat 9 Jan 2004 15:07:59 -0000 1.12.4.1
@@ -5,7 +5,7 @@
set WORKING_REPOSITORY=%MAVEN_HOME_LOCAL%\repository
:DoneMerlinSystem
set MERLIN_CMD_LINE_ARGS=%*
-set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.2.jar
+set MERLIN_BOOTSTRAP_JAR=%MERLIN_HOME%\bin\lib\merlin-cli-3.2.3.jar
set MERLIN_SECURITY_POLICY=-Djava.security.policy=%MERLIN_HOME%\bin\security.policy
java %MERLIN_SECURITY_POLICY% %MERLIN_JVM_OPTS% -jar %MERLIN_BOOTSTRAP_JAR% -system
%WORKING_REPOSITORY% -repository %WORKING_REPOSITORY% %MERLIN_CMD_LINE_ARGS%
goto :EndOfScript
1.12.4.1 +1 -1 avalon/merlin/platform/src/bin/merlinx.sh
Index: merlinx.sh
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/merlinx.sh,v
retrieving revision 1.12
retrieving revision 1.12.4.1
diff -u -r1.12 -r1.12.4.1
--- merlinx.sh 1 Jan 2004 23:34:45 -0000 1.12
+++ merlinx.sh 9 Jan 2004 15:07:59 -0000 1.12.4.1
@@ -53,7 +53,7 @@
[ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --windows "$CLASSPATH"`
fi
-MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.2.jar
+MERLIN_BOOTSTRAP_JAR=$MERLIN_HOME/bin/lib/merlin-cli-3.2.3.jar
echo "Starting Merlin."
echo "================"
No revision
No revision
1.9.4.1 +1 -1 avalon/merlin/platform/src/bin/nt/wrapper.conf
Index: wrapper.conf
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/bin/nt/wrapper.conf,v
retrieving revision 1.9
retrieving revision 1.9.4.1
diff -u -r1.9 -r1.9.4.1
--- wrapper.conf 1 Jan 2004 23:34:45 -0000 1.9
+++ wrapper.conf 9 Jan 2004 15:08:00 -0000 1.9.4.1
@@ -10,7 +10,7 @@
# Java Classpath (include wrapper.jar) Add class path elements as
# needed starting from 1
wrapper.java.classpath.1=wrapper.jar
-wrapper.java.classpath.2=../lib/merlin-cli-3.2.2.jar
+wrapper.java.classpath.2=../lib/merlin-cli-3.2.3.jar
# Java Library Path (location of Wrapper.DLL or libwrapper.so)
wrapper.java.library.path.1=.
No revision
No revision
1.11.4.1 +1 -1 avalon/merlin/platform/tutorials/hello/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
retrieving revision 1.11
retrieving revision 1.11.4.1
diff -u -r1.11 -r1.11.4.1
--- project.xml 29 Dec 2003 22:56:19 -0000 1.11
+++ project.xml 9 Jan 2004 15:08:00 -0000 1.11.4.1
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.7</version>
+ <version>3.2.9</version>
</dependency>
</dependencies>
No revision
No revision
1.5.4.1 +1 -1 avalon/merlin/platform/tutorials/parameterization/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/project.xml,v
retrieving revision 1.5
retrieving revision 1.5.4.1
diff -u -r1.5 -r1.5.4.1
--- project.xml 29 Dec 2003 22:56:19 -0000 1.5
+++ project.xml 9 Jan 2004 15:08:00 -0000 1.5.4.1
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.7</version>
+ <version>3.2.9</version>
</dependency>
</dependencies>
No revision
No revision
1.4.4.1 +3 -3
avalon/merlin/platform/xdocs/starting/installation/3.2/binary.xml
Index: binary.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/xdocs/starting/installation/3.2/binary.xml,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -r1.4 -r1.4.4.1
--- binary.xml 1 Jan 2004 23:34:45 -0000 1.4
+++ binary.xml 9 Jan 2004 15:08:00 -0000 1.4.4.1
@@ -75,7 +75,7 @@
LICENSE.TXT
/plugins
avalon-meta-plugin-1.3.1.jar
- merlin-plugin-3.2.3.jar
+ merlin-plugin-3.2.4.jar
]]></source>
<p>
@@ -137,7 +137,7 @@
</p>
<source><![CDATA[
%MAVEN_HOME%\plugins\avalon-meta-plugin-1.3.1.jar
- %MAVEN_HOME%\plugins\merlin-plugin-3.2.3.jar
+ %MAVEN_HOME%\plugins\merlin-plugin-3.2.4.jar
]]></source>
<p>
@@ -148,7 +148,7 @@
</p>
<source><![CDATA[
%MAVEN_HOME%\plugins\avalon-meta-plugin-1.3.1.jar
- %MAVEN_HOME%\plugins\merlin-plugin-3.2.3.jar
+ %MAVEN_HOME%\plugins\merlin-plugin-3.2.4.jar
]]></source>
<p>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
