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 01:10:19 UTC
cvs commit: avalon/util/plugin index.ent
mcconnell 2004/04/21 16:10:19
Modified: . index.ent maven.xml project.xml
util/criteria index.ent
util/defaults index.ent
util/env index.ent
util/exception index.ent
util/extension/api index.ent
util/extension/impl index.ent
util/i18n index.ent
util index.ent project.properties
util/plugin index.ent
Log:
Updates enable clean build of util from root avalon.
Revision Changes Path
1.2 +1 -6 avalon/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 18 Apr 2004 11:27:16 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:18 -0000 1.2
@@ -1,6 +1 @@
-<!ENTITY % merlin-entities SYSTEM "file:versioning/avalon-merlin.ent"> %merlin-entities;
-<!ENTITY % util-entities SYSTEM "file:versioning/avalon-util.ent"> %util-entities;
-<!ENTITY % framework-entities SYSTEM "file:versioning/avalon-framework.ent"> %framework-entities;
-<!ENTITY % meta-entities SYSTEM "file:versioning/avalon-meta.ent"> %meta-entities;
-<!ENTITY % repo-entities SYSTEM "file:versioning/avalon-repository.ent"> %repo-entities;
-<!ENTITY % logging-entities SYSTEM "file:versioning/avalon-logging.ent"> %logging-entities;
+<!ENTITY % versions SYSTEM "versioning/versions.ent"> %versions;
1.6 +35 -0 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- maven.xml 21 Apr 2004 15:55:53 -0000 1.5
+++ maven.xml 21 Apr 2004 23:10:18 -0000 1.6
@@ -11,6 +11,41 @@
</goal>
<!--
+ <goal name="avalon:build" description="Build the Avalon Platform."
+ prereqs="xmeta,xutil,xrepo,xlogging,xcomposition,xactivation,xmerlin"/>
+ -->
+
+ <goal name="xall">
+ <maven:reactor basedir="${basedir}"
+ includes="**/project.xml"
+ excludes="merlin/project.xml,util/project.xml,meta/project.xml,repository/project.xml,logging/project.xml"
+ banner="Building:"
+ goals=""
+ ignoreFailures="false"
+ postProcessing="false" />
+ </goal>
+
+ <goal name="xutil">
+ <maven:reactor basedir="${basedir}"
+ includes="util/project.xml"
+ banner="Building:"
+ goals="avalon:build"
+ ignoreFailures="false"
+ postProcessing="false" />
+ </goal>
+
+
+
+ <goal name="xmeta">
+ <maven:reactor basedir="meta"
+ includes="project.xml"
+ banner="Building:"
+ goals="avalon:build"
+ ignoreFailures="false"
+ postProcessing="false" />
+ </goal>
+
+ <!--
==============================================================================
filter resources
==============================================================================
1.8 +3 -0 avalon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 18 Apr 2004 14:21:32 -0000 1.7
+++ project.xml 21 Apr 2004 23:10:18 -0000 1.8
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<!--
Copyright 2004 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
1.2 +1 -1 avalon/util/criteria/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/criteria/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 12:57:19 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:18 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/util/defaults/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/defaults/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 12:57:19 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:18 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/util/env/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/env/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 12:57:19 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:18 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions-ent SYSTEM "../../versioning/versions.ent"> %versions-ent;
1.2 +1 -1 avalon/util/exception/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/exception/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 12:57:19 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:18 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/util/extension/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/extension/api/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 10:11:34 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:18 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/util/extension/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/extension/impl/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 10:11:34 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:18 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/util/i18n/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/i18n/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 12:57:19 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:19 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
1.2 +1 -1 avalon/util/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 10:11:34 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:19 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../versioning/versions.ent"> %versions;
1.6 +3 -3 avalon/util/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/util/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 21 Apr 2004 18:28:13 -0000 1.5
+++ project.properties 21 Apr 2004 23:10:19 -0000 1.6
@@ -29,9 +29,9 @@
maven.xdoc.poweredby.image=
# Styles & License
-maven.xdoc.jsl = file:///${basedir}/../buildsystem/site.jsl
-maven.license.licenseFile = ./../buildsystem/LICENSE.txt
-maven.javadoc.stylesheet = ${basedir}/../buildsystem/stylesheet.css
+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
#
# Declaration of the remote links to assign on javadoc generation.
1.2 +1 -1 avalon/util/plugin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/util/plugin/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 8 Apr 2004 12:57:19 -0000 1.1
+++ index.ent 21 Apr 2004 23:10:19 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % util-entities SYSTEM "file:../../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % versions SYSTEM "../../versioning/versions.ent"> %versions;
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org