[jboss-svn-commits] JBL Code SVN: r30136 - in labs/jbosstm/trunk/ArjunaJTS: jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators and 5 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Nov 12 17:29:09 EST 2009
Author: mark.little at jboss.com
Date: 2009-11-12 17:29:04 -0500 (Thu, 12 Nov 2009)
New Revision: 30136
Modified:
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java
labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/orb/implementations/jacorb_2_0.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/oa/implementations/POABase.java
labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
Log:
https://jira.jboss.org/jira/browse/JBTM-650
Modified: labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/ORBManager.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -33,11 +33,8 @@
import com.arjuna.orbportability.*;
-import com.arjuna.ats.jts.common.jtsPropertyManager;
import com.arjuna.ats.jts.logging.*;
-import com.arjuna.ats.internal.jts.recovery.RecoveryORBManager;
-
/**
* Manage the default ORB and POA used by the transaction service for
* the non-recoverable CORBA objects it creates.
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 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/jts/classes/com/arjuna/ats/internal/jts/orbspecific/jacorb/recoverycoordinators/JacOrbRCServiceInit.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -75,6 +75,7 @@
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6] - Starting RecoveryServer ORB on port {0} and address {1}
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6a [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6a] - Sharing RecoveryServer ORB on port {0}
* @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_7 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_7] - Failed to create orb and poa for transactional objects {1}
+ * @message com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_8 [com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_8] - RootPOA is null. Initialization failed. Check no conflicting or duplicate service is running.
*/
public class JacOrbRCServiceInit implements RecoveryServiceInit
@@ -118,52 +119,52 @@
_orb = com.arjuna.orbportability.internal.InternalORB.getInstance("RecoveryServer");
String[] params = null;
String recoveryManagerPort = ""+jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerPort();
- String recoveryManagerAddr = jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerAddress();
+ String recoveryManagerAddr = jtsPropertyManager.getJTSEnvironmentBean().getRecoveryManagerAddress();
- if (recoveryManagerAddr == null)
- recoveryManagerAddr = "";
+ if (recoveryManagerAddr == null)
+ recoveryManagerAddr = "";
- if (jtsLogger.loggerI18N.isInfoEnabled())
+ if (jtsLogger.loggerI18N.isInfoEnabled())
{
jtsLogger.loggerI18N.info("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_6",
- new java.lang.Object[]{recoveryManagerPort, recoveryManagerAddr});
+ new java.lang.Object[]{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
+ // Try to preload jacorb.properties
+ final ClassLoader contextClassLoader = Thread.currentThread().getContextClassLoader() ;
+ if (contextClassLoader != null)
{
- p.load(is) ;
+ final InputStream is = contextClassLoader.getResourceAsStream("jacorb.properties") ;
+ if (is != null)
+ {
+ try
+ {
+ p.load(is) ;
+ }
+ catch (final IOException ioe)
+ {
+ p.clear() ;
+ }
+ }
}
- catch (final IOException ioe)
+ p.setProperty(oaPort, recoveryManagerPort);
+
+ if (recoveryManagerAddr.length() != 0)
{
- p.clear() ;
+ p.setProperty(oaAddr, recoveryManagerAddr);
+ System.setProperty(oaAddr, oldAddr);
}
- }
- }
- p.setProperty(oaPort, recoveryManagerPort);
- if (recoveryManagerAddr.length() != 0)
- {
- p.setProperty(oaAddr, recoveryManagerAddr);
- System.setProperty(oaAddr, oldAddr);
- }
-
- _orb.initORB(params, p);
+ _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.
+ System.setProperty(oaPort, oldPort); // Remove property that JacORB added so future ORB's work.
- RecoveryORBManager.setORB(_orb);
+ RecoveryORBManager.setORB(_orb);
RecoveryORBManager.setPOA(_oa);
}
else
@@ -171,7 +172,7 @@
/** Otherwise use the ORB already registered with the ORB Manager **/
_orb = RecoveryORBManager.getORB();
_oa = (RootOA) RecoveryORBManager.getPOA();
-
+
oaInit = false;
if (jtsLogger.loggerI18N.isInfoEnabled())
@@ -207,6 +208,13 @@
org.omg.CORBA.ORB theORB = _orb.orb();
org.omg.PortableServer.POA rootPOA = _oa.rootPoa();
+ if (rootPOA == null)
+ {
+ jtsLogger.loggerI18N.warn("com.arjuna.ats.internal.jts.orbspecific.jacorb.recoverycoordinators.JacOrbRCServiceInit_8");
+
+ return null;
+ }
+
// create direct persistent POA
// make the policy lists, with standard policies
org.omg.CORBA.Policy[] policies = null;
@@ -254,7 +262,7 @@
org.omg.CORBA.Object obj = ourPOA.create_reference_with_id("RecoveryManager".getBytes(),
RecoveryCoordinatorHelper.id());
- // Write the object refenece in the file
+ // Write the object reference in the file
String reference = _orb.orb().object_to_string(obj);
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/OA.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -54,13 +54,12 @@
import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
/**
- * An attempt at some ORB portable ways of interacting with the OA.
- *
- * NOTE: initPOA *must* be called if you want to use the
- * pre- and post- initialisation mechanisms.
- *
+ * An attempt at some ORB portable ways of interacting with the OA. NOTE:
+ * initPOA *must* be called if you want to use the pre- and post- initialisation
+ * mechanisms.
+ *
* @author Mark Little (mark at arjuna.com)
- * @version $Id: OA.java 2342 2006-03-30 13:06:17Z $
+ * @version $Id: OA.java 2342 2006-03-30 13:06:17Z $
* @since JTS 2.1.
*/
@@ -68,10 +67,10 @@
{
/**
- * Ensure that all OA specific initialisation is done even if the
- * programmer uses the OA specific init routines. This method does
- * not need to be called if using initOA methods.
- *
+ * Ensure that all OA specific initialisation is done even if the programmer
+ * uses the OA specific init routines. This method does not need to be
+ * called if using initOA methods.
+ *
* @since JTS 2.1.1.
*/
@@ -82,165 +81,197 @@
public synchronized void initPOA () throws InvalidName, SystemException
{
- initPOA(null);
+ initPOA(null);
}
- public ORB getAssociatedORB()
+ public ORB getAssociatedORB ()
{
return _associatedORB;
}
- public void setPOA(org.omg.PortableServer.POA p) throws SystemException
- {
- if ( !_oa.initialised() )
- {
- _oa.rootPoa(p);
+ public void setPOA (org.omg.PortableServer.POA p) throws SystemException
+ {
+ if (!_oa.initialised())
+ {
+ _oa.rootPoa(p);
performPostSet(this._oaName);
- }
- }
+ }
+ }
-
/**
* Loads and runs the configured pre-initialisation classes
*/
- protected void performPreInit(String oaName)
+ protected void performPreInit (String oaName)
{
/**
* Perform pre-initialisation classes for all OAs
*/
- PreInitLoader preInit = new PreInitLoader(PreInitLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS), this);
+ PreInitLoader preInit = new PreInitLoader(PreInitLoader
+ .generateOAPropertyName(ORB.ORB_INITIALISER_NS), this);
/**
* Perform pre-initialisation classes for all OAs
*/
- preInit = new PreInitLoader(PreInitLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS,_associatedORB.getName()), this);
+ preInit = new PreInitLoader(PreInitLoader.generateOAPropertyName(
+ ORB.ORB_INITIALISER_NS, _associatedORB.getName()), this);
/**
* Perform pre-initialisation classes for this OA only
*/
- preInit = new PreInitLoader(PreInitLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS,_associatedORB.getName(),oaName), this);
+ preInit = new PreInitLoader(PreInitLoader.generateOAPropertyName(
+ ORB.ORB_INITIALISER_NS, _associatedORB.getName(), oaName), this);
preInit = null;
}
- protected void performPostSet(String oaName)
- {
- /**
- * Perform post-set operations for all OAs
- */
- new PostSetLoader(PostSetLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS), this);
+ protected void performPostSet (String oaName)
+ {
+ /**
+ * Perform post-set operations for all OAs
+ */
+ new PostSetLoader(PostSetLoader
+ .generateOAPropertyName(ORB.ORB_INITIALISER_NS), this);
- /**
- * Perform post-set operations for all OAs
- */
- new PostSetLoader(PostSetLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS,_associatedORB.getName()), this);
+ /**
+ * Perform post-set operations for all OAs
+ */
+ new PostSetLoader(PostSetLoader.generateOAPropertyName(
+ ORB.ORB_INITIALISER_NS, _associatedORB.getName()), this);
- /**
- * Perform post-set operations for this OA only
- */
- new PreInitLoader(PostSetLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS,_associatedORB.getName(),oaName), this);
- }
+ /**
+ * Perform post-set operations for this OA only
+ */
+ new PreInitLoader(PostSetLoader.generateOAPropertyName(
+ ORB.ORB_INITIALISER_NS, _associatedORB.getName(), oaName), this);
+ }
/**
* Loads and runs the configured post-initialisation classes
*/
- protected void performPostInit(String oaName)
+ protected void performPostInit (String oaName)
{
/**
* Perform post-initialisation classes for all OAs
*/
- PostInitLoader postInit = new PostInitLoader(PostInitLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS), this);
+ PostInitLoader postInit = new PostInitLoader(PostInitLoader
+ .generateOAPropertyName(ORB.ORB_INITIALISER_NS), this);
/**
* Perform post-initialisation classes for all OAs
*/
- postInit = new PostInitLoader(PostInitLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS,_associatedORB.getName()), this);
+ postInit = new PostInitLoader(PostInitLoader.generateOAPropertyName(
+ ORB.ORB_INITIALISER_NS, _associatedORB.getName()), this);
/**
* Perform post-initialisation classes for this OA only
*/
- postInit = new PostInitLoader(PostInitLoader.generateOAPropertyName(ORB.ORB_INITIALISER_NS, _associatedORB.getName(), oaName), this);
+ postInit = new PostInitLoader(PostInitLoader.generateOAPropertyName(
+ ORB.ORB_INITIALISER_NS, _associatedORB.getName(), oaName), this);
postInit = null;
}
/**
- * @message com.arjuna.orbportability.OA.caughtexception {0} caught: {1}
- * @message com.arjuna.orbportability.OA.uninitialsedorb OA.initPOA called without initialised ORB.
+ * @message com.arjuna.orbportability.OA.caughtexception {0} caught: {1} whilst initialising Object Adapter.
+ * @message com.arjuna.orbportability.OA.uninitialsedorb OA.initPOA called
+ * without initialised ORB.
+ * @message com.arjuna.orbportability.OA.initialize {0} caught org.omg.CORBA.INITIALIZE whilst initialising Object Adapter. Check another ORB/service is not active on same port.
*/
- public synchronized void initPOA (String[] args) throws InvalidName, SystemException
+ public synchronized void initPOA (String[] args) throws InvalidName,
+ SystemException
{
if (opLogger.logger.isDebugEnabled())
- {
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::initPOA (String[])");
- }
+ {
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA::initPOA (String[])");
+ }
- if (!_oa.initialised())
- {
- if (_associatedORB._orb.initialised())
- {
+ if (!_oa.initialised())
+ {
+ if (_associatedORB._orb.initialised())
+ {
performPreInit(_oaName);
parseProperties(args, true);
- try
- {
- _oa.init(); // create the root poa
- }
- catch (Exception e)
- {
+ try
+ {
+ _oa.init(); // create the root poa
+ }
+ catch (final org.omg.CORBA.INITIALIZE ex)
+ {
if (opLogger.loggerI18N.isWarnEnabled())
{
- opLogger.loggerI18N.warn("com.arjuna.orbportability.OA.caughtexception",new Object[] {"OA.initPOA", e.toString()});
+ opLogger.loggerI18N.warn(
+ "com.arjuna.orbportability.OA.initialize");
}
+
+ throw ex;
+ }
+ catch (final Exception e)
+ {
+ if (opLogger.loggerI18N.isWarnEnabled())
+ {
+ opLogger.loggerI18N.warn(
+ "com.arjuna.orbportability.OA.caughtexception",
+ new Object[]
+ { "OA.initPOA", e.toString() });
+ }
+
+ throw new FatalError("OA.initPOA: "+e.toString());
+ }
- throw new FatalError(e.toString());
- }
+ parseProperties(args, false);
- parseProperties(args, false);
-
performPostInit(_oaName);
- }
- else
- {
+ }
+ else
+ {
if (opLogger.loggerI18N.isFatalEnabled())
{
- opLogger.loggerI18N.fatal("com.arjuna.orbportability.OA.uninitialsedorb");
+ opLogger.loggerI18N
+ .fatal("com.arjuna.orbportability.OA.uninitialsedorb");
}
- throw new FatalError( opLogger.logMesg.getString("com.arjuna.orbportability.OA.uninitialsedorb") );
- }
- }
+ throw new FatalError(
+ opLogger.logMesg
+ .getString("com.arjuna.orbportability.OA.uninitialsedorb"));
+ }
+ }
}
/**
- * @message com.arjuna.orbportability.OA.oanotinitialised OA.createPOA - createPOA called without OA being initialised
+ * @message com.arjuna.orbportability.OA.oanotinitialised OA.createPOA -
+ * createPOA called without OA being initialised
*/
- public synchronized ChildOA createPOA (String adapterName,
- Policy[] policies) throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive
+ public synchronized ChildOA createPOA (String adapterName, Policy[] policies)
+ throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive
{
if (opLogger.logger.isDebugEnabled())
- {
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::createPOA ("+adapterName+" )");
- }
+ {
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA::createPOA ("
+ + adapterName + " )");
+ }
- if (!_oa.initialised())
- {
+ if (!_oa.initialised())
+ {
if (opLogger.loggerI18N.isWarnEnabled())
{
- opLogger.loggerI18N.warn("com.arjuna.orbportability.OA.oanotinitialised");
+ opLogger.loggerI18N
+ .warn("com.arjuna.orbportability.OA.oanotinitialised");
}
- throw new AdapterInactive();
- }
+ throw new AdapterInactive();
+ }
- if (_defaultAdapterName == null)
- _defaultAdapterName = adapterName;
+ if (_defaultAdapterName == null)
+ _defaultAdapterName = adapterName;
/**
* Perform OA pre-initialisation routines
@@ -251,89 +282,96 @@
* Create a child POA of this POA passing the policies passed in
*/
_oa.createPOA(adapterName, policies);
- ChildOA newChildOA = new ChildOA(_associatedORB,adapterName,_oa.poa(adapterName));
+ ChildOA newChildOA = new ChildOA(_associatedORB, adapterName, _oa
+ .poa(adapterName));
/**
* Perform OA post-initialisation routines
*/
performPostInit(adapterName);
- return(newChildOA);
+ return (newChildOA);
}
public void initOA () throws InvalidName, SystemException
{
- initOA(null);
+ initOA(null);
}
public void initOA (String[] args) throws InvalidName, SystemException
{
- initPOA(args);
+ initPOA(args);
}
public synchronized boolean addAttribute (Attribute p)
{
if (opLogger.logger.isDebugEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::addAttribute ("+p+")");
- }
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA::addAttribute (" + p
+ + ")");
+ }
- if ((_oa.initialised()) || (p == null)) // oa already set up!
- return false;
+ if ((_oa.initialised()) || (p == null)) // oa already set up!
+ return false;
- if (p.postOAInit())
- _postOAInitProperty.put(p, p);
- else
- _preOAInitProperty.put(p, p);
+ if (p.postOAInit())
+ _postOAInitProperty.put(p, p);
+ else
+ _preOAInitProperty.put(p, p);
- return true;
+ return true;
}
-public abstract void destroy() throws SystemException;
+ public abstract void destroy () throws SystemException;
-public synchronized POA rootPoa ()
+ public synchronized POA rootPoa ()
{
- return _oa.rootPoa();
+ return _oa.rootPoa();
}
public synchronized POA poa (String adapterName)
{
- return _oa.poa(adapterName);
+ return _oa.poa(adapterName);
}
public synchronized boolean setPoa (String adapterName, POA thePOA)
{
- if (adapterName != null)
- {
- _oa.poa(adapterName, thePOA);
+ if (adapterName != null)
+ {
+ _oa.poa(adapterName, thePOA);
- return true;
- }
- else
- return false;
+ return true;
+ }
+ else
+ return false;
}
public synchronized void addPreShutdown (PreShutdown c)
{
if (opLogger.logger.isDebugEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::addPreShutdown ("+c+")");
- }
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA::addPreShutdown ("
+ + c + ")");
+ }
- _preOAShutdown.put(c, c);
+ _preOAShutdown.put(c, c);
}
public synchronized void addPostShutdown (PostShutdown c)
{
if (opLogger.logger.isDebugEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::addPostShutdown ("+c+")");
- }
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA::addPostShutdown ("
+ + c + ")");
+ }
- _postOAShutdown.put(c, c);
+ _postOAShutdown.put(c, c);
}
/**
@@ -342,24 +380,26 @@
public abstract org.omg.CORBA.Object corbaReference (Servant obj);
- public org.omg.CORBA.Object corbaReference (Servant obj,
- POA poa)
+ public org.omg.CORBA.Object corbaReference (Servant obj, POA poa)
{
- try
- {
- return poa.servant_to_reference(obj);
- }
- catch (Exception e)
- {
- return null;
- }
+ try
+ {
+ return poa.servant_to_reference(obj);
+ }
+ catch (Exception e)
+ {
+ return null;
+ }
}
/**
* Register the object with the ORB.
- * @message com.arjuna.orbportability.OA.exceptioncaughtforobj {0}: exception caught for {1} : {2}
+ *
+ * @message com.arjuna.orbportability.OA.exceptioncaughtforobj {0}:
+ * exception caught for {1} : {2}
*/
- public abstract boolean objectIsReady (Servant obj, byte[] id) throws SystemException;
+ public abstract boolean objectIsReady (Servant obj, byte[] id)
+ throws SystemException;
/**
* @message com.arjuna.orbportability.OA.invalidpoa {0} - invalid POA: {1}
@@ -374,68 +414,74 @@
public abstract boolean shutdownObject (Servant obj);
/**
- * Place the server into a state where it can begin to
- * accept requests for objects from clients.
+ * Place the server into a state where it can begin to accept requests for
+ * objects from clients.
*/
public void run (String name) throws SystemException
{
if (opLogger.logger.isDebugEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::run ("+name+")");
- }
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA::run (" + name + ")");
+ }
- _oa.run(name);
+ _oa.run(name);
}
public void run () throws SystemException
{
if (opLogger.logger.isDebugEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::run ()");
- }
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "OA::run ()");
+ }
- _oa.run();
+ _oa.run();
}
private final void parseProperties (String[] params, boolean preInit)
{
if (opLogger.logger.isDebugEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA::parseProperties (String[], "+preInit+")");
- }
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY,
+ "OA::parseProperties (String[], " + preInit + ")");
+ }
- Hashtable work = ((preInit) ? _preOAInitProperty : _postOAInitProperty);
+ Hashtable work = ((preInit) ? _preOAInitProperty : _postOAInitProperty);
- if (!work.isEmpty())
- {
- Enumeration elements = work.elements();
+ if (!work.isEmpty())
+ {
+ Enumeration elements = work.elements();
- while (elements.hasMoreElements())
- {
- Attribute p = (Attribute) elements.nextElement();
+ while (elements.hasMoreElements())
+ {
+ Attribute p = (Attribute) elements.nextElement();
- if (p != null)
- {
+ if (p != null)
+ {
if (opLogger.logger.isDebugEnabled())
{
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "Attribute "+p+" initialising.");
- }
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY, "Attribute "
+ + p + " initialising.");
+ }
- p.initialise(params);
- p = null;
- }
- }
+ p.initialise(params);
+ p = null;
+ }
+ }
- // work.clear();
- }
+ // work.clear();
+ }
}
- OA (com.arjuna.orbportability.ORB orb, String oaName)
+ OA(com.arjuna.orbportability.ORB orb, String oaName)
{
_associatedORB = orb;
_oaName = oaName;
@@ -443,12 +489,15 @@
}
/**
- * OA constructor - creates an OA which represents a given POA on a given ORB
- *
- * @param orb The ORB this OA exists in
- * @param oa The OA this class will wrap around
+ * OA constructor - creates an OA which represents a given POA on a given
+ * ORB
+ *
+ * @param orb
+ * The ORB this OA exists in
+ * @param oa
+ * The OA this class will wrap around
*/
- OA (com.arjuna.orbportability.ORB orb, String oaName, POA oa)
+ OA(com.arjuna.orbportability.ORB orb, String oaName, POA oa)
{
_associatedORB = orb;
_oaName = oaName;
@@ -464,20 +513,21 @@
_oa.rootPoa(oa);
}
-/**
- * Retrieve an OA instance given a unique name, if an OA instance with this name
- * doesn't exist then create it.
- *
- * @param associatedORB The ORB this OA is being created for.
- * @return The OA instance refered to by the name given.
- */
- public synchronized static RootOA getRootOA(ORB associatedORB)
+ /**
+ * Retrieve an OA instance given a unique name, if an OA instance with this
+ * name doesn't exist then create it.
+ *
+ * @param associatedORB
+ * The ORB this OA is being created for.
+ * @return The OA instance referred to by the name given.
+ */
+ public synchronized static RootOA getRootOA (ORB associatedORB)
{
/**
* Get the OA for this ORB instance
*/
- RootOA oa = (RootOA)_orbToOAMap.get(associatedORB);
+ RootOA oa = (RootOA) _orbToOAMap.get(associatedORB);
if (oa == null)
{
@@ -485,20 +535,25 @@
_orbToOAMap.put(associatedORB, oa);
}
-
- return(oa);
+
+ return (oa);
}
com.arjuna.orbportability.oa.core.OA _oa = null;
+
com.arjuna.orbportability.ORB _associatedORB = null;
- protected String _defaultAdapterName = null;
- protected String _oaName = null;
+ protected String _defaultAdapterName = null;
+ protected String _oaName = null;
+
protected Hashtable _preOAShutdown = new Hashtable();
+
protected Hashtable _postOAShutdown = new Hashtable();
+
protected Hashtable _preOAInitProperty = new Hashtable();
+
protected Hashtable _postOAInitProperty = new Hashtable();
- private static HashMap _orbToOAMap = new HashMap();
+ private static HashMap _orbToOAMap = new HashMap();
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/RootOA.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -31,7 +31,6 @@
package com.arjuna.orbportability;
-import org.omg.PortableServer.POA;
import org.omg.PortableServer.Servant;
import org.omg.CORBA.SystemException;
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/oa/implementations/jacorb_2_0.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -43,28 +43,34 @@
{
/**
- * @message com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0.norootoa {0} called without root POA.
+ * @message
+ * com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations
+ * .jacorb_2_0.norootoa {0} called without root POA.
*/
-public void createPOA (String adapterName,
- Policy[] policies) throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive, SystemException
+ public void createPOA (String adapterName, Policy[] policies)
+ throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive,
+ SystemException
{
- if (_poa == null)
- {
- if ( opLogger.loggerI18N.isWarnEnabled() )
+ if (_poa == null)
+ {
+ if (opLogger.loggerI18N.isWarnEnabled())
{
- opLogger.loggerI18N.warn( "com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0.norootoa",
- new Object[] { "jacorb_2_0.createPOA" } );
+ opLogger.loggerI18N
+ .warn(
+ "com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0.norootoa",
+ new Object[]
+ { "jacorb_2_0.createPOA" });
}
- throw new AdapterInactive();
- }
+ throw new AdapterInactive();
+ }
- POA childPoa = _poa.create_POA(adapterName, _poa.the_POAManager(), policies);
+ POA childPoa = _poa.create_POA(adapterName, _poa.the_POAManager(),
+ policies);
- childPoa.the_POAManager().activate();
+ childPoa.the_POAManager().activate();
- super._poas.put(adapterName, childPoa);
+ super._poas.put(adapterName, childPoa);
}
}
-
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/orb/implementations/jacorb_2_0.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/orb/implementations/jacorb_2_0.java 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/jacorb/orb/implementations/jacorb_2_0.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -31,8 +31,6 @@
package com.arjuna.orbportability.internal.orbspecific.jacorb.orb.implementations;
import com.arjuna.orbportability.internal.orbspecific.orb.implementations.ORBBase;
-import com.arjuna.orbportability.common.opPropertyManager;
-import com.arjuna.orbportability.Services;
public class jacorb_2_0 extends ORBBase
{
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/oa/implementations/POABase.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/oa/implementations/POABase.java 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/internal/orbspecific/oa/implementations/POABase.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -34,104 +34,109 @@
import com.arjuna.orbportability.oa.core.POAImple;
import org.omg.PortableServer.*;
-import org.omg.CORBA.Policy;
import java.util.*;
-import java.applet.Applet;
-import java.io.*;
import org.omg.CORBA.ORBPackage.InvalidName;
import org.omg.CORBA.SystemException;
import org.omg.CORBA.BAD_OPERATION;
import org.omg.CORBA.BAD_PARAM;
-import org.omg.PortableServer.POAPackage.AdapterAlreadyExists;
-import org.omg.PortableServer.POAPackage.InvalidPolicy;
import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
public abstract class POABase implements POAImple
{
-public boolean initialised ()
+ public boolean initialised ()
{
- return _init;
+ return _init;
}
-public boolean supportsBOA ()
+ public boolean supportsBOA ()
{
- return false;
+ return false;
}
-
-public boolean supportsPOA ()
+
+ public boolean supportsPOA ()
{
- return true;
+ return true;
}
-public void init (com.arjuna.orbportability.orb.core.ORB orb) throws InvalidName, AdapterInactive, SystemException
+ public void init (com.arjuna.orbportability.orb.core.ORB orb)
+ throws InvalidName, AdapterInactive, SystemException
{
- if (!_init)
- {
- _poa = POAHelper.narrow(orb.orb().resolve_initial_references("RootPOA"));
-
- _poa.the_POAManager().activate();
- _init = true;
- }
+ if (!_init)
+ {
+ _poa = POAHelper.narrow(orb.orb().resolve_initial_references(
+ "RootPOA"));
+
+ _poa.the_POAManager().activate();
+ _init = true;
+ }
}
-public void destroyRootPOA () throws SystemException
+ public void destroyRootPOA () throws SystemException
{
- _poa.destroy(true, true);
- _init = false;
+ _poa.destroy(true, true);
+ _init = false;
}
-public void destroyPOA (String adapterName) throws SystemException
+ public void destroyPOA (String adapterName) throws SystemException
{
- if (adapterName == null)
- throw new BAD_PARAM();
-
- org.omg.PortableServer.POA childPoa = (org.omg.PortableServer.POA) _poas.remove(adapterName);
-
- if (childPoa != null)
- {
- childPoa.destroy(true, true);
- childPoa = null;
- }
- else
- throw new BAD_OPERATION();
+ if (adapterName == null)
+ throw new BAD_PARAM();
+
+ org.omg.PortableServer.POA childPoa = (org.omg.PortableServer.POA) _poas
+ .remove(adapterName);
+
+ if (childPoa != null)
+ {
+ childPoa.destroy(true, true);
+ childPoa = null;
+ }
+ else
+ throw new BAD_OPERATION();
}
-public org.omg.PortableServer.POA rootPoa () throws SystemException
+ public org.omg.PortableServer.POA rootPoa () throws SystemException
{
- return _poa;
+ return _poa;
}
-
-public void rootPoa (org.omg.PortableServer.POA thePOA) throws SystemException
+
+ public void rootPoa (org.omg.PortableServer.POA thePOA)
+ throws SystemException
{
- _poa = thePOA;
+ _poa = thePOA;
- _init = true;
+ _init = true;
}
-
-public org.omg.PortableServer.POA poa (String adapterName) throws SystemException
+
+ public org.omg.PortableServer.POA poa (String adapterName)
+ throws SystemException
{
- return (org.omg.PortableServer.POA) _poas.get(adapterName);
+ return (org.omg.PortableServer.POA) _poas.get(adapterName);
}
-
-public void poa (String adapterName, org.omg.PortableServer.POA thePOA) throws SystemException
+
+ public void poa (String adapterName, org.omg.PortableServer.POA thePOA)
+ throws SystemException
{
- _poas.put(adapterName, thePOA);
+ _poas.put(adapterName, thePOA);
}
-public void run (com.arjuna.orbportability.orb.core.ORB orb, String name) throws SystemException
+ public void run (com.arjuna.orbportability.orb.core.ORB orb, String name)
+ throws SystemException
{
- orb.orb().run();
+ orb.orb().run();
}
-public void run (com.arjuna.orbportability.orb.core.ORB orb) throws SystemException
+ public void run (com.arjuna.orbportability.orb.core.ORB orb)
+ throws SystemException
{
- orb.orb().run();
+ orb.orb().run();
}
-protected org.omg.PortableServer.POA _poa = null;
-protected Hashtable _poas = new Hashtable();
-protected boolean _init = false;
+ protected org.omg.PortableServer.POA _poa = null;
+ protected Hashtable _poas = new Hashtable();
+
+ protected boolean _init = false;
+
}
Modified: labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java
===================================================================
--- labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2009-11-12 21:05:50 UTC (rev 30135)
+++ labs/jbosstm/trunk/ArjunaJTS/orbportability/classes/com/arjuna/orbportability/oa/core/OA.java 2009-11-12 22:29:04 UTC (rev 30136)
@@ -47,142 +47,164 @@
import org.omg.PortableServer.POAManagerPackage.AdapterInactive;
/**
- * An instance of this class provides access to the ORB specific
- * Object Adapter class.
- *
+ * An instance of this class provides access to the ORB specific Object Adapter
+ * class.
+ *
* @author Mark Little (mark at arjuna.com)
- * @version $Id: OA.java 2342 2006-03-30 13:06:17Z $
+ * @version $Id: OA.java 2342 2006-03-30 13:06:17Z $
* @since JTS 2.1.
*/
public class OA
{
-public OA (com.arjuna.orbportability.orb.core.ORB theORB)
+ public OA(com.arjuna.orbportability.orb.core.ORB theORB)
{
- initialise();
+ initialise();
- _theORB = theORB;
+ _theORB = theORB;
}
-public boolean initialised ()
+ public boolean initialised ()
{
- return _theOA.initialised();
+ return _theOA.initialised();
}
-public void init () throws InvalidName, AdapterInactive, SystemException
+ public void init () throws InvalidName, AdapterInactive, SystemException
{
- ((POAImple) _theOA).init(_theORB);
+ ((POAImple) _theOA).init(_theORB);
}
-public void createPOA (String adapterName,
- Policy[] policies) throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive, SystemException
+ public void createPOA (String adapterName, Policy[] policies)
+ throws AdapterAlreadyExists, InvalidPolicy, AdapterInactive,
+ SystemException
{
- ((POAImple) _theOA).createPOA(adapterName, policies);
+ ((POAImple) _theOA).createPOA(adapterName, policies);
}
-public void destroyRootPOA () throws SystemException
+ public void destroyRootPOA () throws SystemException
{
- ((POAImple) _theOA).destroyRootPOA();
+ ((POAImple) _theOA).destroyRootPOA();
}
-public void destroyPOA (String adapterName) throws SystemException
+ public void destroyPOA (String adapterName) throws SystemException
{
- ((POAImple) _theOA).destroyPOA(adapterName);
+ ((POAImple) _theOA).destroyPOA(adapterName);
}
-public org.omg.PortableServer.POA rootPoa () throws SystemException
+ public org.omg.PortableServer.POA rootPoa () throws SystemException
{
- return ((POAImple) _theOA).rootPoa();
+ return ((POAImple) _theOA).rootPoa();
}
-public void rootPoa (org.omg.PortableServer.POA thePOA) throws SystemException
+ public void rootPoa (org.omg.PortableServer.POA thePOA)
+ throws SystemException
{
- ((POAImple) _theOA).rootPoa(thePOA);
+ ((POAImple) _theOA).rootPoa(thePOA);
}
-public org.omg.PortableServer.POA poa (String adapterName) throws SystemException
+ public org.omg.PortableServer.POA poa (String adapterName)
+ throws SystemException
{
- return ((POAImple) _theOA).poa(adapterName);
+ return ((POAImple) _theOA).poa(adapterName);
}
-public void poa (String adapterName, org.omg.PortableServer.POA thePOA) throws SystemException
+ public void poa (String adapterName, org.omg.PortableServer.POA thePOA)
+ throws SystemException
{
- ((POAImple) _theOA).poa(adapterName, thePOA);
+ ((POAImple) _theOA).poa(adapterName, thePOA);
}
-public void run (String name) throws SystemException
+ public void run (String name) throws SystemException
{
- _theOA.run(_theORB, name);
+ _theOA.run(_theORB, name);
}
-public void run () throws SystemException
+ public void run () throws SystemException
{
- _theOA.run(_theORB);
+ _theOA.run(_theORB);
}
/**
- * @message com.arjuna.orbportability.oa.core.OA.nosupportedorb OA ORB specific class creation failed - unable to find supported ORB
- * @message com.arjuna.orbportability.oa.core.OA.caughtexception OA ORB specific class creation failed with: {0}
+ * @message com.arjuna.orbportability.oa.core.OA.nosupportedorb OA ORB
+ * specific class creation failed - unable to find supported ORB
+ * @message com.arjuna.orbportability.oa.core.OA.caughtexception OA ORB
+ * specific class creation failed with: {0}
*/
-private final void initialise ()
-{
- String className = opPropertyManager.getOrbPortabilityEnvironmentBean().getOaImplementation();
-
- if (className == null)
+ @SuppressWarnings("unchecked")
+ private final void initialise ()
{
+ String className = opPropertyManager.getOrbPortabilityEnvironmentBean()
+ .getOaImplementation();
- try
+ if (className == null)
{
- Thread.currentThread().getContextClassLoader().loadClass("org.jacorb.orb.ORB");
- className = "com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0";
- }
- catch (ClassNotFoundException ce)
- {
try
{
- Thread.currentThread().getContextClassLoader().loadClass("com.sun.corba.se.internal.corba.ORB");
+ Thread.currentThread().getContextClassLoader().loadClass(
+ "org.jacorb.orb.ORB");
- className = "com.arjuna.orbportability.internal.orbspecific.javaidl.oa.implementations.javaidl_1_4";
+ className = "com.arjuna.orbportability.internal.orbspecific.jacorb.oa.implementations.jacorb_2_0";
}
- catch (ClassNotFoundException je)
+ catch (ClassNotFoundException ce)
{
- if (opLogger.loggerI18N.isFatalEnabled())
+ try
{
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.nosupportedorb", je );
+ Thread.currentThread().getContextClassLoader().loadClass(
+ "com.sun.corba.se.internal.corba.ORB");
+
+ className = "com.arjuna.orbportability.internal.orbspecific.javaidl.oa.implementations.javaidl_1_4";
}
- throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.nosupportedorb") );
+ catch (ClassNotFoundException je)
+ {
+ if (opLogger.loggerI18N.isFatalEnabled())
+ {
+ opLogger.loggerI18N
+ .fatal(
+ "com.arjuna.orbportability.oa.core.OA.nosupportedorb",
+ je);
+ }
+ throw new ExceptionInInitializerError(
+ opLogger.logMesg
+ .getString("com.arjuna.orbportability.oa.core.OA.nosupportedorb"));
+ }
}
}
- }
- if (opLogger.logger.isDebugEnabled())
- {
- opLogger.logger.debug(DebugLevel.FUNCTIONS, VisibilityLevel.VIS_PUBLIC,
- FacilityCode.FAC_ORB_PORTABILITY, "OA.initialise() - using OA Implementation "+className);
- }
+ if (opLogger.logger.isDebugEnabled())
+ {
+ opLogger.logger.debug(DebugLevel.FUNCTIONS,
+ VisibilityLevel.VIS_PUBLIC,
+ FacilityCode.FAC_ORB_PORTABILITY,
+ "OA.initialise() - using OA Implementation " + className);
+ }
- try
- {
- Class c = Thread.currentThread().getContextClassLoader().loadClass(className);
+ try
+ {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass(
+ className);
- _theOA = (POAImple) c.newInstance();
- }
- catch (Exception e)
- {
- if (opLogger.loggerI18N.isFatalEnabled())
+ _theOA = (POAImple) c.newInstance();
+ }
+ catch (Exception e)
{
- opLogger.loggerI18N.fatal( "com.arjuna.orbportability.oa.core.OA.caughtexception",
- new Object[] { e } , e);
+ if (opLogger.loggerI18N.isFatalEnabled())
+ {
+ opLogger.loggerI18N.fatal(
+ "com.arjuna.orbportability.oa.core.OA.caughtexception",
+ new Object[]
+ { e }, e);
+ }
+
+ throw new ExceptionInInitializerError(
+ opLogger.logMesg
+ .getString("com.arjuna.orbportability.oa.core.OA.caughtexception"));
}
-
- throw new ExceptionInInitializerError( opLogger.logMesg.getString("com.arjuna.orbportability.oa.core.OA.caughtexception") );
}
-}
-private com.arjuna.orbportability.orb.core.ORB _theORB;
-private com.arjuna.orbportability.oa.core.POAImple _theOA;
+ private com.arjuna.orbportability.orb.core.ORB _theORB;
+ private com.arjuna.orbportability.oa.core.POAImple _theOA;
+
}
-
More information about the jboss-svn-commits
mailing list