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 13:07:07 UTC
cvs commit: avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context entries.xml
mcconnell 2003/09/10 04:07:07
Modified: merlin maven.xml project.xml
merlin/activation/impl/src/test/conf block.xml
merlin/composition/impl/src/test/conf block.xml context.xml
data-test.xml
merlin/kernel/plugin project.xml
merlin/merlin-extensions/merlin-jmx/conf block.xml
merlin/merlin-platform/tutorials/composition/application/impl
project.xml
merlin/merlin-platform/tutorials/composition/application/impl/conf
block.xml
merlin/merlin-platform/tutorials/composition/location/api
project.xml
merlin/merlin-platform/tutorials/composition/location/impl
project.xml
merlin/merlin-platform/tutorials/composition/location/impl/conf
block.xml
merlin/merlin-platform/tutorials/composition/publisher/api
project.xml
merlin/merlin-platform/tutorials/composition/publisher/impl
project.xml
merlin/merlin-platform/tutorials/composition/publisher/impl/conf
block.xml
merlin/merlin-platform/tutorials/configuration/block
project.xml
merlin/merlin-platform/tutorials/configuration/block/conf
block.xml
merlin/merlin-platform/tutorials/configuration/defaults
project.xml
merlin/merlin-platform/tutorials/configuration/defaults/conf
block.xml
merlin/merlin-platform/tutorials/configuration/override
project.xml
merlin/merlin-platform/tutorials/configuration/override/conf
block.xml
merlin/merlin-platform/tutorials/context/avalon project.xml
merlin/merlin-platform/tutorials/context/avalon/conf
block.xml
merlin/merlin-platform/tutorials/context/casting project.xml
merlin/merlin-platform/tutorials/context/casting/conf
block.xml
merlin/merlin-platform/tutorials/context/custom project.xml
merlin/merlin-platform/tutorials/context/custom/conf
block.xml
merlin/merlin-platform/tutorials/context/strategy
project.xml
merlin/merlin-platform/tutorials/context/strategy/conf
block.xml
merlin/merlin-platform/tutorials/dependencies/auto
project.xml
merlin/merlin-platform/tutorials/dependencies/auto/conf
block.xml
merlin/merlin-platform/tutorials/dependencies/manual
project.xml
merlin/merlin-platform/tutorials/dependencies/manual/conf
block.xml
merlin/merlin-platform/tutorials/hello project.xml
merlin/merlin-platform/tutorials/hello/conf block.xml
merlin/merlin-platform/tutorials/lifecycle/activation
project.xml
merlin/merlin-platform/tutorials/lifecycle/activation/conf
block.xml
merlin/merlin-platform/tutorials/lifecycle/excalibur
project.xml
merlin/merlin-platform/tutorials/lifecycle/excalibur/conf
block.xml
merlin/merlin-platform/tutorials/meta project.xml
merlin/merlin-platform/xdocs/meta/block/components/dependencies
dependency.xml
merlin/merlin-platform/xdocs/starting/advanced composite.xml
includes.xml
merlin/merlin-platform/xdocs/starting/tutorial creation.xml
merlin/merlin-platform/xdocs/starting/tutorial/context
entries.xml
Log:
Main build updates (validated version).
Revision Changes Path
1.56 +4 -4 avalon-sandbox/merlin/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/maven.xml,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- maven.xml 10 Sep 2003 09:49:17 -0000 1.55
+++ maven.xml 10 Sep 2003 11:07:05 -0000 1.56
@@ -55,8 +55,8 @@
<!-- build the subprojects -->
<maven:reactor basedir="${basedir}"
includes="**/project.xml"
- excludes="target/**,merlin-platform/**,kernel/plugin/**,project.xml,kernel/bootstrap/*,merlin-extensions/**"
- goals="jar:install-snapshot"
+ excludes="target/**,merlin-platform/**,kernel/plugin/**,project.xml,merlin-extensions/**"
+ goals="jar:install"
banner="Installing:"
ignoreFailures="false" />
@@ -306,8 +306,8 @@
<maven:reactor
basedir="${basedir}"
includes="**/project.xml"
- excludes="merlin-platform/**,project.xml,kernel/plugin/**/*,merlin-extensions/**"
- goals="clean"
+ excludes="project.xml,kernel/plugin/**/*,merlin-extensions/**"
+ goals="clean:clean"
banner="Cleaning subproject:"
ignoreFailures="false"/>
</goal>
1.34 +1 -1 avalon-sandbox/merlin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/project.xml,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- project.xml 26 Aug 2003 21:02:45 -0000 1.33
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.34
@@ -6,7 +6,7 @@
<groupId>merlin</groupId>
<id>merlin</id>
<name>Merlin POM</name>
- <currentVersion>3.0</currentVersion>
+ <currentVersion>3.0-RC1</currentVersion>
<organization>
<name>Apache Software Foundation</name>
1.2 +1 -3 avalon-sandbox/merlin/activation/impl/src/test/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/activation/impl/src/test/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 10 Sep 2003 08:56:30 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:05 -0000 1.2
@@ -9,9 +9,7 @@
<classpath>
<fileset dir="."/>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
- <resource id="excalibur-lifecycle:excalibur-lifecycle-api" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +1 -2 avalon-sandbox/merlin/composition/impl/src/test/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/src/test/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 31 Aug 2003 14:30:44 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:05 -0000 1.2
@@ -21,8 +21,7 @@
<include>test-c.jar</include>
</fileset>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
<resource id="test:test-d"/>
</repository>
</classpath>
1.2 +1 -2 avalon-sandbox/merlin/composition/impl/src/test/conf/context.xml
Index: context.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/src/test/conf/context.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- context.xml 31 Aug 2003 14:30:44 -0000 1.1
+++ context.xml 10 Sep 2003 11:07:05 -0000 1.2
@@ -6,8 +6,7 @@
<classpath>
<!--
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
-->
<fileset dir="ext">
1.2 +1 -1 avalon-sandbox/merlin/composition/impl/src/test/conf/data-test.xml
Index: data-test.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/composition/impl/src/test/conf/data-test.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- data-test.xml 31 Aug 2003 14:30:44 -0000 1.1
+++ data-test.xml 10 Sep 2003 11:07:05 -0000 1.2
@@ -17,7 +17,7 @@
<include>sally.jar</include>
</fileset>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-dev"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
<resource id="cornerstone-threads:cornerstone-threads-api"/>
</repository>
<repository>
1.3 +2 -2 avalon-sandbox/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel/plugin/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 10 Sep 2003 09:40:33 -0000 1.2
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.3
@@ -103,12 +103,12 @@
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-spi</artifactId>
- <version>1.0-RC1</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-impl</artifactId>
- <version>1.0-RC1</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
1.4 +2 -2 avalon-sandbox/merlin/merlin-extensions/merlin-jmx/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-extensions/merlin-jmx/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 5 Sep 2003 10:00:32 -0000 1.3
+++ block.xml 10 Sep 2003 11:07:05 -0000 1.4
@@ -8,8 +8,8 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
- <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
+ <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
<resource id="mx4j:mx4j-jmx" version="1.1.1"/>
<resource id="mx4j:mx4j-tools" version="1.1.1"/>
<resource id="merlin:merlin-jmx" version="SNAPSHOT"/>
1.5 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 5 Sep 2003 10:00:32 -0000 1.4
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.5
@@ -12,12 +12,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>merlin-tutorial</groupId>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/application/impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 19 Aug 2003 13:39:24 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:05 -0000 1.2
@@ -4,8 +4,8 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
<resource id="merlin-tutorial:locator-api" version="1.0"/>
<resource id="merlin-tutorial:publisher-api" version="1.0"/>
<resource id="merlin-tutorial:application-impl" version="1.0"/>
1.5 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/api/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 5 Sep 2003 10:00:32 -0000 1.4
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.5
@@ -12,7 +12,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.5 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 5 Sep 2003 10:00:32 -0000 1.4
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.5
@@ -12,12 +12,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>merlin-tutorial</groupId>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/location/impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 19 Aug 2003 13:39:24 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:05 -0000 1.2
@@ -10,8 +10,8 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
<resource id="merlin-tutorial:locator-api" version="1.0"/>
<resource id="merlin-tutorial:locator-impl" version="1.0"/>
</repository>
1.5 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/api/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 5 Sep 2003 10:00:32 -0000 1.4
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.5
@@ -12,7 +12,7 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.5 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 5 Sep 2003 10:00:33 -0000 1.4
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.5
@@ -12,12 +12,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>merlin-tutorial</groupId>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/composition/publisher/impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 19 Aug 2003 13:39:24 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:05 -0000 1.2
@@ -10,8 +10,8 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
<resource id="merlin-tutorial:publisher-api" version="1.0"/>
<resource id="merlin-tutorial:publisher-impl" version="1.0"/>
</repository>
1.7 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 20 Aug 2003 17:02:51 -0000 1.6
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.7
@@ -10,12 +10,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.4 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/block/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 20 Aug 2003 11:57:13 -0000 1.3
+++ block.xml 10 Sep 2003 11:07:05 -0000 1.4
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.7 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 20 Aug 2003 17:02:51 -0000 1.6
+++ project.xml 10 Sep 2003 11:07:05 -0000 1.7
@@ -10,12 +10,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.5 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/defaults/conf/block.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- block.xml 20 Aug 2003 11:57:13 -0000 1.4
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.5
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.7 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- project.xml 20 Aug 2003 17:02:51 -0000 1.6
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.7
@@ -10,12 +10,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.4 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/configuration/override/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 20 Aug 2003 11:57:13 -0000 1.3
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.4
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Aug 2003 17:01:19 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,12 +16,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.2 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/avalon/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 20 Aug 2003 17:01:19 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Aug 2003 17:01:19 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,12 +16,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.2 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/casting/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 20 Aug 2003 17:01:19 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Aug 2003 17:01:20 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,12 +16,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/custom/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 20 Aug 2003 17:01:20 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -4,11 +4,10 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
-
<component name="hello" class="tutorial.HelloComponent">
<context>
1.2 +3 -3 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 20 Aug 2003 17:01:20 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,17 +16,17 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/context/strategy/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 20 Aug 2003 17:01:20 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -8,8 +8,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
- <resource id="avalon-activation:avalon-activation-spi" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 28 Aug 2003 17:26:39 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,13 +16,13 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/auto/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 28 Aug 2003 17:26:39 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -4,8 +4,8 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-api" version="4.1.5-RC3"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 28 Aug 2003 17:26:40 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,13 +16,13 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/dependencies/manual/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 28 Aug 2003 17:26:40 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -4,8 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.4 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/hello/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 20 Aug 2003 08:55:34 -0000 1.3
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.4
@@ -21,13 +21,13 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.5 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/hello/conf/block.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- block.xml 20 Aug 2003 11:57:13 -0000 1.4
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.5
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +5 -5 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 1 Sep 2003 02:13:07 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,27 +16,27 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.0-beta-1-RC1</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>1.1-RC1</version>
</dependency>
</dependencies>
1.2 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/activation/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 1 Sep 2003 02:13:07 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.2 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 1 Sep 2003 02:13:07 -0000 1.1
+++ project.xml 10 Sep 2003 11:07:06 -0000 1.2
@@ -16,12 +16,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>excalibur-lifecycle</groupId>
1.2 +1 -1 avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/lifecycle/excalibur/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 1 Sep 2003 02:13:07 -0000 1.1
+++ block.xml 10 Sep 2003 11:07:07 -0000 1.2
@@ -4,7 +4,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5-RC3"/>
</repository>
</classpath>
</classloader>
1.6 +2 -2 avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/tutorials/meta/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 25 Aug 2003 16:41:05 -0000 1.5
+++ project.xml 10 Sep 2003 11:07:07 -0000 1.6
@@ -16,12 +16,12 @@
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
- <version>4.1.5-dev</version>
+ <version>4.1.5-RC3</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5-dev</version>
+ <version>4.1.5-RC3</version>
</dependency>
</dependencies>
1.2 +1 -2 avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/dependency.xml
Index: dependency.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/meta/block/components/dependencies/dependency.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dependency.xml 28 Aug 2003 17:44:28 -0000 1.1
+++ dependency.xml 10 Sep 2003 11:07:07 -0000 1.2
@@ -37,8 +37,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
</repository>
</classpath>
</classloader>
1.5 +1 -2 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/composite.xml
Index: composite.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/composite.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- composite.xml 6 Sep 2003 09:15:45 -0000 1.4
+++ composite.xml 10 Sep 2003 11:07:07 -0000 1.5
@@ -51,8 +51,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
<resource id="merlin-tutorial:locator-api" version="1.0"/>
<resource id="merlin-tutorial:publisher-api" version="1.0"/>
<resource id="merlin-tutorial:application-impl" version="1.0"/>
1.7 +1 -1 avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/includes.xml
Index: includes.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/advanced/includes.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- includes.xml 17 Aug 2003 04:54:04 -0000 1.6
+++ includes.xml 10 Sep 2003 11:07:07 -0000 1.7
@@ -48,7 +48,7 @@
based on the block defintion from the resource repository.
-->
- <include name="my-block" id="cornerstone-store:cornerstone-store-impl" version="SNAPSHOT"/>
+ <include name="my-block" id="cornerstone-store:cornerstone-store-impl" version="1.0"/>
<container name="subcontainer">
1.5 +1 -1 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/creation.xml
Index: creation.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/creation.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- creation.xml 23 Aug 2003 02:23:30 -0000 1.4
+++ creation.xml 10 Sep 2003 11:07:07 -0000 1.5
@@ -152,7 +152,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
</repository>
</classpath>
</classloader>
1.5 +1 -1 avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/entries.xml
Index: entries.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/merlin-platform/xdocs/starting/tutorial/context/entries.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- entries.xml 23 Aug 2003 02:23:31 -0000 1.4
+++ entries.xml 10 Sep 2003 11:07:07 -0000 1.5
@@ -154,7 +154,7 @@
<classloader>
<classpath>
<repository>
- <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="4.1.5"/>
</repository>
</classpath>
</classloader>
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org