colus 2002/06/11 04:38:45
Modified: . ant.properties.sample build.xml
Log:
Compile DefaultManager when jmx-ri.present not jmx.present.
Use MX4J 1.1.
Revision Changes Path
1.10 +9 -9 jakarta-avalon-phoenix/ant.properties.sample
Index: ant.properties.sample
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/ant.properties.sample,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ant.properties.sample 4 Jun 2002 22:03:26 -0000 1.9
+++ ant.properties.sample 11 Jun 2002 11:38:45 -0000 1.10
@@ -38,15 +38,15 @@
#wrapper.dll=${wrapper.home}/lib/Wrapper.dll
# ----- Java Management Extensions (JMX) RI, version 1.0.1 or later -----
-jmx.home=${base.path}/jmx-ri_1.0.1/jmx
-jmx.lib=${jmx.home}/lib
-jmxri.jar=${jmx.lib}/jmxri.jar
-jmxtools.jar=${jmx.lib}/jmxtools.jar
+#jmx.home=${base.path}/jmx-1_0_1-ri/jmx
+#jmx.lib=${jmx.home}/lib
+#jmxri.jar=${jmx.lib}/jmxri.jar
+#jmxtools.jar=${jmx.lib}/jmxtools.jar
-# ----- MX4J Open JMX Implementation, version 1.0b3 or later -----
-mx4j.home=${base.path}/mx4j-1.0b3
+# ----- 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.jar
+mx4j.jar=${mx4j.lib}/mx4j-jmx.jar
mx4j-tools.jar=${mx4j.lib}/mx4j-tools.jar
# ----- Checkstyle, version 2.1 or later -----
@@ -77,4 +77,4 @@
# It overrides that from project.properties.
# You'll also need bsh-1.2b6.jar for compilation dependancies.
#beanshell.jars
-#kernel.impl.class=org.apache.avalon.phoenix.components.kernel.beanshell.BeanShellKernel
\ No newline at end of file
+#kernel.impl.class=org.apache.avalon.phoenix.components.kernel.beanshell.BeanShellKernel
1.133 +2 -2 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- build.xml 4 Jun 2002 22:03:26 -0000 1.132
+++ build.xml 11 Jun 2002 11:38:45 -0000 1.133
@@ -112,7 +112,7 @@
<available property="jmx.present"
classname="javax.management.MBeanException">
<classpath refid="project.class.path"/>
</available>
- <available property="mx4j.present" classname="mx4j.MBeanServerImpl">
+ <available property="mx4j.present"
classname="mx4j.server.MBeanServerImpl">
<classpath refid="project.class.path"/>
</available>
<available property="wrapper.present"
classname="com.silveregg.wrapper.WrapperManager">
@@ -189,7 +189,7 @@
<exclude
name="org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java"
unless="mx4j.present"/>
<exclude
name="org/apache/avalon/phoenix/components/manager/DefaultManager.java"
- unless="jmx.present"/>
+ unless="jmx-ri.present"/>
<exclude
name="org/apache/avalon/phoenix/launcher/DaemonLauncher.java"
unless="wrapper.present"/>
<exclude
name="org/apache/avalon/phoenix/components/kernel/beanshell/*.java"
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
