mx4j/build build.xml,1.112,1.113
Simone Bordet <[email protected]> Sat, 14 May 2005 09:32:56 +0000
| Newsgroups | gmane.comp.java.mx4j.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/mx4j/mx4j/build
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20294/build
Modified Files:
build.xml
Log Message:
+ Fixed bug #1200186, by reverting the usage of the -poa switch.
+ Added source and target compiler arguments to javac tasks
Index: build.xml
===================================================================
RCS file: /cvsroot/mx4j/mx4j/build/build.xml,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** build.xml 28 Feb 2005 09:00:36 -0000 1.112
--- build.xml 14 May 2005 09:32:53 -0000 1.113
***************
*** 226,230 ****
<mkdir dir="${dist.lib.dir}"/>
! <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
<patternset refid="mx4j.classes"/>
<classpath refid="lib.classpath"/>
--- 226,230 ----
<mkdir dir="${dist.lib.dir}"/>
! <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII" target="1.3" source="1.3">
<patternset refid="mx4j.classes"/>
<classpath refid="lib.classpath"/>
***************
*** 250,263 ****
</target>
! <target name="rmic.iiop.poa" description="RMI compiles the remote JMX (JSR 160) classes using the -poa option" if="jdk14.present">
! <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes">
! <compilerarg value="-poa"/>
! </rmic>
! <rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes">
! <compilerarg value="-poa"/>
! </rmic>
! </target>
!
! <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes" unless="jdk14.present">
<rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes"/>
<rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes"/>
--- 250,254 ----
</target>
! <target name="rmic.iiop" description="RMI compiles the remote JMX (JSR 160) classes">
<rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIServerImpl" classpathref="classpath" debug="yes" iiop="yes"/>
<rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" iiop="yes"/>
***************
*** 265,269 ****
<target name="compile.rjmx" description="Compiles the Remote JMX (JSR 160) classes" depends="compile.jmx" if="jaas.present">
! <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
<patternset refid="rmx4j.classes"/>
<classpath refid="lib.classpath"/>
--- 256,260 ----
<target name="compile.rjmx" description="Compiles the Remote JMX (JSR 160) classes" depends="compile.jmx" if="jaas.present">
! <javac srcdir="${core.src.dir}" destdir="${core.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII" target="1.3" source="1.3">
<patternset refid="rmx4j.classes"/>
<classpath refid="lib.classpath"/>
***************
*** 272,276 ****
<rmic base="${core.classes.dir}" classname="javax.management.remote.rmi.RMIConnectionImpl" classpathref="classpath" debug="yes" stubversion="1.2"/>
<antcall target="rmic.iiop"/>
- <antcall target="rmic.iiop.poa"/>
<jar jarfile="${rjmx.jar.file}" manifest="${etc.dir}/MANIFEST.MF">
--- 263,266 ----
***************
*** 300,304 ****
<mkdir dir="${tools.classes.dir}"/>
! <javac srcdir="${tools.src.dir}" destdir="${tools.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
<patternset refid="tools.classes"/>
<exclude name="mx4j/tools/mail/**" unless="javamail.present"/>
--- 290,294 ----
<mkdir dir="${tools.classes.dir}"/>
! <javac srcdir="${tools.src.dir}" destdir="${tools.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII" target="1.3" source="1.3">
<patternset refid="tools.classes"/>
<exclude name="mx4j/tools/mail/**" unless="javamail.present"/>
***************
*** 357,361 ****
<mkdir dir="${dist.test.dir}"/>
! <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
<patternset refid="tests.classes"/>
<exclude name="test/javax/management/remote/**" unless="jaas.present"/>
--- 347,351 ----
<mkdir dir="${dist.test.dir}"/>
! <javac srcdir="${test.src.dir}" destdir="${test.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII" target="1.3" source="1.3">
<patternset refid="tests.classes"/>
<exclude name="test/javax/management/remote/**" unless="jaas.present"/>
***************
*** 382,386 ****
<mkdir dir="${examples.classes.dir}"/>
! <javac srcdir="${examples.src.dir}" destdir="${examples.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII">
<classpath refid="classpath"/>
<exclude name="mx4j/examples/tools/xdoclet/**"/>
--- 372,376 ----
<mkdir dir="${examples.classes.dir}"/>
! <javac srcdir="${examples.src.dir}" destdir="${examples.classes.dir}" debug="on" deprecation="on" encoding="US-ASCII" target="1.3" source="1.3">
<classpath refid="classpath"/>
<exclude name="mx4j/examples/tools/xdoclet/**"/>
-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7393&alloc_id=16281&op=click