You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2004/01/08 11:40:54 UTC
cvs commit: avalon/merlin/platform/src/config debug.xml kernel.xml
mcconnell 2004/01/08 02:40:54
Modified: merlin Tag: Ver_3_4 INSTALL.TXT LICENSE.txt README.TXT
maven.xml
merlin/activation/impl Tag: Ver_3_4 project.xml
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
Tag: Ver_3_4 DefaultAppliance.java
DefaultBlock.java
merlin/activation/impl/src/test/org/apache/avalon/playground
Tag: Ver_3_4 ComplexComponent.java
SimpleComponent.xinfo
merlin/platform/src/config Tag: Ver_3_4 debug.xml kernel.xml
Log:
Addition of support for the disabling of proxy based isolation, and some additions to simplfy install documentation.
Revision Changes Path
No revision
No revision
1.5.2.1 +4 -4 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- INSTALL.TXT 1 Jan 2004 23:34:45 -0000 1.5
+++ INSTALL.TXT 8 Jan 2004 10:40:53 -0000 1.5.2.1
@@ -16,8 +16,8 @@
LICENSE.TXT
INSTALL.TXT
/plugins
- avalon-meta-plugin-1.3.1.jar
- merlin-plugin-3.2.3-dev.jar
+ @META_PLUGIN_JAR@
+ @MERLIN_PLUGIN_JAR@
Installing Merlin.
@@ -68,8 +68,8 @@
Maven platform. These plugins should be placed in the Maven plugin
directory (${maven.home.local}\plugins).
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-1.3.1.jar
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-3.2.3-dev.jar
+ [YOUR-MAVEN-HOME]\plugins\@META_PLUGIN_JAR@
+ [YOUR-MAVEN-HOME]\plugins\@MERLIN_PLUGIN_JAR@
Please note that if you are upgrading an existing installation you must
delete the following two directories:
1.1.1.1.2.1 +1 -1 avalon/merlin/LICENSE.txt
Index: LICENSE.txt
===================================================================
RCS file: /home/cvs/avalon/merlin/LICENSE.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- LICENSE.txt 24 Sep 2003 09:30:15 -0000 1.1.1.1
+++ LICENSE.txt 8 Jan 2004 10:40:53 -0000 1.1.1.1.2.1
@@ -2,7 +2,7 @@
The Apache Software License, Version 1.1
============================================================================
- Copyright (C) 1997-2003 The Apache Software Foundation.
+ Copyright (C) 1997-2004 The Apache Software Foundation.
All rights reserved.
Redistribution and use in source and binary forms, with or without modifica-
1.2.2.1 +1 -1 avalon/merlin/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/README.TXT,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- README.TXT 28 Dec 2003 14:38:55 -0000 1.2
+++ README.TXT 8 Jan 2004 10:40:53 -0000 1.2.2.1
@@ -5,7 +5,7 @@
What Is It?
-----------
- Merlin is an Avalon "Service Management Platform" (SMP):
+ Avalon Service Management Platform (SMP) Version @VERSION@
Merlin is a service management platform based on an advanced
assembly engine. Its focus is to provide support for the
1.31.2.2 +26 -4 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.31.2.1
retrieving revision 1.31.2.2
diff -u -r1.31.2.1 -r1.31.2.2
--- maven.xml 3 Jan 2004 13:10:48 -0000 1.31.2.1
+++ maven.xml 8 Jan 2004 10:40:53 -0000 1.31.2.2
@@ -51,7 +51,8 @@
</copy>
</goal>
- <goal name="merlin:validate" description="Validate that the tutorial targets are buildable." >
+ <goal name="merlin:validate"
+ description="Validate that the tutorial targets are buildable." >
<maven:reactor
basedir="${basedir}"
includes="platform/tutorials/**/project.xml"
@@ -93,9 +94,9 @@
description="Build the Merlin distribution." prereqs="merlin:build,xinstall"/>
<goal name="xinstall">
+
<!-- prepare structure -->
<ant:mkdir dir="${merlin.build.inst.dir}"/>
- <!--<ant:mkdir dir="${merlin.build.inst.dir}/ext"/>-->
<ant:mkdir dir="${merlin.build.inst.dir}/bin/lib"/>
<!-- import bootstrap jar -->
@@ -125,15 +126,36 @@
<!-- add supporting resources -->
<ant:copy toDir="${merlin.build.inst.dir}">
+ <fileset dir="${basedir}">
+ <include name="INSTALL.TXT"/>
+ </fileset>
+ <filterset>
+ <filter token="@MERLIN_PLUGIN_JAR@" value="${merlin.plugin.jar}"/>
+ <filter token="@META_PLUGIN_JAR@" value="${meta.plugin.jar}"/>
+ <filter token="@VERSION@" value="${pom.currentVersion}"/>
+ </filterset>
+ </ant:copy>
+
+ <!-- add supporting resources -->
+ <ant:copy toDir="${merlin.build.inst.dir}">
<fileset dir="${basedir}/platform/src">
<include name="bin/**/*"/>
+ </fileset>
+ <fileset dir="${basedir}">
+ <include name="README.TXT"/>
+ </fileset>
+ <filterset>
+ <filter token="@VERSION@" value="${pom.currentVersion}"/>
+ </filterset>
+ </ant:copy>
+
+ <ant:copy toDir="${merlin.build.inst.dir}">
+ <fileset dir="${basedir}/platform/src">
<include name="config/**/*"/>
<include name="system/**/*"/>
</fileset>
<fileset dir="${basedir}">
<include name="LICENSE.txt"/>
- <include name="README.TXT"/>
- <include name="INSTALL.TXT"/>
</fileset>
</ant:copy>
No revision
No revision
1.13.2.2 +6 -0 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -r1.13.2.1 -r1.13.2.2
--- project.xml 3 Jan 2004 13:10:48 -0000 1.13.2.1
+++ project.xml 8 Jan 2004 10:40:53 -0000 1.13.2.2
@@ -52,6 +52,12 @@
</dependency>
<dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-exception</artifactId>
+ <version>1.0</version>
+ </dependency>
+
+ <dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
<version>2.0-DEV</version>
No revision
No revision
1.15.2.5 +3 -4 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.2.4
retrieving revision 1.15.2.5
diff -u -r1.15.2.4 -r1.15.2.5
--- DefaultAppliance.java 8 Jan 2004 09:42:58 -0000 1.15.2.4
+++ DefaultAppliance.java 8 Jan 2004 10:40:53 -0000 1.15.2.5
@@ -832,7 +832,6 @@
}
}
-
private void applyStart( Object instance )
throws LifecycleException
{
@@ -999,9 +998,9 @@
private Object createProvider( Object instance ) throws ApplianceException
{
- if( getDeploymentModel().
+ if( getComponentModel().
getType().getInfo().
- getAttribute( "urn:merlin:proxy", "true" ).equals( "false" ) )
+ getAttribute( "urn:activation:proxy", "true" ).equals( "false" ) )
{
return instance;
}
1.7.2.4 +4 -3 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.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- DefaultBlock.java 8 Jan 2004 09:43:45 -0000 1.7.2.3
+++ DefaultBlock.java 8 Jan 2004 10:40:53 -0000 1.7.2.4
@@ -54,6 +54,7 @@
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import java.lang.reflect.UndeclaredThrowableException;
import java.net.URL;
import java.net.URLClassLoader;
import java.util.ArrayList;
@@ -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: " + 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: " + m_block;
throw new ApplianceException( error, e );
}
catch( Throwable e )
No revision
No revision
1.1.1.1.2.2 +2 -0 avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java
Index: ComplexComponent.java
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/ComplexComponent.java,v
retrieving revision 1.1.1.1.2.1
retrieving revision 1.1.1.1.2.2
diff -u -r1.1.1.1.2.1 -r1.1.1.1.2.2
--- ComplexComponent.java 7 Jan 2004 12:57:26 -0000 1.1.1.1.2.1
+++ ComplexComponent.java 8 Jan 2004 10:40:53 -0000 1.1.1.1.2.2
@@ -145,6 +145,7 @@
try
{
m_simple = (SimpleService) m_manager.lookup( "simple" );
+ getLogger().info( m_simple.getClass().toString() );
}
catch( ServiceException e )
{
@@ -155,6 +156,7 @@
try
{
m_basic = (BasicService) m_manager.lookup( "basic" );
+ getLogger().info( m_basic.getClass().toString() );
}
catch( ServiceException e )
{
1.2.2.1 +1 -2 avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo
Index: SimpleComponent.xinfo
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/playground/SimpleComponent.xinfo,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
--- SimpleComponent.xinfo 17 Oct 2003 03:26:28 -0000 1.2
+++ SimpleComponent.xinfo 8 Jan 2004 10:40:53 -0000 1.2.2.1
@@ -19,8 +19,7 @@
<name>simple</name>
<lifestyle>singleton</lifestyle>
<attributes>
- <attribute key="urn:assembly:appliance.class"
- value="org.apache.avalon.assembly.appliance.impl.DefaultAppliance"/>
+ <attribute key="urn:activation:proxy" value="false"/>
</attributes>
</info>
No revision
No revision
1.1.1.1.2.1 +1 -1 avalon/merlin/platform/src/config/debug.xml
Index: debug.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/config/debug.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- debug.xml 24 Sep 2003 09:33:38 -0000 1.1.1.1
+++ debug.xml 8 Jan 2004 10:40:54 -0000 1.1.1.1.2.1
@@ -8,7 +8,7 @@
<repository>
<hosts>
<host path="http://dpml.net/"/>
- <host path="http://www.ibiblio.org/maven/"/>
+ <host path="http://ibiblio.org/maven/"/>
</hosts>
</repository>
1.1.1.1.2.1 +1 -1 avalon/merlin/platform/src/config/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/src/config/kernel.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -u -r1.1.1.1 -r1.1.1.1.2.1
--- kernel.xml 24 Sep 2003 09:33:38 -0000 1.1.1.1
+++ kernel.xml 8 Jan 2004 10:40:54 -0000 1.1.1.1.2.1
@@ -9,7 +9,7 @@
<repository>
<hosts>
<host path="http://dpml.net/"/>
- <host path="http://www.ibiblio.org/maven/"/>
+ <host path="http://ibiblio.org/maven/"/>
</hosts>
</repository>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org