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/07/17 23:12:42 UTC
cvs commit: avalon-components/threads-tutorial/conf block.xml
mcconnell 2003/07/17 14:12:42
Modified: . README.TXT build.xml maven.xml
connection-api project.xml
connection-impl project.xml
connection-impl/conf block.xml
datasources-api project.xml
datasources-impl project.xml
datasources-impl/conf block.xml
scheduler-api project.xml
scheduler-impl project.xml
scheduler-impl/conf block.xml
site project.xml
site/xdocs/examples/merlin threads.xml
sockets-impl project.xml
sockets-impl/conf block.xml
store-api project.xml
store-impl project.xml
store-impl/conf block.xml
threads-impl project.xml
threads-impl/conf block.xml
threads-tutorial project.xml
threads-tutorial/conf block.xml
Log:
Upate all descriptions, build procedures and goals to generate (and use SNAPSHOT builds).
Revision Changes Path
1.4 +11 -12 avalon-components/README.TXT
Index: README.TXT
===================================================================
RCS file: /home/cvs/avalon-components/README.TXT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- README.TXT 19 Jun 2003 20:48:28 -0000 1.3
+++ README.TXT 17 Jul 2003 21:12:40 -0000 1.4
@@ -28,29 +28,28 @@
threads-impl
threads-tutorial
-The entire suite can be built as follows:
+The default target will build, jar and install the complete component
+suite into your local maven repository.
$ cd avalon-components
$ maven
-The default target will build, jar and install the component into
-your local maven repository followind by the generation of the
-project documetation under the following directory:
-
- avalon-components/site/target/docs
Other convinience goals avalible within the root avalon-components
directory include:
- project-install
- project-site
- project-clean
+ do-install
+ do-site
+ do-clean
+
+Site documetation generated hy the do-site goal will be placed in
+the avalon-components/site/target/docs directory.
-Furthermore, each project can be build indepedendently using
-classic Maven goals. For example:
+Each project can be build indepedendently using classic Maven
+goals. For example:
$ cd avalon-components/threads-api
- $ maven jar:install
+ $ maven jar:install-snapshot
For more information please consult the project documentation
included under the avalon-components/site directory.
1.128 +5 -2 avalon-components/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/avalon-components/build.xml,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -r1.127 -r1.128
--- build.xml 20 Jun 2003 01:14:36 -0000 1.127
+++ build.xml 17 Jul 2003 21:12:40 -0000 1.128
@@ -161,9 +161,12 @@
</target>
<target name="get-deps" unless="noget" depends="init">
- <get dest="${lib.dir}/avalon-framework-4.1.4.jar"
+ <get dest="${lib.dir}/avalon-framework-api-SNAPSHOT.jar"
usetimestamp="true" ignoreerrors="true"
- src="http://www.ibiblio.org/maven/avalon-framework/jars/avalon-framework-4.1.4.jar"/>
+ src="http://www.ibiblio.org/maven/avalon-framework/jars/avalon-framework-api-SNAPSHOT.jar"/>
+ <get dest="${lib.dir}/avalon-framework-impl-SNAPSHOT.jar"
+ usetimestamp="true" ignoreerrors="true"
+ src="http://www.ibiblio.org/maven/avalon-framework/jars/avalon-framework-impl-SNAPSHOT.jar"/>
<get dest="${lib.dir}/excalibur-datasource-1.1.1.jar"
usetimestamp="true" ignoreerrors="true"
src="http://www.ibiblio.org/maven/excalibur-datasource/jars/excalibur-datasource-1.1.1.jar"/>
1.3 +6 -6 avalon-components/maven.xml
Index: maven.xml
===================================================================
RCS file: /home/cvs/avalon-components/maven.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- maven.xml 19 Jun 2003 17:05:33 -0000 1.2
+++ maven.xml 17 Jul 2003 21:12:40 -0000 1.3
@@ -3,22 +3,22 @@
<property file="${basedir}/../project.properties"/>
<goal name="build">
- <attainGoal name="project-install"/>
- <attainGoal name="project-site"/>
+ <attainGoal name="do-install"/>
+ <!--<attainGoal name="do-site"/>-->
</goal>
- <goal name="project-install"
+ <goal name="do-install"
description="Install the sub-project jars." >
<maven:reactor
basedir="${basedir}"
includes="*/project.xml"
excludes="site/*.*"
- goals="jar:install"
+ goals="jar:install-snapshot"
banner="Installing:"
ignoreFailures="false" />
</goal>
- <goal name="project-site"
+ <goal name="do-site"
description="Build the project site." >
<maven:reactor
basedir="${basedir}"
@@ -28,7 +28,7 @@
ignoreFailures="false" />
</goal>
- <goal name="project-clean"
+ <goal name="do-clean"
description="Build the distribution." >
<maven:reactor
basedir="${basedir}"
1.2 +10 -4 avalon-components/connection-api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/connection-api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 16:57:06 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:40 -0000 1.2
@@ -19,13 +19,13 @@
<dependency>
<groupId>cornerstone-sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- excalibur api dependencies -->
@@ -38,8 +38,14 @@
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.2 +11 -5 avalon-components/connection-impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/connection-impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 16:57:56 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:40 -0000 1.2
@@ -20,19 +20,19 @@
<dependency>
<groupId>cornerstone-connection</groupId>
<artifactId>cornerstone-connection-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cornerstone-sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- excalibur api dependencies -->
@@ -45,8 +45,14 @@
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.3 +4 -3 avalon-components/connection-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/connection-impl/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 19 Jun 2003 20:31:28 -0000 1.2
+++ block.xml 17 Jul 2003 21:12:40 -0000 1.3
@@ -24,9 +24,10 @@
<engine>
<classpath>
<repository>
- <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
- <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
- <resource id="cornerstone-connection:cornerstone-connection-api" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
+ <resource id="cornerstone-sockets:cornerstone-sockets-api" version="SNAPSHOT"/>
+ <resource id="cornerstone-connection:cornerstone-connection-api" version="SNAPSHOT"/>
<resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
</repository>
</classpath>
1.2 +3 -2 avalon-components/datasources-api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/datasources-api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 16:58:34 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:40 -0000 1.2
@@ -17,8 +17,9 @@
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
</dependencies>
1.2 +9 -3 avalon-components/datasources-impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/datasources-impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 16:59:02 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:40 -0000 1.2
@@ -20,7 +20,7 @@
<dependency>
<groupId>cornerstone-datasources</groupId>
<artifactId>cornerstone-datasources-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- excalibur dependencies -->
@@ -37,8 +37,14 @@
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.4 +3 -2 avalon-components/datasources-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/datasources-impl/conf/block.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- block.xml 19 Jun 2003 20:31:28 -0000 1.3
+++ block.xml 17 Jul 2003 21:12:41 -0000 1.4
@@ -20,10 +20,11 @@
<engine>
<classpath>
<repository>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
<resource id="excalibur-pool:excalibur-pool" version="1.2"/>
<resource id="excalibur-datasource:excalibur-datasource" version="1.1.1"/>
- <resource id="cornerstone-datasources:cornerstone-datasources-api" version="1.0"/>
- <resource id="cornerstone-datasources:cornerstone-datasources-impl" version="1.0"/>
+ <resource id="cornerstone-datasources:cornerstone-datasources-api" version="SNAPSHOT"/>
+ <resource id="cornerstone-datasources:cornerstone-datasources-impl" version="SNAPSHOT"/>
</repository>
</classpath>
</engine>
1.2 +3 -2 avalon-components/scheduler-api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/scheduler-api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 16:59:45 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -17,8 +17,9 @@
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.2 +10 -4 avalon-components/scheduler-impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/scheduler-impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 17:00:21 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -20,13 +20,13 @@
<dependency>
<groupId>cornerstone-scheduler</groupId>
<artifactId>cornerstone-scheduler-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- excalibur api dependencies -->
@@ -39,8 +39,14 @@
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.3 +3 -2 avalon-components/scheduler-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/scheduler-impl/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 19 Jun 2003 20:31:29 -0000 1.2
+++ block.xml 17 Jul 2003 21:12:41 -0000 1.3
@@ -24,8 +24,9 @@
<engine>
<classpath>
<repository>
- <resource id="cornerstone-scheduler:cornerstone-scheduler-api" version="1.0"/>
- <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="cornerstone-scheduler:cornerstone-scheduler-api" version="SNAPSHOT"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
<resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
</repository>
</classpath>
1.5 +62 -14 avalon-components/site/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/site/project.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.xml 19 Jun 2003 23:53:34 -0000 1.4
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.5
@@ -13,11 +13,22 @@
<shortDescription>Avalon Components Site</shortDescription>
<dependencies>
+
+ <!-- framework dependencies -->
+
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
<!-- excalibur dependencies -->
+
<dependency>
<id>excalibur-thread</id>
<version>1.1.1</version>
@@ -30,36 +41,73 @@
<id>excalibur-datasource</id>
<version>1.1.1</version>
</dependency>
+
<!-- local dependencies -->
+
+ <dependency>
+ <groupId>cornerstone-threads</groupId>
+ <artifactId>cornerstone-threads-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>cornerstone-threads</groupId>
- <artifactId>cornerstone-threads</artifactId>
- <version>1.0</version>
+ <artifactId>cornerstone-threads-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>cornerstone-connection</groupId>
- <artifactId>cornerstone-connection</artifactId>
- <version>1.0</version>
+ <artifactId>cornerstone-connection-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>cornerstone-connection</groupId>
+ <artifactId>cornerstone-connection-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cornerstone-datasources</groupId>
+ <artifactId>cornerstone-datasources-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cornerstone-datasources</groupId>
- <artifactId>cornerstone-datasources</artifactId>
- <version>1.0</version>
+ <artifactId>cornerstone-datasources-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
+
<dependency>
<groupId>cornerstone-scheduler</groupId>
- <artifactId>cornerstone-scheduler</artifactId>
- <version>1.0</version>
+ <artifactId>cornerstone-scheduler-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>cornerstone-scheduler</groupId>
+ <artifactId>cornerstone-scheduler-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cornerstone-sockets</groupId>
+ <artifactId>cornerstone-sockets-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cornerstone-sockets</groupId>
- <artifactId>cornerstone-sockets</artifactId>
- <version>1.0</version>
+ <artifactId>cornerstone-sockets-impl</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>cornerstone-store</groupId>
+ <artifactId>cornerstone-store-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<dependency>
<groupId>cornerstone-store</groupId>
- <artifactId>cornerstone-store</artifactId>
- <version>1.0</version>
+ <artifactId>cornerstone-store-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
</dependencies>
1.2 +4 -4 avalon-components/site/xdocs/examples/merlin/threads.xml
Index: threads.xml
===================================================================
RCS file: /home/cvs/avalon-components/site/xdocs/examples/merlin/threads.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- threads.xml 5 May 2003 20:50:27 -0000 1.1
+++ threads.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -53,14 +53,14 @@
<engine>
<classpath>
<repository>
- <resource id="cornerstone:cornerstone-threads-api" version="1.0"/>
- <resource id="excalibur:excalibur-thread" version="1.1.1"/>
- <resource id="excalibur:excalibur-event" version="2.0"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
+ <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
+ <resource id="excalibur-event:excalibur-event" version="1.0.3"/>
</repository>
</classpath>
</engine>
- <include id="cornerstone:cornerstone-threads-impl" version="1.0"/>
+ <include id="cornerstone-threads:cornerstone-threads-impl" version="1.0"/>
<component name="test"
class="org.apache.avalon.cornerstone.threads.tutorial.ThreadConsumer"
1.2 +9 -3 avalon-components/sockets-impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/sockets-impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 17:01:24 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -20,14 +20,20 @@
<dependency>
<groupId>cornerstone-sockets</groupId>
<artifactId>cornerstone-sockets-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.3 +3 -2 avalon-components/sockets-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/sockets-impl/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 19 Jun 2003 20:31:30 -0000 1.2
+++ block.xml 17 Jul 2003 21:12:41 -0000 1.3
@@ -20,8 +20,9 @@
<engine>
<classpath>
<repository>
- <resource id="cornerstone-sockets:cornerstone-sockets-api" version="1.0"/>
- <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="cornerstone-sockets:cornerstone-sockets-api" version="SNAPSHOT"/>
+ <resource id="cornerstone-sockets:cornerstone-sockets-impl" version="SNAPSHOT"/>
</repository>
</classpath>
</engine>
1.2 +3 -2 avalon-components/store-api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/store-api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 17:02:02 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -15,8 +15,9 @@
<dependencies>
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
</dependencies>
1.2 +9 -3 avalon-components/store-impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/store-impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 17:02:24 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -18,14 +18,20 @@
<dependency>
<groupId>cornerstone-store</groupId>
<artifactId>cornerstone-store-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- pre JDK 1.4 dependencies -->
1.2 +3 -2 avalon-components/store-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/store-impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 19 Jun 2003 17:02:24 -0000 1.1
+++ block.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -20,8 +20,9 @@
<engine>
<classpath>
<repository>
- <resource id="cornerstone-store:cornerstone-store-api" version="1.0"/>
- <resource id="cornerstone-store:cornerstone-store-impl" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="cornerstone-store:cornerstone-store-api" version="SNAPSHOT"/>
+ <resource id="cornerstone-store:cornerstone-store-impl" version="SNAPSHOT"/>
</repository>
</classpath>
</engine>
1.2 +9 -3 avalon-components/threads-impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/threads-impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 17:03:31 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -20,14 +20,20 @@
<dependency>
<groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- excalibur dependencies -->
1.2 +6 -5 avalon-components/threads-impl/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/threads-impl/conf/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 19 Jun 2003 17:03:31 -0000 1.1
+++ block.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -17,14 +17,15 @@
<implementation>
- <categories priority="INFO"/>
-
<engine>
<classpath>
<repository>
- <resource id="excalibur:excalibur-thread" version="1.1.1"/>
- <resource id="excalibur:excalibur-event" version="2.0"/>
- <resource id="cornerstone:cornerstone-threads-api" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-api" version="SNAPSHOT"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
+ <resource id="excalibur-event:excalibur-event" version="1.0.3"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
+ <resource id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
</repository>
</classpath>
</engine>
1.2 +9 -3 avalon-components/threads-tutorial/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon-components/threads-tutorial/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Jun 2003 17:03:59 -0000 1.1
+++ project.xml 17 Jul 2003 21:12:41 -0000 1.2
@@ -20,14 +20,20 @@
<dependency>
<groupId>cornerstone-threads</groupId>
<artifactId>cornerstone-threads-api</artifactId>
- <version>1.0</version>
+ <version>SNAPSHOT</version>
</dependency>
<!-- avalon dependencies -->
<dependency>
- <id>avalon-framework</id>
- <version>4.1.4</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>SNAPSHOT</version>
</dependency>
<!-- excalibur dependencies -->
1.3 +3 -2 avalon-components/threads-tutorial/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-components/threads-tutorial/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 19 Jun 2003 20:31:42 -0000 1.2
+++ block.xml 17 Jul 2003 21:12:41 -0000 1.3
@@ -14,7 +14,8 @@
<engine>
<classpath>
<repository>
- <resource id="cornerstone-threads:cornerstone-threads-api" version="1.0"/>
+ <resource id="avalon-framework:avalon-framework-impl" version="SNAPSHOT"/>
+ <resource id="cornerstone-threads:cornerstone-threads-api" version="SNAPSHOT"/>
<resource id="excalibur-thread:excalibur-thread" version="1.1.1"/>
<resource id="excalibur-event:excalibur-event" version="1.0.3"/>
</repository>
@@ -22,7 +23,7 @@
</engine>
<include name="threads">
- <resource id="cornerstone-threads:cornerstone-threads-impl" version="1.0"/>
+ <resource id="cornerstone-threads:cornerstone-threads-impl" version="SNAPSHOT"/>
</include>
<component name="test"
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org