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 2004/04/08 13:58:33 UTC
cvs commit: avalon/versioning avalon-facilities.ent avalon-merlin.ent
mcconnell 2004/04/08 04:58:33
Modified: merlin/activation/api index.ent
merlin/activation/impl index.ent
merlin/composition/api index.ent
merlin/composition/impl index.ent
merlin/composition/spi index.ent
merlin external.xml index.ent
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
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
versioning avalon-facilities.ent avalon-merlin.ent
Removed: merlin version.ent
Log:
Update version reference to link to Nicalas centralized repository.
Revision Changes Path
1.2 +1 -1 avalon/merlin/activation/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 13:33:00 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.3 +1 -1 avalon/merlin/activation/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 10:45:14 -0000 1.2
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.3
@@ -1,2 +1,2 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
1.3 +1 -1 avalon/merlin/composition/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 10:45:14 -0000 1.2
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.3
@@ -1,2 +1,2 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
1.3 +1 -1 avalon/merlin/composition/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 10:45:14 -0000 1.2
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.3
@@ -1,2 +1,2 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
1.3 +1 -1 avalon/merlin/composition/spi/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 10:45:14 -0000 1.2
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.3
@@ -1,2 +1,2 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
1.8 +3 -0 avalon/merlin/external.xml
Index: external.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/external.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- external.xml 24 Mar 2004 15:43:30 -0000 1.7
+++ external.xml 8 Apr 2004 11:58:32 -0000 1.8
@@ -1,4 +1,7 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE project [
+ <!ENTITY % index SYSTEM "file:index.ent"> %index;
+]>
<project>
1.3 +1 -1 avalon/merlin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 10:45:14 -0000 1.2
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.3
@@ -1,2 +1,2 @@
-<!ENTITY % version-entities SYSTEM "file:version.ent"> %version-entities;
<!ENTITY % util-entities SYSTEM "file:../versioning/avalon-util.ent"> %util-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/kernel/api/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 14:04:54 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/kernel/cli/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 14:04:54 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.3 +1 -1 avalon/merlin/kernel/impl/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/index.ent,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.ent 8 Apr 2004 10:45:14 -0000 1.2
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.3
@@ -1,2 +1,2 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
<!ENTITY % util-entities SYSTEM "file:../../../versioning/avalon-util.ent"> %util-entities;
1.2 +1 -1 avalon/merlin/kernel/plugin/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 14:04:54 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/kernel/servlet/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 14:04:54 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/kernel/unit/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 14:04:54 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/platform/tutorials/context/strategy/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/context/strategy/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 15:00:05 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/platform/tutorials/dynamics/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/dynamics/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 15:00:05 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/platform/tutorials/jmx/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/jmx/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 15:00:05 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/platform/tutorials/lifecycle/activation/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/lifecycle/activation/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 15:00:05 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:32 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +1 -1 avalon/merlin/platform/tutorials/parameterization/index.ent
Index: index.ent
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/parameterization/index.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.ent 5 Apr 2004 15:00:05 -0000 1.1
+++ index.ent 8 Apr 2004 11:58:33 -0000 1.2
@@ -1 +1 @@
-<!ENTITY % version-entities SYSTEM "file:../../../version.ent"> %version-entities;
+<!ENTITY % merlin-entities SYSTEM "file:../../../../versioning/avalon-merlin.ent"> %merlin-entities;
1.2 +45 -58 avalon/versioning/avalon-facilities.ent
Index: avalon-facilities.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-facilities.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-facilities.ent 6 Apr 2004 07:33:09 -0000 1.1
+++ avalon-facilities.ent 8 Apr 2004 11:58:33 -0000 1.2
@@ -1,61 +1,48 @@
-<!ENTITY cornerstone-db-api-id "cornerstone-db-api">
-<!ENTITY cornerstone-db-api-group "cornerstone-db">
-<!ENTITY cornerstone-db-api-version "0.9.0">
+<!ENTITY avalon-db-id "cornerstone-db">
+<!ENTITY avalon-db-api-id "avalon-db-api">
+<!ENTITY avalon-db-api-version "0.9.0">
+<!ENTITY avalon-db-hsql-id "cornerstone-db-hsql">
+<!ENTITY avalon-db-hsql-version "0.9.0">
+
+<!ENTITY avalon-finder-id "avalon-finder">
+<!ENTITY avalon-finder-api-id "avalon-finder-api">
+<!ENTITY avalon-finder-api-version "0.9.0">
+<!ENTITY avalon-finder-impl-id "avalon-finder-impl">
+<!ENTITY avalon-finder-impl-version "0.9.0">
+
+<!ENTITY avalon-http-id "avalon-http">
+<!ENTITY avalon-http-api-id "avalon-http-api">
+<!ENTITY avalon-http-api-version "0.9.0">
+<!ENTITY avalon-http-impl-id "avalon-http-impl">
+<!ENTITY avalon-http-impl-version "0.9.0">
+<!ENTITY avalon-http-spi-id "avalon-http-spi">
+<!ENTITY avalon-http-spi-version "0.9.0">
+<!ENTITY avalon-http-test-id "avalon-http-test">
+<!ENTITY avalon-http-test-version "0.9.0">
+<!ENTITY avalon-http-util-id "avalon-http-util">
+<!ENTITY avalon-http-util-version "0.9.0">
+
+<!ENTITY avalon-jmx-id "avalon-jmx">
+<!ENTITY avalon-jmx-api-id "avalon-jmx-api">
+<!ENTITY avalon-jmx-api-version "0.9.0">
+<!ENTITY avalon-jmx-handler-id "avalon-jmx-handler">
+<!ENTITY avalon-jmx-handler-version "0.9.0">
+<!ENTITY avalon-jmx-mx4j-id "avalon-jmx-mx4j">
+<!ENTITY avalon-jmx-mx4j-version "0.9.0">
+<!ENTITY avalon-jmx-spi-id "avalon-jmx-spi">
+<!ENTITY avalon-jmx-spi-version "0.9.0">
+<!ENTITY avalon-jmx-test-id "avalon-jmx-test">
+<!ENTITY avalon-jmx-test-version "0.9.0">
+<!ENTITY avalon-jmx-util-id "avalon-jmx-util">
+<!ENTITY avalon-jmx-util-version "0.9.0">
+
+<!ENTITY avalon-mds-id "avalon-mds">
+<!ENTITY avalon-mds-api-id "avalon-mds-api">
+<!ENTITY avalon-mds-api-version "0.9.0">
+<!ENTITY avalon-mds-impl-id "avalon-mds-impl">
+<!ENTITY avalon-mds-impl-version "0.9.0">
+<!ENTITY avalon-mds-test-id "avalon-mds-test">
+<!ENTITY avalon-mds-test-version "0.9.0">
-<!ENTITY cornerstone-db-hsql-id "cornerstone-db-hsql">
-<!ENTITY cornerstone-db-hsql-group "cornerstone-db">
-<!ENTITY cornerstone-db-hsql-version "0.9.0">
-
-<!ENTITY excalibur-finder-api-id "excalibur-finder-api">
-<!ENTITY excalibur-finder-api-group "excalibur-finder">
-<!ENTITY excalibur-finder-api-version "0.9.0">
-
-<!ENTITY excalibur-finder-impl-id "excalibur-finder-impl">
-<!ENTITY excalibur-finder-impl-group "excalibur-finder">
-<!ENTITY excalibur-finder-impl-version "0.9.0">
-
-<!ENTITY excalibur-http-api-id "excalibur-http-api">
-<!ENTITY excalibur-http-api-group "excalibur-http">
-<!ENTITY excalibur-http-api-version "0.9.0">
-
-<!ENTITY excalibur-http-impl-id "excalibur-http-impl">
-<!ENTITY excalibur-http-impl-group "excalibur-http">
-<!ENTITY excalibur-http-impl-version "0.9.0">
-
-<!ENTITY excalibur-http-spi-id "excalibur-http-spi">
-<!ENTITY excalibur-http-spi-group "excalibur-http">
-<!ENTITY excalibur-http-spi-version "0.9.0">
-
-<!ENTITY excalibur-http-test-id "excalibur-http-test">
-<!ENTITY excalibur-http-test-group "excalibur-http">
-<!ENTITY excalibur-http-test-version "0.9.0">
-
-<!ENTITY excalibur-http-util-id "excalibur-http-util">
-<!ENTITY excalibur-http-util-group "excalibur-http">
-<!ENTITY excalibur-http-util-version "0.9.0">
-
-<!ENTITY excalibur-jmx-api-id "excalibur-jmx-api">
-<!ENTITY excalibur-jmx-api-group "excalibur-jmx">
-<!ENTITY excalibur-jmx-api-version "0.9.0">
-
-<!ENTITY excalibur-jmx-handler-id "excalibur-jmx-handler">
-<!ENTITY excalibur-jmx-handler-group "excalibur-jmx">
-<!ENTITY excalibur-jmx-handler-version "0.9.0">
-
-<!ENTITY excalibur-jmx-mx4j-id "excalibur-jmx-mx4j">
-<!ENTITY excalibur-jmx-mx4j-group "excalibur-jmx">
-<!ENTITY excalibur-jmx-mx4j-version "0.9.0">
-
-<!ENTITY excalibur-jmx-spi-id "excalibur-jmx-spi">
-<!ENTITY excalibur-jmx-spi-group "excalibur-jmx">
-<!ENTITY excalibur-jmx-spi-version "0.9.0">
-
-<!ENTITY excalibur-jmx-test-id "excalibur-jmx-test">
-<!ENTITY excalibur-jmx-test-group "excalibur-jmx">
-<!ENTITY excalibur-jmx-test-version "0.9.0">
-
-<!ENTITY excalibur-jmx-util-id "excalibur-jmx-util">
-<!ENTITY excalibur-jmx-util-group "excalibur-jmx">
-<!ENTITY excalibur-jmx-util-version "0.9.0">
1.2 +45 -28 avalon/versioning/avalon-merlin.ent
Index: avalon-merlin.ent
===================================================================
RCS file: /home/cvs/avalon/versioning/avalon-merlin.ent,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avalon-merlin.ent 6 Apr 2004 07:33:09 -0000 1.1
+++ avalon-merlin.ent 8 Apr 2004 11:58:33 -0000 1.2
@@ -1,45 +1,62 @@
+<!-- Avalon Composition -->
+
+<!ENTITY avalon-composition-spec "2.0">
+<!ENTITY avalon-composition-id "avalon-composition">
<!ENTITY avalon-composition-api-id "avalon-composition-api">
<!ENTITY avalon-composition-api-group "avalon-composition">
-<!ENTITY avalon-composition-api-version "1.0">
+<!ENTITY avalon-composition-api-version "2.0.0-dev">
<!ENTITY avalon-composition-impl-id "avalon-composition-impl">
<!ENTITY avalon-composition-impl-group "avalon-composition">
-<!ENTITY avalon-composition-impl-version "1.0">
+<!ENTITY avalon-composition-impl-version "2.0.0-dev">
<!ENTITY avalon-composition-spi-id "avalon-composition-spi">
<!ENTITY avalon-composition-spi-group "avalon-composition">
-<!ENTITY avalon-composition-spi-version "1.0">
+<!ENTITY avalon-composition-spi-version "2.0.0-dev">
+
+<!-- Avalon Activation -->
+
+<!ENTITY avalon-activation-spec "2.0">
+<!ENTITY avalon-activation-id "avalon-activation">
<!ENTITY avalon-activation-api-id "avalon-activation-api">
<!ENTITY avalon-activation-api-group "avalon-activation">
-<!ENTITY avalon-activation-api-version "1.0">
+<!ENTITY avalon-activation-api-version "2.0.0-dev">
<!ENTITY avalon-activation-impl-id "avalon-activation-impl">
<!ENTITY avalon-activation-impl-group "avalon-activation">
-<!ENTITY avalon-activation-impl-version "1.0">
+<!ENTITY avalon-activation-impl-version "2.0.0-dev">
+
+<!ENTITY avalon-activation-artifact
+ "artifact:&avalon-activation-id;/&avalon-activation-impl-id;#&avalon-activation-impl-version;">
+
+<!-- Avalon Merlin -->
+
+<!ENTITY merlin-spec "3.3">
+<!ENTITY merlin-id "merlin">
+
+<!ENTITY merlin-api-id "merlin-api">
+<!ENTITY merlin-api-group "merlin">
+<!ENTITY merlin-api-version "3.3.0-dev">
+
+<!ENTITY merlin-impl-id "merlin-impl">
+<!ENTITY merlin-impl-group "merlin">
+<!ENTITY merlin-impl-version "3.3.0-dev">
+
+<!ENTITY merlin-cli-id "merlin-cli">
+<!ENTITY merlin-cli-group "merlin">
+<!ENTITY merlin-cli-version "3.3.0-dev">
+
+<!ENTITY merlin-plugin-id "merlin-plugin">
+<!ENTITY merlin-plugin-group "merlin">
+<!ENTITY merlin-plugin-version "3.3.0-dev">
+
+<!ENTITY merlin-servlet-id "merlin-servlet">
+<!ENTITY merlin-servlet-group "merlin">
+<!ENTITY merlin-servlet-version "3.3.0-dev">
-<!ENTITY avalon-merlin-api-id "avalon-merlin-api">
-<!ENTITY avalon-merlin-api-group "avalon-merlin">
-<!ENTITY avalon-merlin-api-version "1.0">
-
-<!ENTITY avalon-merlin-impl-id "avalon-merlin-impl">
-<!ENTITY avalon-merlin-impl-group "avalon-merlin">
-<!ENTITY avalon-merlin-impl-version "1.0">
-
-<!ENTITY avalon-merlin-cli-id "avalon-merlin-cli">
-<!ENTITY avalon-merlin-cli-group "avalon-merlin">
-<!ENTITY avalon-merlin-cli-version "1.0">
-
-<!ENTITY avalon-merlin-plugin-id "avalon-merlin-plugin">
-<!ENTITY avalon-merlin-plugin-group "avalon-merlin">
-<!ENTITY avalon-merlin-plugin-version "1.0">
-
-<!ENTITY avalon-merlin-servlet-id "avalon-merlin-servlet">
-<!ENTITY avalon-merlin-servlet-group "avalon-merlin">
-<!ENTITY avalon-merlin-servlet-version "1.0">
-
-<!ENTITY avalon-merlin-unit-id "avalon-merlin-unit">
-<!ENTITY avalon-merlin-unit-group "avalon-merlin">
-<!ENTITY avalon-merlin-unit-version "1.0">
+<!ENTITY merlin-unit-id "merlin-unit">
+<!ENTITY merlin-unit-group "merlin">
+<!ENTITY merlin-unit-version "3.3.0-dev">
---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org