mcconnell 2003/11/02 15:14:30
Modified: merlin/kernel/bootstrap/src/etc merlin.properties
merlin/kernel/impl project.xml
merlin/kernel/plugin project.xml
merlin/kernel/unit project.xml
merlin/kernel/unit/src/etc merlin.properties
merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit
AbstractMerlinTestCase.java
Log:
Update activation deps.
Revision Changes Path
1.7 +1 -1 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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merlin.properties 19 Oct 2003 06:12:59 -0000 1.6
+++ merlin.properties 2 Nov 2003 23:14:30 -0000 1.7
@@ -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-dev
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.1-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.6 +1 -1 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 19 Oct 2003 06:12:59 -0000 1.5
+++ project.xml 2 Nov 2003 23:14:30 -0000 1.6
@@ -55,7 +55,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 19 Oct 2003 06:12:59 -0000 1.6
+++ project.xml 2 Nov 2003 23:14:30 -0000 1.7
@@ -51,7 +51,7 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-impl</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.11 +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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- project.xml 28 Oct 2003 12:53:49 -0000 1.10
+++ project.xml 2 Nov 2003 23:14:30 -0000 1.11
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit</name>
- <currentVersion>3.2.1-dev</currentVersion>
+ <currentVersion>3.2.2-dev</currentVersion>
<package>org.apache.avalon.merlin.unit</package>
<inceptionYear>2003</inceptionYear>
1.6 +1 -1 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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- merlin.properties 19 Oct 2003 06:12:59 -0000 1.5
+++ merlin.properties 2 Nov 2003 23:14:30 -0000 1.6
@@ -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-dev
+merlin.impl.classpath.4=avalon-activation:avalon-activation-impl;1.2.1-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.14 +2 -1
avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java
Index: AbstractMerlinTestCase.java
===================================================================
RCS file:
/home/cvs/avalon/merlin/kernel/unit/src/java/org/apache/avalon/merlin/unit/AbstractMerlinTestCase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- AbstractMerlinTestCase.java 28 Oct 2003 20:21:02 -0000 1.13
+++ AbstractMerlinTestCase.java 2 Nov 2003 23:14:30 -0000 1.14
@@ -185,6 +185,7 @@
map.put( "merlin.policy.info", new Boolean( info ) );
map.put( "merlin.policy.debug", new Boolean( debug ) );
map.put( "merlin.repository.dir", getMavenRepositoryDirectory() );
+ map.put( "merlin.base.dir", getBaseDirectory() );
try
{
@@ -267,7 +268,7 @@
* the test container and establish it as the reference for
* relative service lookups.
*/
- public void setUp() throws Exception
+ protected void setUp() throws Exception
{
m_kernel.startup();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
