[jboss-svn-commits] JBL Code SVN: r36795 - in labs/jbosstm/trunk: ArjunaCore/arjuna and 9 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Mar 14 10:29:19 EDT 2011
Author: jhalliday
Date: 2011-03-14 10:29:19 -0400 (Mon, 14 Mar 2011)
New Revision: 36795
Modified:
labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java
labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
labs/jbosstm/trunk/XTS/sharedbuild.xml
labs/jbosstm/trunk/atsintegration/build.xml
labs/jbosstm/trunk/maven/pom-template.xml
labs/jbosstm/trunk/sharedbuild.xml
labs/jbosstm/trunk/txbridge/build.xml
Log:
Add i18n logging annotation processor to build. JBTM-795
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/build.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -22,7 +22,7 @@
<property name="modulename" value="arjuna"/>
- <property name="global.ext.libs" value="hornetq-core.jar,jboss-logging.jar"/><!-- jboss-logging-tools.jar -->
+ <property name="global.ext.libs" value="hornetq-core.jar"/>
<import file="../../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/hornetq/HornetqJournalStore.java 2011-03-14 14:29:19 UTC (rev 36795)
@@ -114,7 +114,7 @@
if(AIOSequentialFileFactory.isSupported()) {
sequentialFileFactory = new AIOSequentialFileFactory(envBean.getStoreDir());
} else {
- sequentialFileFactory = new NIOSequentialFileFactory(envBean.getStoreDir());
+ sequentialFileFactory = new NIOSequentialFileFactory(envBean.getStoreDir(), true);
}
journal = new JournalImpl(envBean.getFileSize(), envBean.getMinFiles(), envBean.getCompactMinFiles(),
Modified: labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/ArjunaCore/tsmx/build.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -22,7 +22,7 @@
<property name="modulename" value="tsmx"/>
- <property name="global.ext.libs" value="jcommon.jar,jfreechart.jar,jboss-logging.jar"/>
+ <property name="global.ext.libs" value="jcommon.jar,jfreechart.jar"/>
<import file="../../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/ArjunaJTA/jdbc/build.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -22,7 +22,7 @@
<property name="modulename" value="jdbc"/>
- <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,jboss-logging.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar"/>
<import file="../../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/ArjunaJTA/jta/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/ArjunaJTA/jta/build.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -22,7 +22,7 @@
<property name="modulename" value="jta"/>
- <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,ironjacamar-spec-api.jar,jboss-logging.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,ironjacamar-spec-api.jar"/>
<import file="../../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/ArjunaJTS/jtax/build.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -22,7 +22,7 @@
<property name="modulename" value="jtax"/>
- <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,ironjacamar-spec-api.jar,jboss-logging.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,ironjacamar-spec-api.jar"/>
<import file="../sharedbuild.xml"/>
Modified: labs/jbosstm/trunk/XTS/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/XTS/sharedbuild.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/XTS/sharedbuild.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -93,7 +93,7 @@
<!-- external jars used by XTS for all builds -->
<property name="xts.build.extlib.jars" value="jaxb-api.jar jboss-javaee.jar
jbossws-client.jar stax-api.jar
- jbossws-native-core.jar jbossws-common.jar jboss-logging.jar
+ jbossws-native-core.jar jbossws-common.jar jboss-logging.jar jboss-logging-generator.jar jboss-logging-processor.jar
jboss-transaction-api_1.1_spec.jar jboss-servlet-api_3.0_spec.jar dom4j.jar ${cxf.build.extlib.jars}"/>
<!-- paths internal to build -->
Modified: labs/jbosstm/trunk/atsintegration/build.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/build.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/atsintegration/build.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -22,7 +22,7 @@
<property name="modulename" value="jbossatx"/>
- <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,ironjacamar-spec-api.jar,jboss-logging.jar"/>
+ <property name="global.ext.libs" value="jboss-transaction-api_1.1_spec.jar,ironjacamar-spec-api.jar"/>
<property name="component-module-list" value="../atsintegration"/>
Modified: labs/jbosstm/trunk/maven/pom-template.xml
===================================================================
--- labs/jbosstm/trunk/maven/pom-template.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/maven/pom-template.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -401,12 +401,19 @@
<version>3.0.0.Beta5</version><!-- TODO AS7 -->
</dependency>
+
+ <!-- https://repository.jboss.org/nexus/content/groups/public-jboss/org/jboss/logging/jboss-logging-processor/ from beta5 -->
<!-- https://repository.jboss.org/nexus/content/groups/public-jboss/org/jboss/logging/jboss-logging-tools/ -->
<dependency>
<groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-tools</artifactId>
- <version>1.0.0.Beta4</version><!-- TODO AS7 -->
+ <artifactId>jboss-logging-processor</artifactId>
+ <version>1.0.0.Beta5</version><!-- TODO AS7 -->
</dependency>
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-generator</artifactId>
+ <version>1.0.0.Beta5</version><!-- TODO AS7 -->
+ </dependency>
<!--<dependency>-->
<!--<groupId>stax</groupId>-->
Modified: labs/jbosstm/trunk/sharedbuild.xml
===================================================================
--- labs/jbosstm/trunk/sharedbuild.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/sharedbuild.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -46,7 +46,8 @@
<!-- using an empty string does not work, it's treated as undefined
and that results in everything being included by default. use
e.g. "fakefile.jar" if needed. -->
- <property name="global.ext.libs" value="jboss-logging.jar"/>
+ <property name="global.ext.libs" value="fakefile.jar"/>
+ <property name="global.ext.logging.libs" value="jboss-logging.jar,jboss-logging-processor.jar,jboss-logging-generator.jar"/>
<property name="global.ext.test.libs" value="junit.jar"/>
<property name="excluded.classes" value=""/>
@@ -134,6 +135,7 @@
<classpath>
<fileset dir="${build.dir}/lib/ext/" includes="*"/>
<fileset dir="${global.ext.lib.dir}" includes="${global.ext.libs}"/>
+ <fileset dir="${global.ext.lib.dir}" includes="${global.ext.logging.libs}"/>
<additional.classpath/>
</classpath>
<additional.src.dirs/>
Modified: labs/jbosstm/trunk/txbridge/build.xml
===================================================================
--- labs/jbosstm/trunk/txbridge/build.xml 2011-03-14 13:10:34 UTC (rev 36794)
+++ labs/jbosstm/trunk/txbridge/build.xml 2011-03-14 14:29:19 UTC (rev 36795)
@@ -53,6 +53,8 @@
<fileset dir="${global.ext.lib.dir}">
<include name="jboss-logging.jar"/>
+ <include name="jboss-logging-generator.jar"/>
+ <include name="jboss-logging-processor.jar"/>
<include name="jboss-transaction-api_1.1_spec.jar"/>
<include name="ironjacamar-spec-api.jar"/>
</fileset>
More information about the jboss-svn-commits
mailing list