#include "SALOME_Container_i.hxx"
#include "SALOME_ContainerManager.hxx"
-#include "SALOMEDS_StudyManager_i.hxx"
+#include <SALOMEDSClient.hxx>
+#include <SALOMEDSClient_ClientFactory.hxx>
#include "SALOME_ModuleCatalog_impl.hxx"
#include "RegistryService.hxx"
#include "Session_Session_i.hxx"
"SalomeAppEngine",
"ContainerManager"};
-//=============================================================================
/*!
- * default constructor not for use
- */
-//=============================================================================
-
+ default constructor not for use
+*/
Session_ServerThread::Session_ServerThread()
{
ASSERT(0); // must not be called
}
-//=============================================================================
/*!
- * constructor
- */
-//=============================================================================
-
+ constructor
+*/
Session_ServerThread::Session_ServerThread(int argc,
char ** argv,
CORBA::ORB_ptr orb,
- PortableServer::POA_ptr poa,
- QMutex *GUIMutex)
+ PortableServer::POA_ptr poa)
{
//MESSAGE("Session_ServerThread Constructor " << argv[0]);
_argc = argc;
_argv = argv;
_orb = CORBA::ORB::_duplicate(orb);
_root_poa = PortableServer::POA::_duplicate(poa);
- _GUIMutex = GUIMutex;
_servType =-1;
_NS = new SALOME_NamingService(_orb); // one instance per server to limit
// multi thread coherence problems
}
-//=============================================================================
/*!
- * destructor
- */
-//=============================================================================
-
+ destructor
+*/
Session_ServerThread::~Session_ServerThread()
{
//MESSAGE("~Session_ServerThread "<< _argv[0]);
}
-//=============================================================================
/*!
- * run the thread : activate one servant, the servant type is given by
- * argument _argv[0]
- */
-//=============================================================================
-
+ run the thread : activate one servant, the servant type is given by
+ argument _argv[0]
+*/
void Session_ServerThread::Init()
{
MESSAGE("Session_ServerThread::Init "<< _argv[0]);
}
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void Session_ServerThread::ActivateModuleCatalog(int argc,
char ** argv)
{
}
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void Session_ServerThread::ActivateSALOMEDS(int argc,
char ** argv)
{
// counted objects, they will be deleted by the POA when they are no
// longer needed.
- SALOMEDS_StudyManager_i * myStudyManager_i
- = new SALOMEDS_StudyManager_i(_orb,_root_poa);
-
- // Activate the objects. This tells the POA that the objects are
- // ready to accept requests.
-
- PortableServer::ObjectId_var myStudyManager_iid
- = _root_poa->activate_object(myStudyManager_i);
- myStudyManager_i->register_name("/myStudyManager");
+ ClientFactory::createStudyManager(_orb,_root_poa);
}
catch(CORBA::SystemException&)
{
}
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void Session_ServerThread::ActivateRegistry(int argc,
char ** argv)
{
}
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void Session_ServerThread::ActivateContainerManager(int argc,
char ** argv)
{
}
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void Session_ServerThread::ActivateContainer(int argc,
char ** argv)
{
}
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void Session_ServerThread::ActivateEngine(int /*argc*/, char ** /*argv*/)
{
try
}
}
-//=============================================================================
-/*!
- *
- */
-//=============================================================================
-
void Session_ServerThread::ActivateSession(int argc,
char ** argv)
{
MESSAGE("Session_ServerThread::ActivateSession() not implemented!");
}
+/*!
+ constructor
+*/
Session_SessionThread::Session_SessionThread(int argc,
char** argv,
CORBA::ORB_ptr orb,
PortableServer::POA_ptr poa,
QMutex* GUIMutex,
QWaitCondition* GUILauncher)
-: Session_ServerThread(argc, argv, orb, poa, GUIMutex),
+: Session_ServerThread(argc, argv, orb, poa),
+ _GUIMutex( GUIMutex ),
_GUILauncher( GUILauncher )
{
}
+/*!
+ destructor
+*/
Session_SessionThread::~Session_SessionThread()
{
}