[jboss-svn-commits] JBL Code SVN: r29887 - in labs/jbosstm/trunk: ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator and 10 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Mon Nov 2 05:31:15 EST 2009


Author: jhalliday
Date: 2009-11-02 05:31:14 -0500 (Mon, 02 Nov 2009)
New Revision: 29887

Modified:
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
   labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java
   labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverACCoordinator.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverSubordinateCoordinator.java
   labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverACCoordinator.java
   labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java
   labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/Logi18nImpl.java
   labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java
   labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/Logi18n.java
   labs/jbosstm/trunk/common/tests/com/hp/mwtests/commonlogging/testlevels/TestLevels.java
Log:
Cleanup of CLF impl and usage. JBTM-638 and JBTM-612


Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/PersistenceRecord.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -232,7 +232,7 @@
 					+ order());
 		}
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.PersistenceRecord_1", new Object[]
 			{ order(), getTypeOfObject() });
@@ -434,7 +434,7 @@
 		{
 			objStoreType = os.unpackInt();
 
-			if (tsLogger.arjLoggerI18N.debugAllowed())
+			if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			{
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.PersistenceRecord_9", new Object[]
 				{ Integer.toString(objStoreType) });
@@ -500,7 +500,7 @@
 				{
 					os.packInt(store.typeIs());
 
-					if (tsLogger.arjLoggerI18N.debugAllowed())
+					if (tsLogger.arjLoggerI18N.isDebugEnabled())
 					{
 						tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.PersistenceRecord_12", new Object[]
 						{ Integer.toString(store.typeIs()) });
@@ -508,7 +508,7 @@
 
 					store.pack(os);
 
-					if (tsLogger.arjLoggerI18N.debugAllowed())
+					if (tsLogger.arjLoggerI18N.isDebugEnabled())
 					{
 						tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.PersistenceRecord_13");
 					}
@@ -586,7 +586,7 @@
 	{
 		super();
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.PersistenceRecord_17");
 		}

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/StateManager.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -532,7 +532,7 @@
 
 public synchronized boolean destroy ()
     {
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_STATE_MAN,

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/AbstractRecord.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -655,7 +655,7 @@
 		uidOfObject = new Uid(Uid.nullUid());
 		typeOfObject = null;
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.CONSTRUCTORS, VisibilityLevel.VIS_PROTECTED, FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.coordinator.AbstractRecord_1");
 		}

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/BasicAction.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -845,7 +845,7 @@
 
 	public final boolean addChildThread (Thread t)
 	{
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_6", new Object[]
 			{ get_uid(), t });
@@ -874,7 +874,7 @@
 
 		criticalEnd();
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_7", new Object[]
 			{ get_uid(), t, new Boolean(result) });
@@ -908,7 +908,7 @@
 
 	public final boolean removeChildThread (String threadId)
 	{
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_8", new Object[]
 			{ get_uid(), threadId });
@@ -932,7 +932,7 @@
 
 		criticalEnd();
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			if (result)
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_9", new Object[]
@@ -954,7 +954,7 @@
 
 	public final boolean addChildAction (BasicAction act)
 	{
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_10", new Object[]
 			{ get_uid(), ((act != null) ? act.get_uid() : Uid.nullUid()) });
@@ -986,7 +986,7 @@
 
 		criticalEnd();
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			if (result)
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_11", new Object[]
@@ -1012,7 +1012,7 @@
 
 	public final boolean removeChildAction (BasicAction act)
 	{
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_12", new Object[]
 			{ get_uid(), ((act != null) ? act.get_uid() : Uid.nullUid()) });
@@ -1036,7 +1036,7 @@
 
 		criticalEnd();
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 			if (result)
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_13", new Object[]
@@ -1193,7 +1193,7 @@
 			 * which type of record to create when restoring.
 			 */
 
-			if (tsLogger.arjLoggerI18N.debugAllowed())
+			if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			{
 				if (temp.doSave())
 					tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_14", new Object[]
@@ -1209,7 +1209,7 @@
 
 				try
 				{
-					if (tsLogger.arjLoggerI18N.debugAllowed())
+					if (tsLogger.arjLoggerI18N.isDebugEnabled())
 					{
 						tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_15", new Object[]
 						{ Integer.toString(temp.typeIs()) });
@@ -1242,7 +1242,7 @@
 		{
 			try
 			{
-				if (tsLogger.arjLoggerI18N.debugAllowed())
+				if (tsLogger.arjLoggerI18N.isDebugEnabled())
 				{
 					tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_16");
 				}
@@ -1285,7 +1285,7 @@
 
 						try
 						{
-							if (tsLogger.arjLoggerI18N.debugAllowed())
+							if (tsLogger.arjLoggerI18N.isDebugEnabled())
 							{
 								tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_17", new Object[]
 								{ Integer.toString(temp.typeIs()) });
@@ -1313,7 +1313,7 @@
 				{
 					try
 					{
-						if (tsLogger.arjLoggerI18N.debugAllowed())
+						if (tsLogger.arjLoggerI18N.isDebugEnabled())
 						{
 							tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_18");
 						}
@@ -1332,7 +1332,7 @@
 		{
 			try
 			{
-				if (tsLogger.arjLoggerI18N.debugAllowed())
+				if (tsLogger.arjLoggerI18N.isDebugEnabled())
 				{
 					tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_19", new Object[]
 					{ ActionStatus.stringForm(actionStatus) });
@@ -1395,7 +1395,7 @@
 		{
 			record_type = os.unpackInt();
 
-			if (tsLogger.arjLoggerI18N.debugAllowed())
+			if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			{
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_20", new Object[]
 				{ Integer.toString(record_type) });
@@ -1431,7 +1431,7 @@
 				{
 					record_type = os.unpackInt();
 
-					if (tsLogger.arjLoggerI18N.debugAllowed())
+					if (tsLogger.arjLoggerI18N.isDebugEnabled())
 					{
 						tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_20", new Object[]
 						{ Integer.toString(record_type) });
@@ -1454,7 +1454,7 @@
 			{
 				hSize = os.unpackInt();
 
-				if (tsLogger.arjLoggerI18N.debugAllowed())
+				if (tsLogger.arjLoggerI18N.isDebugEnabled())
 				{
 					tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_22", new Object[]
 					{ Integer.toString(hSize) });
@@ -1472,7 +1472,7 @@
 			{
 				record_type = os.unpackInt();
 
-				if (tsLogger.arjLoggerI18N.debugAllowed())
+				if (tsLogger.arjLoggerI18N.isDebugEnabled())
 				{
 					tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_23", new Object[]
 					{ Integer.toString(record_type) });
@@ -1495,7 +1495,7 @@
 				{
 					record_type = os.unpackInt();
 
-					if (tsLogger.arjLoggerI18N.debugAllowed())
+					if (tsLogger.arjLoggerI18N.isDebugEnabled())
 					{
 						tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_23", new Object[]
 						{ Integer.toString(record_type) });
@@ -1527,7 +1527,7 @@
 
 		if (res)
 		{
-			if (tsLogger.arjLoggerI18N.debugAllowed())
+			if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			{
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_25", new Object[]
 				{ ActionStatus.stringForm(tempActionStatus), Integer.toString(tempActionStatus) });
@@ -1711,7 +1711,7 @@
 		            }
 		            else
 		            {
-		                if (tsLogger.arjLoggerI18N.debugAllowed())
+		                if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		                {
 		                    tsLogger.arjLoggerI18N.warn("com.arjuna.ats.arjuna.coordinator.BasicAction_31", new Object[]
 		                                                                                                               { get_uid(), parentAct.get_uid(), Integer.toString(parentAct.status()) });
@@ -3236,7 +3236,7 @@
 				}
 				else
 				{				
-					if (tsLogger.arjLoggerI18N.debugAllowed(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ATOMIC_ACTION))
+					if (tsLogger.arjLoggerI18N.isDebugEnabled())
 					{
 						tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_51", new Object[]
 						{ get_uid(), TwoPhaseOutcome.stringForm(ok), RecordType.typeToClassName(recordBeingHandled.typeIs()) });
@@ -3833,7 +3833,7 @@
 			{
 				t = (Thread) iter.nextElement();
 
-				if (tsLogger.arjLoggerI18N.debugAllowed())
+				if (tsLogger.arjLoggerI18N.isDebugEnabled())
 				{
 					tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_63", new Object[]
 					{ get_uid(), t });
@@ -3864,7 +3864,7 @@
 
 		if (parent != null) /* ie not top_level */
 		{
-			if (tsLogger.arjLoggerI18N.debugAllowed())
+			if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			{
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_66", new Object[]
 				{ get_uid(), Integer.toString(parent.actionStatus) });
@@ -3895,7 +3895,7 @@
 				 * nested top-level actions are used for.
 				 */
 
-				if (tsLogger.arjLoggerI18N.debugAllowed())
+				if (tsLogger.arjLoggerI18N.isDebugEnabled())
 				{
 					tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE, FacilityCode.FAC_ATOMIC_ACTION, "com.arjuna.ats.arjuna.coordinator.BasicAction_67", new Object[]
 					{ get_uid(), parent.get_uid() });

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/coordinator/RecordList.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -31,7 +31,6 @@
 
 package com.arjuna.ats.arjuna.coordinator;
 
-import com.arjuna.ats.arjuna.common.*;
 import java.io.PrintWriter;
 
 import com.arjuna.ats.arjuna.logging.tsLogger;
@@ -349,7 +348,7 @@
 	{
 	    if (newRecord.shouldMerge(current))
 	    {
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 		    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
 						 FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.coordinator.RecordList_1",
@@ -366,7 +365,7 @@
 	    {
 		if (newRecord.shouldReplace(current))
 		{
-		    if (tsLogger.arjLoggerI18N.debugAllowed())
+		    if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		    {
 			tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
 						     FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.coordinator.RecordList_2",
@@ -382,7 +381,7 @@
 		{
 		    if (newRecord.shouldAdd(current))
 		    {
-			if (tsLogger.arjLoggerI18N.debugAllowed())
+			if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			{
 			    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
 							 FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.coordinator.RecordList_3",
@@ -405,7 +404,7 @@
 			}
 			else if (newRecord.lessThan(current))
 			{
-			    if (tsLogger.arjLoggerI18N.debugAllowed())
+			    if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			    {
 				tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
 							     FacilityCode.FAC_ABSTRACT_REC, "com.arjuna.ats.arjuna.coordinator.RecordList_4",
@@ -426,7 +425,7 @@
 
 	if (current == null)
 	{
-	    if (tsLogger.arjLoggerI18N.debugAllowed())
+	    if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	    {
 		tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
 					     FacilityCode.FAC_ABSTRACT_REC,
@@ -437,7 +436,7 @@
 	}
 	else
 	{
-	    if (tsLogger.arjLoggerI18N.debugAllowed())
+	    if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	    {
 		tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PRIVATE,
 					     FacilityCode.FAC_ABSTRACT_REC,

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/RecoverAtomicAction.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -67,7 +67,7 @@
     */
    public void replayPhase2()
    {
-       if (tsLogger.arjLoggerI18N.debugAllowed())
+       if (tsLogger.arjLoggerI18N.isDebugEnabled())
        {
 	   tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					FacilityCode.FAC_CRASH_RECOVERY, 
@@ -102,7 +102,7 @@
 	       }
 	   }
 
-	   if (tsLogger.arjLoggerI18N.debugAllowed())
+	   if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	   {
 	       tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					    FacilityCode.FAC_CRASH_RECOVERY, 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/recovery/TransactionStatusConnectionManager.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -228,7 +228,7 @@
 		    {
 			Uid newUid = new Uid (theUid) ;
 
-			if (tsLogger.arjLoggerI18N.debugAllowed())
+			if (tsLogger.arjLoggerI18N.isDebugEnabled())
 			{
 			    tsLogger.arjLoggerI18N.debug( DebugLevel.FUNCTIONS,
 							  VisibilityLevel.VIS_PUBLIC,
@@ -269,7 +269,7 @@
 		    _tscTable.put ( process_id, tsc ) ;
 		}
 
-		if (tsLogger.arjLoggerI18N.debugAllowed())
+		if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		{
 		    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 						 FacilityCode.FAC_CRASH_RECOVERY,

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/arjuna/utils/FileLock.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -122,7 +122,7 @@
     
 public boolean lock (int lmode, boolean create)
     {
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_GENERAL, "com.arjuna.ats.arjuna.utils.FileLock_1", 
@@ -217,7 +217,7 @@
 
 public boolean unlock ()
     {
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_GENERAL, "com.arjuna.ats.arjuna.utils.FileLock_2", 
@@ -301,7 +301,7 @@
 
 private final boolean createFile ()
     {
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_GENERAL, "com.arjuna.ats.arjuna.utils.FileLock_3", 
@@ -335,7 +335,7 @@
     
 private final boolean lockFile ()
     {
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_GENERAL, "com.arjuna.ats.arjuna.utils.FileLock_5", 
@@ -370,7 +370,7 @@
 
 private final boolean unlockFile ()
     {
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_GENERAL, "com.arjuna.ats.arjuna.utils.FileLock_6", 

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ActionStore.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -86,7 +86,7 @@
 	    path = null;
 	}
 
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_OBJECT_STORE,

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/objectstore/ShadowingStore.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -146,7 +146,7 @@
 		}
 	    }
 	}
-	if (tsLogger.arjLoggerI18N.debugAllowed())
+	if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	{
 	    tsLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					 FacilityCode.FAC_OBJECT_STORE,

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/ExpiredEntryMonitor.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -93,7 +93,7 @@
       {
 	  // no scanning wanted
 	      
-	  if (tsLogger.arjLoggerI18N.debugAllowed())
+	  if (tsLogger.arjLoggerI18N.isDebugEnabled())
 	  {
 	      tsLogger.arjLoggerI18N.debug( DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					    FacilityCode.FAC_CRASH_RECOVERY, 
@@ -249,7 +249,7 @@
 
         _scanIntervalSeconds = recoveryPropertyManager.getRecoveryEnvironmentBean().getExpiryScanInterval() * 60 * 60;
 
-        if (tsLogger.arjLoggerI18N.debugAllowed())
+        if (tsLogger.arjLoggerI18N.isDebugEnabled())
         {
             tsLogger.arjLoggerI18N.debug( DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
                     FacilityCode.FAC_CRASH_RECOVERY,

Modified: labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java
===================================================================
--- labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaCore/arjuna/classes/com/arjuna/ats/internal/arjuna/recovery/Listener.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -168,7 +168,7 @@
          }
          catch ( final IOException ex )
          {
-	     if (tsLogger.arjLoggerI18N.debugAllowed())
+	     if (tsLogger.arjLoggerI18N.isDebugEnabled())
 		 tsLogger.arjLoggerI18N.debug("com.arjuna.ats.internal.arjuna.recovery.Listener_2"+" "+ex);
          }
          catch (final Exception ex)

Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -75,6 +75,7 @@
      * @message com.arjuna.orbportability.internal.utils.InitLoader.initfailed {0} - attempt to initialise {1} with null class name!
      * @message com.arjuna.orbportability.internal.utils.InitLoader.couldnotfindclass {0} - could not find class {1}
      * @message com.arjuna.orbportability.internal.utils.InitLoader.loading Loading {0} class - {1}
+     * @message com.arjuna.orbportability.internal.utils.InitLoader.exception Exception {0} whilst loading {1}
      */
 private void createInstance (String attrName, String className)
     {
@@ -115,14 +116,14 @@
 		{
                     if ( opLogger.loggerI18N.isWarnEnabled() )
                     {
-                        opLogger.logger.warn( initName + " " +e1 );
+                        opLogger.loggerI18N.warn("com.arjuna.orbportability.internal.utils.InitLoader.exception", new Object[] {e1.toString(), initName}, e1);
                     }
 		}
 		catch (InstantiationException e2)
 		{
                     if ( opLogger.loggerI18N.isWarnEnabled() )
                     {
-                        opLogger.logger.warn( initName + " " +e2 );
+                        opLogger.loggerI18N.warn("com.arjuna.orbportability.internal.utils.InitLoader.exception", new Object[] {e2.toString(), initName}, e2);
                     }
 		}
 

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverACCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverACCoordinator.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverACCoordinator.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -38,7 +38,7 @@
    {
        final int status = status();
 
-       if (XTSLogger.arjLoggerI18N.debugAllowed())
+       if (XTSLogger.arjLoggerI18N.isDebugEnabled())
        {
 	   XTSLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					FacilityCode.FAC_CRASH_RECOVERY,
@@ -80,7 +80,7 @@
            super.phase2Abort( _reportHeuristics ) ;
        }
 
-       if (XTSLogger.arjLoggerI18N.debugAllowed())
+       if (XTSLogger.arjLoggerI18N.isDebugEnabled())
 	   {
 	       XTSLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					    FacilityCode.FAC_CRASH_RECOVERY,

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverSubordinateCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverSubordinateCoordinator.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/at/RecoverSubordinateCoordinator.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -68,7 +68,7 @@
    {
        final int status = status();
 
-       if (XTSLogger.arjLoggerI18N.debugAllowed())
+       if (XTSLogger.arjLoggerI18N.isDebugEnabled())
        {
 	   XTSLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					FacilityCode.FAC_CRASH_RECOVERY,
@@ -103,7 +103,7 @@
            SubordinateCoordinator.removeRecoveredCoordinator(this);
        }
 
-       if (XTSLogger.arjLoggerI18N.debugAllowed())
+       if (XTSLogger.arjLoggerI18N.isDebugEnabled())
 	   {
 	       XTSLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					    FacilityCode.FAC_CRASH_RECOVERY,

Modified: labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverACCoordinator.java
===================================================================
--- labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverACCoordinator.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/XTS/recovery/src/org/jboss/jbossts/xts/recovery/coordinator/ba/RecoverACCoordinator.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -12,8 +12,6 @@
 import com.arjuna.mwlabs.wscf.model.sagas.arjunacore.ParticipantRecord;
 import com.arjuna.common.util.logging.DebugLevel;
 import com.arjuna.common.util.logging.VisibilityLevel;
-import com.arjuna.mw.wsas.exceptions.SystemException;
-import com.arjuna.mw.wscf.logging.wscfLogger;
 
 /**
  * This class is a plug-in module for the recovery manager.
@@ -70,7 +68,7 @@
    {
        final int status = status();
 
-       if (XTSLogger.arjLoggerI18N.debugAllowed())
+       if (XTSLogger.arjLoggerI18N.isDebugEnabled())
        {
 	   XTSLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					FacilityCode.FAC_CRASH_RECOVERY,
@@ -109,7 +107,7 @@
            super.phase2Abort( _reportHeuristics ) ;
        }
 
-       if (XTSLogger.arjLoggerI18N.debugAllowed())
+       if (XTSLogger.arjLoggerI18N.isDebugEnabled())
 	   {
 	       XTSLogger.arjLoggerI18N.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
 					    FacilityCode.FAC_CRASH_RECOVERY,

Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/LogNoi18nImpl.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -93,13 +93,8 @@
    /**
     * Determine if this logger is enabled for DEBUG messages.
     *
-    * This method returns true when the following is set:
-    * <ul>
-    * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
-    * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
-    * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
-    * </ul>
-    * and the debug level is enabled in the underlying logger.
+    * This method returns true when the logger's DebugLevel, VisibilityLevel and FacililityCode are all
+    * non zero and the underlying logger is configured with DEBUG level on.
     *
     * @return  True if the logger is enabled for DEBUG, false otherwise
     */

Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/Logi18nImpl.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/Logi18nImpl.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/internal/util/logging/Logi18nImpl.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -141,11 +141,15 @@
 
    /**
     * Determine if this logger is enabled for DEBUG messages.
+    *
+    * This method returns true when the logger's DebugLevel, VisibilityLevel and FacililityCode are all
+    * non zero and the underlying logger is configured with DEBUG level on.
+    *
     * @return  True if the logger is enabled for DEBUG, false otherwise
     */
    public boolean isDebugEnabled()
    {
-      return m_logInterface.isDebugEnabled();
+      return debugAllowed(DebugLevel.FULL_DEBUGGING, VisibilityLevel.VIS_ALL, FacilityCode.FAC_ALL);
    }
 
    /**
@@ -207,24 +211,6 @@
    }
 
    /**
-    * Is it allowed to print finer debugging statements?
-    *
-    * This method returns true when the following is set:
-    * <ul>
-    * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
-    * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
-    * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
-    * </ul>
-    *
-    * @return true if the Logger allows full logging
-    */
-   public boolean debugAllowed()
-   {
-      return debugAllowed(DebugLevel.FULL_DEBUGGING, VisibilityLevel.VIS_ALL,
-                          FacilityCode.FAC_ALL);
-   }
-
-   /**
     * Is it allowed to print finer debugging statements with a given debug level,
     * visibility level and facility code level?
     *
@@ -237,11 +223,11 @@
     * @param vLevel The debug visibilty level to check for.
     * @param fLevel The facility code level to check for.
     */
-   public boolean debugAllowed(long dLevel, long vLevel, long fLevel)
+   private boolean debugAllowed(long dLevel, long vLevel, long fLevel)
    {
-      return (((dLevel & m_debugLevel) != 0) &&
-            ((vLevel & m_visLevel) != 0) &&
-            ((fLevel & m_facLevel) != 0));
+       // check the underlying logger threshold as well as (but after, due to cost) our own filters
+       return (((dLevel & m_debugLevel) != 0) && ((vLevel & m_visLevel) != 0) &&
+              ((fLevel & m_facLevel) != 0) && m_logInterface.isDebugEnabled());
    }
 
    /**********************************************************************************************************

Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/LogNoi18n.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -77,11 +77,8 @@
    /**
     * Determine if this logger is enabled for DEBUG messages.
     *
-    * This method returns true when the following is set:
-    * <ul>
-    * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
-    * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
-    * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
+    * This method returns true when the logger's DebugLevel, VisibilityLevel and FacililityCode are all
+    * non zero and the underlying logger is configured with DEBUG level on.
     *
     * @return  True if the logger is enabled for DEBUG, false otherwise
     */

Modified: labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/Logi18n.java
===================================================================
--- labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/Logi18n.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/common/classes/com/arjuna/common/util/logging/Logi18n.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -78,6 +78,10 @@
 
    /**
     * Determine if this logger is enabled for DEBUG messages.
+    *
+    * This method returns true when the logger's DebugLevel, VisibilityLevel and FacililityCode are all
+    * non zero and the underlying logger is configured with DEBUG level on.
+    *
     * @return  True if the logger is enabled for DEBUG, false otherwise
     */
    boolean isDebugEnabled();
@@ -264,41 +268,6 @@
    void fatal(String key, Object[] params, Throwable throwable);
 
 
-
-   /**************************** Debug Granularity Extension ***************************/
-
-   /**
-    * Is it allowed to print finer debugging statements?
-    *
-    * This method returns true when the following is set:
-    * <ul>
-    * <li>finer debug level = <code>DebugLevel.FULL_DEBUGGING</code>.</li>
-    * <li>visibility level = <code>VisibilityLevel.VIS_ALL</code>.</li>
-    * <li>facility code = <code>FacilityCode.FAC_ALL</code>.</li>
-    * </ul>
-    *
-    * @return true if the Logger allows full logging
-    * @deprecated replace with isDebugEnabled
-    */
-   boolean debugAllowed ();
-
-
-   /**
-    * Is it allowed to print finer debugging statements with a given debug level,
-    * visibility level and facility code level?
-    *
-    * @return true if the Logger allows logging for the finer debugging value <code>dLevel</code>,
-    *    visibility level <code>vLevel</code> and facility code level <code>fLevel</code>.
-    *    i.e., dLevel is equal or greater than the finer debug level assigned to the Logger
-    *    and vLevel is equal or greater than the visiblity level
-    *    and fLevel is equal or greater then the facility code level.
-    * @param dLevel The debug finer level to check for.
-    * @param vLevel The debug visibilty level to check for.
-    * @param fLevel The facility code level to check for.
-    * @deprecated replace with isDebugEnabled
-    */
-   boolean debugAllowed (long dLevel, long vLevel, long fLevel);
-
    /**********************************************************************************************************
     * Finer-Granularity Debug Methods.
     **********************************************************************************************************/

Modified: labs/jbosstm/trunk/common/tests/com/hp/mwtests/commonlogging/testlevels/TestLevels.java
===================================================================
--- labs/jbosstm/trunk/common/tests/com/hp/mwtests/commonlogging/testlevels/TestLevels.java	2009-11-02 10:24:16 UTC (rev 29886)
+++ labs/jbosstm/trunk/common/tests/com/hp/mwtests/commonlogging/testlevels/TestLevels.java	2009-11-02 10:31:14 UTC (rev 29887)
@@ -74,6 +74,7 @@
 		// test the releveling for AS integration:
 		// TODO: how to configure this on a per-test (not per-JVM) basis?
         commonPropertyManager.getLoggingEnvironmentBean().setLoggingFactory("com.arjuna.common.internal.util.logging.jakarta.JakartaRelevelingLogFactory;com.arjuna.common.internal.util.logging.jakarta.Log4JLogger");
+        commonPropertyManager.getLoggingEnvironmentBean().setDebugLevel("0xffffffff");
 
 		System.setOut(bufferedStream);
 		writeLogMessages();



More information about the jboss-svn-commits mailing list