niclas 2004/04/03 22:28:52
Modified: merlin/facilities/db/api project.xml
merlin/facilities/db/hsql project.xml
merlin/facilities/finder/api project.xml
merlin/facilities/finder/ecm project.xml
merlin/facilities/finder/impl project.xml
merlin/facilities/finder/test project.xml
merlin/facilities/http project.xml
merlin/facilities/http/api project.xml
merlin/facilities/http/impl project.xml
merlin/facilities/http/spi project.xml
merlin/facilities/http/test project.xml
merlin/facilities/http/util project.xml
merlin/facilities/jmx/conf block.xml
merlin/facilities/jmx/mx4j/conf block.xml
merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j
MX4JComponentRegistrationManager.xconfig
merlin/facilities/mds project.xml
merlin/facilities/mds/api project.xml
merlin/facilities/mds/impl project.xml
merlin/facilities/mds/test project.xml
Added: merlin/facilities/jmx/handler/conf block.xml
Log:
Some steps forward to make this facility working.
Revision Changes Path
1.2 +1 -1 avalon/merlin/facilities/db/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/db/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Feb 2004 08:58:44 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-db-api</id>
<name>Avalon Database API</name>
<package>org.apache.avalon.db</package>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+
<shortDescription>Avalon Database Server API</shortDescription>
</project>
1.2 +2 -2 avalon/merlin/facilities/db/hsql/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/db/hsql/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 19 Feb 2004 08:58:44 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -7,7 +7,7 @@
<groupId>avalon-db</groupId>
<id>avalon-db-hsql</id>
<name>Avalon HSQLDB Database Implementation</name>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+
<shortDescription>Avalon HSQLDB Database Implementation</shortDescription>
<package>org.apache.avalon.db.impl</package>
@@ -16,7 +16,7 @@
<dependency>
<groupId>avalon-db</groupId>
<artifactId>avalon-db-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
1.2 +1 -1 avalon/merlin/facilities/finder/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/finder/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 7 Mar 2004 22:05:48 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-finder-api</id>
<name>Avalon Finder API</name>
<package>org.apache.avalon.finder</package>
- <currentVersion>SNAPSHOT</currentVersion>
+
<shortDescription>Avalon Finder API</shortDescription>
</project>
1.2 +2 -2 avalon/merlin/facilities/finder/ecm/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/finder/ecm/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 8 Mar 2004 01:36:08 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -7,7 +7,7 @@
<groupId>avalon-finder</groupId>
<id>avalon-finder-ecm</id>
<name>Avalon Finder ECM Adapter</name>
- <currentVersion>SNAPSHOT</currentVersion>
+
<shortDescription>Avalon ECM Adapter</shortDescription>
<package>org.apache.avalon.finder.ecm</package>
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-finder</groupId>
<artifactId>avalon-finder-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
1.2 +3 -3 avalon/merlin/facilities/finder/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/finder/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 7 Mar 2004 22:05:49 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -7,7 +7,7 @@
<groupId>avalon-finder</groupId>
<id>avalon-finder-impl</id>
<name>Avalon Finder Implementation</name>
- <currentVersion>SNAPSHOT</currentVersion>
+
<shortDescription>Avalon Finder Implementation</shortDescription>
<package>org.apache.avalon.finder.impl</package>
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-finder</groupId>
<artifactId>avalon-finder-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-framework</groupId>
@@ -28,7 +28,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-meta</groupId>
1.2 +3 -3 avalon/merlin/facilities/finder/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/finder/test/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 7 Mar 2004 22:05:49 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -7,7 +7,7 @@
<groupId>avalon-finder</groupId>
<id>avalon-finder-test</id>
<name>Avalon Finder Test</name>
- <currentVersion>SNAPSHOT</currentVersion>
+
<shortDescription>Avalon Finder Test</shortDescription>
<package>org.apache.avalon.finder</package>
@@ -18,7 +18,7 @@
<dependency>
<groupId>avalon-finder</groupId>
<artifactId>avalon-finder-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
@@ -32,7 +32,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
</dependencies>
1.2 +1 -1 avalon/merlin/facilities/http/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 13 Jan 2004 12:46:54 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -6,7 +6,7 @@
<groupId>avalon-http</groupId>
<name>Avalon HTTP</name>
- <currentVersion>1.0</currentVersion>
+
<shortDescription>Avalon HTTP Project Template.</shortDescription>
<packageGroups>
1.6 +1 -1 avalon/merlin/facilities/http/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/api/project.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- project.xml 5 Feb 2004 18:59:07 -0000 1.5
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.6
@@ -8,7 +8,7 @@
<id>avalon-http-api</id>
<name>Avalon HTTP API</name>
<package>org.apache.avalon.http</package>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+
<shortDescription>Avalon HTTP Server API</shortDescription>
<dependencies>
1.8 +6 -6 avalon/merlin/facilities/http/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/impl/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 31 Mar 2004 16:57:20 -0000 1.7
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.8
@@ -7,7 +7,7 @@
<groupId>avalon-http</groupId>
<id>avalon-http-impl</id>
<name>Avalon HTTP Implementation</name>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+
<shortDescription>Avalon HTTP Implementation</shortDescription>
<package>org.apache.avalon.http.impl</package>
@@ -16,17 +16,17 @@
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-spi</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-test</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
@@ -61,13 +61,13 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-unit</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
</dependencies>
1.2 +3 -3 avalon/merlin/facilities/http/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/spi/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 5 Feb 2004 18:59:07 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-http-spi</id>
<name>Avalon HTTP SPI</name>
<package>org.apache.avalon.http</package>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+
<shortDescription>Avalon HTTP Server SPI</shortDescription>
<dependencies>
@@ -21,12 +21,12 @@
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
</dependencies>
1.4 +3 -3 avalon/merlin/facilities/http/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/test/project.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- project.xml 5 Feb 2004 18:59:07 -0000 1.3
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.4
@@ -7,7 +7,7 @@
<groupId>avalon-http</groupId>
<id>avalon-http-test</id>
<name>Avalon HTTP Test</name>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+
<shortDescription>Avalon HTTP Test</shortDescription>
<package>org.apache.avalon.http.impl</package>
@@ -20,12 +20,12 @@
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-util</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>servletapi</groupId>
1.2 +2 -2 avalon/merlin/facilities/http/util/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/http/util/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 5 Feb 2004 18:59:07 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -7,7 +7,7 @@
<groupId>avalon-http</groupId>
<id>avalon-http-util</id>
<name>Avalon HTTP Util</name>
- <currentVersion>1.0-SNAPSHOT</currentVersion>
+
<shortDescription>Avalon HTTP Util</shortDescription>
<package>org.apache.avalon.http.util</package>
@@ -20,7 +20,7 @@
<dependency>
<groupId>avalon-http</groupId>
<artifactId>avalon-http-api</artifactId>
- <version>1.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
</dependencies>
1.3 +2 -2 avalon/merlin/facilities/jmx/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/jmx/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 3 Apr 2004 15:51:35 -0000 1.2
+++ block.xml 4 Apr 2004 06:28:51 -0000 1.3
@@ -4,7 +4,7 @@
<classpath>
<repository>
<resource id="avalon-framework:avalon-framework-api"
version="4.1.5"/>
- <resource id="avalon-composition:avalon-composition-api"
version="2.0-SNAPSHOT"/>
+ <resource id="avalon-composition:avalon-composition-api"
version="3.3"/>
<resource id="avalon-merlin-jmx:merlin-jmx-management-api"
version="1.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-management-handler"
version="1.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-test" version="1.0"/>
@@ -12,7 +12,7 @@
</classpath>
</classloader>
- <include name="ComponentRegistrationManager"
id="avalon-merlin-jmx:merlin-jmx-management-handler" version="1.0"/>
+ <include name="ComponentRegistrationManager"
id="avalon-merlin-jmx:merlin-jmx-management-mx4j" version="1.0"/>
<component name="JmxManagementHandler"
class="org.apache.avalon.merlin.jmx.handler.JmxManagementHandler"/>
1.1 avalon/merlin/facilities/jmx/handler/conf/block.xml
Index: block.xml
===================================================================
<container name="jmx-facility">
<classloader>
<classpath>
<repository>
<resource id="avalon-framework:avalon-framework-api" version="4.1.5"/>
<resource id="avalon-composition:avalon-composition-api"
version="2.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-management-api"
version="1.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-management-handler"
version="1.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-test" version="1.0"/>
</repository>
</classpath>
</classloader>
<include name="ComponentRegistrationManager"
id="avalon-merlin-jmx:merlin-jmx-management-mx4j" version="1.0"/>
<component name="JmxManagementHandler"
class="org.apache.avalon.merlin.jmx.handler.JmxManagementHandler"/>
<component name="JMXTestComponent"
class="org.apache.avalon.playground.jmxtest.JMXTestComponent"/>
</container>
1.3 +2 -2 avalon/merlin/facilities/jmx/mx4j/conf/block.xml
Index: block.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/jmx/mx4j/conf/block.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- block.xml 3 Apr 2004 15:51:35 -0000 1.2
+++ block.xml 4 Apr 2004 06:28:51 -0000 1.3
@@ -12,8 +12,8 @@
<repository>
<resource id="avalon-framework:avalon-framework-api"
version="4.1.5"/>
<resource id="avalon-framework:avalon-framework-impl"
version="4.1.5"/>
- <resource id="avalon-composition:avalon-composition-api"
version="2.0-SNAPSHOT"/>
- <resource id="excalibur-i18n:excalibur-i18n" version="1.1"/>
+ <resource id="avalon-composition:avalon-composition-api"
version="2.0"/>
+ <resource id="avalon-util:avalon-util-i18n" version="1.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-management-api"
version="1.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-management-spi"
version="1.0"/>
<resource id="avalon-merlin-jmx:merlin-jmx-util" version="1.0"/>
1.2 +1 -1
avalon/merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j/MX4JComponentRegistrationManager.xconfig
Index: MX4JComponentRegistrationManager.xconfig
===================================================================
RCS file:
/home/cvs/avalon/merlin/facilities/jmx/mx4j/src/java/org/apache/avalon/merlin/jmx/mx4j/MX4JComponentRegistrationManager.xconfig,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MX4JComponentRegistrationManager.xconfig 3 Apr 2004 15:51:35 -0000
1.1
+++ MX4JComponentRegistrationManager.xconfig 4 Apr 2004 06:28:51 -0000
1.2
@@ -11,7 +11,7 @@
<!--
This specifies the IP port which the Http Adaptor will bind on.
-->
- <manager-adaptor-port>8083</manager-adaptor-port>
+ <manager-adaptor-port>8082</manager-adaptor-port>
<!--
<enable-rmi-adaptor>true</enable-rmi-adaptor>
<rmi-naming-factory>com.sun.jndi.rmi.registry.RegistryContextFactory</rmi-naming-factory>
1.2 +1 -1 avalon/merlin/facilities/mds/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/mds/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 30 Mar 2004 23:59:54 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -6,7 +6,7 @@
<groupId>avalon-mds</groupId>
<name>Avalon MDS</name>
- <currentVersion>1.0</currentVersion>
+
<shortDescription>Avalon MDS Project</shortDescription>
<packageGroups>
1.2 +1 -1 avalon/merlin/facilities/mds/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/mds/api/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 30 Mar 2004 23:59:54 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-mds-api</id>
<name>Avalon MDS API</name>
<package>org.apache.avalon.mds</package>
- <currentVersion>0.1</currentVersion>
+
<shortDescription>Avalon MDS API</shortDescription>
<dependencies>
1.2 +3 -3 avalon/merlin/facilities/mds/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/mds/impl/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 30 Mar 2004 23:59:55 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:51 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-mds-impl</id>
<name>Avalon MDS API</name>
<package>org.apache.avalon.mds.impl</package>
- <currentVersion>0.1</currentVersion>
+
<shortDescription>Avalon MDS API</shortDescription>
<dependencies>
@@ -28,7 +28,7 @@
<dependency>
<groupId>avalon-mds</groupId>
<artifactId>avalon-mds-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
1.2 +3 -6 avalon/merlin/facilities/mds/test/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/facilities/mds/test/project.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- project.xml 30 Mar 2004 23:59:55 -0000 1.1
+++ project.xml 4 Apr 2004 06:28:52 -0000 1.2
@@ -8,7 +8,7 @@
<id>avalon-mds-test</id>
<name>Avalon MDS API</name>
<package>org.apache.avalon.mds</package>
- <currentVersion>0.1</currentVersion>
+
<shortDescription>Avalon MDS API</shortDescription>
<dependencies>
@@ -34,13 +34,13 @@
<dependency>
<groupId>avalon-mds</groupId>
<artifactId>avalon-mds-api</artifactId>
- <version>SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-mds</groupId>
<artifactId>avalon-mds-impl</artifactId>
- <version>SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
@@ -67,7 +67,4 @@
<version>2.3</version>
</dependency>
</dependencies>
-
-
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
