mcconnell 2004/04/05 08:00:05
Modified: merlin/platform/tutorials/context/strategy project.xml
merlin/platform/tutorials/dynamics project.xml
merlin/platform/tutorials/hello project.xml
merlin/platform/tutorials/jmx project.xml
merlin/platform/tutorials/lifecycle/activation project.xml
merlin/platform/tutorials/parameterization project.xml
Added: merlin/platform/tutorials/context/strategy index.ent
merlin/platform/tutorials/dynamics index.ent
merlin/platform/tutorials/jmx index.ent
merlin/platform/tutorials/lifecycle/activation index.ent
merlin/platform/tutorials/parameterization index.ent
Removed: merlin/platform/tutorials/hello/src/test/tutorial
StandardTestCase.java
Log:
SUnc. tutorials with common version index.
Revision Changes Path
1.9 +7 -4 avalon/merlin/platform/tutorials/context/strategy/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/strategy/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 4 Apr 2004 22:10:42 -0000 1.8
+++ project.xml 5 Apr 2004 15:00:05 -0000 1.9
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
@@ -24,9 +27,9 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
</dependencies>
1.1 avalon/merlin/platform/tutorials/context/strategy/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../../../version.ent"> %version-entities;
1.4 +7 -4 avalon/merlin/platform/tutorials/dynamics/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/dynamics/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 4 Apr 2004 22:10:42 -0000 1.3
+++ project.xml 5 Apr 2004 15:00:05 -0000 1.4
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
@@ -24,9 +27,9 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.1 avalon/merlin/platform/tutorials/dynamics/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../../version.ent"> %version-entities;
1.15 +0 -6 avalon/merlin/platform/tutorials/hello/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/hello/project.xml,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- project.xml 4 Apr 2004 22:10:42 -0000 1.14
+++ project.xml 5 Apr 2004 15:00:05 -0000 1.15
@@ -24,12 +24,6 @@
<version>4.1.5</version>
</dependency>
- <dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-unit</artifactId>
- <version>3.3.0</version>
- </dependency>
-
</dependencies>
</project>
1.3 +6 -3 avalon/merlin/platform/tutorials/jmx/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/jmx/project.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.xml 4 Apr 2004 22:10:42 -0000 1.2
+++ project.xml 5 Apr 2004 15:00:05 -0000 1.3
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
@@ -25,9 +28,9 @@
</dependency>
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-unit</artifactId>
- <version>3.3.0</version>
+ <groupId>&merlin-id;</groupId>
+ <artifactId>&merlin-unit-id;</artifactId>
+ <version>&merlin-unit-version;</version>
</dependency>
</dependencies>
1.1 avalon/merlin/platform/tutorials/jmx/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../../version.ent"> %version-entities;
1.9 +7 -4
avalon/merlin/platform/tutorials/lifecycle/activation/project.xml
Index: project.xml
===================================================================
RCS file:
/home/cvs/avalon/merlin/platform/tutorials/lifecycle/activation/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 4 Apr 2004 22:10:42 -0000 1.8
+++ project.xml 5 Apr 2004 15:00:05 -0000 1.9
@@ -1,4 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
@@ -24,9 +27,9 @@
<version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>3.3.0</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.1 avalon/merlin/platform/tutorials/lifecycle/activation/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../../../version.ent"> %version-entities;
1.9 +6 -3 avalon/merlin/platform/tutorials/parameterization/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 4 Apr 2004 22:10:42 -0000 1.8
+++ project.xml 5 Apr 2004 15:00:05 -0000 1.9
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
@@ -25,9 +28,9 @@
</dependency>
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-unit</artifactId>
- <version>3.3.0</version>
+ <groupId>&merlin-id;</groupId>
+ <artifactId>&merlin-unit-id;</artifactId>
+ <version>&merlin-unit-version;</version>
</dependency>
</dependencies>
1.1 avalon/merlin/platform/tutorials/parameterization/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../../version.ent"> %version-entities;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
