mcconnell 2003/12/03 12:44:26
Modified: kernel/api project.xml
kernel/impl project.xml
kernel/impl/src/java/org/apache/avalon/merlin/impl
DefaultFactory.java
kernel/test maven.xml merlin.properties
kernel/test/src/test/org/apache/avalon/merlin
MerlinEmbeddedTest.java
Log:
Synchronize with updated composition and activation versions.
Revision Changes Path
1.2 +3 -3 avalon-sandbox/kernel/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 30 Nov 2003 05:55:29 -0000 1.1
+++ project.xml 3 Dec 2003 20:44:25 -0000 1.2
@@ -9,7 +9,7 @@
<name>Merlin API</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.2-dev</currentVersion>
+ <currentVersion>3.2-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin API</shortDescription>
@@ -31,12 +31,12 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
</dependencies>
1.13 +8 -8 avalon-sandbox/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/impl/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- project.xml 2 Dec 2003 23:20:02 -0000 1.12
+++ project.xml 3 Dec 2003 20:44:25 -0000 1.13
@@ -9,7 +9,7 @@
<name>Merlin Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.2.2-dev</currentVersion>
+ <currentVersion>3.2-dev</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Implementation</shortDescription>
@@ -37,7 +37,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-api</artifactId>
- <version>3.2.2-dev</version>
+ <version>3.2-dev</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -48,7 +48,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -56,7 +56,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-spi</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -64,7 +64,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2.2-dev</version>
+ <version>1.2.3-dev</version>
</dependency>
<dependency>
@@ -87,7 +87,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -95,7 +95,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -103,7 +103,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>1.2.1-dev</version>
+ <version>1.2.2-dev</version>
</dependency>
<dependency>
1.4 +1 -1
avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java
Index: DefaultFactory.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/kernel/impl/src/java/org/apache/avalon/merlin/impl/DefaultFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DefaultFactory.java 2 Dec 2003 23:20:02 -0000 1.3
+++ DefaultFactory.java 3 Dec 2003 20:44:26 -0000 1.4
@@ -51,7 +51,7 @@
import org.apache.avalon.merlin.KernelCriteria;
import org.apache.avalon.repository.Repository;
-import org.apache.avalon.repository.InitialContext;
+import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.util.factory.Factory;
import org.apache.avalon.util.factory.FactoryException;
1.3 +2 -0 avalon-sandbox/kernel/test/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/test/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 26 Nov 2003 17:07:38 -0000 1.2
+++ maven.xml 3 Dec 2003 20:44:26 -0000 1.3
@@ -1,5 +1,6 @@
<project default="test:test" xmlns:maven="jelly:maven" xmlns:j="jelly:core"
xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+ <!--
<preGoal name="test:test">
<ant:mkdir dir="${maven.build.dir}/repository"/>
<copy todir="${maven.build.dir}/repository" preserverlastmodified="true">
@@ -11,5 +12,6 @@
</fileset>
</copy>
</preGoal>
+ -->
</project>
1.3 +1 -1 avalon-sandbox/kernel/test/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/kernel/test/merlin.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- merlin.properties 3 Dec 2003 04:38:02 -0000 1.2
+++ merlin.properties 3 Dec 2003 20:44:26 -0000 1.3
@@ -1,4 +1,4 @@
merlin.info = true
merlin.debug = true
-merlin.deployment = conf/test.block,conf/test-2.block
+merlin.deployment = conf/test.block,conf/test-2.block,hello.block
1.11 +4 -4
avalon-sandbox/kernel/test/src/test/org/apache/avalon/merlin/MerlinEmbeddedTest.java
Index: MerlinEmbeddedTest.java
===================================================================
RCS file:
/home/cvs/avalon-sandbox/kernel/test/src/test/org/apache/avalon/merlin/MerlinEmbeddedTest.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MerlinEmbeddedTest.java 3 Dec 2003 04:38:02 -0000 1.10
+++ MerlinEmbeddedTest.java 3 Dec 2003 20:44:26 -0000 1.11
@@ -60,8 +60,8 @@
import junit.framework.TestCase;
import org.apache.avalon.repository.Artifact;
-import org.apache.avalon.repository.Builder;
-import org.apache.avalon.repository.InitialContext;
+import org.apache.avalon.repository.provider.Builder;
+import org.apache.avalon.repository.provider.InitialContext;
import org.apache.avalon.repository.RepositoryException;
import org.apache.avalon.repository.main.DefaultInitialContext;
import org.apache.avalon.repository.main.DefaultBuilder;
@@ -101,7 +101,7 @@
{
Artifact artifact =
Artifact.createArtifact(
- "merlin", "merlin-impl", "3.2.2-dev" );
+ "merlin", "merlin-impl", "3.2-dev" );
InitialContext context =
new DefaultInitialContext(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
