mcconnell 2002/12/10 18:53:40
Modified: merlin default.properties kernel.xml
merlin/src/etc project.mf
merlin/src/test/config block.xml
Log:
Updating version information for demo resources.
Revision Changes Path
1.4 +3 -2 avalon-sandbox/merlin/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/default.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- default.properties 11 Dec 2002 01:23:47 -0000 1.3
+++ default.properties 11 Dec 2002 02:53:40 -0000 1.4
@@ -8,8 +8,9 @@
name=avalon-merlin
Name=Merlin Service Management System
dir-name=merlin
-version=2.0
+version=2.1
package-version=2.1
+demo-version=1.0
year=2002
@@ -131,7 +132,7 @@
lib.dir = lib
demo.name = demo
-demo.jar = ${name}-${demo.name}-${version}.jar
+demo.jar = ${name}-${demo.name}-${demo-version}.jar
sar.name = ${name}-${version}.sar
# misc.
1.4 +2 -2 avalon-sandbox/merlin/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/kernel.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- kernel.xml 11 Dec 2002 01:24:29 -0000 1.3
+++ kernel.xml 11 Dec 2002 02:53:40 -0000 1.4
@@ -20,7 +20,7 @@
<classpath>
<fileset dir="build/lib">
- <!--<include name="avalon-merlin-demo-2.0.jar"/>-->
+ <!--<include name="avalon-merlin-demo-1.0.jar"/>-->
</fileset>
</classpath>
@@ -31,7 +31,7 @@
<include name="avalon-assembly-demo-1.0.jar"/>
</fileset>
<fileset dir="build/lib">
- <include name="avalon-merlin-demo-2.0.jar"/>
+ <include name="avalon-merlin-demo-1.0.jar"/>
</fileset>
</blocks>
1.5 +1 -1 avalon-sandbox/merlin/src/etc/project.mf
Index: project.mf
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/etc/project.mf,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- project.mf 11 Dec 2002 01:25:15 -0000 1.4
+++ project.mf 11 Dec 2002 02:53:40 -0000 1.5
@@ -2,7 +2,7 @@
Created-By: Apache Avalon
Extension-Name: avalon-merlin
Specification-Vendor: Apache Software Foundation
-Specification-Version: 2.1
+Specification-Version: 2.0
Implementation-Vendor: Apache Software Foundation
Implementation-Version: 2.1
Extension-List: framework i18n logger configuration meta lifecycle assembly
1.2 +1 -1 avalon-sandbox/merlin/src/test/config/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon-sandbox/merlin/src/test/config/block.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- block.xml 9 Dec 2002 12:16:26 -0000 1.1
+++ block.xml 11 Dec 2002 02:53:40 -0000 1.2
@@ -37,7 +37,7 @@
<classpath>
<fileset dir="build/lib">
- <include name="avalon-merlin-demo-2.0.jar"/>
+ <include name="avalon-merlin-demo-1.0.jar"/>
</fileset>
</classpath>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
