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/23 06:28:31 UTC
cvs commit: avalon/tutorials project.properties
mcconnell 2004/04/22 21:28:31
Modified: . .cvsignore maven.xml project.properties
activation project.properties
buildsystem project.properties
composition project.properties
framework project.properties
logging project.properties
maven-plugins maven.xml project.properties
merlin maven.xml project.properties
meta project.properties
repository project.properties
versioning avalon-logging.ent avalon-merlin.ent
avalon-repository.ent avalon-util.ent
Added: tutorials project.properties
Log:
add www.dpml.net to the set of remote repositories
Revision Changes Path
1.15 +2 -1 avalon/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/avalon/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 26 Sep 2003 04:00:11 -0000 1.14
+++ .cvsignore 23 Apr 2004 04:28:30 -0000 1.15
@@ -10,4 +10,5 @@
todo
.classpath
.project
-build.xml
\ No newline at end of file
+build.xml
+build.properties
1.18 +12 -11 avalon/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven.xml,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- maven.xml 22 Apr 2004 09:47:18 -0000 1.17
+++ maven.xml 23 Apr 2004 04:28:30 -0000 1.18
@@ -4,6 +4,8 @@
]>
<project default="avalon:help" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:util="jelly:util" xmlns:ant="jelly:ant">
+ <ant:property name="avalonTarget" value="avalon:build"/>
+
<goal name="avalon:help">
<echo>
To build the avalon platform you need to invoke the following three goals:
@@ -52,14 +54,13 @@
<!-- phase 4 targets -->
<goal name="tutorials" prereqs="xtutorials"/>
-
<!-- local goals -->
<goal name="xframework">
<maven:reactor basedir="${basedir}"
includes="framework/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -68,7 +69,7 @@
<maven:reactor basedir="${basedir}"
includes="util/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -77,7 +78,7 @@
<maven:reactor basedir="${basedir}"
includes="meta/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -86,7 +87,7 @@
<maven:reactor basedir="${basedir}"
includes="repository/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -95,7 +96,7 @@
<maven:reactor basedir="${basedir}"
includes="logging/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -104,7 +105,7 @@
<maven:reactor basedir="${basedir}"
includes="composition/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -113,7 +114,7 @@
<maven:reactor basedir="${basedir}"
includes="activation/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -122,7 +123,7 @@
<maven:reactor basedir="${basedir}"
includes="merlin/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -131,7 +132,7 @@
<maven:reactor basedir="${basedir}"
includes="maven-plugins/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
@@ -140,7 +141,7 @@
<maven:reactor basedir="${basedir}"
includes="tutorials/project.xml"
banner="Building:"
- goals="avalon:build"
+ goals="${avalonTarget}"
ignoreFailures="false"
postProcessing="false" />
</goal>
1.4 +1 -0 avalon/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 22 Apr 2004 01:26:11 -0000 1.3
+++ project.properties 23 Apr 2004 04:28:30 -0000 1.4
@@ -15,3 +15,4 @@
# The Avalon Build System location.
avalon.buildsystem = ${basedir}/buildsystem
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
1.2 +1 -1 avalon/activation/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/activation/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 22 Apr 2004 02:50:34 -0000 1.1
+++ project.properties 23 Apr 2004 04:28:30 -0000 1.2
@@ -16,7 +16,7 @@
avalon.buildsystem = ${basedir}/../buildsystem
# Repositories used.
-maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
# Junit needs to fork the JVM.
maven.junit.fork = yes
1.4 +1 -1 avalon/buildsystem/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/buildsystem/project.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.properties 18 Apr 2004 05:16:44 -0000 1.3
+++ project.properties 23 Apr 2004 04:28:30 -0000 1.4
@@ -17,6 +17,6 @@
# -------------------------------------------------------------------
# P R O J E C T P R O P E R T I E S
# -------------------------------------------------------------------
-maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
avalon.buildsystem = ${basedir}
1.2 +1 -1 avalon/composition/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/composition/project.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.properties 22 Apr 2004 02:42:26 -0000 1.1
+++ project.properties 23 Apr 2004 04:28:30 -0000 1.2
@@ -16,7 +16,7 @@
avalon.buildsystem = ${basedir}/../buildsystem
# Repositories used.
-maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
# Junit needs to fork the JVM.
maven.junit.fork = yes
1.7 +1 -1 avalon/framework/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/framework/project.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.properties 22 Apr 2004 01:24:49 -0000 1.6
+++ project.properties 23 Apr 2004 04:28:30 -0000 1.7
@@ -1,5 +1,5 @@
-maven.repo.remote = http://www.apache.org/dist/avalon/,http://www.ibiblio.org/maven/
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
maven.junit.fork = yes
avalon.buildsystem = ${basedir}/../buildsystem
1.6 +1 -1 avalon/logging/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/logging/project.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.properties 21 Apr 2004 23:38:44 -0000 1.5
+++ project.properties 23 Apr 2004 04:28:30 -0000 1.6
@@ -16,7 +16,7 @@
avalon.buildsystem = ${basedir}/../buildsystem
# Repositories used.
-maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
# Junit needs to fork the JVM.
maven.junit.fork = yes
1.5 +12 -0 avalon/maven-plugins/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/maven.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- maven.xml 22 Apr 2004 00:15:04 -0000 1.4
+++ maven.xml 23 Apr 2004 04:28:31 -0000 1.5
@@ -18,6 +18,16 @@
<project default="avalon:build" xmlns:maven="jelly:maven" xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:ant="jelly:ant">
+ <goal name="avalon:clean" prereqs="clean">
+ <maven:reactor basedir="${basedir}"
+ includes="**/project.xml"
+ excludes="project.xml,**/target/**/project.xml"
+ banner="Cleaning:"
+ goals="clean:clean"
+ ignoreFailures="true"
+ postProcessing="false" />
+ </goal>
+
<goal name="avalon:build">
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
@@ -27,6 +37,8 @@
ignoreFailures="false"
postProcessing="false" />
</goal>
+
+ <goal name="avalon:dist" prereqs="avalon:build"/>
<postGoal name="multiproject:site-init">
<ant:mkdir dir="${maven.build.dir}/docs/style"/>
1.5 +1 -1 avalon/maven-plugins/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/maven-plugins/project.properties,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.properties 22 Apr 2004 00:15:05 -0000 1.4
+++ project.properties 23 Apr 2004 04:28:31 -0000 1.5
@@ -16,7 +16,7 @@
avalon.buildsystem = ${basedir}/../buildsystem
# Repositories used.
-maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
# Junit needs to fork the JVM.
maven.junit.fork = yes
1.76 +0 -1 avalon/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/maven.xml,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- maven.xml 22 Apr 2004 01:24:49 -0000 1.75
+++ maven.xml 23 Apr 2004 04:28:31 -0000 1.76
@@ -60,7 +60,6 @@
<ant:property name="maven.checkstyle.format" value="avalon"/>
<ant:property name="pom.organization.identifier" value="ASF"/>
<ant:property name="pom.specificationVersion" value="&merlin-spec;"/>
- <ant:property name="maven.license.licenseFile" value="${basedir}/LICENSE.txt"/>
<maven:snapshot project="${pom}"/>
<!--
1.16 +3 -1 avalon/merlin/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/project.properties,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.properties 22 Apr 2004 00:15:05 -0000 1.15
+++ project.properties 23 Apr 2004 04:28:31 -0000 1.16
@@ -1,5 +1,7 @@
+# The Avalon Build System location.
+avalon.buildsystem = ${basedir}/../buildsystem
-maven.repo.remote = http://www.dpml.net,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
#
# Banner background and foreground colors.
1.10 +1 -1 avalon/meta/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/meta/project.properties,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.properties 21 Apr 2004 23:16:33 -0000 1.9
+++ project.properties 23 Apr 2004 04:28:31 -0000 1.10
@@ -2,7 +2,7 @@
# The Avalon Build System location.
avalon.buildsystem = ${basedir}/../buildsystem
-maven.repo.remote = http://www.dpml.net,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
maven.junit.fork = yes
1.9 +1 -1 avalon/repository/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/avalon/repository/project.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.properties 21 Apr 2004 23:32:05 -0000 1.8
+++ project.properties 23 Apr 2004 04:28:31 -0000 1.9
@@ -16,7 +16,7 @@
avalon.buildsystem = ${basedir}/../buildsystem
# Repositories used.
-maven.repo.remote = http://www.apache.org/dist/avalon,http://www.ibiblio.org/maven
+maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
# Junit needs to fork the JVM.
maven.junit.fork = yes
1.6 +5 -5 avalon/versioning/avalon-logging.ent
Index: avalon-logging.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-logging.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- avalon-logging.ent 18 Apr 2004 05:16:44 -0000 1.5
+++ avalon-logging.ent 23 Apr 2004 04:28:31 -0000 1.6
@@ -30,7 +30,7 @@
<!ENTITY avalon-logging-test-version "1.0.dev-0">
<!ENTITY avalon-logging-log4j-id "avalon-logging-log4j">
-<!ENTITY avalon-logging-log4j-version "1.0.dev-0">
+<!ENTITY avalon-logging-log4j-version "1.0.dev-1">
<!ENTITY avalon-logging-log4j-artifact-spec "&avalon-logging-id;/&avalon-logging-log4j-id;#&avalon-logging-log4j-version;">
<!ENTITY avalon-logging-logkit-api-id "avalon-logging-logkit-api">
@@ -38,13 +38,13 @@
<!ENTITY avalon-logging-logkit-spi-id "avalon-logging-logkit-spi">
<!ENTITY avalon-logging-logkit-spi-version "1.0.dev-0">
<!ENTITY avalon-logging-logkit-impl-id "avalon-logging-logkit-impl">
-<!ENTITY avalon-logging-logkit-impl-version "1.0.dev-0">
+<!ENTITY avalon-logging-logkit-impl-version "1.0.dev-1">
<!ENTITY avalon-logging-logkit-datagram-id "avalon-logging-logkit-datagram">
-<!ENTITY avalon-logging-logkit-datagram-version "1.0.dev-0">
+<!ENTITY avalon-logging-logkit-datagram-version "1.0.dev-1">
<!ENTITY avalon-logging-logkit-socket-id "avalon-logging-logkit-socket">
-<!ENTITY avalon-logging-logkit-socket-version "1.0.dev-0">
+<!ENTITY avalon-logging-logkit-socket-version "1.0.dev-1">
<!ENTITY avalon-logging-logkit-syslog-id "avalon-logging-logkit-syslog">
-<!ENTITY avalon-logging-logkit-syslog-version "1.0.dev-0">
+<!ENTITY avalon-logging-logkit-syslog-version "1.0.dev-1">
<!ENTITY avalon-logging-logkit-artifact-spec "&avalon-logging-id;/&avalon-logging-logkit-impl-id;#&avalon-logging-logkit-impl-version;">
<!ENTITY avalon-logging-logkit-artifact "artifact:&avalon-logging-logkit-artifact-spec;">
1.7 +8 -8 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- avalon-merlin.ent 18 Apr 2004 05:16:44 -0000 1.6
+++ avalon-merlin.ent 23 Apr 2004 04:28:31 -0000 1.7
@@ -21,10 +21,10 @@
<!ENTITY avalon-composition-id "avalon-composition">
<!ENTITY avalon-composition-api-id "avalon-composition-api">
-<!ENTITY avalon-composition-api-version "2.0.dev-0">
+<!ENTITY avalon-composition-api-version "2.0.dev-1">
<!ENTITY avalon-composition-impl-id "avalon-composition-impl">
-<!ENTITY avalon-composition-impl-version "2.0.dev-0">
+<!ENTITY avalon-composition-impl-version "2.0.dev-1">
<!ENTITY avalon-composition-spi-id "avalon-composition-spi">
<!ENTITY avalon-composition-spi-version "2.0.dev-0">
@@ -38,7 +38,7 @@
<!ENTITY avalon-activation-api-version "2.0.dev-0">
<!ENTITY avalon-activation-impl-id "avalon-activation-impl">
-<!ENTITY avalon-activation-impl-version "2.0.dev-0">
+<!ENTITY avalon-activation-impl-version "2.0.dev-1">
<!ENTITY avalon-activation-artifact
"artifact:&avalon-activation-id;/&avalon-activation-impl-id;#&avalon-activation-impl-version;">
@@ -52,18 +52,18 @@
<!ENTITY merlin-api-version "3.3.dev-0">
<!ENTITY merlin-impl-id "merlin-impl">
-<!ENTITY merlin-impl-version "3.3.dev-0">
+<!ENTITY merlin-impl-version "3.3.dev-1">
<!ENTITY merlin-impl-artifact "artifact:&merlin-id;/&merlin-impl-id;#merlin-impl-version;">
<!ENTITY merlin-cli-id "merlin-cli">
-<!ENTITY merlin-cli-version "3.3.dev-0">
+<!ENTITY merlin-cli-version "3.3.dev-1">
<!ENTITY merlin-plugin-id "merlin-plugin">
-<!ENTITY merlin-plugin-version "3.3.dev-0">
+<!ENTITY merlin-plugin-version "3.3.dev-1">
<!ENTITY merlin-servlet-id "merlin-servlet">
-<!ENTITY merlin-servlet-version "3.3.dev-0">
+<!ENTITY merlin-servlet-version "3.3.dev-1">
<!ENTITY merlin-unit-id "merlin-unit">
-<!ENTITY merlin-unit-version "3.3.dev-0">
+<!ENTITY merlin-unit-version "3.3.dev-1">
1.4 +3 -3 avalon/versioning/avalon-repository.ent
Index: avalon-repository.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-repository.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- avalon-repository.ent 11 Apr 2004 13:06:32 -0000 1.3
+++ avalon-repository.ent 23 Apr 2004 04:28:31 -0000 1.4
@@ -4,13 +4,13 @@
<!ENTITY avalon-repository-api-version "2.0.dev-0">
<!ENTITY avalon-repository-cli-id "avalon-repository-cli">
-<!ENTITY avalon-repository-cli-version "2.0.dev-0">
+<!ENTITY avalon-repository-cli-version "2.0.dev-1">
<!ENTITY avalon-repository-impl-id "avalon-repository-impl">
-<!ENTITY avalon-repository-impl-version "2.0.dev-0">
+<!ENTITY avalon-repository-impl-version "2.0.dev-1">
<!ENTITY avalon-repository-main-id "avalon-repository-main">
-<!ENTITY avalon-repository-main-version "2.0.dev-0">
+<!ENTITY avalon-repository-main-version "2.0.dev-1">
<!ENTITY avalon-repository-spi-id "avalon-repository-spi">
<!ENTITY avalon-repository-spi-version "2.0.dev-0">
1.6 +2 -2 avalon/versioning/avalon-util.ent
Index: avalon-util.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-util.ent,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- avalon-util.ent 11 Apr 2004 13:06:32 -0000 1.5
+++ avalon-util.ent 23 Apr 2004 04:28:31 -0000 1.6
@@ -5,10 +5,10 @@
<!ENTITY avalon-util-criteria-version "1.1.dev-0">
<!ENTITY avalon-util-defaults-id "avalon-util-defaults">
-<!ENTITY avalon-util-defaults-version "1.2.dev-0">
+<!ENTITY avalon-util-defaults-version "1.2.dev-1">
<!ENTITY avalon-util-env-id "avalon-util-env">
-<!ENTITY avalon-util-env-version "1.1.dev-0">
+<!ENTITY avalon-util-env-version "1.1.dev-1">
<!ENTITY avalon-util-exception-id "avalon-util-exception">
<!ENTITY avalon-util-exception-version "1.0.0">
1.1 avalon/tutorials/project.properties
Index: project.properties
===================================================================
# Copyright 2001-2004 The Apache Software Foundation.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# The Avalon Build System location.
avalon.buildsystem = ${basedir}/../buildsystem
# Repositories used.
maven.repo.remote = http://www.apache.org/dist/avalon,http://www.dpml.net,http://www.ibiblio.org/maven
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org