You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2010/03/29 12:45:34 UTC

svn commit: r928703 - in /qpid/branches/0.5.x-dev/qpid/java: broker/build.xml client/test/example_build.xml common.xml module.xml

Author: robbie
Date: Mon Mar 29 10:45:34 2010
New Revision: 928703

URL: http://svn.apache.org/viewvc?rev=928703&view=rev
Log:
QPID-2465: Set javac includeantruntime property in build files

Applying patch from Andrew Kennedy <an...@gmail.com>

Modified:
    qpid/branches/0.5.x-dev/qpid/java/broker/build.xml
    qpid/branches/0.5.x-dev/qpid/java/client/test/example_build.xml
    qpid/branches/0.5.x-dev/qpid/java/common.xml
    qpid/branches/0.5.x-dev/qpid/java/module.xml

Modified: qpid/branches/0.5.x-dev/qpid/java/broker/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/broker/build.xml?rev=928703&r1=928702&r2=928703&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/broker/build.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/broker/build.xml Mon Mar 29 10:45:34 2010
@@ -46,7 +46,7 @@
         <mkdir dir="${velocity.compile.dir}" />	
         <!-- Compile LogMessages Velocity Generator -->
         <javac source="${java.source}" target="${java.target}"
-               destdir="${velocity.compile.dir}" debug="on"
+               destdir="${velocity.compile.dir}" debug="on" includeantruntime="false"
                deprecation="${javac.deprecation}" 
                srcdir="src/velocity/java" >
           <classpath>

Modified: qpid/branches/0.5.x-dev/qpid/java/client/test/example_build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/client/test/example_build.xml?rev=928703&r1=928702&r2=928703&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/client/test/example_build.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/client/test/example_build.xml Mon Mar 29 10:45:34 2010
@@ -66,7 +66,7 @@
 
     <!-- Compile Java -->
     <target name="compile" depends="init">
-        <javac destdir="${example.classes}" debug="on">
+        <javac destdir="${example.classes}" debug="on" includeantruntime="false">
             <classpath refid="example_amq.classpath"/>
             <src path="${example.src}"/>
             <exclude name="**/Test*.java"/>

Modified: qpid/branches/0.5.x-dev/qpid/java/common.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/common.xml?rev=928703&r1=928702&r2=928703&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/common.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/common.xml Mon Mar 29 10:45:34 2010
@@ -105,7 +105,7 @@
   </macrodef>
 
   <mkdir dir="${tasks.classes}"/>
-  <javac source="${java.source}" target="${java.target}" srcdir="${tasks.src}" destdir="${tasks.classes}"  classpath="${java.class.path}">
+  <javac source="${java.source}" target="${java.target}" srcdir="${tasks.src}" destdir="${tasks.classes}"  classpath="${java.class.path}" includeantruntime="false">
     <compilerarg line="${javac.compiler.args}"/>
   </javac>
 

Modified: qpid/branches/0.5.x-dev/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/branches/0.5.x-dev/qpid/java/module.xml?rev=928703&r1=928702&r2=928703&view=diff
==============================================================================
--- qpid/branches/0.5.x-dev/qpid/java/module.xml (original)
+++ qpid/branches/0.5.x-dev/qpid/java/module.xml Mon Mar 29 10:45:34 2010
@@ -186,7 +186,7 @@
     <echo message="Targeting : ${java.target}" level="info"/>
 
     <javac source="${java.source}" target="${java.target}" 
-           destdir="${module.classes}" debug="on"
+           destdir="${module.classes}" debug="on" includeantruntime="false"
            deprecation="${javac.deprecation}">
       <compilerarg line="${javac.compiler.args}"/>
       <src refid="module.src.path"/>



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org