[jboss-svn-commits] JBL Code SVN: r6318 - in labs/jbosstm/trunk/atsintegration: . classes/com/arjuna/ats/internal/jbossatx/jta/jca classes/com/arjuna/ats/internal/jbossatx/jts/jca classes/com/arjuna/ats/jbossatx classes/com/arjuna/ats/jbossatx/logging
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Sep 20 11:28:35 EDT 2006
Author: kevin.conner at jboss.com
Date: 2006-09-20 11:28:27 -0400 (Wed, 20 Sep 2006)
New Revision: 6318
Added:
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
Modified:
labs/jbosstm/trunk/atsintegration/build.xml
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
Log:
Fix for JBTM-124 and JBTM-126 (logging and XATerminator)
Modified: labs/jbosstm/trunk/atsintegration/build.xml
===================================================================
--- labs/jbosstm/trunk/atsintegration/build.xml 2006-09-20 14:56:02 UTC (rev 6317)
+++ labs/jbosstm/trunk/atsintegration/build.xml 2006-09-20 15:28:27 UTC (rev 6318)
@@ -31,6 +31,10 @@
<property file="${com.arjuna.mw.ts.properties}"/>
<property environment="env"/>
+
+ <!-- configure dependencies -->
+ <property name="com.arjuna.buildsystem.dir" location="${buildsystem.dir}"/>
+ <property name="com.arjuna.buildsystem.build.lib" location="${com.arjuna.buildsystem.dir}/build/lib"/>
<!-- Set internal property defaults -->
<!-- Path names -->
@@ -41,6 +45,7 @@
<property name="com.arjuna.mwlabs.ts.jbossatx.docs.src" location="docbuild"/>
<property name="com.arjuna.mwlabs.ts.jbossatx.docs.dest" location="${com.arjuna.mwlabs.ts.jbossatx.buildroot}/docs"/>
+ <property name="com.arjuna.mwlabs.ts.jbossatx.resourcebundle" value="jbossatx_msg_en_US.properties"/>
<!-- Initialisation -->
<target name="com.arjuna.mwlabs.ts.jbossatx.init">
@@ -88,6 +93,11 @@
<echo message="Date = ${com.arjuna.mw.date}"/>
<echo message="Notes = ${com.arjuna.mw.notes}"/>
+ <path id="com.arjuna.buildsystem.classpath">
+ <fileset dir="${com.arjuna.buildsystem.build.lib}"/>
+ </path>
+ <property name="com.arjuna.buildsystem.classpath" refid="com.arjuna.buildsystem.classpath"/>
+
<!-- Installation directory -->
<property name="com.arjuna.mwlabs.installationdirectory"
location="${com.hp.mw.installationdirectory}"/>
@@ -134,7 +144,7 @@
</target>
<!-- Default build target -->
- <target name="com.arjuna.mw.ts.jbossatx.build" depends="com.arjuna.mwlabs.ts.jbossatx.service.compile,com.arjuna.mw.ts.jbossatx.jar"/>
+ <target name="com.arjuna.mw.ts.jbossatx.build" depends="com.arjuna.mwlabs.ts.jbossatx.service.compile,com.arjuna.mwlabs.ts.jbossatx.generateresourcebundle,com.arjuna.mw.ts.jbossatx.jar"/>
<target name="com.arjuna.mwlabs.ts.jbossatx.service.compile" depends="com.arjuna.mwlabs.ts.jbossatx.init">
@@ -223,5 +233,27 @@
<target name="install" depends="com.arjuna.mw.ts.jbossatx.install"/>
<target name="clean" depends="com.arjuna.mw.ts.jbossatx.clean"/>
+
+ <target name="com.arjuna.mwlabs.ts.jbossatx.generateresourcebundle">
+
+ <echo message="Generating Integration Resource Bundle"/>
+
+ <javadoc sourcepath="${com.arjuna.mwlabs.ts.jbossatx.src}"
+ packagenames="com.arjuna.*"
+ failonerror="yes"
+ private="yes"
+ defaultexcludes="yes"
+ classpath="${build.classpath}">
+
+ <doclet name="com.hp.mw.buildsystem.doclet.resbundledoclet.ResourceBundleDoclet">
+ <path>
+ <pathelement path="${com.arjuna.buildsystem.classpath}"/>
+ </path>
+ <param name="-basedir" value="${com.arjuna.mwlabs.ts.jbossatx.dest}"/>
+ <param name="-resourcebundle" value="${com.arjuna.mwlabs.ts.jbossatx.resourcebundle}"/>
+ <param name="-appendkey" value="[]"/>
+ </doclet>
+ </javadoc>
+ </target>
</project>
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java 2006-09-20 14:56:02 UTC (rev 6317)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jta/jca/XATerminator.java 2006-09-20 15:28:27 UTC (rev 6318)
@@ -48,8 +48,8 @@
import org.jboss.tm.JBossXATerminator;
import org.jboss.util.UnexpectedThrowable;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
import com.arjuna.ats.jta.TransactionManager;
-import com.arjuna.ats.jta.logging.*;
import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.TxWorkManager;
@@ -108,13 +108,13 @@
case Status.STATUS_NO_TRANSACTION:
case Status.STATUS_UNKNOWN:
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
case Status.STATUS_ACTIVE:
break;
default:
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.completing"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.completing"),
WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
@@ -146,7 +146,7 @@
ex.printStackTrace();
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
WorkException.INTERNAL);
}
}
@@ -173,7 +173,7 @@
if (!TxWorkManager.getWork(tx).equals(work))
{
- throw new WorkCompletedException(jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknownwork"),
+ throw new WorkCompletedException(jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknownwork"),
WorkException.INTERNAL);
}
@@ -186,13 +186,13 @@
catch (InvalidTransactionException ex)
{
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
}
catch (SystemException ex)
{
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jta.jca.unknown"),
WorkException.INTERNAL);
}
}
Modified: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java 2006-09-20 14:56:02 UTC (rev 6317)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/internal/jbossatx/jts/jca/XATerminator.java 2006-09-20 15:28:27 UTC (rev 6318)
@@ -40,18 +40,18 @@
import javax.transaction.xa.XAException;
import javax.transaction.xa.Xid;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.TxImporter;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.WorkSynchronization;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.XATerminatorImple;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.subordinate.jca.TransactionImple;
+import com.arjuna.ats.internal.jta.transaction.jts.jca.TxImporter;
+import com.arjuna.ats.internal.jta.transaction.jts.jca.WorkSynchronization;
+import com.arjuna.ats.internal.jta.transaction.jts.jca.XATerminatorImple;
+import com.arjuna.ats.internal.jta.transaction.jts.subordinate.jca.TransactionImple;
import org.jboss.tm.JBossXATerminator;
import org.jboss.util.UnexpectedThrowable;
+import com.arjuna.ats.jbossatx.logging.jbossatxLogger;
import com.arjuna.ats.jta.TransactionManager;
-import com.arjuna.ats.jta.logging.*;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.jca.TxWorkManager;
+import com.arjuna.ats.internal.jta.transaction.jts.jca.TxWorkManager;
/**
* The implementation of JBossXATerminator using the JTS implementation of the
@@ -105,13 +105,13 @@
case Status.STATUS_NO_TRANSACTION:
case Status.STATUS_UNKNOWN:
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
case Status.STATUS_ACTIVE:
break;
default:
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.completing"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.completing"),
WorkException.TX_CONCURRENT_WORK_DISALLOWED);
}
@@ -143,7 +143,7 @@
ex.printStackTrace();
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
WorkException.INTERNAL);
}
}
@@ -170,7 +170,7 @@
if (!TxWorkManager.getWork(tx).equals(work))
{
- throw new WorkCompletedException(jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknownwork"),
+ throw new WorkCompletedException(jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknownwork"),
WorkException.INTERNAL);
}
@@ -183,13 +183,13 @@
catch (InvalidTransactionException ex)
{
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.inactive"),
WorkException.TX_RECREATE_FAILED);
}
catch (SystemException ex)
{
throw new WorkCompletedException(
- jtaLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
+ jbossatxLogger.logMesg.getString("com.arjuna.ats.jbossatx.jts.jca.unknown"),
WorkException.INTERNAL);
}
}
Added: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
===================================================================
--- labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java 2006-09-20 14:56:02 UTC (rev 6317)
+++ labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java 2006-09-20 15:28:27 UTC (rev 6318)
@@ -0,0 +1,94 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a full listing
+ * of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU General Public License, v. 2.0.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License,
+ * v. 2.0 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author JBoss Inc.
+ */
+/*
+ * Copyright (C) 2001, 2002,
+ *
+ * Hewlett-Packard Arjuna Labs,
+ * Newcastle upon Tyne,
+ * Tyne and Wear,
+ * UK.
+ *
+ * $Id: jbossatxLogger.java $
+ */
+
+package com.arjuna.ats.jbossatx.logging;
+
+import com.arjuna.common.util.logging.*;
+
+import com.arjuna.ats.jta.common.jtaPropertyManager;
+
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class jbossatxLogger
+{
+ public static LogNoi18n logger;
+ public static Logi18n loggerI18N;
+ public static ResourceBundle logMesg;
+
+ private static String _language;
+ private static String _country;
+ private static Locale _currentLocale;
+
+ static
+ {
+ /** Ensure the properties are loaded before initialising the logger **/
+ jtaPropertyManager.getPropertyManager();
+
+ logger = LogFactory.getLogNoi18n("com.arjuna.ats.jbossatx.logging.logger");
+
+ _language = System.getProperty("language","en");
+ _country = System.getProperty("country","US");
+
+ _currentLocale = new Locale(_language, _country);
+
+ try
+ {
+ logMesg = ResourceBundle.getBundle("jbossatx_msg", _currentLocale);
+ }
+ catch (Throwable ex)
+ {
+ logMesg = null;
+ }
+
+ if (logMesg == null)
+ {
+ _currentLocale = new Locale("en", "US");
+
+ logMesg = ResourceBundle.getBundle("jbossatx_msg", _currentLocale);
+ }
+
+ try
+ {
+ loggerI18N = LogFactory.getLogi18n("com.arjuna.ats.jbossatx.logging.loggerI18N", "jbossatx_msg_"+_language+"_"+_country);
+ }
+ catch (Throwable ex)
+ {
+ loggerI18N = null;
+ }
+
+ if (loggerI18N == null)
+ loggerI18N = LogFactory.getLogi18n("com.arjuna.ats.jbossatx.logging.loggerI18N", "jbossatx_msg_en_US");
+ }
+}
+
+
+
Property changes on: labs/jbosstm/trunk/atsintegration/classes/com/arjuna/ats/jbossatx/logging/jbossatxLogger.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
More information about the jboss-svn-commits
mailing list