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/09/10 02:35:40 UTC
cvs commit: avalon-sandbox/merlin/repository/spi project.xml
mcconnell 2003/09/09 17:35:40
Modified: merlin STRUCTURE.TXT maven.xml
merlin/extension/impl project.xml
merlin/extension/spi project.xml
merlin/repository/impl project.xml
merlin/repository/spi project.xml
Removed: merlin/merlin-plugin .cvsignore plugin.jelly
plugin.properties project.xml
merlin/merlin-plugin/src/java/org/apache/avalon/merlin/tools
MerlinBean.java
merlin/merlin-plugin/xdocs goals.xml navigation.xml
properties.xml
Log:
Move merlin-plugin under kernel package.
Revision Changes Path
1.7 +3 -2 avalon-sandbox/merlin/STRUCTURE.TXT
Index: STRUCTURE.TXT
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/STRUCTURE.TXT,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- STRUCTURE.TXT 5 Sep 2003 10:00:32 -0000 1.6
+++ STRUCTURE.TXT 10 Sep 2003 00:35:40 -0000 1.7
@@ -19,8 +19,9 @@
+- api composition API
+- spi composition SPI
+- impl composition framework implementation
- +-- extension jar manegement implementation
- +-- extension-spi jar manegement SPI interfaces and classes
+ +-- extension
+ +-- impl jar management implementation
+ +-- spi jar management SPI interfaces and classes
+-- kernel
+- bootstrap kernel bootstrap
+- spi kernel interfaces
1.54 +15 -5 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- maven.xml 9 Sep 2003 02:16:32 -0000 1.53
+++ maven.xml 10 Sep 2003 00:35:40 -0000 1.54
@@ -13,8 +13,17 @@
<ant:property name="maven.javadoc.stylesheet"
value="${basedir}/merlin-platform/src/etc/stylesheet.css"/>
+ <!--
+ Get the MERLIN_HOME environment variable. If its not declared then
+ default to ${user.home}/.merlin as the install directory.
+ -->
+
<ant:property environment="env"/>
- <ant:property name="merlin.home" value="${env.MERLIN_HOME}"/>
+ <ant:property name="merlinEnvironment" value="${env.MERLIN_HOME}"/>
+ <j:if test="${merlinEnvironment != ''}">
+ <ant:property name="merlin.home" value="${merlinEnvironment}"/>
+ </j:if>
+ <ant:property name="merlin.home" value="${user.home}/.merlin"/>
<goal name="merlin:update">
<!--<attainGoal name="merlin:clean"/>-->
@@ -26,6 +35,7 @@
</goal>
<goal name="merlin:replicate">
+ <mkdir dir="${merlin.home}"/>
<copy toDir="${merlin.home}">
<fileset dir="${merlin.build.inst.dir}"/>
</copy>
@@ -46,7 +56,7 @@
<!-- build the subprojects -->
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="target/**,merlin-platform/**,merlin-plugin/**,project.xml,kernel/bootstrap/*,merlin-extensions/**"
+ excludes="target/**,merlin-platform/**,kernel/plugin/**,project.xml,kernel/bootstrap/*,merlin-extensions/**"
goals="jar:install-snapshot"
banner="Installing:"
ignoreFailures="false" />
@@ -121,7 +131,7 @@
<goal name="merlin:plugin">
<maven:reactor
basedir="${basedir}"
- includes="merlin-plugin/project.xml"
+ includes="kernel/plugin/project.xml"
goals="plugin:install"
banner="Installing plugin:"
ignoreFailures="false"/>
@@ -138,7 +148,7 @@
<fileset dir="${basedir}">
<include name="INSTALLATION.TXT"/>
</fileset>
- <fileset dir="${basedir}/merlin-plugin/target">
+ <fileset dir="${basedir}/kernel/plugin/target">
<include name="*.jar"/>
</fileset>
<fileset dir="${basedir}/../meta/plugin/target">
@@ -303,7 +313,7 @@
<maven:reactor
basedir="${basedir}"
includes="**/project.xml"
- excludes="merlin-platform/**,project.xml,merlin-plugin/**/*,merlin-extensions/**"
+ excludes="merlin-platform/**,project.xml,kernel/plugin/**/*,merlin-extensions/**"
goals="clean"
banner="Cleaning subproject:"
ignoreFailures="false"/>
1.2 +2 -2 avalon-sandbox/merlin/extension/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/extension/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 9 Sep 2003 22:42:47 -0000 1.1
+++ project.xml 10 Sep 2003 00:35:40 -0000 1.2
@@ -5,7 +5,7 @@
<groupId>avalon-extension</groupId>
<id>avalon-extension-impl</id>
<name>Avalon Extension Framework</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Extension Management Implementation</shortDescription>
@@ -23,7 +23,7 @@
<dependency>
<groupId>avalon-extension</groupId>
<artifactId>avalon-extension-spi</artifactId>
- <version>4.1.5-RC3</version>
+ <version>1.0-RC1</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.2 +1 -1 avalon-sandbox/merlin/extension/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/extension/spi/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 9 Sep 2003 22:42:48 -0000 1.1
+++ project.xml 10 Sep 2003 00:35:40 -0000 1.2
@@ -5,7 +5,7 @@
<groupId>avalon-extension</groupId>
<id>avalon-extension-spi</id>
<name>Avalon Extension SPI</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Extension Management SPI</shortDescription>
<gumpRepositoryId>avalon-extension-spi</gumpRepositoryId>
1.4 +2 -2 avalon-sandbox/merlin/repository/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/repository/impl/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 21 Aug 2003 19:37:43 -0000 1.3
+++ project.xml 10 Sep 2003 00:35:40 -0000 1.4
@@ -8,7 +8,7 @@
<id>avalon-repository-impl</id>
<name>Avalon Repository Implementation</name>
<package>org.apache.avalon.repository</package>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-RC1</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Jar file repository implementation.</shortDescription>
@@ -17,7 +17,7 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-RC1</version>
</dependency>
</dependencies>
1.3 +1 -1 avalon-sandbox/merlin/repository/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/repository/spi/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 21 Aug 2003 00:52:47 -0000 1.2
+++ project.xml 10 Sep 2003 00:35:40 -0000 1.3
@@ -7,7 +7,7 @@
<groupId>avalon-repository</groupId>
<id>avalon-repository-spi</id>
<name>Avalon Repository SPI</name>
- <currentVersion>1.0</currentVersion>
+ <currentVersion>1.0-RC1</currentVersion>
<package>org.apache.avalon.repository</package>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org