[jboss-svn-commits] JBL Code SVN: r37486 - in labs/jbosstm/branches/JBOSSTS_4_15_0_Final: XTS and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: jhalliday
Date: 2011-09-26 11:02:05 -0400 (Mon, 26 Sep 2011)
New Revision: 37486

Modified:
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/sharedbuild.xml
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml
   labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml
Log:
Build system workaround for logging annotation processing on jdk7. JBTM-904


Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/sharedbuild.xml	2011-09-26 14:39:22 UTC (rev 37485)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/XTS/sharedbuild.xml	2011-09-26 15:02:05 UTC (rev 37486)
@@ -85,7 +85,7 @@
     </path>
 
     <!-- compilation flags -->
-    
+
     <property name="debug" value="true"/>
     <property name="deprecation" value="true"/>
 
@@ -140,9 +140,11 @@
                 <path refid="build.classpath"/>
                 <additional.classpath/>
             </classpath>
+            <!-- http://issues.jboss.org/jira/browse/LOGTOOL-23  -->
+            <compilerarg value="-AtranslationFilesPath=${src.dir}"/>
             <additional.src.dirs/>
         </javac>
-            
+
         <emma enabled="@{includeemma}">
             <instr mode="overwrite"
                    metadatafile="${emma.report.dir}/metadata.emma"

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml	2011-09-26 14:39:22 UTC (rev 37485)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/sharedbuild.xml	2011-09-26 15:02:05 UTC (rev 37486)
@@ -139,6 +139,8 @@
                 <additional.classpath/>
             </classpath>
             <additional.src.dirs/>
+            <!-- http://issues.jboss.org/jira/browse/LOGTOOL-23  -->
+            <compilerarg value="-AtranslationFilesPath=${src.dir}"/>
         </javac>
 
         <emma enabled="@{includeemma}">
@@ -327,7 +329,7 @@
                 <jar destfile="${build.dir}/lib/${modulename}-sources.jar" update="true">
                     <fileset dir="@{module}/classes"/>
                 </jar>
-                
+
                 <if>
                     <available file="@{module}/${build.dir}/generatedclasses"/>
                     <then>
@@ -480,9 +482,9 @@
                 message="&lt;!DOCTYPE properties SYSTEM &quot;http://java.sun.com/dtd/properties.dtd&quot;&gt;&lt;properties/&gt;"/>
 
         <copy file="${sharedbuild.base.dir}/ArjunaCore/arjuna/etc/log4j.properties" todir="${build.dir}/classes"/>
-        	
+
         <copy todir="${build.dir}" failonerror="false">
-        	<fileset dir="tests/byteman-scripts/"/> 
+        	<fileset dir="tests/byteman-scripts/"/>
        	</copy>
 
         <mkdir dir="${build.dir}/testresults"/>

Modified: labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml	2011-09-26 14:39:22 UTC (rev 37485)
+++ labs/jbosstm/branches/JBOSSTS_4_15_0_Final/txbridge/build.xml	2011-09-26 15:02:05 UTC (rev 37486)
@@ -81,6 +81,8 @@
 		<mkdir dir="${build}/classes"/>
 		<javac srcdir="${src}" destdir="${build}/classes" debug="true" includeantruntime="false">
 			<classpath refid="build-prereqs"/>
+            <!-- http://issues.jboss.org/jira/browse/LOGTOOL-23  -->
+            <compilerarg value="-AtranslationFilesPath=${src}"/>
 		</javac>
 
         <emma enabled="${emma.enabled}">