hammant 2002/08/03 12:17:44
Modified: . ant.properties.sample build.xml project.properties
src/conf kernel.xml
Log:
MX4J is now part of the standard setup for Phoenx. Its jars are not included for
licensing reasons, but there are handy targets to get MX4J.
Revision Changes Path
1.14 +6 -7 jakarta-avalon-phoenix/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/ant.properties.sample,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ant.properties.sample 30 Jul 2002 12:10:48 -0000 1.13
+++ ant.properties.sample 3 Aug 2002 19:17:44 -0000 1.14
@@ -37,12 +37,6 @@
#wrapper.exe=${wrapper.home}/bin/Wrapper.exe
#wrapper.dll=${wrapper.home}/lib/Wrapper.dll
-# ----- MX4J Open JMX Implementation, version 1.1 or later -----
-mx4j.home=${base.path}/mx4j-1.1
-mx4j.lib=${mx4j.home}/lib
-mx4j.jar=${mx4j.lib}/mx4j-jmx.jar
-mx4j-tools.jar=${mx4j.lib}/mx4j-tools.jar
-
# ----- Javac tools.jar -----
# The path to tools.jar, required for building the docs. Most people won't need
# to set this, unless $JRE_HOME is not equal to $JAVA_HOME/jre. For example, on
@@ -70,3 +64,8 @@
# You'll also need bsh-1.2b6.jar for compilation dependancies.
#beanshell.jars
#kernel.impl.class=org.apache.avalon.phoenix.components.kernel.beanshell.BeanShellKernel
+
+# ----- Management Type -----
+# Uncomment these two use MX4J for JMX management
+#mx4j.jars
+#system.manager.impl.class=org.apache.avalon.phoenix.components.manager.MX4JSystemManager
1.147 +37 -4 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- build.xml 1 Aug 2002 23:19:51 -0000 1.146
+++ build.xml 3 Aug 2002 19:17:44 -0000 1.147
@@ -61,6 +61,10 @@
<property name="framework.jar"
value="${lib.dir}/avalon-framework-20020713.jar"/>
<property name="logkit.jar" value="${lib.dir}/logkit-1.1a.jar"/>
<property name="tools.jar" value="${java.home}/../lib/tools.jar"/>
+
+ <!-- Invoke 'ant get-mx4j' to get these -->
+ <property name="mx4j.jar" value="mx4j\mx4j-1.1\lib\mx4j-jmx.jar"/>
+ <property name="mx4j-tools.jar" value="mx4j\mx4j-1.1\lib\mx4j-tools.jar"/>
<path id="project.class.path">
<pathelement location="${xerces.jar}"/>
@@ -97,7 +101,25 @@
<target name="help" depends="usage"/>
<!-- Check requirements of environment -->
- <target name="check-environment">
+ <target name="check-mx4j" if="mx4j.jars">
+ <available property="mx4j.present" classname="mx4j.server.MBeanServerImpl">
+ <classpath refid="project.class.path"/>
+ </available>
+ <antcall target="check-mx4j2"/>
+ </target>
+ <target name="check-mx4j2" unless="mx4j.present">
+ <echo>**************************</echo>
+ <echo>* Please execute target *</echo>
+ <echo>* 'get-mx4j' in the main *</echo>
+ <echo>* build.xml build file *</echo>
+ <echo>* to download one and *</echo>
+ <echo>* a half Mb of MX4J *</echo>
+ <echo>**************************</echo>
+ <fail message="MX4J needed. See above."/>
+ </target>
+
+ <!-- Check requirements of environment -->
+ <target name="check-environment" depends="check-mx4j">
<available property="xerces.present" type="file" file="${xerces.jar}"/>
<available property="servlet.present" classname="javax.servlet.Servlet">
<classpath refid="project.class.path"/>
@@ -105,9 +127,6 @@
<available property="jmx.present"
classname="javax.management.MBeanException">
<classpath refid="project.class.path"/>
</available>
- <available property="mx4j.present" classname="mx4j.server.MBeanServerImpl">
- <classpath refid="project.class.path"/>
- </available>
<available property="wrapper.present"
classname="com.silveregg.wrapper.WrapperManager">
<classpath refid="project.class.path"/>
</available>
@@ -116,6 +135,19 @@
</available>
</target>
+ <!-- Get the jars from the MX4J project. -->
+ <!-- For licensing reasons, we are unable to put these Jars in our CVS or source
distributions. -->
+ <target name="get-mx4j">
+ <mkdir dir="mx4j"/>
+ <get src="http://telia.dl.sourceforge.net/sourceforge/mx4j/mx4j-1.1.tar.gz";
+ dest="mx4j/mx4j.tar.gz"
+ verbose="true"
+ usetimestamp="true"/>
+ <gunzip src="mx4j/mx4j.tar.gz" dest="mx4j" />
+ <untar src="mx4j/mx4j.tar" dest="mx4j"/>
+ </target>
+
+
<target name="pretty">
<taskdef name="pretty"
classname="org.acm.seguin.ant.Pretty"
@@ -366,6 +398,7 @@
<copy file="${xml-api.jar}" todir="${bin.dist.lib}"/>
<copy file="${xalan.jar}" todir="${bin.dist.lib}"/>
<filter token="KERNEL-CLASS" value="${kernel.impl.class}"/>
+ <filter token="SYSTEM-MANAGER-CLASS" value="${system.manager.impl.class}"/>
<copy todir="${bin.dist.conf}" filtering="on">
<fileset dir="${conf.dir}">
<include name="kernel.xml"/>
1.3 +2 -0 jakarta-avalon-phoenix/project.properties
Index: project.properties
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/project.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- project.properties 4 Jun 2002 22:03:26 -0000 1.2
+++ project.properties 3 Aug 2002 19:17:44 -0000 1.3
@@ -13,3 +13,5 @@
kernel.impl.class=org.apache.avalon.phoenix.components.kernel.DefaultKernel
+system.manager.impl.class=org.apache.avalon.phoenix.components.manager.NoopSystemManager
+
1.19 +7 -3 jakarta-avalon-phoenix/src/conf/kernel.xml
Index: kernel.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/src/conf/kernel.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- kernel.xml 1 Aug 2002 04:05:22 -0000 1.18
+++ kernel.xml 3 Aug 2002 19:17:44 -0000 1.19
@@ -26,17 +26,21 @@
See http://mx4j.sourceforge.net/ -
org.apache.avalon.phoenix.components.manager.MX4JSystemManager
+
+ There is an impl of system manager that does nothing and it is....
+
+ org.apache.avalon.phoenix.components.manager.NoopSystemManager
+
+ Alternatively, you could comment the whole SystemManager section out.
-->
- <!-- JMX Management... use this one if you need the MX4JSystemManager
<component role="org.apache.avalon.phoenix.interfaces.SystemManager"
- class="org.apache.avalon.phoenix.components.manager.MX4JSystemManager"
+ class="@SYSTEM-MANAGER-CLASS@"
logger="manager" >
<manager-adaptor-port>8082</manager-adaptor-port>
<enable-rmi-adaptor>false</enable-rmi-adaptor>
<stylesheets-dir>conf/xsl</stylesheets-dir>
</component>
- -->
<!-- There are two kernels
org.apache.avalon.phoenix.components.kernel.DefaultKernel
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
