mcconnell 2003/11/02 22:11:31
Modified: merlin/activation/impl project.xml
merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl
DefaultBlockContext.java
merlin/activation/impl/src/test/org/apache/avalon/activation/appliance
RuntimeTestCase.java
merlin/activation/spi project.xml
merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl
DefaultDeploymentModel.java
merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl project.xml
merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl
DefaultKernel.java
merlin/kernel/plugin project.xml
merlin/kernel/unit project.xml
merlin/kernel/unit/src/etc merlin.properties
merlin platform.xml project.properties
Log:
Updates to the activation package to seperate abstract block operations from
composite block semantics.
Revision Changes Path
1.6 +2 -2 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 2 Nov 2003 23:12:50 -0000 1.5
+++ project.xml 3 Nov 2003 06:11:30 -0000 1.6
@@ -8,7 +8,7 @@
<id>avalon-activation-impl</id>
<name>Avalon Activation Framework</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2.1-dev</currentVersion>
+ <currentVersion>1.2.2-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Runtime activation framework.</shortDescription>
@@ -49,7 +49,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.2 +6 -4
avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java
Index: DefaultBlockContext.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/java/org/apache/avalon/activation/appliance/impl/DefaultBlockContext.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultBlockContext.java 2 Nov 2003 23:12:50 -0000 1.1
+++ DefaultBlockContext.java 3 Nov 2003 06:11:30 -0000 1.2
@@ -53,10 +53,11 @@
import org.apache.avalon.framework.logger.Logger;
import org.apache.avalon.composition.model.ContainmentModel;
import org.apache.avalon.composition.model.DependencyModel;
+import org.apache.avalon.activation.appliance.ApplianceRepository;
import org.apache.avalon.activation.appliance.DependencyGraph;
import org.apache.avalon.activation.appliance.ServiceContext;
import org.apache.avalon.activation.appliance.Engine;
-import org.apache.avalon.activation.appliance.ApplianceRepository;
+import org.apache.avalon.activation.appliance.BlockContext;
/**
* Context object applied to a new block.
@@ -64,9 +65,9 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Avalon Development Team</a>
* @version $Revision$ $Date$
*/
-public class DefaultBlockContext
+public class DefaultBlockContext implements BlockContext
{
- private Logger m_logger;
+ private final Logger m_logger;
private final ContainmentModel m_model;
@@ -96,6 +97,7 @@
if( context == null ) throw new NullPointerException( "context" );
if( repository == null ) throw new NullPointerException( "repository" );
+ m_logger = logger;
m_repository = repository;
m_model = model;
m_context = context;
1.3 +2 -2
avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java
Index: RuntimeTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/activation/impl/src/test/org/apache/avalon/activation/appliance/RuntimeTestCase.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RuntimeTestCase.java 18 Oct 2003 00:34:19 -0000 1.2
+++ RuntimeTestCase.java 3 Nov 2003 06:11:30 -0000 1.3
@@ -2,7 +2,7 @@
package org.apache.avalon.activation.appliance;
-import org.apache.avalon.activation.appliance.impl.DefaultBlock;
+import org.apache.avalon.activation.appliance.impl.AbstractBlock;
import org.apache.avalon.composition.util.ExceptionHelper;
import org.apache.avalon.framework.activity.Disposable;
@@ -65,7 +65,7 @@
//
getLogger().debug( "creating root block" );
- Block block = DefaultBlock.createRootBlock( m_context, m_model );
+ Block block = AbstractBlock.createRootBlock( m_context, m_model );
getLogger().debug( "block: " + block );
//
1.4 +1 -1 avalon/merlin/activation/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/spi/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 19 Oct 2003 06:12:58 -0000 1.3
+++ project.xml 3 Nov 2003 06:11:30 -0000 1.4
@@ -8,7 +8,7 @@
<id>avalon-activation-spi</id>
<name>Avalon Activation SPI</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>1.2-dev</currentVersion>
+ <currentVersion>1.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation Service Provider Interface</shortDescription>
1.6 +2 -2
avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java
Index: DefaultDeploymentModel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/composition/impl/src/java/org/apache/avalon/composition/model/impl/DefaultDeploymentModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DefaultDeploymentModel.java 28 Oct 2003 20:21:00 -0000 1.5
+++ DefaultDeploymentModel.java 3 Nov 2003 06:11:30 -0000 1.6
@@ -329,7 +329,7 @@
/**
* Set the collection policy for the model.
*
- * @param the collection policy
+ * @param policy the collection policy
* @see InfoDescriptor#LIBERAL
* @see InfoDescriptor#DEMOCRAT
* @see InfoDescriptor#CONSERVATIVE
1.8 +2 -2 avalon/merlin/kernel/bootstrap/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/bootstrap/src/etc/merlin.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- merlin.properties 2 Nov 2003 23:14:30 -0000 1.7
+++ merlin.properties 3 Nov 2003 06:11:30 -0000 1.8
@@ -20,7 +20,7 @@
#
merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.2.1-dev
merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2-dev
-merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2-dev
+merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.1-dev
merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.0b1
#
@@ -30,7 +30,7 @@
merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.2.1-dev
merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0
merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
-merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.1-dev
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.0b1
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
1.7 +3 -3 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 2 Nov 2003 23:14:30 -0000 1.6
+++ project.xml 3 Nov 2003 06:11:30 -0000 1.7
@@ -9,7 +9,7 @@
<name>Merlin Kernel Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2-dev</currentVersion>
+ <currentVersion>3.2.1-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Kernel Implementation</shortDescription>
@@ -50,12 +50,12 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
1.7 +3 -3
avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java
Index: DefaultKernel.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/impl/src/java/org/apache/avalon/merlin/kernel/impl/DefaultKernel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DefaultKernel.java 28 Oct 2003 20:21:01 -0000 1.6
+++ DefaultKernel.java 3 Nov 2003 06:11:30 -0000 1.7
@@ -63,7 +63,7 @@
import org.apache.avalon.activation.appliance.Appliance;
import org.apache.avalon.activation.appliance.Block;
import org.apache.avalon.activation.appliance.Composite;
-import org.apache.avalon.activation.appliance.impl.DefaultBlock;
+import org.apache.avalon.activation.appliance.impl.AbstractBlock;
import org.apache.avalon.activation.appliance.impl.DefaultServiceContext;
import org.apache.avalon.composition.data.TargetDirective;
import org.apache.avalon.composition.logging.LoggingManager;
@@ -443,7 +443,7 @@
{
services.put( Appliance.MBEAN_SERVER_KEY, m_server );
}
- m_block = DefaultBlock.createRootBlock( services, m_model );
+ m_block = AbstractBlock.createRootBlock( services, m_model );
}
catch( Throwable e )
{
1.8 +3 -3 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 2 Nov 2003 23:14:30 -0000 1.7
+++ project.xml 3 Nov 2003 06:11:31 -0000 1.8
@@ -35,7 +35,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-impl</artifactId>
- <version>3.2-dev</version>
+ <version>3.2.1-dev</version>
</dependency>
<dependency>
@@ -46,12 +46,12 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
1.12 +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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- project.xml 2 Nov 2003 23:14:30 -0000 1.11
+++ project.xml 3 Nov 2003 06:11:31 -0000 1.12
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit</name>
- <currentVersion>3.2.2-dev</currentVersion>
+ <currentVersion>3.2.3-dev</currentVersion>
<package>org.apache.avalon.merlin.unit</package>
<inceptionYear>2003</inceptionYear>
1.7 +4 -3 avalon/merlin/kernel/unit/src/etc/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/src/etc/merlin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merlin.properties 2 Nov 2003 23:14:30 -0000 1.6
+++ merlin.properties 3 Nov 2003 06:11:31 -0000 1.7
@@ -20,7 +20,7 @@
#
merlin.spi.classpath.0=avalon-meta:avalon-meta-spi;1.2.1-dev
merlin.spi.classpath.1=avalon-composition:avalon-composition-spi;1.2-dev
-merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2-dev
+merlin.spi.classpath.2=avalon-activation:avalon-activation-spi;1.2.1-dev
merlin.spi.classpath.3=avalon-repository:avalon-repository-spi;1.0b1
#
@@ -30,13 +30,14 @@
merlin.impl.classpath.1=avalon-meta:avalon-meta-impl;1.2.1-dev
merlin.impl.classpath.2=avalon-extension:avalon-extension-impl;1.0
merlin.impl.classpath.3=avalon-composition:avalon-composition-impl;1.2-dev
-merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.1-dev
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.2-dev
merlin.impl.classpath.5=excalibur-i18n:excalibur-i18n;1.1
merlin.impl.classpath.6=avalon-repository:avalon-repository-impl;1.0b1
merlin.impl.classpath.7=commons-cli:commons-cli;1.0
-merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2-dev
+merlin.impl.classpath.8=merlin:merlin-kernel-impl;3.2.1-dev
merlin.impl.classpath.9=logkit:logkit;1.2
merlin.impl.classpath.10=excalibur-event:excalibur-event;1.0.3
merlin.impl.classpath.11=excalibur-configuration:excalibur-configuration;1.1
merlin.impl.classpath.12=mx4j:mx4j-jmx;1.1.1
merlin.impl.classpath.13=mx4j:mx4j-tools;1.1.1
+
1.7 +3 -3 avalon/merlin/platform.xml
Index: platform.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- platform.xml 19 Oct 2003 06:12:59 -0000 1.6
+++ platform.xml 3 Nov 2003 06:11:31 -0000 1.7
@@ -33,7 +33,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-kernel-impl</artifactId>
- <version>3.2-dev</version>
+ <version>3.2.1-dev</version>
</dependency>
<!-- avalon dependecies -->
@@ -94,12 +94,12 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
1.3 +3 -2 avalon/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 26 Sep 2003 01:46:36 -0000 1.2
+++ project.properties 3 Nov 2003 06:11:31 -0000 1.3
@@ -20,10 +20,11 @@
avalon.meta.link = http://avalon.apache.org/meta/api/
avalon.logkit.link = http://avalon.apache.org/logkit/api/
avalon.lifecycle.link = http://avalon.apache.org/excalibur/lifecycle/api/
-excalibur.configuration.link = http://avalon.apache.org/excalibur/configuration/api/
+excalibur.configuration.link =
http://avalon.apache.org/excalibur/configuration/apidocs/
+excalibur.i18n.link = http://avalon.apache.org/excalibur/i18n/apidocs/
excalibur.pool.link = http://avalon.apache.org/excalibur/pool/api/
excalibur.thread.link = http://avalon.apache.org/excalibur/thread/api/
excalibur.threadcontext.link = http://avalon.apache.org/excalibur/threadcontext/api/
excalibur.event.link = http://avalon.apache.org/excalibur/event/api/
-maven.javadoc.links =
${sun.j2se.link},${avalon.logkit.link},${avalon.framework.link},${avalon.meta.link},${avalon.lifecycle.link},${excalibur.configuration.link},${excalibur.pool.link},${excalibur.thread.link},${excalibur.threadcontext.link},${excalibur.event.link},${sun.jmx.link}
+maven.javadoc.links =
${sun.j2se.link},${avalon.logkit.link},${avalon.framework.link},${avalon.meta.link},${avalon.lifecycle.link},${excalibur.configuration.link},${excalibur.i18n.link},${excalibur.pool.link},${excalibur.thread.link},${excalibur.threadcontext.link},${excalibur.event.link},${sun.jmx.link}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
