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 2003/12/10 09:25:32 UTC
cvs commit: avalon/merlin/platform/tutorials/hello/src/test/tutorial StandardTestCase.java
mcconnell 2003/12/10 00:25:32
Modified: merlin INSTALLATION.TXT maven.xml
merlin/activation/spi project.xml
merlin/composition/impl project.xml
merlin/platform/tutorials/hello project.xml
merlin/platform/tutorials/hello/src/test/tutorial
StandardTestCase.java
Log:
Housekeeping.
Revision Changes Path
1.3 +16 -8 avalon/merlin/INSTALLATION.TXT
Index: INSTALLATION.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALLATION.TXT,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- INSTALLATION.TXT 14 Nov 2003 12:19:24 -0000 1.2
+++ INSTALLATION.TXT 10 Dec 2003 08:25:32 -0000 1.3
@@ -1,5 +1,5 @@
-PROJECT: Merlin 3.0
+PROJECT: Merlin 3.2-dev
====================================================================
DESCRIPTION:
@@ -12,13 +12,12 @@
/bin
/config
/ext
- /repository
/system
README.TXT
LICENSE.TXT
/plugins
- avalon-meta-plugin-1.2-SNAPSHOT.jar
- merlin-plugin-1.2.jar
+ avalon-meta-plugin-1.2.jar
+ merlin-plugin-3.2-dev.jar
Installing Merlin.
@@ -43,7 +42,16 @@
Under Windows you can set environment variables by selecting the
Environment Tab from the System Control Panel.
-To confirm that you %MERLIN_HOME% variable is correct, you
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME which defaults to ${user.home}/.avalon. To
+override this behaviour you can either define a AVALON_HOME
+environment variable or you can add a merlin.properties file to
+${user.home} containing the "merlin.repository" property key and
+a value point to you preferred repository location.
+
+To confirm that your environment variables are correct, you
should open a new command window and invoke the Merlin
CLI application.
@@ -60,8 +68,8 @@
Maven platform. These plugins should be placed in the Maven plugin
directory (%MAVEN_HOME%\plugins).
- %MAVEN_HOME%\plugins\avalon-meta-plugin-1.2-SNAPSHOT.jar
- %MAVEN_HOME%\plugins\merlin-plugin-1.1-SNAPSHOT.jar
+ %MAVEN_HOME%\plugins\avalon-meta-plugin-1.2.jar
+ %MAVEN_HOME%\plugins\merlin-plugin-3.2-dev.jar
Please note that if you are upgrading an existing installation you must
delete the following two directories:
@@ -69,7 +77,7 @@
%MAVEN_HOME%\plugins\merlin-plugin-*
%MAVEN_HOME%\plugins\avalon-meta-plugin-*
-Replace the existing avalon-mweta and merlin plugin jar files with the supplied
+Replace the existing avalon-meta and merlin plugin jar files with the supplied
versions. Finally, delete all *.cache files in the Maven plugin directory.
You now have everything in place to start using the Merlin Tutorial or
1.15 +0 -6 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- maven.xml 9 Dec 2003 11:51:33 -0000 1.14
+++ maven.xml 10 Dec 2003 08:25:32 -0000 1.15
@@ -90,7 +90,6 @@
<ant:mkdir dir="${merlin.build.inst.dir}"/>
<ant:mkdir dir="${merlin.build.inst.dir}/ext"/>
<ant:mkdir dir="${merlin.build.inst.dir}/bin/lib"/>
- <ant:mkdir dir="${merlin.build.inst.dir}/repository"/>
<!-- import bootstrap jar -->
<ant:copy
@@ -140,11 +139,6 @@
<fileset dir="${basedir}">
<include name="LICENSE.txt"/>
<include name="README.TXT"/>
- </fileset>
- </ant:copy>
-
- <ant:copy toDir="${maven.build.dir}">
- <fileset dir="${basedir}">
<include name="INSTALLATION.TXT"/>
</fileset>
</ant:copy>
1.7 +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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 3 Dec 2003 19:04:53 -0000 1.6
+++ project.xml 10 Dec 2003 08:25:32 -0000 1.7
@@ -47,7 +47,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.7 +2 -2 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 3 Dec 2003 19:04:53 -0000 1.6
+++ project.xml 10 Dec 2003 08:25:32 -0000 1.7
@@ -68,12 +68,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-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>1.2-dev</version>
+ <version>1.2.1-dev</version>
</dependency>
<dependency>
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 22 Nov 2003 12:52:55 -0000 1.7
+++ project.xml 10 Dec 2003 08:25:32 -0000 1.8
@@ -27,7 +27,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.2.3-dev</version>
+ <version>3.2.5-dev</version>
</dependency>
</dependencies>
1.4 +2 -8 avalon/merlin/platform/tutorials/hello/src/test/tutorial/StandardTestCase.java
Index: StandardTestCase.java
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/src/test/tutorial/StandardTestCase.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StandardTestCase.java 12 Nov 2003 12:14:49 -0000 1.3
+++ StandardTestCase.java 10 Dec 2003 08:25:32 -0000 1.4
@@ -69,12 +69,7 @@
*/
public StandardTestCase( String name )
{
- super(
- MAVEN_TARGET_CLASSES_DIR,
- MERLIN_DEFAULT_CONFIG_FILE,
- MERLIN_INFO_OFF,
- MERLIN_DEBUG_OFF,
- name );
+ super( name );
}
//--------------------------------------------------------
@@ -84,8 +79,7 @@
public void testServiceResolution() throws Exception
{
Object hello = resolve( "hello" );
- assertTrue( hello != null );
- getLogger().info( "Hello established." );
+ assertNotNull( "hello", hello );
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org