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 2004/04/22 03:24:49 UTC
cvs commit: avalon/repository/main project.properties
mcconnell 2004/04/21 18:24:49
Modified: framework/api index.ent
framework/impl index.ent
framework index.ent project.properties
. maven.xml
merlin maven.xml
repository/impl project.properties
repository/main project.properties
Log:
Update framework entitity refs and other assorted housekeeping type stuff.
Revision Changes Path
1.2 +1 -1 avalon/framework/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/framework/api/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 13:05:19 -0000 1.1
+++ index.ent 22 Apr 2004 01:24:49 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/framework/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/framework/impl/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 13:03:43 -0000 1.1
+++ index.ent 22 Apr 2004 01:24:49 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % framework-entities SYSTEM "file:../../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/framework/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/framework/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 13:03:43 -0000 1.1
+++ index.ent 22 Apr 2004 01:24:49 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % framework-entities SYSTEM "file:../versioning/avalon-framework.ent"> %framework-entities;
+<!ENTITY % versions SYSTEM "../versioning/versions.ent"> %versions;
1.6 +19 -7 avalon/framework/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/framework/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 28 Mar 2004 02:55:36 -0000 1.5
+++ project.properties 22 Apr 2004 01:24:49 -0000 1.6
@@ -3,19 +3,31 @@
maven.junit.fork = yes
avalon.buildsystem = ${basedir}/../buildsystem
-maven.xdoc.poweredby.image=
-# doc related
-maven.xdoc.poweredby.image =
+
+#
+# Banner background and foreground colors.
+#
maven.ui.banner.background = #fff
maven.ui.banner.foreground = #000
-maven.xdoc.jsl = file:/${basedir}/site/etc/site.jsl
-maven.license.licenseFile = ${basedir}/LICENSE.txt
-maven.javadoc.stylesheet = ${basedir}/site/etc/stylesheet.css
+maven.xdoc.poweredby.image=
+
+# Styles & License
+maven.xdoc.jsl = file:///${avalon.buildsystem}/site/site.jsl
+maven.license.licenseFile = ${avalon.buildsystem}/site/LICENSE.txt
+maven.javadoc.stylesheet = ${avalon.buildsystem}/site/stylesheet.css
+
+#
+# doc sources
+#
+
+maven.docs.src = ${basedir}/xdocs
+maven.docs.dest = ${maven.build.dir}/docs
+
+# doc links
sun.j2se.link = http://java.sun.com/j2se/1.4/docs/api/
framework.api.link = http://avalon.apache.org/framework/api/
maven.javadoc.links = ${sun.j2se.link},${framework.api.link}
-maven.docs.dest = ${maven.build.dir}/docs
# gump integration
project.name=avalon-framework
1.8 +20 -0 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- maven.xml 22 Apr 2004 00:15:04 -0000 1.7
+++ maven.xml 22 Apr 2004 01:24:49 -0000 1.8
@@ -15,6 +15,26 @@
prereqs="xmeta,xutil,xrepo,xlogging,xcomposition,xactivation,xmerlin"/>
-->
+ <goal name="plugins" prereqs="xplugins"/>
+
+ <goal name="util" prereqs="xutil"/>
+ <goal name="framework" prereqs="xframework"/>
+ <goal name="meta" prereqs="framework,xmeta"/>
+ <goal name="repository" prereqs="util,xrepository"/>
+ <goal name="logging" prereqs="repository,xlogging"/>
+ <goal name="composition" prereqs="repository,meta,logging,xcomposition"/>
+ <goal name="activation" prereqs="composition,xactivation"/>
+ <goal name="merlin" prereqs="activation,xmerlin"/>
+
+ <goal name="xframework">
+ <maven:reactor basedir="${basedir}"
+ includes="framework/project.xml"
+ banner="Building:"
+ goals="avalon:build"
+ ignoreFailures="false"
+ postProcessing="false" />
+ </goal>
+
<goal name="xutil">
<maven:reactor basedir="${basedir}"
includes="util/project.xml"
1.75 +14 -6 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- maven.xml 22 Apr 2004 00:15:05 -0000 1.74
+++ maven.xml 22 Apr 2004 01:24:49 -0000 1.75
@@ -106,12 +106,12 @@
-->
<goal name="avalon:build" description="Build Merlin."
- prereqs="avalon:build-main,avalon:build-kernel,avalon:build-externals,avalon:xinstall"/>
+ prereqs="xmain,xkernel,xplugin,xexternals,xinstall"/>
- <goal name="avalon:build-main" description="Build Merlin.">
+ <goal name="xmain" description="Build Merlin.">
<maven:reactor basedir="${basedir}"
- includes="api/project.xml,impl/project.xml,../composition/**/project.xml,../activation/**/project.xml"
+ includes="api/project.xml,impl/project.xml"
banner="Installing:"
goals="jar:install"
ignoreFailures="false"
@@ -149,7 +149,7 @@
</j:forEach>
</goal>
- <goal name="avalon:build-kernel">
+ <goal name="xkernel">
<maven:reactor basedir="${basedir}"
includes="unit/project.xml,cli/project.xml"
goals="jar:install"
@@ -192,7 +192,7 @@
</j:forEach>
</goal>
- <goal name="avalon:build-externals" description="Build Externals.">
+ <goal name="xexternals">
<maven:reactor basedir="${basedir}"
includes="external.xml"
banner="Installing:"
@@ -215,6 +215,14 @@
</j:forEach>
</goal>
+ <goal name="xplugin">
+ <maven:reactor basedir="${basedir}"
+ includes="plugin/plugin.xml"
+ banner="Installing:"
+ ignoreFailures="false"
+ postProcessing="false" />
+ </goal>
+
<!--
==============================================================================
build the merlin installation
@@ -224,7 +232,7 @@
<goal name="avalon:install"
description="Build the Merlin distribution." prereqs="avalon:build"/>
- <goal name="avalon:xinstall">
+ <goal name="xinstall">
<!-- add supporting resources -->
<ant:copy toDir="${merlin.build.inst.dir}">
<fileset dir="${basedir}">
1.5 +3 -1 avalon/repository/impl/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/repository/impl/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 17 Mar 2004 08:46:58 -0000 1.4
+++ project.properties 22 Apr 2004 01:24:49 -0000 1.5
@@ -8,6 +8,8 @@
#
avalon.artifact.export = org.apache.avalon.repository.Repository
+#
+# gump
+#
project.name=avalon-repository-impl
-
avalon.buildsystem = ${basedir}/../../buildsystem
1.8 +3 -2 avalon/repository/main/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/repository/main/project.properties,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.properties 9 Apr 2004 06:52:02 -0000 1.7
+++ project.properties 22 Apr 2004 01:24:49 -0000 1.8
@@ -4,7 +4,8 @@
avalon.repository.hosts = http://www.dpml.net,http://www.ibiblio.org/maven
-
+#
+# gump
+#
project.name=avalon-repository-main
-
avalon.buildsystem = ${basedir}/../../buildsystem
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org