mcconnell 2004/04/05 07:04:54
Modified: merlin/kernel/api project.xml
merlin/kernel/cli project.xml
merlin/kernel/impl project.xml
merlin/kernel/plugin project.xml
merlin/kernel/servlet project.xml
merlin/kernel/unit project.xml
merlin version.ent
Added: merlin/kernel/api index.ent
merlin/kernel/cli index.ent
merlin/kernel/impl index.ent
merlin/kernel/plugin index.ent
merlin/kernel/servlet index.ent
merlin/kernel/unit index.ent
Log:
Parameterize build using entity references.
Revision Changes Path
1.9 +11 -7 avalon/merlin/kernel/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 4 Apr 2004 06:30:54 -0000 1.8
+++ project.xml 5 Apr 2004 14:04:54 -0000 1.9
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
<extend>${basedir}/../../project.xml</extend>
- <groupId>merlin</groupId>
- <id>merlin-api</id>
+ <groupId>&merlin-id;</groupId>
+ <id>&merlin-api-id;</id>
+ <currentVersion>&merlin-api-version;</currentVersion>
+
<name>Merlin API</name>
<package>org.apache.avalon.merlin</package>
-
- <inceptionYear>2002</inceptionYear>
<shortDescription>Merlin API</shortDescription>
+ <inceptionYear>2002</inceptionYear>
<description>
Merlin service management platform.
@@ -28,9 +32,9 @@
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
</dependency>
</dependencies>
1.1 avalon/merlin/kernel/api/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
1.10 +8 -5 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 4 Apr 2004 06:30:54 -0000 1.9
+++ project.xml 5 Apr 2004 14:04:54 -0000 1.10
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
<extend>${basedir}/../../project.xml</extend>
- <groupId>merlin</groupId>
- <id>merlin-cli</id>
- <name>Merlin CLI</name>
+ <groupId>&merlin-id;</groupId>
+ <id>&merlin-cli-id;</id>
+ <currentVersion>&merlin-cli-version;</currentVersion>
+ <name>Merlin CLI</name>
<package>org.apache.avalon.merlin.cli</package>
-
- <inceptionYear>2002</inceptionYear>
<shortDescription>Merlin CLI</shortDescription>
+ <inceptionYear>2002</inceptionYear>
<dependencies>
<dependency>
1.1 avalon/merlin/kernel/cli/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
1.31 +37 -34 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- project.xml 4 Apr 2004 06:30:54 -0000 1.30
+++ project.xml 5 Apr 2004 14:04:54 -0000 1.31
@@ -1,16 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
<extend>${basedir}/../../project.xml</extend>
- <groupId>merlin</groupId>
- <id>merlin-impl</id>
+ <groupId>&merlin-id;</groupId>
+ <id>&merlin-impl-id;</id>
+ <currentVersion>&merlin-impl-version;</currentVersion>
+
<name>Merlin Implementation</name>
<package>org.apache.avalon.merlin</package>
-
- <inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Implementation.</shortDescription>
+ <inceptionYear>2002</inceptionYear>
<description>
Merlin service management platform.
@@ -21,9 +25,9 @@
<!-- merlin dependecies -->
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&merlin-id;</groupId>
+ <artifactId>&merlin-api-id;</artifactId>
+ <version>&merlin-api-version;</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -67,25 +71,25 @@
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-spi</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-spi-id;</artifactId>
+ <version>&avalon-composition-spi-version;</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-impl</artifactId>
- <version>${pom.currentVersion}</version>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-impl-id;</artifactId>
+ <version>&avalon-composition-impl-version;</version>
</dependency>
<dependency>
@@ -111,33 +115,32 @@
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-api</artifactId>
- <version>1.1</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-api</artifactId>
+ <version>4.1.5</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-extension-impl</artifactId>
- <version>1.1</version>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <version>4.1.5</version>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-api</artifactId>
- <version>4.1.5</version>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-api</artifactId>
+ <version>1.1</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
</dependency>
<dependency>
- <groupId>avalon-framework</groupId>
- <artifactId>avalon-framework-impl</artifactId>
- <version>4.1.5</version>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-extension-impl</artifactId>
+ <version>1.1</version>
</dependency>
-
<dependency>
<groupId>avalon-util</groupId>
<artifactId>avalon-util-defaults</artifactId>
@@ -158,6 +161,11 @@
<artifactId>avalon-util-criteria</artifactId>
<version>1.1-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>avalon-util</groupId>
+ <artifactId>avalon-util-i18n</artifactId>
+ <version>1.0</version>
+ </dependency>
<!-- excalibur dependecies -->
@@ -168,11 +176,6 @@
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
- </dependency>
- <dependency>
- <groupId>avalon-util</groupId>
- <artifactId>avalon-util-i18n</artifactId>
- <version>1.0</version>
</dependency>
<dependency>
<id>excalibur-configuration</id>
1.1 avalon/merlin/kernel/impl/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
1.21 +8 -2 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- project.xml 4 Apr 2004 06:30:54 -0000 1.20
+++ project.xml 5 Apr 2004 14:04:54 -0000 1.21
@@ -1,11 +1,17 @@
-<?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>
<extend>${basedir}/../../project.xml</extend>
+ <groupId>&merlin-id;</groupId>
+ <id>&merlin-plugin-id;</id>
+ <currentVersion>&merlin-plugin-version;</currentVersion>
+
<pomVersion>3</pomVersion>
- <id>merlin-plugin</id>
<name>Merlin Plugin</name>
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
1.1 avalon/merlin/kernel/plugin/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
1.10 +20 -12 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- project.xml 4 Apr 2004 06:30:54 -0000 1.9
+++ project.xml 5 Apr 2004 14:04:54 -0000 1.10
@@ -1,22 +1,27 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
<extend>${basedir}/../../project.xml</extend>
- <groupId>merlin</groupId>
- <id>merlin-servlet</id>
+ <groupId>&merlin-id;</groupId>
+ <id>&merlin-servlet-id;</id>
+ <currentVersion>&merlin-servlet-version;</currentVersion>
+
<name>Merlin Servlet</name>
<package>org.apache.avalon.merlin.servlet</package>
-
- <inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Servlet</shortDescription>
+ <inceptionYear>2002</inceptionYear>
<description>
Merlin servlet is a servlet with an embedded Merlin Kernel.
</description>
<dependencies>
+
<dependency>
<groupId>avalon-meta</groupId>
<artifactId>avalon-meta-api</artifactId>
@@ -26,6 +31,7 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+
<dependency>
<groupId>avalon-framework</groupId>
<artifactId>avalon-framework-api</artifactId>
@@ -35,25 +41,25 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+
<dependency>
- <groupId>avalon-composition</groupId>
- <artifactId>avalon-composition-api</artifactId>
- <version>${pom.currentVersion}</version>
- <type>jar</type>
+ <groupId>&avalon-composition-id;</groupId>
+ <artifactId>&avalon-composition-api-id;</artifactId>
+ <version>&avalon-composition-api-version;</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
<dependency>
- <groupId>merlin</groupId>
- <artifactId>merlin-api</artifactId>
- <version>${pom.currentVersion}</version>
- <type>jar</type>
+ <groupId>&merlin-id;</groupId>
+ <artifactId>&merlin-api-id;</artifactId>
+ <version>&merlin-api-version;</version>
<properties>
<war.bundle>true</war.bundle>
</properties>
</dependency>
+
<dependency>
<groupId>avalon-repository</groupId>
<artifactId>avalon-repository-main</artifactId>
@@ -63,10 +69,12 @@
<war.bundle>true</war.bundle>
</properties>
</dependency>
+
<dependency>
<id>servletapi</id>
<version>2.3</version>
</dependency>
+
</dependencies>
</project>
1.1 avalon/merlin/kernel/servlet/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
1.29 +8 -5 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- project.xml 4 Apr 2004 06:30:54 -0000 1.28
+++ project.xml 5 Apr 2004 14:04:54 -0000 1.29
@@ -1,17 +1,20 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
<extend>${basedir}/../../project.xml</extend>
- <groupId>merlin</groupId>
- <id>merlin-unit</id>
- <name>Merlin Unit Test</name>
+ <groupId>&merlin-id;</groupId>
+ <id>&merlin-unit-id;</id>
+ <currentVersion>&merlin-unit-version;</currentVersion>
+ <name>Merlin Unit Test</name>
<package>org.apache.avalon.merlin</package>
-
- <inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Unit Test</shortDescription>
+ <inceptionYear>2002</inceptionYear>
<dependencies>
<dependency>
1.1 avalon/merlin/kernel/unit/index.ent
Index: index.ent
===================================================================
<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
1.4 +2 -2 avalon/merlin/version.ent
Index: version.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/version.ent,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- version.ent 5 Apr 2004 12:56:50 -0000 1.3
+++ version.ent 5 Apr 2004 14:04:54 -0000 1.4
@@ -22,8 +22,8 @@
<!ENTITY merlin-cli-version "3.3.0">
<!ENTITY merlin-plugin-id "merlin-plugin">
<!ENTITY merlin-plugin-version "3.3.0">
-<!ENTITY merlin-plugin-id "merlin-servlet">
-<!ENTITY merlin-plugin-version "3.3.0">
+<!ENTITY merlin-servlet-id "merlin-servlet">
+<!ENTITY merlin-servlet-version "3.3.0">
<!ENTITY merlin-unit-id "merlin-unit">
<!ENTITY merlin-unit-version "3.3.0">
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
