(file) Return to ProviderManagerService.cpp CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Pegasus / ProviderManager2 / Attic

Diff for /pegasus/src/Pegasus/ProviderManager2/Attic/ProviderManagerService.cpp between version 1.24.2.1 and 1.25

version 1.24.2.1, 2004/02/17 01:32:47 version 1.25, 2004/02/04 22:58:21
Line 66 
Line 66 
  
     ProviderManagerContainer(const String & physicalName, const String & logicalName, const String & interfaceName) : _manager(0)     ProviderManagerContainer(const String & physicalName, const String & logicalName, const String & interfaceName) : _manager(0)
     {     {
         #if defined(PEGASUS_OS_TYPE_WINDOWS)          _physicalName=ProviderManager::_resolvePhysicalName(physicalName);
         _physicalName = physicalName + String(".dll");  
         #elif defined(PEGASUS_OS_HPUX) && defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)  
         _physicalName = ConfigManager::getHomedPath(ConfigManager::getInstance()->getCurrentValue("providerDir"));  
         _physicalName.append(String("/lib") + physicalName + String(".sl"));  
         #elif defined(PEGASUS_OS_HPUX) && !defined(PEGASUS_PLATFORM_HPUX_PARISC_ACC)  
         _physicalName = ConfigManager::getHomedPath(ConfigManager::getInstance()->getCurrentValue("providerDir"));  
         _physicalName.append(String("/lib") + physicalName + String(".so"));  
         #elif defined(PEGASUS_OS_OS400)  
         _physicalName = physicalName;  
         #else  
         _physicalName = ConfigManager::getHomedPath(ConfigManager::getInstance()->getCurrentValue("providerDir"));  
         _physicalName.append(String("/lib") + physicalName + String(".so"));  
         #endif  
  
         _logicalName = logicalName;         _logicalName = logicalName;
  
Line 168 
Line 155 
 } }
  
 ProviderManagerService* ProviderManagerService::providerManagerService=NULL; ProviderManagerService* ProviderManagerService::providerManagerService=NULL;
   CIMRepository* ProviderManagerService::_repository=NULL;
  
 ProviderManagerService::ProviderManagerService(void) ProviderManagerService::ProviderManagerService(void)
     : MessageQueueService(PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP)     : MessageQueueService(PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP)
Line 175 
Line 163 
     providerManagerService=this;     providerManagerService=this;
 } }
  
 ProviderManagerService::ProviderManagerService(ProviderRegistrationManager * providerRegistrationManager)  ProviderManagerService::ProviderManagerService(
           ProviderRegistrationManager * providerRegistrationManager,
           CIMRepository * repository)
     : MessageQueueService(PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP)     : MessageQueueService(PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP)
 { {
     providerManagerService=this;     providerManagerService=this;
       _repository=repository;
   
     SetProviderRegistrationManager(providerRegistrationManager);     SetProviderRegistrationManager(providerRegistrationManager);
  
     // ATTN: this section is a temporary solution to populate the list of enabled     // ATTN: this section is a temporary solution to populate the list of enabled
Line 395 
Line 387 
     if (pm) {     if (pm) {
         response = pm->processMessage(request);         response = pm->processMessage(request);
     }     }
       else
     else for (Uint32 i = 0, n = _providerManagers.size(); i < n; i++) {      {
          if (request->getType()==CIM_STOP_ALL_PROVIDERS_REQUEST_MESSAGE) {
             for (Uint32 i = 0, n = _providerManagers.size(); i < n; i++) {
        ProviderManagerContainer *pmc=_providerManagers[i];        ProviderManagerContainer *pmc=_providerManagers[i];
        switch (message->getType()) {  // ---- next instruction is disabled because of a bug
        case CIM_ENABLE_MODULE_REQUEST_MESSAGE: {  //             response=pmc->getProviderManager()->processMessage(request);
              CIMEnableModuleRequestMessage * request =  // ---- this block is an workaround
                 dynamic_cast<CIMEnableModuleRequestMessage*>(const_cast<Message*>(message));              CIMStopAllProvidersResponseMessage * resp =
              if (request->providerModule.getProperty(request->providerModule.findProperty                new CIMStopAllProvidersResponseMessage(
                  ("InterfaceType")).getValue().toString()==pmc->getInterfaceName())                   request->messageId,
              response=pmc->getProviderManager()->processMessage(request);                   CIMException(),
           }                   ((CIMStopAllProvidersRequestMessage*)request)->queueIds.copyAndPop());
                resp->setKey(request->getKey());
                resp->setHttpMethod (request->getHttpMethod ());
                response=resp;
           break;           break;
        case CIM_DISABLE_MODULE_REQUEST_MESSAGE: {  // ---- end of  workaround
              CIMDisableModuleRequestMessage * request =  
                 dynamic_cast<CIMDisableModuleRequestMessage*>(const_cast<Message*>(message));  
              if (request->providerModule.getProperty(request->providerModule.findProperty  
                  ("InterfaceType")).getValue().toString()==pmc->getInterfaceName())  
              response=pmc->getProviderManager()->processMessage(request);  
           }           }
           break;         }
        case CIM_STOP_ALL_PROVIDERS_REQUEST_MESSAGE: {         else {
           Message  *resp=pmc->getProviderManager()->processMessage(request);  
           if (resp) response=resp; }  
           break;  
        default:  
           CIMRequestMessage * req =           CIMRequestMessage * req =
               dynamic_cast<CIMRequestMessage *>(const_cast<Message *>(message));               dynamic_cast<CIMRequestMessage *>(const_cast<Message *>(message));
           CIMResponseMessage  *resp=new CIMResponseMessage(0,req->messageId,CIMException(),           CIMResponseMessage  *resp=new CIMResponseMessage(0,req->messageId,CIMException(),
Line 427 
Line 415 
           response=resp;           response=resp;
           resp->synch_response(req);           resp->synch_response(req);
           OperationResponseHandler handler(req, resp);           OperationResponseHandler handler(req, resp);
           handler.setStatus(CIM_ERR_FAILED, "Unknown messagetype.");            handler.setStatus(CIM_ERR_FAILED, "Unknown error.");
        }        }
     }     }
  
Line 483 
Line 471 
           it=m->providerModule.getProperty (m->providerModule.findProperty           it=m->providerModule.getProperty (m->providerModule.findProperty
                 ("InterfaceType")).getValue ().toString ();                 ("InterfaceType")).getValue ().toString ();
        }        }
   /*       else {
        else switch (message->getType()) {            const CIMConsumeIndicationRequestMessage * p =
        case CIM_DISABLE_MODULE_REQUEST_MESSAGE:              dynamic_cast<const CIMConsumeIndicationRequestMessage *>(message);
        case CIM_ENABLE_MODULE_REQUEST_MESSAGE:            if (p) {
        case CIM_STOP_ALL_PROVIDERS_REQUEST_MESSAGE:               CIMConsumeIndicationRequestMessage *m=(CIMConsumeIndicationRequestMessage*)message;
           return NULL;               it=m->consumer_module.getProperty (m->consumer_module.findProperty
        default:                  ("InterfaceType")).getValue ().toString ();
             } */
             else {  // remaining functions are sent to default provider
   //           cout<<"--- ProviderManagerService::locateProviderManager(): unknown message type: "<<
   //              message->getType()<<endl;
           it="C++Default";           it="C++Default";
   //           return NULL;
        }        }
    //      }
     }     }
  
     // find provider manager for provider interface     // find provider manager for provider interface

Legend:
Removed from v.1.24.2.1  
changed lines
  Added in v.1.25
No CVS admin address has been configured
 Powered by
ViewCVS 0.9.2