106 lines
4.8 KiB
Diff
106 lines
4.8 KiB
Diff
|
--- mx4j-3.0.2/build/build.xml 2006-10-13 01:12:17.000000000 +0200
|
||
|
|
+++ mx4j-3.0.2/build/build.xml-gil 2009-09-07 19:44:29.000000000 +0200
|
||
|
|
@@ -55,6 +55,9 @@
|
||
|
|
<property name="rjmx.jar.file" value="${dist.lib.dir}/${name}-rjmx.jar"/>
|
||
|
|
<property name="rimpl.jar.file" value="${dist.lib.dir}/${name}-rimpl.jar"/>
|
||
|
|
<property name="rmx4j.jar.file" value="${dist.lib.dir}/${name}-remote.jar"/>
|
||
|
|
+ <property name="rjmx-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rjmx-boa.jar"/>
|
||
|
|
+ <property name="rimpl-boa.jar.file" value="${dist.lib.dir}/boa/${name}-rimpl-boa.jar"/>
|
||
|
|
+ <property name="rmx4j-boa.jar.file" value="${dist.lib.dir}/boa/${name}-remote-boa.jar"/>
|
||
|
|
|
||
|
|
<property name="tools.jar.file" value="${dist.lib.dir}/${name}-tools.jar"/>
|
||
|
|
|
||
|
|
@@ -261,6 +264,25 @@
|
||
|
|
</javac>
|
||
|
|
<rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
|
||
|
|
<rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
|
||
|
|
+
|
||
|
|
+ <jar jarfile="${rjmx-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
|
||
|
|
+ <fileset dir="${core.classes.dir}">
|
||
|
|
+ <patternset refid="rjmx.classes"/>
|
||
|
|
+ </fileset>
|
||
|
|
+ </jar>
|
||
|
|
+
|
||
|
|
+ <jar jarfile="${rimpl-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
|
||
|
|
+ <fileset dir="${core.classes.dir}">
|
||
|
|
+ <patternset refid="rimpl.classes"/>
|
||
|
|
+ </fileset>
|
||
|
|
+ </jar>
|
||
|
|
+
|
||
|
|
+ <jar jarfile="${rmx4j-boa.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
|
||
|
|
+ <fileset dir="${core.classes.dir}">
|
||
|
|
+ <patternset refid="rmx4j.classes"/>
|
||
|
|
+ </fileset>
|
||
|
|
+ </jar>
|
||
|
|
+
|
||
|
|
<antcall target="rmic.iiop"/>
|
||
|
|
|
||
|
|
<jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
|
||
|
|
@@ -427,8 +449,6 @@
|
||
|
|
</target>
|
||
|
|
|
||
|
|
<target name="docs" description="Builds the MX4J documentation">
|
||
|
|
- <unzip src="${docbook.dtd.zip.file}" dest="${docs.src.dir}/docbook"/>
|
||
|
|
- <unzip src="${docbook.xsl.zip.file}" dest="${docs.src.dir}/docbookx"/>
|
||
|
|
<mkdir dir="${dist.docs.dir}"/>
|
||
|
|
|
||
|
|
<style processor="trax"
|
||
|
|
@@ -437,11 +457,13 @@
|
||
|
|
force="yes"
|
||
|
|
style="${docs.src.dir}/xsl/mx4j-chunk.xsl"
|
||
|
|
includes="${root.document.name}"
|
||
|
|
- classpathref="lib.classpath"
|
||
|
|
- />
|
||
|
|
-
|
||
|
|
- <delete dir="${docs.src.dir}/docbook" quiet="true"/>
|
||
|
|
- <delete dir="${docs.src.dir}/docbookx" quiet="true"/>
|
||
|
|
+ classpathref="lib.classpath">
|
||
|
|
+ <xmlcatalog>
|
||
|
|
+ <catalogpath>
|
||
|
|
+ <pathelement location="/etc/xml/catalog"/>
|
||
|
|
+ </catalogpath>
|
||
|
|
+ </xmlcatalog>
|
||
|
|
+ </style>>
|
||
|
|
|
||
|
|
<!-- Bug in Ant forces this move, since destdir of the style task does not work -->
|
||
|
|
<move todir="${dist.docs.dir}">
|
||
|
|
@@ -573,7 +595,8 @@
|
||
|
|
<include name="wsdl4j.jar"/>
|
||
|
|
<include name="commons-discovery.jar"/>
|
||
|
|
<include name="org.mortbay.jetty.jar"/>
|
||
|
|
- <include name="hessian-3.0.8.jar"/>
|
||
|
|
+ <include name="hessian.jar"/>
|
||
|
|
+ <include name="burlap3.jar"/>
|
||
|
|
<!-- Also jars downloaded apart -->
|
||
|
|
<include name="servlet.jar"/>
|
||
|
|
<include name="jython.jar"/>
|
||
|
|
@@ -602,7 +625,9 @@
|
||
|
|
|
||
|
|
<target name="single-test" description="Executes the test class defined by the system property 'testname'" depends="tests">
|
||
|
|
<junit printsummary="withOutAndErr" fork="yes" dir="${basedir}" showoutput="yes">
|
||
|
|
- <!--sysproperty key="mx4j.log.priority" value="debug"/-->
|
||
|
|
+ <sysproperty key="mx4j.log.priority" value="debug"/>
|
||
|
|
+ <sysproperty key="java.security.manager" value=""/>
|
||
|
|
+ <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
|
||
|
|
<!--sysproperty key="java.security.debug" value="access.failure"/-->
|
||
|
|
<formatter type="plain" usefile="no"/>
|
||
|
|
<test name="${testname}" if="testname" fork="yes"/>
|
||
|
|
@@ -629,6 +654,8 @@
|
||
|
|
|
||
|
|
<junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
|
||
|
|
<sysproperty key="mx4j.log.priority" value="warn"/>
|
||
|
|
+ <sysproperty key="java.security.manager" value=""/>
|
||
|
|
+ <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
|
||
|
|
<!-- sysproperty key="java.security.debug" value="access.failure"/-->
|
||
|
|
<formatter type="xml"/>
|
||
|
|
<batchtest fork="yes" todir="${test.xml.dir}">
|
||
|
|
@@ -677,6 +704,8 @@
|
||
|
|
|
||
|
|
<junit printsummary="withOutAndErr" fork="yes" timeout="300000" dir="${basedir}" showoutput="yes">
|
||
|
|
<sysproperty key="mx4j.log.priority" value="warn"/>
|
||
|
|
+ <sysproperty key="java.security.manager" value=""/>
|
||
|
|
+ <sysproperty key="java.security.policy" value="${basedir}/build/mx4j-build.policy"/>
|
||
|
|
<!-- sysproperty key="java.security.debug" value="access.failure"/-->
|
||
|
|
<formatter type="xml"/>
|
||
|
|
<batchtest fork="yes" todir="${test.xml.dir}">
|