niclas 2004/04/03 22:30:54
Modified: merlin INSTALL.TXT
merlin/activation/api project.xml
merlin/activation/impl project.xml
merlin/composition/api project.xml
merlin/composition/impl project.xml
merlin/composition/spi project.xml
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/platform/tutorials/jmx merlin.properties
merlin/platform/tutorials/jmx/conf hello.block
merlin/platform/xdocs/extensions/facilities index.xml
jmx.xml
Added: merlin/facilities/finder/site project.xml
merlin/platform/tutorials/jmx maven.xml
Log:
I can't wait for people to oppose the use of same version within the whole of
Merlin, so I have gone ahead and made the change.
Revision Changes Path
1.18 +99 -99 avalon/merlin/INSTALL.TXT
Index: INSTALL.TXT
===================================================================
RCS file: /home/cvs/avalon/merlin/INSTALL.TXT,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- INSTALL.TXT 10 Mar 2004 10:52:17 -0000 1.17
+++ INSTALL.TXT 4 Apr 2004 06:30:54 -0000 1.18
@@ -1,99 +1,99 @@
-
-PROJECT: Merlin @VERSION@
-====================================================================
-
-DESCRIPTION:
-------------
-
-This directory contains the merlin system installation and related
-resources.
-
- /merlin
- /bin
- /config
- /system
- README.TXT
- LICENSE.TXT
- INSTALL.TXT
- /plugins
- @META_PLUGIN_JAR@
- @MERLIN_PLUGIN_JAR@
-
-
-Installing Merlin.
-------------------
-
-To use Merlin command line support or the Merlin NT Service
-you will need to define the MERLIN_HOME environment
-variable for your system and include MERLIN_HOME/bin in
-your system path. The MERLIN_HOME environment variable
-should point to the merlin directory.
-
-Under Windows you can set environment variables by selecting the
-Environment Tab from the System Control Panel.
-
-Under Lunix you can do this as follows:
-
- $ echo '
- > # set location of merlin
- > export MERLIN_HOME=/opt/merlin
- > # include it in the path
- > export PATH=$PATH:$MERLIN_HOME/bin
- > ' >> ~/.bash_profile
- $ source ~/.bash_profile
-
-Versions of Merlin prior to the 3.2-dev 20031210 build maintained
-a local repository of jar files under the %MERLIN_HOME%/repository
-directory. As of the 20031210 build the repository is maintained
-under AVALON_HOME which defaults to ${user.home}/.avalon. To
-override this behaviour you can either define a AVALON_HOME
-environment variable or you can add a merlin.properties file to
-${user.home} containing the "merlin.repository" property key and
-a value point to you preferred repository location.
-
-To confirm that your environment variables are correct, you
-should open a new command window and invoke the Merlin
-CLI application.
-
-Under DOS:
-
- $ merlin -version
-
-Under Lunix:
-
- $ merlin.sh -version
-
-The installation of Merlin is now complete, however, two plugins are
-provided with the installation supporting merlin development under the
-Maven platform. These plugins should be placed in the Maven plugin
-directory (${maven.home.local}\plugins).
-
- [EMAIL PROTECTED]@
- [EMAIL PROTECTED]@
-
-Please note that if you are upgrading an existing installation you must
-delete the following two directories:
-
- [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
- [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
-
-Replace the existing avalon-meta and merlin plugin jar files with the supplied
-versions. Finally, delete all *.cache files in the Maven plugin directory.
-
-You now have everything in place to start using the Merlin Tutorial or
-building you own components. If you have any problems, please subscribe
-and post a message to [EMAIL PROTECTED]
-
-Special Note for JRE 1.3 and earlier.
--------------------------------------
-
-Some applications assume that XML parsing classes are available withing
-the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
-you can copy the following files to the JAVAHOME/lib/ext directory or
-declare an alternative directory as a JVM argument under the
-MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
-
- system/xml-apis/jars/xml-apis-2.0.2.jar
- system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
- system/xerces/jars/xerces-2.4.0.jar
-
+
+PROJECT: Merlin @VERSION@
+====================================================================
+
+DESCRIPTION:
+------------
+
+This directory contains the merlin system installation and related
+resources.
+
+ /merlin
+ /bin
+ /config
+ /system
+ README.TXT
+ LICENSE.TXT
+ INSTALL.TXT
+ /plugins
+ @META_PLUGIN_JAR@
+ @MERLIN_PLUGIN_JAR@
+
+
+Installing Merlin.
+------------------
+
+To use Merlin command line support or the Merlin NT Service
+you will need to define the MERLIN_HOME environment
+variable for your system and include MERLIN_HOME/bin in
+your system path. The MERLIN_HOME environment variable
+should point to the merlin directory.
+
+Under Windows you can set environment variables by selecting the
+Environment Tab from the System Control Panel.
+
+Under Lunix you can do this as follows:
+
+ $ echo '
+ > # set location of merlin
+ > export MERLIN_HOME=/opt/merlin
+ > # include it in the path
+ > export PATH=$PATH:$MERLIN_HOME/bin
+ > ' >> ~/.bash_profile
+ $ source ~/.bash_profile
+
+Versions of Merlin prior to the 3.2-dev 20031210 build maintained
+a local repository of jar files under the %MERLIN_HOME%/repository
+directory. As of the 20031210 build the repository is maintained
+under AVALON_HOME which defaults to ${user.home}/.avalon. To
+override this behaviour you can either define a AVALON_HOME
+environment variable or you can add a merlin.properties file to
+${user.home} containing the "merlin.repository" property key and
+a value point to you preferred repository location.
+
+To confirm that your environment variables are correct, you
+should open a new command window and invoke the Merlin
+CLI application.
+
+Under DOS:
+
+ $ merlin -version
+
+Under Lunix:
+
+ $ merlin.sh -version
+
+The installation of Merlin is now complete, however, two plugins are
+provided with the installation supporting merlin development under the
+Maven platform. These plugins should be placed in the Maven plugin
+directory (${maven.home.local}\plugins).
+
+ [EMAIL PROTECTED]@
+ [EMAIL PROTECTED]@
+
+Please note that if you are upgrading an existing installation you must
+delete the following two directories:
+
+ [YOUR-MAVEN-HOME]\plugins\avalon-meta-plugin-*
+ [YOUR-MAVEN-HOME]\plugins\merlin-plugin-*
+
+Replace the existing avalon-meta and merlin plugin jar files with the supplied
+versions. Finally, delete all *.cache files in the Maven plugin directory.
+
+You now have everything in place to start using the Merlin Tutorial or
+building you own components. If you have any problems, please subscribe
+and post a message to [EMAIL PROTECTED]
+
+Special Note for JRE 1.3 and earlier.
+-------------------------------------
+
+Some applications assume that XML parsing classes are available withing
+the JRE. This is not the case with JDK 1.3 and earlier. To resolve this
+you can copy the following files to the JAVAHOME/lib/ext directory or
+declare an alternative directory as a JVM argument under the
+MERLIN_JVM_OPTS environment variable, i.e. -Djava.ext.dir=someDirectory
+
+ system/xml-apis/jars/xml-apis-2.0.2.jar
+ system/xml-apis/jars/xmlParserAPIs-2.0.2.jar
+ system/xerces/jars/xerces-2.4.0.jar
+
1.9 +1 -2 avalon/merlin/activation/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/api/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 10 Feb 2004 16:18:42 -0000 1.8
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.9
@@ -8,7 +8,6 @@
<id>avalon-activation-api</id>
<name>Avalon Activation API</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Activation API</shortDescription>
@@ -32,7 +31,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
</dependencies>
1.23 +4 -5 avalon/merlin/activation/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/activation/impl/project.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- project.xml 31 Mar 2004 16:57:20 -0000 1.22
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.23
@@ -8,7 +8,6 @@
<id>avalon-activation-impl</id>
<name>Avalon Activation Framework</name>
<package>org.apache.avalon.activation</package>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Runtime activation framework.</shortDescription>
@@ -37,23 +36,23 @@
<dependency>
<groupId>avalon-activation</groupId>
<artifactId>avalon-activation-api</artifactId>
- <version>2.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>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
1.16 +0 -1 avalon/merlin/composition/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/api/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 27 Feb 2004 22:39:36 -0000 1.15
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.16
@@ -8,7 +8,6 @@
<id>avalon-composition-api</id>
<name>Avalon Composition API</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition SPI</shortDescription>
1.22 +2 -3 avalon/merlin/composition/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/impl/project.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- project.xml 31 Mar 2004 16:57:20 -0000 1.21
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.22
@@ -8,7 +8,6 @@
<id>avalon-composition-impl</id>
<name>Avalon Composition Framework</name>
<package>org.apache.avalon.composition</package>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition Framework.</shortDescription>
@@ -64,12 +63,12 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
1.16 +1 -2 avalon/merlin/composition/spi/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/composition/spi/project.xml,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- project.xml 27 Feb 2004 22:39:36 -0000 1.15
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.16
@@ -8,7 +8,6 @@
<id>avalon-composition-spi</id>
<name>Avalon Composition SPI</name>
<package>org.apache.avalon.assembly</package>
- <currentVersion>2.0-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Avalon Composition SPI</shortDescription>
@@ -34,7 +33,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
1.1 avalon/merlin/facilities/finder/site/project.xml
Index: project.xml
===================================================================
<?xml version="1.0" encoding="ISO-8859-1"?>
<project>
<extend>${basedir}/../../../project.xml</extend>
<groupId>avalon-finder</groupId>
<id>avalon-finder-site</id>
<name>Avalon Finder Documentation</name>
<shortDescription>Avalon Finder Documentation</shortDescription>
</project>
1.8 +1 -2 avalon/merlin/kernel/api/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/api/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- project.xml 22 Feb 2004 19:10:34 -0000 1.7
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.8
@@ -9,7 +9,6 @@
<name>Merlin API</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.3-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin API</shortDescription>
@@ -31,7 +30,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
</dependencies>
1.9 +0 -1 avalon/merlin/kernel/cli/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/cli/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 8 Mar 2004 11:28:37 -0000 1.8
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.9
@@ -7,7 +7,6 @@
<groupId>merlin</groupId>
<id>merlin-cli</id>
<name>Merlin CLI</name>
- <currentVersion>3.3-SNAPSHOT</currentVersion>
<package>org.apache.avalon.merlin.cli</package>
1.30 +4 -5 avalon/merlin/kernel/impl/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/impl/project.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- project.xml 31 Mar 2004 16:57:20 -0000 1.29
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.30
@@ -9,7 +9,6 @@
<name>Merlin Implementation</name>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.3-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Implementation.</shortDescription>
@@ -24,7 +23,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-api</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -70,7 +69,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<properties>
<avalon.classloader>api</avalon.classloader>
</properties>
@@ -78,7 +77,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-spi</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<properties>
<avalon.classloader>spi</avalon.classloader>
</properties>
@@ -86,7 +85,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
</dependency>
<dependency>
1.20 +0 -1 avalon/merlin/kernel/plugin/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/plugin/project.xml,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- project.xml 22 Feb 2004 19:10:35 -0000 1.19
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.20
@@ -10,7 +10,6 @@
<description>Merlin Plugin for Maven</description>
<shortDescription>Merlin Plugin for Maven</shortDescription>
<package>org.apache.avalon.merlin</package>
- <currentVersion>3.3-SNAPSHOT</currentVersion>
<dependencies>
<dependency>
1.9 +2 -3 avalon/merlin/kernel/servlet/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/servlet/project.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- project.xml 22 Feb 2004 19:10:35 -0000 1.8
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.9
@@ -9,7 +9,6 @@
<name>Merlin Servlet</name>
<package>org.apache.avalon.merlin.servlet</package>
- <currentVersion>3.3-SNAPSHOT</currentVersion>
<inceptionYear>2002</inceptionYear>
<shortDescription>Merlin Servlet</shortDescription>
@@ -39,7 +38,7 @@
<dependency>
<groupId>avalon-composition</groupId>
<artifactId>avalon-composition-api</artifactId>
- <version>2.0-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
@@ -49,7 +48,7 @@
<dependency>
<groupId>merlin</groupId>
<artifactId>merlin-api</artifactId>
- <version>3.3-SNAPSHOT</version>
+ <version>${pom.currentVersion}</version>
<type>jar</type>
<properties>
<war.bundle>true</war.bundle>
1.28 +0 -1 avalon/merlin/kernel/unit/project.xml
Index: project.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/kernel/unit/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 4 Mar 2004 03:42:30 -0000 1.27
+++ project.xml 4 Apr 2004 06:30:54 -0000 1.28
@@ -7,7 +7,6 @@
<groupId>merlin</groupId>
<id>merlin-unit</id>
<name>Merlin Unit Test</name>
- <currentVersion>3.3-SNAPSHOT</currentVersion>
<package>org.apache.avalon.merlin</package>
1.2 +2 -0 avalon/merlin/platform/tutorials/jmx/merlin.properties
Index: merlin.properties
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/jmx/merlin.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- merlin.properties 3 Apr 2004 15:49:17 -0000 1.1
+++ merlin.properties 4 Apr 2004 06:30:54 -0000 1.2
@@ -4,3 +4,5 @@
#
# merlin.info = true
# merlin.debug = false
+
+merlin.repository = /home/niclas/.maven/repository
1.1 avalon/merlin/platform/tutorials/jmx/maven.xml
Index: maven.xml
===================================================================
<project default="jar:install">
<preGoal name="java:compile">
<attainGoal name="avalon:meta"/>
</preGoal>
</project>
1.2 +2 -2 avalon/merlin/platform/tutorials/jmx/conf/hello.block
Index: hello.block
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/tutorials/jmx/conf/hello.block,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hello.block 3 Apr 2004 15:49:17 -0000 1.1
+++ hello.block 4 Apr 2004 06:30:54 -0000 1.2
@@ -16,10 +16,10 @@
</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"/>
-
+
<component name="hello" class="tutorial.HelloComponent">
<configuration>
<hello>Hello, Apache!</hello>
1.3 +10 -1 avalon/merlin/platform/xdocs/extensions/facilities/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/facilities/index.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- index.xml 3 Apr 2004 07:52:51 -0000 1.2
+++ index.xml 4 Apr 2004 06:30:54 -0000 1.3
@@ -50,6 +50,15 @@
between web-centric protocols and components.
</td>
</tr>
+ <tr>
+ <td><a href="jmx.html">Avalon JMX</a></td>
+ <td>
+ A facility that handles Java Management Extensions, JMX.
+ It allows components to declare their JMX MBeans, and the
+ facility will expose these over the JMX HTTP connector.
+ Support for JSR-160 is planned.
+ </td>
+ </tr>
</table>
</subsection>
</section>
1.2 +2 -2 avalon/merlin/platform/xdocs/extensions/facilities/jmx.xml
Index: jmx.xml
===================================================================
RCS file: /home/cvs/avalon/merlin/platform/xdocs/extensions/facilities/jmx.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- jmx.xml 3 Apr 2004 10:46:45 -0000 1.1
+++ jmx.xml 4 Apr 2004 06:30:54 -0000 1.2
@@ -36,7 +36,7 @@
The Merlin JMX Extension is an MX4J adapter and contains everything
needed to expose components as MBeans, as well as the JMX Agent and
a couple of connectors, such as the HttpConnector and Remote JMX
- connector (JSR-160).
+ connector (JSR-160) (planned).
</p>
<p>
To enable JMX, you will need to declare the JMX Facility, as well as
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
