[jboss-svn-commits] JBL Code SVN: r35216 - in labs/jbosstm/trunk/ArjunaJTS: jts/classes/com/arjuna/ats/internal/jts/recovery and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Sep 21 11:59:25 EDT 2010
Author: jhalliday
Date: 2010-09-21 11:59:24 -0400 (Tue, 21 Sep 2010)
New Revision: 35216
Removed:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryORBManager.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/InternalORB.java
Modified:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java
Log:
Streamline ORB/OA config. JBTM-784
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -33,7 +33,6 @@
package com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators;
import com.arjuna.ats.arjuna.common.*;
-import com.arjuna.ats.arjuna.objectstore.ParticipantStore;
import com.arjuna.ats.arjuna.objectstore.StoreManager;
import com.arjuna.ats.arjuna.objectstore.TxLog;
import com.arjuna.ats.internal.jts.recovery.recoverycoordinators.*;
@@ -44,20 +43,16 @@
import com.arjuna.ats.jts.common.jtsPropertyManager;
-import com.arjuna.ats.internal.jts.recovery.RecoveryORBManager;
import com.arjuna.orbportability.*;
-import java.io.InputStream;
-
import org.omg.CORBA.*;
+import org.omg.CORBA.ORBPackage.InvalidName;
import org.omg.PortableServer.*;
import org.omg.CosTransactions.*;
-import com.arjuna.ats.arjuna.coordinator.TxControl;
import com.arjuna.ats.arjuna.state.*;
-import java.io.IOException;
import java.util.Properties;
/**
@@ -82,110 +77,21 @@
* but the policies are usable by the JacOrbRCManager to create the IOR's in
* TS-using processes.
*/
-
- static POA getRCPOA (String domainName)
+ private static POA getRCPOA ()
{
String rcServiceName = GenericRecoveryCreator.getRecCoordServiceName();
-
+
if (jtsLogger.logger.isDebugEnabled()) {
jtsLogger.logger.debug("JacOrbRCServiceInit.getRCPOA " + rcServiceName);
}
if (_poa == null)
{
+ String domainName = "recovery_coordinator";
String poaName = POA_NAME_PREFIX + rcServiceName+domainName;
- boolean oaInit = true;
- String oaPort = "OAPort";
- String oaAddr = "OAIAddr";
- String oldPort = System.getProperty(oaPort, "");
- String oldAddr = System.getProperty(oaAddr, "");
- /** If the ORB Manager hasn't been initialised then create our own ORB **/
-
- if ( !RecoveryORBManager.isInitialised() )
- {
- _orb = com.arjuna.orbportability.internal.InternalORB.getInstance("RecoveryServer");
- String[] params = null;
- String recoveryManagerPort = ""+jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerPort();
- String recoveryManagerAddr = jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerAddress();
-
- if (recoveryManagerAddr == null)
- recoveryManagerAddr = "";
-
- jtsLogger.i18NLogger.info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(recoveryManagerPort, recoveryManagerAddr);
-
- final Properties p = new Properties();
- // Try to preload jacorb.properties
- final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader() ;
- if (contextClassLoader != null)
- {
- final InputStream is = contextClassLoader.getResourceAsStream("jacorb.properties") ;
- if (is != null)
- {
- try
- {
- p.load(is) ;
- }
- catch (final IOException ioe)
- {
- p.clear() ;
- }
- }
- }
- p.setProperty(oaPort, recoveryManagerPort);
-
- if (recoveryManagerAddr.length() != 0)
- {
- p.setProperty(oaAddr, recoveryManagerAddr);
- System.setProperty(oaAddr, oldAddr);
- }
-
- _orb.initORB(params, p);
- _oa = OA.getRootOA(_orb);
-
- if (oldPort == null)
- oldPort = "";
-
- System.setProperty(oaPort, oldPort); // Remove property that JacORB added so future ORB's work.
-
- RecoveryORBManager.setORB(_orb);
- RecoveryORBManager.setPOA(_oa);
- }
- else
- {
- /** Otherwise use the ORB already registered with the ORB Manager **/
- _orb = RecoveryORBManager.getORB();
- _oa = (RootOA) RecoveryORBManager.getPOA();
-
- oaInit = false;
-
- jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(oldPort);
- }
-
try
{
- /*
- * Only initialise the object adapter if we created it.
- * Otherwise we assume the ORB and the POA have been
- * initialised already.
- */
-
- if (oaInit)
- _oa.initOA();
-
- if (domainName.equals("recovery_coordinator") && !ORBManager.isInitialised())
- {
- try
- {
- ORBManager.setORB(_orb);
- ORBManager.setPOA(_oa);
- }
- catch (Exception ex) {
- jtsLogger.i18NLogger.warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(ex);
- }
- }
-
- org.omg.CORBA.ORB theORB = _orb.orb();
org.omg.PortableServer.POA rootPOA = _oa.rootPoa();
if (rootPOA == null) {
@@ -193,19 +99,19 @@
return null;
}
-
+
// create direct persistent POA
// make the policy lists, with standard policies
org.omg.CORBA.Policy[] policies = null;
policies = new Policy []
- {
- rootPOA.create_lifespan_policy(LifespanPolicyValue.PERSISTENT),
- rootPOA.create_servant_retention_policy(ServantRetentionPolicyValue.NON_RETAIN),
- rootPOA.create_id_assignment_policy(IdAssignmentPolicyValue.USER_ID),
- rootPOA.create_id_uniqueness_policy(IdUniquenessPolicyValue.MULTIPLE_ID),
- rootPOA.create_request_processing_policy(RequestProcessingPolicyValue.USE_DEFAULT_SERVANT)
- };
+ {
+ rootPOA.create_lifespan_policy(LifespanPolicyValue.PERSISTENT),
+ rootPOA.create_servant_retention_policy(ServantRetentionPolicyValue.NON_RETAIN),
+ rootPOA.create_id_assignment_policy(IdAssignmentPolicyValue.USER_ID),
+ rootPOA.create_id_uniqueness_policy(IdUniquenessPolicyValue.MULTIPLE_ID),
+ rootPOA.create_request_processing_policy(RequestProcessingPolicyValue.USE_DEFAULT_SERVANT)
+ };
_poa = rootPOA.create_POA(poaName, rootPOA.the_POAManager(), policies);
}
@@ -217,21 +123,63 @@
return _poa;
}
+ private static void initORBandOA() throws InvalidName
+ {
+ if ( !ORBManager.isInitialised() )
+ {
+ // If the ORB Manager hasn't been initialised then create our own ORB
+
+ _orb = com.arjuna.orbportability.ORB.getInstance("RecoveryServer");
+
+ String recoveryManagerPort = ""+ jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerPort();
+ String recoveryManagerAddr = jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerAddress();
+
+ jtsLogger.i18NLogger.info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(recoveryManagerPort, recoveryManagerAddr);
+
+ final Properties p = new Properties();
+ p.setProperty("OAPort", recoveryManagerPort);
+
+ if (recoveryManagerAddr != null && recoveryManagerAddr.length() > 0)
+ {
+ p.setProperty("OAIAddr", recoveryManagerAddr);
+ }
+
+ _orb.initORB((String[])null, p);
+ _oa = OA.getRootOA(_orb);
+ _oa.initOA();
+
+ ORBManager.setORB(_orb);
+ ORBManager.setPOA(_oa);
+ }
+ else
+ {
+ // Otherwise use the ORB already registered with the ORB Manager
+
+ _orb = ORBManager.getORB();
+ _oa = (RootOA) ORBManager.getPOA();
+
+ jtsLogger.i18NLogger.info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a();
+ }
+ }
+
/**
* This starts the service in the RecoveryManager.
*/
public boolean startRCservice ()
{
- POA ourPOA = getRCPOA("recovery_coordinator");
-
- if (ourPOA == null) // shortcut
- return false;
-
- Implementations.initialise();
-
try
{
+ initORBandOA();
+
+ POA ourPOA = getRCPOA();
+
+ if (ourPOA == null) // shortcut
+ return false;
+
+ Implementations.initialise();
+
+
// get the orb, so we can pass it to the default servant
// make the default servant
@@ -297,12 +245,6 @@
protected static com.arjuna.orbportability.ORB _orb = null;
protected static com.arjuna.orbportability.RootOA _oa = null;
- protected static String RecoveryIdStore = "RecoveryCoordinatorIdStore";
- protected static String RecoveryCoordStore = "RecoveryCoordinator";
-
- private static final String orbNamePrefix = "ots_";
- private static final String orbName = "arjuna.portable_interceptor.";
-
static protected String uid4Recovery = "0:ffff52e38d0c:c91:4140398c:0";
}
\ No newline at end of file
Deleted: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryORBManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryORBManager.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/recovery/RecoveryORBManager.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * 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 Lesser General Public License, v. 2.1.
- * 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 Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 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: RecoveryORBManager.java 2342 2006-03-30 13:06:17Z $
- */
-
-package com.arjuna.ats.internal.jts.recovery;
-
-import com.arjuna.ats.internal.jts.ORBManager;
-import com.arjuna.orbportability.*;
-
-/**
- * Manage the recovery POA.
- */
-
-public class RecoveryORBManager
-{
-
- public static final com.arjuna.orbportability.ORB getORB ()
- {
- return ORBManager.getORB();
- }
-
- public static final boolean setORB (com.arjuna.orbportability.ORB theOrb)
- {
- return ORBManager.setORB(theOrb);
- }
-
- public static final com.arjuna.orbportability.OA getPOA ()
- {
- if (_thePoa == null)
- _thePoa = RootOA.getRootOA(ORBManager.getORB());
-
- return _thePoa;
- }
-
- public static final boolean setPOA (com.arjuna.orbportability.OA thePoa)
- {
- if (_thePoa == null)
- {
- _thePoa = thePoa;
-
- return true;
- }
-
- return false;
- }
-
- public static final com.arjuna.orbportability.Services getServices ()
- {
- return ORBManager.getServices();
- }
-
- public static final boolean isInitialised ()
- {
- return (ORBManager.isInitialised() || _thePoa != null);
- }
-
- private static com.arjuna.orbportability.OA _thePoa = null;
-}
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLogger.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -372,13 +372,13 @@
@LogMessage(level = INFO)
public void info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6(String arg0, String arg1);
- @Message(id = 22087, value = "Sharing RecoveryServer ORB on port {0}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(String arg0);
+ @Message(id = 22087, value = "RecoveryServer using existing ORB", format = MESSAGE_FORMAT)
+ @LogMessage(level = INFO)
+ public void info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a();
- @Message(id = 22088, value = "Failed to create orb and poa for transactional objects", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(@Cause() Throwable arg0);
+// @Message(id = 22088, value = "Failed to create orb and poa for transactional objects", format = MESSAGE_FORMAT)
+// @LogMessage(level = WARN)
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(@Cause() Throwable arg0);
@Message(id = 22089, value = "RootPOA is null. Initialization failed. Check no conflicting or duplicate service is running.", format = MESSAGE_FORMAT)
@LogMessage(level = WARN)
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/logging/jtsI18NLoggerImpl.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -337,13 +337,13 @@
logger.logv(INFO, "ARJUNA-22086 Starting RecoveryServer ORB on port {0} and address {1}", arg0, arg1);
}
- public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a(String arg0) {
- logger.logv(WARN, "ARJUNA-22087 Sharing RecoveryServer ORB on port {0}", arg0);
+ public void info_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_6a() {
+ logger.logv(INFO, "ARJUNA-22087 RecoveryServer using existing ORB");
}
- public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(Throwable arg0) {
- logger.logv(WARN, arg0, "ARJUNA-22088 Failed to create orb and poa for transactional objects", (Object)null);
- }
+// public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_7(Throwable arg0) {
+// logger.logv(WARN, arg0, "ARJUNA-22088 Failed to create orb and poa for transactional objects", (Object)null);
+// }
public void warn_orbspecific_jacorb_recoverycoordinators_JacOrbRCServiceInit_8() {
logger.logv(WARN, "ARJUNA-22089 RootPOA is null. Initialization failed. Check no conflicting or duplicate service is running.", (Object)null);
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/jts/utils/ORBSetup.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -35,9 +35,7 @@
import com.arjuna.orbportability.ORB;
import com.arjuna.orbportability.OA;
import com.arjuna.orbportability.RootOA;
-import com.arjuna.orbportability.internal.InternalORB;
import com.arjuna.ats.jts.logging.jtsLogger;
-import com.arjuna.ats.arjuna.exceptions.FatalError;
import com.arjuna.ats.internal.jts.ORBManager;
@@ -57,7 +55,7 @@
*/
public void invoke(Object obj)
{
- if ( !ORBManager.isInitialised() )
+ if ( !ORBManager.isInitialised() )
{
if (jtsLogger.logger.isTraceEnabled()) {
jtsLogger.logger.trace("The ORBSetup.invoke method has been invoked");
@@ -71,19 +69,16 @@
{
ORB orb = (ORB)obj;
- if ( !( orb instanceof InternalORB ) )
- {
- if (jtsLogger.logger.isTraceEnabled()) {
- jtsLogger.logger.trace("The JTS ORB has been set to " + orb);
- }
-
- /**
- * Set the orb manager and then set the POA to be the root POA for
- * that ORB. If another POA is then initialised this will be overridden.
- */
- ORBManager.setORB(orb);
- ORBManager.setPOA(RootOA.getRootOA(orb));
+ if (jtsLogger.logger.isTraceEnabled()) {
+ jtsLogger.logger.trace("The JTS ORB has been set to " + orb);
}
+
+ /**
+ * Set the orb manager and then set the POA to be the root POA for
+ * that ORB. If another POA is then initialised this will be overridden.
+ */
+ ORBManager.setORB(orb);
+ ORBManager.setPOA(RootOA.getRootOA(orb));
}
/**
@@ -94,13 +89,10 @@
{
OA oa = (OA)obj;
- if ( ( oa != null ) && ( !( oa.getAssociatedORB() instanceof InternalORB ) ) )
- {
- if (jtsLogger.logger.isTraceEnabled()) {
- jtsLogger.logger.trace("The JTS OA has been set " + oa);
- }
- ORBManager.setPOA(oa);
+ if (jtsLogger.logger.isTraceEnabled()) {
+ jtsLogger.logger.trace("The JTS OA has been set " + oa);
}
+ ORBManager.setPOA(oa);
}
}
else
Deleted: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/InternalORB.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/InternalORB.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/InternalORB.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -1,64 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags.
- * 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 Lesser General Public License, v. 2.1.
- * 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 Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 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.
- */
-package com.arjuna.orbportability.internal;
-
-import com.arjuna.orbportability.ORB;
-
-import java.util.Hashtable;
-
-/*
- * Copyright (C) 2001, 2002, 2003
- *
- * Arjuna Technologies Ltd.
- * Newcastle upon Tyne,
- * Tyne and Wear,
- * UK.
- *
- * $Id: InternalORB.java 2342 2006-03-30 13:06:17Z $
- */
-
-public class InternalORB extends ORB
-{
- protected InternalORB(String orbName)
- {
- super(orbName);
- }
-
- public static ORB getInstance(String uniqueId)
- {
- /**
- * Try and find this ORB in the hashmap first if
- * its not there then create one and add it
- */
- ORB orb = (ORB)_orbMap.get(uniqueId);
-
- if (orb == null)
- {
- orb = new InternalORB(uniqueId);
-
- _orbMap.put(uniqueId, orb);
- }
-
- return(orb);
- }
-
- private static Hashtable _orbMap = new Hashtable();
-}
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 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/utils/InitLoader.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -35,8 +35,6 @@
import com.arjuna.orbportability.logging.opLogger;
import com.arjuna.orbportability.utils.InitClassInterface;
-import java.util.Properties;
-import java.util.Enumeration;
import java.util.Map;
import java.lang.ClassNotFoundException;
@@ -83,7 +81,7 @@
{
try
{
- opLogger.i18NLogger.warn_internal_utils_InitLoader_loading(initName, className);
+ opLogger.i18NLogger.info_internal_utils_InitLoader_loading(initName, className);
Class c = Thread.currentThread().getContextClassLoader().loadClass(className);
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLogger.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -144,8 +144,8 @@
public void warn_internal_utils_InitLoader_initfailed(String arg0, String arg1);
@Message(id = 21027, value = "Loading {0} class - {1}", format = MESSAGE_FORMAT)
- @LogMessage(level = WARN)
- public void warn_internal_utils_InitLoader_loading(String arg0, String arg1);
+ @LogMessage(level = INFO)
+ public void info_internal_utils_InitLoader_loading(String arg0, String arg1);
// @Message(id = 21028, value = "OA ORB specific class creation failed with: {0}", format = MESSAGE_FORMAT)
// @LogMessage(level = WARN)
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java 2010-09-21 15:44:00 UTC (rev 35215)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/logging/orbportabilityI18NLoggerImpl.java 2010-09-21 15:59:24 UTC (rev 35216)
@@ -117,7 +117,7 @@
logger.logv(WARN, "ARJUNA-21026 {0} - attempt to initialise {1} with null class name!", arg0, arg1);
}
- public void warn_internal_utils_InitLoader_loading(String arg0, String arg1) {
- logger.logv(WARN, "ARJUNA-21027 Loading {0} class - {1}", arg0, arg1);
+ public void info_internal_utils_InitLoader_loading(String arg0, String arg1) {
+ logger.logv(INFO, "ARJUNA-21027 Loading {0} class - {1}", arg0, arg1);
}
}
More information about the jboss-svn-commits
mailing list