[jboss-svn-commits] JBL Code SVN: r31693 - in labs/jbosstm/trunk/XTS: WS-T/dev/src/com/arjuna/webservices/logging and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 16 05:57:14 EST 2010
Author: jhalliday
Date: 2010-02-16 05:57:13 -0500 (Tue, 16 Feb 2010)
New Revision: 31693
Modified:
labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java
labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java
labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java
labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java
labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java
labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java
Log:
refactor per-module logger initialization code to reduce duplication. JBTM-680
Modified: labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java 2010-02-16 04:36:55 UTC (rev 31692)
+++ labs/jbosstm/trunk/XTS/WS-C/dev/src/com/arjuna/webservices/logging/WSCLogger.java 2010-02-16 10:57:13 UTC (rev 31693)
@@ -31,11 +31,6 @@
package com.arjuna.webservices.logging;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
-import com.arjuna.common.internal.util.logging.commonPropertyManager;
import com.arjuna.common.util.logging.LogFactory;
import com.arjuna.common.util.logging.LogNoi18n;
import com.arjuna.common.util.logging.Logi18n;
@@ -53,22 +48,15 @@
* The I18N logger.
*/
public static Logi18n arjLoggerI18N;
- /**
- * The message bundle.
- */
- public static ResourceBundle log_mesg;
+ public static void initialize(LogNoi18n noi18n, Logi18n i18n)
+ {
+ arjLogger = noi18n;
+ arjLoggerI18N = i18n;
+ }
+
static
{
- arjLogger = LogFactory.getLogNoi18n("com.arjuna.wsc.logging.WSCLogger");
-
- final String language = commonPropertyManager.getLoggingEnvironmentBean().getLanguage();
- final String country = commonPropertyManager.getLoggingEnvironmentBean().getCountry();
-
- final Locale currentLocale = new Locale(language, country);
- log_mesg = ResourceBundle.getBundle("wsc_msg",currentLocale);
-
- arjLoggerI18N = LogFactory.getLogi18n("com.arjuna.wsc.logging.WSCLoggerI18N",
- "wsc_msg_"+language+"_"+country);
+ LogFactory.initializeModuleLogger(WSCLogger.class, "wsc_msg", "com.arjuna.wsc");
}
}
Modified: labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java 2010-02-16 04:36:55 UTC (rev 31692)
+++ labs/jbosstm/trunk/XTS/WS-T/dev/src/com/arjuna/webservices/logging/WSTLogger.java 2010-02-16 10:57:13 UTC (rev 31693)
@@ -31,11 +31,6 @@
package com.arjuna.webservices.logging;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
-import com.arjuna.common.internal.util.logging.commonPropertyManager;
import com.arjuna.common.util.logging.LogFactory;
import com.arjuna.common.util.logging.LogNoi18n;
import com.arjuna.common.util.logging.Logi18n;
@@ -44,19 +39,15 @@
{
public static LogNoi18n arjLogger;
public static Logi18n arjLoggerI18N;
- public static ResourceBundle log_mesg;
+ public static void initialize(LogNoi18n noi18n, Logi18n i18n)
+ {
+ arjLogger = noi18n;
+ arjLoggerI18N = i18n;
+ }
+
static
{
- arjLogger = LogFactory.getLogNoi18n("com.arjuna.webservices.logging.WSTLogger");
-
- final String language = commonPropertyManager.getLoggingEnvironmentBean().getLanguage();
- final String country = commonPropertyManager.getLoggingEnvironmentBean().getCountry();
-
- final Locale currentLocale = new Locale(language, country);
- log_mesg = ResourceBundle.getBundle("wst_msg",currentLocale);
-
- arjLoggerI18N = LogFactory.getLogi18n("com.arjuna.webservices.logging.WSTLoggerI18N",
- "wst_msg_"+language+"_"+country);
+ LogFactory.initializeModuleLogger(WSTLogger.class, "wst_msg", "com.arjuna.wst");
}
}
Modified: labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java 2010-02-16 04:36:55 UTC (rev 31692)
+++ labs/jbosstm/trunk/XTS/WSAS/classes/com/arjuna/mw/wsas/logging/wsasLogger.java 2010-02-16 10:57:13 UTC (rev 31693)
@@ -33,36 +33,20 @@
import com.arjuna.common.util.logging.*;
-import com.arjuna.common.internal.util.logging.commonPropertyManager;
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
-
-import java.util.*;
-
public class wsasLogger
{
public static LogNoi18n arjLogger;
public static Logi18n arjLoggerI18N;
- public static ResourceBundle log_mesg;
- private static String language;
- private static String country;
- private static Locale currentLocale;
- private static String dirLocale;
+ public static void initialize(LogNoi18n noi18n, Logi18n i18n)
+ {
+ arjLogger = noi18n;
+ arjLoggerI18N = i18n;
+ }
static
{
- arjLogger = LogFactory.getLogNoi18n("com.arjuna.mw.wsas.logging.wsasLogger");
-
- language = commonPropertyManager.getLoggingEnvironmentBean().getLanguage();
- country = commonPropertyManager.getLoggingEnvironmentBean().getCountry();
-
- currentLocale = new Locale(language,country);
- log_mesg = ResourceBundle.getBundle("wsas_msg",currentLocale);
-
- arjLoggerI18N = LogFactory.getLogi18n("com.arjuna.mw.wsas.logging.wsasLoggerI18N",
- "wsas_msg_"+language+"_"+country);
-
+ LogFactory.initializeModuleLogger(wsasLogger.class, "wsas_msg", "com.arjuna.mw.wsas");
}
-
}
Modified: labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java 2010-02-16 04:36:55 UTC (rev 31692)
+++ labs/jbosstm/trunk/XTS/WSCF/classes/com/arjuna/mw/wscf/logging/wscfLogger.java 2010-02-16 10:57:13 UTC (rev 31693)
@@ -33,36 +33,19 @@
import com.arjuna.common.util.logging.*;
-import com.arjuna.common.internal.util.logging.commonPropertyManager;
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
-
-import java.util.*;
-
public class wscfLogger
{
-
public static LogNoi18n arjLogger;
public static Logi18n arjLoggerI18N;
- public static ResourceBundle log_mesg;
- private static String language;
- private static String country;
- private static Locale currentLocale;
- private static String dirLocale;
+ public static void initialize(LogNoi18n noi18n, Logi18n i18n)
+ {
+ arjLogger = noi18n;
+ arjLoggerI18N = i18n;
+ }
static
{
- arjLogger = LogFactory.getLogNoi18n("com.arjuna.mw.wscf.logging.wscfLogger");
-
- language = commonPropertyManager.getLoggingEnvironmentBean().getLanguage();
- country = commonPropertyManager.getLoggingEnvironmentBean().getCountry();
-
- currentLocale = new Locale(language,country);
- log_mesg = ResourceBundle.getBundle("wscf_msg",currentLocale);
-
- arjLoggerI18N = LogFactory.getLogi18n("com.arjuna.mw.wscf.logging.wscfLoggerI18N",
- "wscf_msg_"+language+"_"+country);
-
+ LogFactory.initializeModuleLogger(wscfLogger.class, "wscf_msg", "com.arjuna.mw.wscf");
}
-
}
Modified: labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java 2010-02-16 04:36:55 UTC (rev 31692)
+++ labs/jbosstm/trunk/XTS/WSTX/classes/com/arjuna/mw/wstx/logging/wstxLogger.java 2010-02-16 10:57:13 UTC (rev 31693)
@@ -33,36 +33,20 @@
import com.arjuna.common.util.logging.*;
-import com.arjuna.common.internal.util.logging.commonPropertyManager;
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
-
-import java.util.*;
-
public class wstxLogger
{
public static LogNoi18n arjLogger;
public static Logi18n arjLoggerI18N;
- public static ResourceBundle log_mesg;
- private static String language;
- private static String country;
- private static Locale currentLocale;
- private static String dirLocale;
+ public static void initialize(LogNoi18n noi18n, Logi18n i18n)
+ {
+ arjLogger = noi18n;
+ arjLoggerI18N = i18n;
+ }
static
{
- arjLogger = LogFactory.getLogNoi18n("com.arjuna.mw.wstx.logging.wstxLogger");
-
- language = commonPropertyManager.getLoggingEnvironmentBean().getLanguage();
- country = commonPropertyManager.getLoggingEnvironmentBean().getCountry();
-
- currentLocale = new Locale(language,country);
- log_mesg = ResourceBundle.getBundle("wstx_msg",currentLocale);
-
- arjLoggerI18N = LogFactory.getLogi18n("com.arjuna.mw.wstx.logging.wstxLoggerI18N",
- "wstx_msg_"+language+"_"+country);
-
+ LogFactory.initializeModuleLogger(wstxLogger.class, "wstx_msg", "com.arjuna.mw.wstx");
}
-
}
Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java 2010-02-16 04:36:55 UTC (rev 31692)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/logging/XTSLogger.java 2010-02-16 10:57:13 UTC (rev 31693)
@@ -1,10 +1,5 @@
package org.jboss.jbossts.xts.logging;
-import java.util.Locale;
-import java.util.ResourceBundle;
-
-import com.arjuna.ats.arjuna.common.arjPropertyManager;
-import com.arjuna.common.internal.util.logging.commonPropertyManager;
import com.arjuna.common.util.logging.LogFactory;
import com.arjuna.common.util.logging.LogNoi18n;
import com.arjuna.common.util.logging.Logi18n;
@@ -13,19 +8,15 @@
{
public static LogNoi18n arjLogger;
public static Logi18n arjLoggerI18N;
- public static ResourceBundle log_mesg;
- static
+ public static void initialize(LogNoi18n noi18n, Logi18n i18n)
{
- arjLogger = LogFactory.getLogNoi18n("com.arjuna.webservices.logging.XTSLogger");
+ arjLogger = noi18n;
+ arjLoggerI18N = i18n;
+ }
- final String language = commonPropertyManager.getLoggingEnvironmentBean().getLanguage();
- final String country = commonPropertyManager.getLoggingEnvironmentBean().getCountry();
-
- final Locale currentLocale = new Locale(language, country);
- log_mesg = ResourceBundle.getBundle("recovery_msg",currentLocale);
-
- arjLoggerI18N = LogFactory.getLogi18n("com.arjuna.webservices.logging.XTSLoggerI18N",
- "recovery_msg_"+language+"_"+country);
+ static
+ {
+ LogFactory.initializeModuleLogger(XTSLogger.class, "recovery_msg", "com.arjuna.wsrecovery");
}
}
More information about the jboss-svn-commits
mailing list