donaldp 2002/09/06 05:15:45
Modified: . build.xml
Log:
Require JMX as part of the build process.
Submitted by: "David W." <[EMAIL PROTECTED]>
Revision Changes Path
1.162 +9 -39 jakarta-avalon-phoenix/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-avalon-phoenix/build.xml,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- build.xml 6 Sep 2002 09:37:09 -0000 1.161
+++ build.xml 6 Sep 2002 12:15:45 -0000 1.162
@@ -101,7 +101,7 @@
<target name="help" depends="usage"/>
<!-- Check requirements of environment -->
- <target name="check-mx4j" if="mx4j.jars">
+ <target name="check-mx4j">
<available property="mx4j.present" classname="mx4j.server.MBeanServerImpl">
<classpath refid="project.class.path"/>
</available>
@@ -124,9 +124,6 @@
<available property="servlet.present" classname="javax.servlet.Servlet">
<classpath refid="project.class.path"/>
</available>
- <available property="jmx.present"
classname="javax.management.MBeanException">
- <classpath refid="project.class.path"/>
- </available>
<available property="wrapper.present"
classname="com.silveregg.wrapper.WrapperManager">
<classpath refid="project.class.path"/>
</available>
@@ -208,19 +205,6 @@
<exclude name="${constants.file}" />
<exclude name="org/apache/avalon/phoenix/frontends/PhoenixServlet.java"
unless="servlet.present"/>
<exclude
name="org/apache/avalon/phoenix/frontends/ComposableServlet.java"
unless="servlet.present"/>
- <exclude name="**/*MBean.java" unless="jmx.present"/>
- <exclude
name="org/apache/avalon/phoenix/components/manager/AbstractJMXManager.java"
- unless="jmx.present"/>
- <exclude
name="org/apache/avalon/phoenix/components/manager/rmiadaptor/*.java"
- unless="jmx.present"/>
- <exclude name="org/apache/avalon/phoenix/components/manager/Target.java"
- unless="jmx.present"/>
- <exclude
name="org/apache/avalon/phoenix/components/manager/MBeanInfoBuilder.java"
- unless="jmx.present"/>
- <exclude
name="org/apache/avalon/phoenix/components/manager/MX4JSystemManager.java"
- unless="mx4j.present"/>
- <exclude
name="org/apache/avalon/phoenix/components/manager/MX4JLoggerAdapter.java"
- unless="mx4j.present"/>
<exclude name="org/apache/avalon/phoenix/launcher/DaemonLauncher.java"
unless="wrapper.present"/>
<exclude
name="org/apache/avalon/phoenix/components/kernel/beanshell/*.java"
@@ -347,18 +331,6 @@
</checkstyle>
</target>
-
- <!-- Copy MX4J jars to the bin/lin dir (and modify) -->
- <target name="dist-mx4j" description="Copies MX4J jars" if="mx4j.present">
- <copy file="${mx4j.jar}" todir="${bin.dist.bin}/lib"/>
- <copy file="${mx4j-tools.jar}" todir="${bin.dist.bin}/lib"/>
- <jar jarfile="${bin.dist.bin}/lib/mx4j-tools.jar" update="true">
- <zipfileset dir="src/mx4j/xsl" prefix="mx4j/adaptor/http/xsl/">
- <include name="common.xsl"/>
- </zipfileset>
- </jar>
- </target>
-
<!-- Copy BeanShell jars -->
<target name="dist-beanshell" description="Copies Beanshell jars"
if="beanshell.jars">
<copy file="${build.lib}/phoenix-bsh-commands.jar" todir="${bin.dist.lib}"/>
@@ -418,17 +390,15 @@
<fileset dir="${lib.dir}/deploy/ext"/>
</copy>
- <antcall target="dist-mx4j"/>
- <antcall target="dist-beanshell"/>
+ <copy file="${mx4j.jar}" todir="${bin.dist.bin}/lib"/>
+ <copy file="${mx4j-tools.jar}" todir="${bin.dist.bin}/lib"/>
+ <jar jarfile="${bin.dist.bin}/lib/mx4j-tools.jar" update="true">
+ <zipfileset dir="src/mx4j/xsl" prefix="mx4j/adaptor/http/xsl/">
+ <include name="common.xsl"/>
+ </zipfileset>
+ </jar>
- <!--
- This was not copying for relatively local
..\jakarta-avalon\tools\lib\xerces.jar - PH
- <copy todir="${bin.dist.lib}">
- <fileset dir="${xerces.dir}">
- <include name="${xerces.file}" if="xerces.present"/>
- </fileset>
- </copy>
- -->
+ <antcall target="dist-beanshell"/>
<copy file="${script.dir}/run.bat" todir="${bin.dist.bin}"/>
<copy file="${script.dir}/run.sh" todir="${bin.dist.bin}"/>
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
