HP-RK Changed the MessageQueue::getQueueName() method from virtual to non-virtual...

diff --git a/doc/changelog.txt b/doc/changelog.txt
index 3032fafc7dea3ae6122475d8fabc4bdaf3aa29a7..bc67b63abcb0cd77a437bd29b08ded1ee8866750 100644 (file)
--- a/doc/changelog.txt
+++ b/doc/changelog.txt
@@ -51,10 +51,19 @@ TAG: Version_1_09.
    with a propertyList parameter must be modified in accordance with this
    change.  All providers linked into the Pegasus build have been updated.
 
-8. (Roger Kumpf - HP) 11 Apr 2002 - Defined an HTTP error message to be
+9. (Roger Kumpf - HP) 11 Apr 2002 - Defined an HTTP error message to be
    returned to the CIMClient when an HTTP error response is returned.
    Added a method to parse the status line of an HTTP response.
 
+10. (Roger Kumpf - HP) 11 Apr 2002 - Changed the MessageQueue::getQueueName()
+    method from virtual to non-virtual, and removed that method definition
+    from all the subclasses.  To make sure that the MessageQueue class gets
+    the queue name value, the default value for the queue name parameter to
+    the MessageQueue constructor was removed.  Constants were defined in
+    Constants.h for all the queue names currently used in Pegasus.  The
+    places where those queue names were being used for lookup were also
+    changed to use the constants.
+
 ========================================================================
 
 Version 1.08 working towards 1.1 - Started 27 March 2002

diff --git a/src/Pegasus/Client/CIMClient.cpp b/src/Pegasus/Client/CIMClient.cpp
index 9166fa5f241a5da4630c2a892457b366be75a6db..8e9dc2d33729b4f93ca1ffcf4ad8779dc904c100 100644 (file)
--- a/src/Pegasus/Client/CIMClient.cpp
+++ b/src/Pegasus/Client/CIMClient.cpp
@@ -31,6 +31,7 @@
 //%/////////////////////////////////////////////////////////////////////////////
 
 #include <Pegasus/Common/Config.h>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/HTTPConnection.h>
 #include <Pegasus/Common/Destroyer.h>
 #include <Pegasus/Common/XmlWriter.h>
@@ -54,6 +55,7 @@ PEGASUS_NAMESPACE_BEGIN
 
 CIMClient::CIMClient(Uint32 timeOutMilliseconds)
     : 
+    MessageQueue(PEGASUS_QUEUENAME_CLIENT),
     _httpConnection(0),
     _timeOutMilliseconds(timeOutMilliseconds),
     _connected(false),
@@ -79,11 +81,6 @@ void CIMClient::handleEnqueue()
 
 }
 
-const char* CIMClient::getQueueName() const
-{
-    return "CIMClient";
-}
-
 void CIMClient::_connect(
     const String& address,
     SSLContext* sslContext)

diff --git a/src/Pegasus/Client/CIMClient.h b/src/Pegasus/Client/CIMClient.h
index 14c837c7e3260909f337a9f01f31cb37de0cf135..03e60b2fe597738e3b9d99fa0b24abdb188503dd 100644 (file)
--- a/src/Pegasus/Client/CIMClient.h
+++ b/src/Pegasus/Client/CIMClient.h
@@ -98,9 +98,6 @@ public:
     */
     virtual void handleEnqueue();
 
-    /** Returns the queue name. */
-    virtual const char* getQueueName() const;
-
     /** TBD
     */
     Uint32 getTimeOut() const

diff --git a/src/Pegasus/Client/CIMOperationRequestEncoder.cpp b/src/Pegasus/Client/CIMOperationRequestEncoder.cpp
index a8f9cdd32e078d6c58726d84f66ae66a05ad665d..fc894a2325fe78f4b6304a15b8b03a304d3e9092 100644 (file)
--- a/src/Pegasus/Client/CIMOperationRequestEncoder.cpp
+++ b/src/Pegasus/Client/CIMOperationRequestEncoder.cpp
@@ -31,6 +31,7 @@
 
 #include <Pegasus/Common/Config.h>
 #include <iostream>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/XmlWriter.h>
 #include <Pegasus/Common/HTTPMessage.h>
@@ -43,6 +44,7 @@ PEGASUS_NAMESPACE_BEGIN
 CIMOperationRequestEncoder::CIMOperationRequestEncoder(
     MessageQueue* outputQueue, ClientAuthenticator* authenticator)
     :
+    MessageQueue(PEGASUS_QUEUENAME_OPREQENCODER),
     _outputQueue(outputQueue),
     _authenticator(authenticator)
 {
@@ -192,11 +194,6 @@ void CIMOperationRequestEncoder::handleEnqueue()
     //delete message;
 }
 
-const char* CIMOperationRequestEncoder::getQueueName() const
-{
-    return "CIMOperationRequestEncoder";
-}
-
 void CIMOperationRequestEncoder::_encodeCreateClassRequest(
     CIMCreateClassRequestMessage* message)
 {

diff --git a/src/Pegasus/Client/CIMOperationRequestEncoder.h b/src/Pegasus/Client/CIMOperationRequestEncoder.h
index 2dd957651dded6209fecf722ec52474043b8c4f4..48f7825350ecca6c478ba12b888806048c9512bd 100644 (file)
--- a/src/Pegasus/Client/CIMOperationRequestEncoder.h
+++ b/src/Pegasus/Client/CIMOperationRequestEncoder.h
@@ -60,9 +60,6 @@ public:
     /** This method is called when a message is enqueued on this queue. */
     virtual void handleEnqueue();
 
-    /** Returns the queue name. */
-    virtual const char* getQueueName() const;
-
 private:
 
     void _encodeCreateClassRequest(

diff --git a/src/Pegasus/Client/CIMOperationResponseDecoder.cpp b/src/Pegasus/Client/CIMOperationResponseDecoder.cpp
index 772271acec78fba965cfe9251ea322b562e79c10..d117d448d0076d5739a5e6e2ee7695b59771834e 100644 (file)
--- a/src/Pegasus/Client/CIMOperationResponseDecoder.cpp
+++ b/src/Pegasus/Client/CIMOperationResponseDecoder.cpp
@@ -50,6 +50,7 @@ CIMOperationResponseDecoder::CIMOperationResponseDecoder(
     MessageQueue* encoderQueue,
     ClientAuthenticator* authenticator)
     :
+    MessageQueue(PEGASUS_QUEUENAME_OPRESPDECODER),
     _outputQueue(outputQueue),
     _encoderQueue(encoderQueue),
     _authenticator(authenticator)
@@ -92,11 +93,6 @@ void CIMOperationResponseDecoder::handleEnqueue()
     delete message;
 }
 
-const char* CIMOperationResponseDecoder::getQueueName() const
-{
-    return "CIMOperationResponseDecoder";
-}
-
 void CIMOperationResponseDecoder::_handleHTTPMessage(HTTPMessage* httpMessage)
 {
     //

diff --git a/src/Pegasus/Client/CIMOperationResponseDecoder.h b/src/Pegasus/Client/CIMOperationResponseDecoder.h
index 1b52b8b6d58221363cd1165097e37ade217faf24..9df3df97af080e22e053ca559a57d968e06db9b2 100644 (file)
--- a/src/Pegasus/Client/CIMOperationResponseDecoder.h
+++ b/src/Pegasus/Client/CIMOperationResponseDecoder.h
@@ -68,9 +68,6 @@ public:
     /** This method is called when a message is enqueued on this queue. */
     virtual void handleEnqueue();
 
-    /** Returns the queue name. */
-    virtual const char* getQueueName() const;
-
 private:
 
     void _handleHTTPMessage(

diff --git a/src/Pegasus/Common/Cimom.cpp b/src/Pegasus/Common/Cimom.cpp
index 6ae9778dc908e4bfbf67006f0a3b9fd690ca9e13..b77460d418547f1ac076ddf9af37d6501dd82fa8 100644 (file)
--- a/src/Pegasus/Common/Cimom.cpp
+++ b/src/Pegasus/Common/Cimom.cpp
@@ -30,6 +30,7 @@
 #include "Cimom.h"
 
 #include <iostream>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/Tracer.h>
 
 PEGASUS_NAMESPACE_BEGIN
@@ -270,7 +271,7 @@ PEGASUS_THREAD_RETURN PEGASUS_THREAD_CDECL cimom::_routing_proc(void *parm)
 
 
 cimom::cimom(void)
-   : MessageQueue("pegasus meta dispatcher", true, CIMOM_Q_ID ),
+   : MessageQueue(PEGASUS_QUEUENAME_METADISPATCHER, true, CIMOM_Q_ID ),
      _modules(true),
      _recycle(true),
      _routed_ops(true, 0), 

diff --git a/src/Pegasus/Common/Constants.h b/src/Pegasus/Common/Constants.h
index b0a34de690cb66f537a7cb414e512f76686e0b18..4722e2d0d772e355f023cb54ce5a669ed23964eb 100644 (file)
--- a/src/Pegasus/Common/Constants.h
+++ b/src/Pegasus/Common/Constants.h
@@ -34,25 +34,46 @@
 
 PEGASUS_NAMESPACE_BEGIN
 
-#define PEGASUS_SERVICENAME_CIMOPREQDISPATCHER  "CIMOpRequestDispatcher"
-#define PEGASUS_SERVICENAME_CIMOPREQDECODER     "CIMOpRequestDecoder"
-#define PEGASUS_SERVICENAME_CIMOPREQENCODER     "CIMOpResponseEncoder"
-#define PEGASUS_SERVICENAME_CIMOPREQAUTHORIZER  "CIMOpRequestAuthorizer"
-#define PEGASUS_SERVICENAME_HTTPAUTHDELEGATOR   "HTTPAuthenticatorDelegator"
-#define PEGASUS_SERVICENAME_CONTROLSERVICE      "ControlService"
-#define PEGASUS_CONTROL_TEMP_MODULE             "ControlService::temp::do not use this name"
-#define PEGASUS_SERVICENAME_INDICATIONSERVICE   "Server::IndicationService"
-#define PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP "Server::ProviderManagerService"
-#define PEGASUS_SERVICENAME_HANDLERMANAGER      "IndicationHandlerService"
+#define PEGASUS_QUEUENAME_METADISPATCHER      "pegasus meta dispatcher"
+
+#define PEGASUS_QUEUENAME_HTTPACCEPTOR        "HTTPAcceptor"
+#define PEGASUS_QUEUENAME_HTTPCONNECTION      "HTTPConnection"
+#define PEGASUS_QUEUENAME_HTTPCONNECTOR       "HTTPConnector"
+#define PEGASUS_QUEUENAME_HTTPOPTIONS         "HTTPOptions"
+
+#define PEGASUS_QUEUENAME_HTTPAUTHDELEGATOR   "HTTPAuthenticatorDelegator"
+#define PEGASUS_QUEUENAME_OPREQDECODER        "CIMOpRequestDecoder"
+#define PEGASUS_QUEUENAME_OPREQAUTHORIZER     "CIMOpRequestAuthorizer"
+#define PEGASUS_QUEUENAME_OPREQDISPATCHER     "CIMOpRequestDispatcher"
+#define PEGASUS_QUEUENAME_OPRESPENCODER       "CIMOpResponseEncoder"
+
+#define PEGASUS_QUEUENAME_CONTROLSERVICE      "ControlService"
+#define PEGASUS_QUEUENAME_INDICATIONSERVICE   "Server::IndicationService"
+#define PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP "Server::ProviderManagerService"
+#define PEGASUS_QUEUENAME_INDHANDLERMANAGER   "IndicationHandlerService"
+
+#define PEGASUS_QUEUENAME_CLIENT              "CIMClient"
+#define PEGASUS_QUEUENAME_OPREQENCODER        "CIMOperationRequestEncoder"
+#define PEGASUS_QUEUENAME_OPRESPDECODER       "CIMOperationResponseDecoder"
+
+#define PEGASUS_QUEUENAME_EXPORTCLIENT        "CIMExportClient"
+#define PEGASUS_QUEUENAME_EXPORTREQENCODER    "CIMExportRequestEncoder"
+#define PEGASUS_QUEUENAME_EXPORTRESPDECODER   "CIMExportResponseDecoder"
+
+#define PEGASUS_QUEUENAME_EXPORTREQDECODER    "CIMExportRequestDecoder"
+#define PEGASUS_QUEUENAME_EXPORTREQDISPATCHER "CIMExportRequestDispatcher"
+#define PEGASUS_QUEUENAME_EXPORTRESPENCODER   "CIMExportResponseEncoder"
 
 #define PEGASUS_MODULENAME_CONFIGPROVIDER \
-    PEGASUS_SERVICENAME_CONTROLSERVICE "::ConfigProvider"
+    PEGASUS_QUEUENAME_CONTROLSERVICE "::ConfigProvider"
 #define PEGASUS_MODULENAME_USERAUTHPROVIDER \
-    PEGASUS_SERVICENAME_CONTROLSERVICE "::UserAuthProvider"
+    PEGASUS_QUEUENAME_CONTROLSERVICE "::UserAuthProvider"
 #define PEGASUS_MODULENAME_PROVREGPROVIDER \
-    PEGASUS_SERVICENAME_CONTROLSERVICE "::ProviderRegistrationProvider"
+    PEGASUS_QUEUENAME_CONTROLSERVICE "::ProviderRegistrationProvider"
 #define PEGASUS_MODULENAME_SHUTDOWNPROVIDER \
-    PEGASUS_SERVICENAME_CONTROLSERVICE "::ShutdownProvider"
+    PEGASUS_QUEUENAME_CONTROLSERVICE "::ShutdownProvider"
+#define PEGASUS_MODULENAME_TEMP \
+    PEGASUS_QUEUENAME_CONTROLSERVICE "::temp::do not use this name"
 
 #define PEGASUS_CLASSNAME_CONFIGSETTING        "PG_ConfigSetting"
 #define PEGASUS_CLASSNAME_AUTHORIZATION        "PG_Authorization"

diff --git a/src/Pegasus/Common/HTTPAcceptor.cpp b/src/Pegasus/Common/HTTPAcceptor.cpp
index 8c4beddeb8ead13563682e7b1b7fc8dfba30ac8c..42388acff73a988f96d68a942e6940ee35434136 100644 (file)
--- a/src/Pegasus/Common/HTTPAcceptor.cpp
+++ b/src/Pegasus/Common/HTTPAcceptor.cpp
@@ -30,6 +30,7 @@
 //%/////////////////////////////////////////////////////////////////////////////
 
 #include "Config.h"
+#include "Constants.h"
 #include <iostream>
 #include "Socket.h"
 
@@ -83,7 +84,7 @@ struct HTTPAcceptorRep
 ////////////////////////////////////////////////////////////////////////////////
 
 HTTPAcceptor::HTTPAcceptor(Monitor* monitor, MessageQueueService* outputMessageQueue)
-   : Base("HTTPAcceptor", MessageQueue::getNextQueueId()), 
+   : Base(PEGASUS_QUEUENAME_HTTPACCEPTOR), 
      _monitor(monitor), _outputMessageQueue(outputMessageQueue), 
      _rep(0), _sslcontext(NULL)
 {
@@ -93,7 +94,7 @@ HTTPAcceptor::HTTPAcceptor(Monitor* monitor, MessageQueueService* outputMessageQ
 
 HTTPAcceptor::HTTPAcceptor(Monitor* monitor, MessageQueueService* outputMessageQueue,
                            SSLContext * sslcontext)
-   :       Base("HTTPAcceptor", MessageQueue::getNextQueueId()), 
+   :       Base(PEGASUS_QUEUENAME_HTTPACCEPTOR), 
           _monitor(monitor), _outputMessageQueue(outputMessageQueue), _rep(0),
           _sslcontext(sslcontext)
 {
@@ -172,11 +173,6 @@ void HTTPAcceptor::handleEnqueue()
 
 }
 
-const char* HTTPAcceptor::getQueueName() const
-{
-   return "HTTPAcceptor";
-}
-
 void HTTPAcceptor::bind(Uint32 portNumber)
 {
    if (_rep)

diff --git a/src/Pegasus/Common/HTTPAcceptor.h b/src/Pegasus/Common/HTTPAcceptor.h
index d276e0f65769a418437d38dab5b5fcf934884e50..5a107bf7e329f5b87f75e3b956e1b5dc0699638b 100644 (file)
--- a/src/Pegasus/Common/HTTPAcceptor.h
+++ b/src/Pegasus/Common/HTTPAcceptor.h
@@ -69,8 +69,6 @@ class PEGASUS_COMMON_LINKAGE HTTPAcceptor : public MessageQueueService
     
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       /** Bind to the given port (the port on which this acceptor listens for 
          connections).
          @param portNumber the number of the port used to listen for

diff --git a/src/Pegasus/Common/HTTPConnection.cpp b/src/Pegasus/Common/HTTPConnection.cpp
index ec7d56c3bef79543fa48678605d653b37181e98f..6879c46542c37dca139b701fa504a73d7224c1f4 100644 (file)
--- a/src/Pegasus/Common/HTTPConnection.cpp
+++ b/src/Pegasus/Common/HTTPConnection.cpp
@@ -30,6 +30,7 @@
 //%/////////////////////////////////////////////////////////////////////////////
 
 #include <Pegasus/Common/Config.h>
+#include <Pegasus/Common/Constants.h>
 
 #if defined(PEGASUS_PLATFORM_LINUX_IX86_GNU) || defined(PEGASUS_PLATFORM_LINUX_GENERIC_GNU)
 #include <Pegasus/Common/Signal.h>
@@ -106,7 +107,7 @@ HTTPConnection::HTTPConnection(
     MessageQueueService* ownerMessageQueue,
     MessageQueueService* outputMessageQueue)
     : 
-   Base("HTTPConnection", MessageQueue::getNextQueueId()), 
+   Base(PEGASUS_QUEUENAME_HTTPCONNECTION), 
    _monitor(monitor),
    _socket(socket), 
    _ownerMessageQueue(ownerMessageQueue),
@@ -261,11 +262,6 @@ void HTTPConnection::handleEnqueue()
     handleEnqueue(message);
 }
 
-const char* HTTPConnection::getQueueName() const
-{
-    return "HTTPConnection";
-}
-
 Boolean _IsBodylessMessage(const char* line)
 {
     //ATTN: Make sure this is the right place to check for HTTP/1.1 and

diff --git a/src/Pegasus/Common/HTTPConnection.h b/src/Pegasus/Common/HTTPConnection.h
index 09c0a242367fbd92b32bc953e0aea5b3f46e1bde..fcffd8ed2d8b35e1be7bde46d7a8eb8dd7eb5585 100644 (file)
--- a/src/Pegasus/Common/HTTPConnection.h
+++ b/src/Pegasus/Common/HTTPConnection.h
@@ -87,8 +87,6 @@ class PEGASUS_COMMON_LINKAGE HTTPConnection : public MessageQueue
       
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       /** Return socket this connection is using. */
       Sint32 getSocket() { return _socket->getSocket();}
 

diff --git a/src/Pegasus/Common/HTTPConnector.cpp b/src/Pegasus/Common/HTTPConnector.cpp
index 4e551f97a64e3043ce9d5d64f556fe19dd7c4688..4ecdd9b2a3eba5099322665e48e5d8632113dd68 100644 (file)
--- a/src/Pegasus/Common/HTTPConnector.cpp
+++ b/src/Pegasus/Common/HTTPConnector.cpp
@@ -29,6 +29,7 @@
 
 #include "Config.h"
 #include <iostream>
+#include "Constants.h"
 #include "Socket.h"
 
 #ifdef PEGASUS_OS_TYPE_WINDOWS
@@ -140,7 +141,7 @@ struct HTTPConnectorRep
 ////////////////////////////////////////////////////////////////////////////////
 
 HTTPConnector::HTTPConnector(Monitor* monitor)
-   : Base("HTTPConnector", MessageQueue::getNextQueueId()),
+   : Base(PEGASUS_QUEUENAME_HTTPCONNECTOR),
      _monitor(monitor)
 {
    _rep = new HTTPConnectorRep;
@@ -207,11 +208,6 @@ void HTTPConnector::handleEnqueue()
    handleEnqueue(message);
 }
 
-const char* HTTPConnector::getQueueName() const
-{
-   return "HTTPConnector";
-}
-
 HTTPConnection* HTTPConnector::connect(
    const String& locator, 
    SSLContext * sslContext,

diff --git a/src/Pegasus/Common/HTTPConnector.h b/src/Pegasus/Common/HTTPConnector.h
index 40a7362ebef33885423548943c236b04433d1d4f..ed5f9bba9d64faca55aabd6e86304de6ed39dba0 100644 (file)
--- a/src/Pegasus/Common/HTTPConnector.h
+++ b/src/Pegasus/Common/HTTPConnector.h
@@ -71,8 +71,6 @@ class PEGASUS_COMMON_LINKAGE HTTPConnector : public MessageQueueService
       virtual void handleEnqueue(Message *);
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       /** Establishes a new connection and creates an HTTPConnection object
          to represent it.
 

diff --git a/src/Pegasus/Common/HTTPOptions.cpp b/src/Pegasus/Common/HTTPOptions.cpp
index 74d33cf88ae4c1e5fbe5bab5653d32091633df8d..7ae0577c01b1f2ec9f1ae7d246ebb294d51c9333 100644 (file)
--- a/src/Pegasus/Common/HTTPOptions.cpp
+++ b/src/Pegasus/Common/HTTPOptions.cpp
@@ -27,6 +27,8 @@
 //
 //%/////////////////////////////////////////////////////////////////////////////
 
+#include <Pegasus/Common/Config.h>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/HTTPAcceptor.h>
 #include <Pegasus/Common/FileSystem.h>
 #include <Pegasus/Common/HTTPConnection.h>
@@ -40,6 +42,7 @@ PEGASUS_USING_PEGASUS;
 PEGASUS_USING_STD;
 
 HTTPOptions::HTTPOptions()
+    : MessageQueue(PEGASUS_QUEUENAME_HTTPOPTIONS)
 {
 #error  "this class does not appear to be used" // <<< Sat Feb  9 17:33:07 2002 mdd >>>
 }
@@ -128,9 +131,4 @@ void HTTPOptions::handleHTTPMessage(HTTPMessage* httpMessage)
 }
 
 
-const char* HTTPOptions::getQueueName() const
-{
-   return "HTTPOptions";
-}
-
 PEGASUS_NAMESPACE_END

diff --git a/src/Pegasus/Common/HTTPOptions.h b/src/Pegasus/Common/HTTPOptions.h
index 2b401529c9cfccc7c270dbfd033f8543b5fd6694..908ec4ac3c29186be93f670e2c2cb95eae8b9761 100644 (file)
--- a/src/Pegasus/Common/HTTPOptions.h
+++ b/src/Pegasus/Common/HTTPOptions.h
@@ -92,8 +92,6 @@ class PEGASUS_COMMON_LINKAGE HTTPOptions : public MessageQueueService
       virtual void handleEnqueue(Message *);
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       void handleHTTPMessage(HTTPMessage* httpMessage);
 
    private:

diff --git a/src/Pegasus/Common/MessageQueue.cpp b/src/Pegasus/Common/MessageQueue.cpp
index d2e173c801007d63a58e8095b91ee29089c94d6b..26ff9b7b47c611a4dd6a87166eb81b7f1bcebce4 100644 (file)
--- a/src/Pegasus/Common/MessageQueue.cpp
+++ b/src/Pegasus/Common/MessageQueue.cpp
@@ -322,9 +322,7 @@ void MessageQueue::unlock()
 
 const char* MessageQueue::getQueueName() const
 {
-   if(_name[0] != 0x00)
-      return _name;
-   return "unknown";
+   return _name;
 }
 
 MessageQueue* MessageQueue::lookup(Uint32 queueId) throw(IPCException)

diff --git a/src/Pegasus/Common/MessageQueue.h b/src/Pegasus/Common/MessageQueue.h
index 89c27fd7c45ad2d2781fd27337fd176a22ba8a31..a435c37be4b476467f5e755c5b7664e98eb44e66 100644 (file)
--- a/src/Pegasus/Common/MessageQueue.h
+++ b/src/Pegasus/Common/MessageQueue.h
@@ -88,7 +88,7 @@ class PEGASUS_COMMON_LINKAGE MessageQueue
          queue id.
       */
       MessageQueue(
-        const char *name = 0,
+        const char *name,
         Boolean async = false,
         Uint32 queueId = MessageQueue::getNextQueueId());
       
@@ -190,7 +190,7 @@ class PEGASUS_COMMON_LINKAGE MessageQueue
 
       /** Provide a string name for this queue to be used by the print method.
        */
-      virtual const char* getQueueName() const;
+      const char* getQueueName() const;
 
       /** This method is called after a message has been enqueued. This default
          implementation does nothing. Derived classes may override this to

diff --git a/src/Pegasus/Common/MessageQueueService.h b/src/Pegasus/Common/MessageQueueService.h
index a77cce7c64dd0e3f43ada142a0917b2b77fbc799..e22ed6378ef2f99f89935f7ffd25644bd78529b1 100644 (file)
--- a/src/Pegasus/Common/MessageQueueService.h
+++ b/src/Pegasus/Common/MessageQueueService.h
@@ -50,7 +50,8 @@ class PEGASUS_COMMON_LINKAGE MessageQueueService : public MessageQueue
 
       typedef MessageQueue Base;
       
-      MessageQueueService(const char *name, Uint32 queueID, 
+      MessageQueueService(const char *name,
+                         Uint32 queueID = MessageQueue::getNextQueueId(),
                          Uint32 capabilities = 0, 
                          Uint32 mask = message_mask::type_cimom | 
                          message_mask::type_service | 

diff --git a/src/Pegasus/Common/ModuleController.cpp b/src/Pegasus/Common/ModuleController.cpp
index ff5fb4b703686c4a0257a511ddfad66af786a334..737e096d887471ffce616ed36666d3c3a8cfb4a6 100644 (file)
--- a/src/Pegasus/Common/ModuleController.cpp
+++ b/src/Pegasus/Common/ModuleController.cpp
@@ -838,7 +838,7 @@ ModuleController & ModuleController::get_client_handle(const pegasus_identity &
       
    Array<Uint32> services;
    
-   MessageQueue *message_queue = MessageQueue::lookup(PEGASUS_SERVICENAME_CONTROLSERVICE);
+   MessageQueue *message_queue = MessageQueue::lookup(PEGASUS_QUEUENAME_CONTROLSERVICE);
    
    if ((message_queue == NULL) || ( false == message_queue->isAsync() ))
    {
@@ -904,7 +904,7 @@ Boolean ModuleController::ClientSendAsync(const client_handle & handle,
    if( false == const_cast<client_handle &>(handle).authorized(CLIENT_SEND_ASYNC)) 
       throw Permission(pegasus_thread_self());
    pegasus_module *temp = new pegasus_module(this, 
-                                            String(PEGASUS_CONTROL_TEMP_MODULE),
+                                            String(PEGASUS_MODULENAME_TEMP),
                                             this, 
                                             0, 
                                             async_callback, 
@@ -931,7 +931,7 @@ Boolean ModuleController::ClientSendAsync(const client_handle & handle,
       throw Permission(pegasus_thread_self());
    
    pegasus_module *temp = new pegasus_module(this, 
-                                            String(PEGASUS_CONTROL_TEMP_MODULE),
+                                            String(PEGASUS_MODULENAME_TEMP),
                                             this, 
                                             0, 
                                             async_callback, 

diff --git a/src/Pegasus/Common/ModuleController.h b/src/Pegasus/Common/ModuleController.h
index 8e12f87309edb95ba80c0157396541c5520fa5b5..bee1aee01e061f552665b3784d24cabe716d5051 100644 (file)
--- a/src/Pegasus/Common/ModuleController.h
+++ b/src/Pegasus/Common/ModuleController.h
@@ -245,7 +245,7 @@ class PEGASUS_COMMON_LINKAGE ModuleController : public MessageQueueService
            
            ~callback_handle()
            {
-              if( _module->get_name() == String(PEGASUS_CONTROL_TEMP_MODULE) )
+              if( _module->get_name() == String(PEGASUS_MODULENAME_TEMP) )
                  delete _module;
            }
            

diff --git a/src/Pegasus/Common/tests/WebClient/WebClient.cpp b/src/Pegasus/Common/tests/WebClient/WebClient.cpp
index 92b72c008c5adb5993d7103bfd5b58892c83314a..fbafd86ff76966d0767718738d57b5a7840ace72 100644 (file)
--- a/src/Pegasus/Common/tests/WebClient/WebClient.cpp
+++ b/src/Pegasus/Common/tests/WebClient/WebClient.cpp
@@ -46,10 +46,16 @@ PEGASUS_USING_STD;
 class WebClientQueue : public MessageQueue
 {
 public:
+    WebClientQueue();
 
     virtual void handleEnqueue();
 };
 
+WebClientQueue::WebClientQueue()
+    : MessageQueue("WebClientQueue TEST")
+{
+}
+
 void WebClientQueue::handleEnqueue()
 {
     Message* message = dequeue();

diff --git a/src/Pegasus/ExportClient/CIMExportClient.cpp b/src/Pegasus/ExportClient/CIMExportClient.cpp
index f91438de9902fc87ac774c011e1d02fa6845ce13..784969dbb28fe171bb482d3bc2cc6524e8fea417 100644 (file)
--- a/src/Pegasus/ExportClient/CIMExportClient.cpp
+++ b/src/Pegasus/ExportClient/CIMExportClient.cpp
@@ -30,6 +30,7 @@
 //%/////////////////////////////////////////////////////////////////////////////
 
 #include <Pegasus/Common/Config.h>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/HTTPConnection.h>
 #include <Pegasus/Common/Destroyer.h>
 #include <Pegasus/Common/XmlWriter.h>
@@ -50,7 +51,7 @@ CIMExportClient::CIMExportClient(
    HTTPConnector* httpConnector,
    Uint32 timeOutMilliseconds)
    : 
-   Base("CIMExportClient", MessageQueue::getNextQueueId()),
+   Base(PEGASUS_QUEUENAME_EXPORTCLIENT),
    _monitor(monitor), 
    _httpConnector(httpConnector),
    _timeOutMilliseconds(timeOutMilliseconds),
@@ -82,11 +83,6 @@ void CIMExportClient::handleEnqueue()
 
 }
 
-const char* CIMExportClient::getQueueName() const
-{
-   return "CIMExportClient";
-}
-
 void CIMExportClient::connect(const String& address)
 {
    // If already connected, bail out!

diff --git a/src/Pegasus/ExportClient/CIMExportClient.h b/src/Pegasus/ExportClient/CIMExportClient.h
index 654b06d1f58ca7405c2caf5dc5595764264ce89d..bd90820661996fd6e7341a8652a23d2fdb772d9e 100644 (file)
--- a/src/Pegasus/ExportClient/CIMExportClient.h
+++ b/src/Pegasus/ExportClient/CIMExportClient.h
@@ -74,9 +74,6 @@ class PEGASUS_EXPORT_CLIENT_LINKAGE CIMExportClient : public MessageQueueService
       virtual void handleEnqueue(Message *);
       virtual void handleEnqueue();
 
-      /** Returns the queue name. */
-      virtual const char* getQueueName() const;
-
       ///
       Uint32 getTimeOut() const
       {

diff --git a/src/Pegasus/ExportClient/CIMExportRequestEncoder.cpp b/src/Pegasus/ExportClient/CIMExportRequestEncoder.cpp
index d1a280a7034337392c9a31ac4cb2c07ef50efc1d..7eaf5c710f963dd7f8ee09d43bd3b2a0516b6022 100644 (file)
--- a/src/Pegasus/ExportClient/CIMExportRequestEncoder.cpp
+++ b/src/Pegasus/ExportClient/CIMExportRequestEncoder.cpp
@@ -31,6 +31,7 @@
 
 #include <Pegasus/Common/Config.h>
 #include <iostream>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/System.h>
 #include <Pegasus/Common/XmlWriter.h>
 #include <Pegasus/Common/HTTPMessage.h>
@@ -43,7 +44,7 @@ PEGASUS_NAMESPACE_BEGIN
 CIMExportRequestEncoder::CIMExportRequestEncoder(
    MessageQueue* outputQueue, ClientAuthenticator* authenticator)
    : 
-   Base("CIMExportRequestEncoder", MessageQueue::getNextQueueId()),
+   Base(PEGASUS_QUEUENAME_EXPORTREQENCODER),
    _outputQueue(outputQueue),
    _authenticator(authenticator)
 {
@@ -87,11 +88,6 @@ void CIMExportRequestEncoder::handleEnqueue()
       handleEnqueue(message);
 }
 
-const char* CIMExportRequestEncoder::getQueueName() const
-{
-   return "CIMExportRequestEncoder";
-}
-
 void CIMExportRequestEncoder::_encodeExportIndicationRequest(
    CIMExportIndicationRequestMessage* message)
 {

diff --git a/src/Pegasus/ExportClient/CIMExportRequestEncoder.h b/src/Pegasus/ExportClient/CIMExportRequestEncoder.h
index 6f53a1ac23d2ee445a58724fe253cbfaf305e4a9..47af97a62d1e944839ca1cea57fd555567236fad 100644 (file)
--- a/src/Pegasus/ExportClient/CIMExportRequestEncoder.h
+++ b/src/Pegasus/ExportClient/CIMExportRequestEncoder.h
@@ -63,9 +63,6 @@ class PEGASUS_EXPORT_CLIENT_LINKAGE CIMExportRequestEncoder
       virtual void handleEnqueue(Message *);
       virtual void handleEnqueue();
 
-      /** Returns the queue name. */
-      virtual const char* getQueueName() const;
-
    private:
 
       void _encodeExportIndicationRequest(

diff --git a/src/Pegasus/ExportClient/CIMExportResponseDecoder.cpp b/src/Pegasus/ExportClient/CIMExportResponseDecoder.cpp
index 8bfb8d679a09e9707390ab1be52097e23512c2df..e08641c5417bfc3f964a5575944df306fb1977fa 100644 (file)
--- a/src/Pegasus/ExportClient/CIMExportResponseDecoder.cpp
+++ b/src/Pegasus/ExportClient/CIMExportResponseDecoder.cpp
@@ -31,6 +31,7 @@
 
 #include <Pegasus/Common/Config.h>
 #include <iostream>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/XmlParser.h>
 #include <Pegasus/Common/XmlReader.h>
 #include <Pegasus/Common/System.h>
@@ -48,7 +49,7 @@ CIMExportResponseDecoder::CIMExportResponseDecoder(
    MessageQueueService* encoderQueue,
    ClientAuthenticator* authenticator)
    :
-   Base("CIMExportResponseDecoder", MessageQueue::getNextQueueId()),
+   Base(PEGASUS_QUEUENAME_EXPORTRESPDECODER),
    _outputQueue(outputQueue),
    _encoderQueue(encoderQueue),
    _authenticator(authenticator)
@@ -96,11 +97,6 @@ void CIMExportResponseDecoder::handleEnqueue()
       handleEnqueue(message);
 }
 
-const char* CIMExportResponseDecoder::getQueueName() const
-{
-   return "CIMExportResponseDecoder";
-}
-
 void CIMExportResponseDecoder::_handleHTTPMessage(HTTPMessage* httpMessage)
 {
    //

diff --git a/src/Pegasus/ExportClient/CIMExportResponseDecoder.h b/src/Pegasus/ExportClient/CIMExportResponseDecoder.h
index e51e63cea3a94fa5ecfaecd9aa4a9c6a381635f4..1dea9d884f14ad863718bb8ea81431c129e376de 100644 (file)
--- a/src/Pegasus/ExportClient/CIMExportResponseDecoder.h
+++ b/src/Pegasus/ExportClient/CIMExportResponseDecoder.h
@@ -70,9 +70,6 @@ class PEGASUS_EXPORT_CLIENT_LINKAGE CIMExportResponseDecoder :  public MessageQu
       virtual void handleEnqueue(Message *);
       virtual void handleEnqueue();
 
-      /** Returns the queue name. */
-      virtual const char* getQueueName() const;
-
    private:
 
       void _handleHTTPMessage(

diff --git a/src/Pegasus/ExportServer/CIMExportRequestDecoder.cpp b/src/Pegasus/ExportServer/CIMExportRequestDecoder.cpp
index 125dd3aa4cb81635c5edfcce0b2fa74ac346a4ab..9ba4dc786ec42b59bcfe34ae8100a30da1e37359 100644 (file)
--- a/src/Pegasus/ExportServer/CIMExportRequestDecoder.cpp
+++ b/src/Pegasus/ExportServer/CIMExportRequestDecoder.cpp
@@ -33,6 +33,7 @@
 #include <Pegasus/Common/Config.h>
 #include <cctype>
 #include <cstdio>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/XmlParser.h>
 #include <Pegasus/Common/XmlReader.h>
 #include <Pegasus/Common/Destroyer.h>
@@ -49,7 +50,7 @@ CIMExportRequestDecoder::CIMExportRequestDecoder(
    MessageQueueService* outputQueue,
    Uint32 returnQueueId)
    :   
-   Base("CIMExportRequestDecoder", MessageQueue::getNextQueueId()),
+   Base(PEGASUS_QUEUENAME_EXPORTREQDECODER),
    _outputQueue(outputQueue),
    _returnQueueId(returnQueueId),
    _serverTerminating(false)
@@ -128,11 +129,6 @@ void CIMExportRequestDecoder::handleEnqueue()
       handleEnqueue(message);
 }
 
-const char* CIMExportRequestDecoder::getQueueName() const
-{
-   return "CIMExportRequestDecoder";
-}
-
 //------------------------------------------------------------------------------
 //
 // From the HTTP/1.1 Specification (RFC 2626):

diff --git a/src/Pegasus/ExportServer/CIMExportRequestDecoder.h b/src/Pegasus/ExportServer/CIMExportRequestDecoder.h
index dbc11bfdbce3213e440554b36c9178cdba76ed49..bb25013f218ef889cb079dededb9d894c0b2af16 100644 (file)
--- a/src/Pegasus/ExportServer/CIMExportRequestDecoder.h
+++ b/src/Pegasus/ExportServer/CIMExportRequestDecoder.h
@@ -78,8 +78,6 @@ class PEGASUS_EXPORT_SERVER_LINKAGE CIMExportRequestDecoder
 
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       void handleHTTPMessage(HTTPMessage* httpMessage);
 
       void handleMethodRequest(

diff --git a/src/Pegasus/ExportServer/CIMExportRequestDispatcher.cpp b/src/Pegasus/ExportServer/CIMExportRequestDispatcher.cpp
index dadfe30b355b336da7176fe82f4dc58f85bf9ae1..306fde2c56067ea1a07f61a7ccac544f96dab5a4 100644 (file)
--- a/src/Pegasus/ExportServer/CIMExportRequestDispatcher.cpp
+++ b/src/Pegasus/ExportServer/CIMExportRequestDispatcher.cpp
@@ -28,6 +28,7 @@
 //%/////////////////////////////////////////////////////////////////////////////
 
 #include <Pegasus/Common/Config.h>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/HTTPMessage.h>
 #include <Pegasus/Provider/CIMOMHandle.h>
 
@@ -39,7 +40,7 @@ PEGASUS_NAMESPACE_BEGIN
 
 CIMExportRequestDispatcher::CIMExportRequestDispatcher(
    Boolean dynamicReg, Boolean staticConsumers, Boolean persistence)
-   : Base("CIMExportRequestDispatcher", MessageQueue::getNextQueueId()),
+   : Base(PEGASUS_QUEUENAME_EXPORTREQDISPATCHER),
      _dynamicReg(dynamicReg),
      _staticConsumers(staticConsumers),
      _persistence(persistence)
@@ -59,11 +60,6 @@ CIMExportRequestDispatcher::~CIMExportRequestDispatcher()
 
 }
 
-const char* CIMExportRequestDispatcher::getQueueName() const
-{
-    return "CIMExportRequestDispatcher";
-}
-
 void CIMExportRequestDispatcher::_handle_async_request(AsyncRequest *req)
 {
     if ( req->getType() == async_messages::CIMSERVICE_STOP )

diff --git a/src/Pegasus/ExportServer/CIMExportRequestDispatcher.h b/src/Pegasus/ExportServer/CIMExportRequestDispatcher.h
index 842e32c94dba3d1467fc0a3bff9d71cfa338d71a..1034cc2e1450a371f0bac3c5314a74bbcbe3f201 100644 (file)
--- a/src/Pegasus/ExportServer/CIMExportRequestDispatcher.h
+++ b/src/Pegasus/ExportServer/CIMExportRequestDispatcher.h
@@ -72,8 +72,6 @@ class PEGASUS_EXPORT_SERVER_LINKAGE CIMExportRequestDispatcher
       
       AtomicInt dienow;
 
-      virtual const char* getQueueName() const;
-        
    private:
 
       void _handleExportIndicationRequest(

diff --git a/src/Pegasus/ExportServer/CIMExportResponseEncoder.cpp b/src/Pegasus/ExportServer/CIMExportResponseEncoder.cpp
index 8cedebd9a6bbc5a4541bc88701151f7c0cb8061b..faab62f0f3c4f9d1511b16e953a73c2180938aa7 100644 (file)
--- a/src/Pegasus/ExportServer/CIMExportResponseEncoder.cpp
+++ b/src/Pegasus/ExportServer/CIMExportResponseEncoder.cpp
@@ -30,6 +30,7 @@
 #include <Pegasus/Common/Config.h>
 #include <cctype>
 #include <cstdio>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/XmlParser.h>
 #include <Pegasus/Common/XmlReader.h>
 #include <Pegasus/Common/Destroyer.h>
@@ -43,7 +44,7 @@ PEGASUS_USING_STD;
 PEGASUS_NAMESPACE_BEGIN
 
 CIMExportResponseEncoder::CIMExportResponseEncoder()
-   : Base("CIMExportResponseEncoder", MessageQueue::getNextQueueId())
+   : Base(PEGASUS_QUEUENAME_EXPORTRESPENCODER)
 {
 
 }
@@ -119,11 +120,6 @@ void CIMExportResponseEncoder::handleEnqueue()
       handleEnqueue(message);
 }
 
-const char* CIMExportResponseEncoder::getQueueName() const
-{
-   return "CIMExportResponseEncoder";
-}
-
 void CIMExportResponseEncoder::encodeExportIndicationResponse(
    CIMExportIndicationResponseMessage* response)
 {

diff --git a/src/Pegasus/ExportServer/CIMExportResponseEncoder.h b/src/Pegasus/ExportServer/CIMExportResponseEncoder.h
index dcfc5b15993a3a29d7a043435dad9b3efdbf2347..a6f1f85a56347bcaa9848f0ccabcfad0d4684bf6 100644 (file)
--- a/src/Pegasus/ExportServer/CIMExportResponseEncoder.h
+++ b/src/Pegasus/ExportServer/CIMExportResponseEncoder.h
@@ -65,8 +65,6 @@ class PEGASUS_EXPORT_SERVER_LINKAGE CIMExportResponseEncoder
 
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       void encodeExportIndicationResponse(
         CIMExportIndicationResponseMessage* response);
 };

diff --git a/src/Pegasus/HandlerService/IndicationHandlerService.cpp b/src/Pegasus/HandlerService/IndicationHandlerService.cpp
index 8ba0d3b94d671a0834ea0ca7a0c6f3131471a269..355669c19fcc8f5ecdcbafdd15786d8be1276ba9 100644 (file)
--- a/src/Pegasus/HandlerService/IndicationHandlerService.cpp
+++ b/src/Pegasus/HandlerService/IndicationHandlerService.cpp
@@ -27,6 +27,7 @@
 //
 //%/////////////////////////////////////////////////////////////////////////////
 
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/CIMMessage.h>
 #include <Pegasus/Common/XmlWriter.h>
 
@@ -38,7 +39,7 @@ PEGASUS_USING_PEGASUS;
 PEGASUS_NAMESPACE_BEGIN
 
 IndicationHandlerService::IndicationHandlerService(void)
-   : Base("IndicationHandlerService", MessageQueue::getNextQueueId())
+   : Base(PEGASUS_QUEUENAME_INDHANDLERMANAGER)
 {
 
 }
@@ -49,11 +50,6 @@ IndicationHandlerService::IndicationHandlerService(CIMRepository* repository)
 {
 }
 
-const char* IndicationHandlerService::getQueueName() const
-{
-   return "IndicationHandlerService";
-}
-
 void IndicationHandlerService::_handle_async_request(AsyncRequest *req)
 {
    if ( req->getType() == async_messages::CIMSERVICE_STOP )
@@ -165,7 +161,7 @@ void IndicationHandlerService::_handleIndication(const Message* message)
    {
       Array<Uint32> exportServer;
 
-      find_services(String("CIMExportRequestDispatcher"), 0, 0, &exportServer);
+      find_services(PEGASUS_QUEUENAME_EXPORTREQDISPATCHER, 0, 0, &exportServer);
         
       // Listener is build with Cimom, so send message to ExportServer
        

diff --git a/src/Pegasus/HandlerService/IndicationHandlerService.h b/src/Pegasus/HandlerService/IndicationHandlerService.h
index 627209775f6f4b57c76ee681a26411014ad41a0f..f6a9a90b755bc972d9e84cff1a6fe2d9ed5b70de 100644 (file)
--- a/src/Pegasus/HandlerService/IndicationHandlerService.h
+++ b/src/Pegasus/HandlerService/IndicationHandlerService.h
@@ -80,7 +80,6 @@ class PEGASUS_HANDLER_SERVICE_LINKAGE IndicationHandlerService
 
       virtual void handleEnqueue(void);
 
-      virtual const char* getQueueName() const;
       static void _handleIndicationCallBack(AsyncOpNode *, 
                                            MessageQueue *, 
                                            void *);

diff --git a/src/Pegasus/IndicationService/IndicationService.cpp b/src/Pegasus/IndicationService/IndicationService.cpp
index 2d5043e20003ddaf6da31373e22f03737c802d7c..a32a55c92ca33fef350090dd323384948e9cdb92 100644 (file)
--- a/src/Pegasus/IndicationService/IndicationService.cpp
+++ b/src/Pegasus/IndicationService/IndicationService.cpp
@@ -55,7 +55,7 @@ PEGASUS_NAMESPACE_BEGIN
 IndicationService::IndicationService (
     CIMRepository * repository,
     ProviderRegistrationManager * providerRegManager)
-    : Base (PEGASUS_SERVICENAME_INDICATIONSERVICE, 
+    : Base (PEGASUS_QUEUENAME_INDICATIONSERVICE, 
             MessageQueue::getNextQueueId ()),
          _repository (repository),
          _providerRegManager (providerRegManager)
@@ -188,7 +188,7 @@ void IndicationService::_initialize (void)
     //  Find required services
     //
     Array <Uint32> pmservices;
-    find_services (PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, 0, 0, &pmservices);
+    find_services (PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, 0, 0, &pmservices);
     pegasus_yield ();
     if (pmservices.size () > 0)
     {
@@ -206,7 +206,7 @@ void IndicationService::_initialize (void)
     }
 
     Array <Uint32> hmservices;
-    find_services (PEGASUS_SERVICENAME_HANDLERMANAGER, 0, 0, &hmservices);
+    find_services (PEGASUS_QUEUENAME_INDHANDLERMANAGER, 0, 0, &hmservices);
     pegasus_yield ();
     if (hmservices.size () > 0)
     {

diff --git a/src/Pegasus/Provider/CIMOMHandle.cpp b/src/Pegasus/Provider/CIMOMHandle.cpp
index 7820a4879294a4622e8335de3c1ee9b29b3ad1df..2449a061853ddede7d90997cbd29c0a1d7998b0f 100644 (file)
--- a/src/Pegasus/Provider/CIMOMHandle.cpp
+++ b/src/Pegasus/Provider/CIMOMHandle.cpp
@@ -51,7 +51,7 @@ CIMOMHandle::CIMOMHandle(MessageQueueService * service)
    : _service(service), _cimom(0), _id(peg_credential_types::PROVIDER)
 {
     MessageQueue * queue =
-        MessageQueue::lookup(PEGASUS_SERVICENAME_CIMOPREQDISPATCHER);
+        MessageQueue::lookup(PEGASUS_QUEUENAME_OPREQDISPATCHER);
 
     _cimom = dynamic_cast<MessageQueueService *>(queue);
     _controller = &(ModuleController::get_client_handle(_id, &_client_handle));

diff --git a/src/Pegasus/ProviderManager/OperationResponseHandler.h b/src/Pegasus/ProviderManager/OperationResponseHandler.h
index 5540f7f05ddef5749dc38077cdbb1e621463df9b..f41a6b0d44e16c5b62e4bd03340b1f93b029e775 100644 (file)
--- a/src/Pegasus/ProviderManager/OperationResponseHandler.h
+++ b/src/Pegasus/ProviderManager/OperationResponseHandler.h
@@ -341,7 +341,7 @@ public:
        {
            Array<Uint32> serviceIds;
 
-           _source->find_services(PEGASUS_SERVICENAME_INDICATIONSERVICE, 0, 0, &serviceIds);
+           _source->find_services(PEGASUS_QUEUENAME_INDICATIONSERVICE, 0, 0, &serviceIds);
 
            PEGASUS_ASSERT(serviceIds.size() != 0);
 

diff --git a/src/Pegasus/ProviderManager/ProviderManager.cpp b/src/Pegasus/ProviderManager/ProviderManager.cpp
index 2cc4b563ae6760d38a2b1e4cd3b38c95433952f7..b06b5533b4b22be7c9bbec7383747c4ef22adf2d 100644 (file)
--- a/src/Pegasus/ProviderManager/ProviderManager.cpp
+++ b/src/Pegasus/ProviderManager/ProviderManager.cpp
@@ -28,6 +28,7 @@
 
 #include "ProviderManager.h"
 
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/Tracer.h>
 
 PEGASUS_NAMESPACE_BEGIN
@@ -71,7 +72,7 @@ Provider ProviderManager::getProvider(
     Provider provider(providerName, fileName);
 
     // create a CIMOMHandle
-    MessageQueue * queue = MessageQueue::lookup("Server::ProviderManagerService");
+    MessageQueue * queue = MessageQueue::lookup(PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP);
 
     PEGASUS_ASSERT(queue != 0);
 

diff --git a/src/Pegasus/ProviderManager/ProviderManagerService.cpp b/src/Pegasus/ProviderManager/ProviderManagerService.cpp
index 39ed0dd5dcf101209646bd9fd5adc5a8198c0448..5c3d2877ae9166ed72b1f7213945111deb41f2fc 100644 (file)
--- a/src/Pegasus/ProviderManager/ProviderManagerService.cpp
+++ b/src/Pegasus/ProviderManager/ProviderManagerService.cpp
@@ -29,6 +29,7 @@
 #include "ProviderManagerService.h"
 
 #include <Pegasus/Common/Config.h>
+#include <Pegasus/Common/Constants.h>
 #include <Pegasus/Common/CIMMessage.h>
 #include <Pegasus/Common/OperationContext.h>
 #include <Pegasus/Common/Destroyer.h>
@@ -54,7 +55,7 @@ static struct timeval deadwait = { 1, 0};
 
 ProviderManagerService::ProviderManagerService(
     ProviderRegistrationManager * providerRegistrationManager)
-    : MessageQueueService("Server::ProviderManagerService", MessageQueue::getNextQueueId()),
+    : MessageQueueService(PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP),
     _threadPool(10, "ProviderManagerService", 2, 7, await, dwait, deadwait),
     _providerRegistrationManager(providerRegistrationManager)
 {

diff --git a/src/Pegasus/Server/CIMOperationRequestAuthorizer.cpp b/src/Pegasus/Server/CIMOperationRequestAuthorizer.cpp
index 21b384dd47fd355fb711269cc8801ed1f6cb2598..abeed43ecbb5f8055c256ac88701347e1aebc774 100644 (file)
--- a/src/Pegasus/Server/CIMOperationRequestAuthorizer.cpp
+++ b/src/Pegasus/Server/CIMOperationRequestAuthorizer.cpp
@@ -45,7 +45,7 @@ PEGASUS_USING_STD;
 CIMOperationRequestAuthorizer::CIMOperationRequestAuthorizer(
    MessageQueueService* outputQueue)
    :
-   Base(PEGASUS_SERVICENAME_CIMOPREQAUTHORIZER, MessageQueue::getNextQueueId()),
+   Base(PEGASUS_QUEUENAME_OPREQAUTHORIZER),
    _outputQueue(outputQueue),
    _serverTerminating(false)
 {
@@ -408,14 +408,6 @@ void CIMOperationRequestAuthorizer::handleEnqueue()
    PEG_METHOD_EXIT();
 }
 
-const char* CIMOperationRequestAuthorizer::getQueueName() const
-{
-   PEG_METHOD_ENTER(TRC_SERVER, "CIMOperationRequestAuthorizer::getQueueName");
-
-   PEG_METHOD_EXIT();
-   return PEGASUS_SERVICENAME_CIMOPREQAUTHORIZER;
-}
-
 void CIMOperationRequestAuthorizer::setServerTerminating(Boolean flag)
 {
    PEG_METHOD_ENTER(TRC_SERVER,

diff --git a/src/Pegasus/Server/CIMOperationRequestAuthorizer.h b/src/Pegasus/Server/CIMOperationRequestAuthorizer.h
index ba9ffb7b651d5fe444c312b33aac8ebb05b95db1..f43980716e878c8ca04c20987f32109f852035f3 100644 (file)
--- a/src/Pegasus/Server/CIMOperationRequestAuthorizer.h
+++ b/src/Pegasus/Server/CIMOperationRequestAuthorizer.h
@@ -63,8 +63,6 @@ class PEGASUS_SERVER_LINKAGE CIMOperationRequestAuthorizer : public MessageQueue
 
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       /** Sets the flag to indicate whether or not the CIMServer is
          shutting down.
       */

diff --git a/src/Pegasus/Server/CIMOperationRequestDecoder.cpp b/src/Pegasus/Server/CIMOperationRequestDecoder.cpp
index 5499b37719709931de3a3d2d88bc5b29f81f6431..19b81a5d7171016726b1197fde7f5501c4e09fa6 100644 (file)
--- a/src/Pegasus/Server/CIMOperationRequestDecoder.cpp
+++ b/src/Pegasus/Server/CIMOperationRequestDecoder.cpp
@@ -53,7 +53,7 @@ PEGASUS_NAMESPACE_BEGIN
 CIMOperationRequestDecoder::CIMOperationRequestDecoder(
    MessageQueueService* outputQueue,
    Uint32 returnQueueId)
-   :  Base(PEGASUS_SERVICENAME_CIMOPREQDECODER, MessageQueue::getNextQueueId()),
+   :  Base(PEGASUS_QUEUENAME_OPREQDECODER),
       _outputQueue(outputQueue),
       _returnQueueId(returnQueueId),
       _serverTerminating(false)
@@ -148,11 +148,6 @@ void CIMOperationRequestDecoder::handleEnqueue()
       handleEnqueue(message);
 }
 
-const char* CIMOperationRequestDecoder::getQueueName() const
-{
-   return PEGASUS_SERVICENAME_CIMOPREQDECODER;
-}
-
 //------------------------------------------------------------------------------
 //
 // From the HTTP/1.1 Specification (RFC 2626):

diff --git a/src/Pegasus/Server/CIMOperationRequestDecoder.h b/src/Pegasus/Server/CIMOperationRequestDecoder.h
index a6e3a885b0154a1b42eedfe5e9fe102202ab66e4..3a6876f1ad4c7da9698b0f3f2ac0a5f4b7f0831a 100644 (file)
--- a/src/Pegasus/Server/CIMOperationRequestDecoder.h
+++ b/src/Pegasus/Server/CIMOperationRequestDecoder.h
@@ -82,8 +82,6 @@ class CIMOperationRequestDecoder : public MessageQueueService
 
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       void handleHTTPMessage(HTTPMessage* httpMessage);
 
       void handleMethodCall(

diff --git a/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp b/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp
index 421587811d386ce951ae4d2216bf9f0e454abbf7..40bd61f930242f62f122046e41b83e84146d8464 100644 (file)
--- a/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp
+++ b/src/Pegasus/Server/CIMOperationRequestDispatcher.cpp
@@ -48,8 +48,7 @@ CIMOperationRequestDispatcher::CIMOperationRequestDispatcher(
     CIMRepository* repository,
     ProviderRegistrationManager* providerRegistrationManager)
       :
-      Base(PEGASUS_SERVICENAME_CIMOPREQDISPATCHER,
-           MessageQueue::getNextQueueId()),
+      Base(PEGASUS_QUEUENAME_OPREQDISPATCHER),
       _repository(repository),
       _providerRegistrationManager(providerRegistrationManager)
 {
@@ -100,7 +99,7 @@ Boolean CIMOperationRequestDispatcher::_lookupInternalProvider(
 
     if (String::equalNoCase(className, PEGASUS_CLASSNAME_CONFIGSETTING))
     {
-        service = PEGASUS_SERVICENAME_CONTROLSERVICE;
+        service = PEGASUS_QUEUENAME_CONTROLSERVICE;
         provider = PEGASUS_MODULENAME_CONFIGPROVIDER;
         PEG_METHOD_EXIT();
         return true;
@@ -108,7 +107,7 @@ Boolean CIMOperationRequestDispatcher::_lookupInternalProvider(
     if (String::equalNoCase(className, PEGASUS_CLASSNAME_AUTHORIZATION) ||
         String::equalNoCase(className, PEGASUS_CLASSNAME_USER))
     {
-        service = PEGASUS_SERVICENAME_CONTROLSERVICE;
+        service = PEGASUS_QUEUENAME_CONTROLSERVICE;
         provider = PEGASUS_MODULENAME_USERAUTHPROVIDER;
         PEG_METHOD_EXIT();
         return true;
@@ -117,7 +116,7 @@ Boolean CIMOperationRequestDispatcher::_lookupInternalProvider(
         String::equalNoCase(className, PEGASUS_CLASSNAME_PROVIDER) ||
         String::equalNoCase(className, PEGASUS_CLASSNAME_PROVIDERCAPABILITIES))
     {
-        service = PEGASUS_SERVICENAME_CONTROLSERVICE;
+        service = PEGASUS_QUEUENAME_CONTROLSERVICE;
         provider = PEGASUS_MODULENAME_PROVREGPROVIDER;
         PEG_METHOD_EXIT();
         return true;
@@ -128,7 +127,7 @@ Boolean CIMOperationRequestDispatcher::_lookupInternalProvider(
         String::equalNoCase(className, PEGASUS_CLASSNAME_INDHANDLER_SNMP) ||
         String::equalNoCase(className, PEGASUS_CLASSNAME_INDFILTER))
     {
-        service = PEGASUS_SERVICENAME_INDICATIONSERVICE;
+        service = PEGASUS_QUEUENAME_INDICATIONSERVICE;
         provider = String::EMPTY;
         PEG_METHOD_EXIT();
         return true;
@@ -567,11 +566,6 @@ void CIMOperationRequestDispatcher::handleEnqueue()
    PEG_METHOD_EXIT();
 }
 
-const char* CIMOperationRequestDispatcher::getQueueName() const
-{
-   return(_name);
-}
-
 void CIMOperationRequestDispatcher::handleGetClassRequest(
    CIMGetClassRequestMessage* request)
 {
@@ -666,7 +660,7 @@ void CIMOperationRequestDispatcher::handleGetInstanceRequest(
           new CIMGetInstanceRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -813,7 +807,7 @@ void CIMOperationRequestDispatcher::handleDeleteInstanceRequest(
           new CIMDeleteInstanceRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
 
       PEG_METHOD_EXIT();
@@ -964,7 +958,7 @@ void CIMOperationRequestDispatcher::handleCreateInstanceRequest(
 
       Array<Uint32> iService;
 
-      find_services(PEGASUS_SERVICENAME_INDICATIONSERVICE, 0, 0, &iService);
+      find_services(PEGASUS_QUEUENAME_INDICATIONSERVICE, 0, 0, &iService);
 
       AsyncOpNode* op = this->get_op();
 
@@ -1000,7 +994,7 @@ void CIMOperationRequestDispatcher::handleCreateInstanceRequest(
           new CIMCreateInstanceRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
 
       PEG_METHOD_EXIT();
@@ -1148,7 +1142,7 @@ void CIMOperationRequestDispatcher::handleModifyInstanceRequest(
           new CIMModifyInstanceRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
 
       PEG_METHOD_EXIT();
@@ -1346,7 +1340,7 @@ void CIMOperationRequestDispatcher::handleEnumerateInstancesRequest(
           new CIMEnumerateInstancesRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -1452,7 +1446,7 @@ void CIMOperationRequestDispatcher::handleEnumerateInstanceNamesRequest(
           new CIMEnumerateInstanceNamesRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -1528,7 +1522,7 @@ void CIMOperationRequestDispatcher::handleAssociatorsRequest(
           new CIMAssociatorsRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -1611,7 +1605,7 @@ void CIMOperationRequestDispatcher::handleAssociatorNamesRequest(
           new CIMAssociatorNamesRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -1691,7 +1685,7 @@ void CIMOperationRequestDispatcher::handleReferencesRequest(
           new CIMReferencesRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -1772,7 +1766,7 @@ void CIMOperationRequestDispatcher::handleReferenceNamesRequest(
           new CIMReferenceNamesRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -1849,7 +1843,7 @@ void CIMOperationRequestDispatcher::handleGetPropertyRequest(
           new CIMGetPropertyRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -1960,7 +1954,7 @@ void CIMOperationRequestDispatcher::handleSetPropertyRequest(
           new CIMSetPropertyRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -2299,7 +2293,7 @@ void CIMOperationRequestDispatcher::handleInvokeMethodRequest(
           new CIMInvokeMethodRequestMessage(*request);
 
       _forwardRequestToService(
-          PEGASUS_SERVICENAME_PROVIDERMANAGER_CPP, requestCopy, response);
+          PEGASUS_QUEUENAME_PROVIDERMANAGER_CPP, requestCopy, response);
 
       PEG_METHOD_EXIT();
       return;
@@ -2338,7 +2332,7 @@ void CIMOperationRequestDispatcher::handleProcessIndicationRequest(
 
    // lookup IndicationService
    MessageQueue * queue =
-       MessageQueue::lookup(PEGASUS_SERVICENAME_INDICATIONSERVICE);
+       MessageQueue::lookup(PEGASUS_QUEUENAME_INDICATIONSERVICE);
 
    PEGASUS_ASSERT(queue != 0);
 

diff --git a/src/Pegasus/Server/CIMOperationRequestDispatcher.h b/src/Pegasus/Server/CIMOperationRequestDispatcher.h
index 70def71551d5f7b62544eca2b353cd31ab974bbf..7da1268beecdf4852d99b7ba4332d11c7e9fb5c4 100644 (file)
--- a/src/Pegasus/Server/CIMOperationRequestDispatcher.h
+++ b/src/Pegasus/Server/CIMOperationRequestDispatcher.h
@@ -69,8 +69,6 @@ public:
 
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       void handleGetClassRequest(
         CIMGetClassRequestMessage* request);
 

diff --git a/src/Pegasus/Server/CIMOperationResponseEncoder.cpp b/src/Pegasus/Server/CIMOperationResponseEncoder.cpp
index 72b3a4283fc7f105d3fab20e3e09686b70ad69dc..bf00cdb490bd7e5c5e9f1648d8486eb6c09ffa1b 100644 (file)
--- a/src/Pegasus/Server/CIMOperationResponseEncoder.cpp
+++ b/src/Pegasus/Server/CIMOperationResponseEncoder.cpp
@@ -51,7 +51,7 @@ PEGASUS_USING_STD;
 PEGASUS_NAMESPACE_BEGIN
 
 CIMOperationResponseEncoder::CIMOperationResponseEncoder()
-   : Base(PEGASUS_SERVICENAME_CIMOPREQENCODER, MessageQueue::getNextQueueId())
+   : Base(PEGASUS_QUEUENAME_OPRESPENCODER)
 {
 
 }
@@ -320,11 +320,6 @@ void CIMOperationResponseEncoder::handleEnqueue()
       handleEnqueue(message);
 }
 
-const char* CIMOperationResponseEncoder::getQueueName() const
-{
-   return PEGASUS_SERVICENAME_CIMOPREQENCODER;
-}
-
 void CIMOperationResponseEncoder::encodeCreateClassResponse(
    CIMCreateClassResponseMessage* response)
 {

diff --git a/src/Pegasus/Server/CIMOperationResponseEncoder.h b/src/Pegasus/Server/CIMOperationResponseEncoder.h
index 27eef67817dc6a09dfbb824bd795a322d9840eb5..68cd5a782709fc14aa033f7a1c3fa2e210c3d432 100644 (file)
--- a/src/Pegasus/Server/CIMOperationResponseEncoder.h
+++ b/src/Pegasus/Server/CIMOperationResponseEncoder.h
@@ -76,8 +76,6 @@ class CIMOperationResponseEncoder : public MessageQueueService
       virtual void handleEnqueue();
 
 
-      virtual const char* getQueueName() const;
-
       void encodeCreateClassResponse(
         CIMCreateClassResponseMessage* response);
 

diff --git a/src/Pegasus/Server/CIMServer.cpp b/src/Pegasus/Server/CIMServer.cpp
index e18f0d4dfb7bfb87b1ddbc0a4d1905ff63ff5ca1..f5bf9a19d49abb06643a870202b5fb03535437a4 100644 (file)
--- a/src/Pegasus/Server/CIMServer.cpp
+++ b/src/Pegasus/Server/CIMServer.cpp
@@ -129,12 +129,12 @@ CIMServer::CIMServer(
 
     // Create the control service
     ModuleController* controlService =
-        new ModuleController(PEGASUS_SERVICENAME_CONTROLSERVICE);
+        new ModuleController(PEGASUS_QUEUENAME_CONTROLSERVICE);
 
     // Create the Configuration control provider
     ProviderMessageFacade * configProvider =
         new ProviderMessageFacade(new ConfigSettingProvider());
-    ModuleController::register_module(PEGASUS_SERVICENAME_CONTROLSERVICE,
+    ModuleController::register_module(PEGASUS_QUEUENAME_CONTROLSERVICE,
                                       PEGASUS_MODULENAME_CONFIGPROVIDER,
                                       configProvider,
                                       controlProviderReceiveMessageCallback,
@@ -143,7 +143,7 @@ CIMServer::CIMServer(
     // Create the User/Authorization control provider
     ProviderMessageFacade * userAuthProvider =
         new ProviderMessageFacade(new UserAuthProvider(_repository));
-    ModuleController::register_module(PEGASUS_SERVICENAME_CONTROLSERVICE,
+    ModuleController::register_module(PEGASUS_QUEUENAME_CONTROLSERVICE,
                                       PEGASUS_MODULENAME_USERAUTHPROVIDER,
                                       userAuthProvider,
                                       controlProviderReceiveMessageCallback,
@@ -152,7 +152,7 @@ CIMServer::CIMServer(
     // Create the Provider Registration control provider
     ProviderMessageFacade * provRegProvider = new ProviderMessageFacade(
         new ProviderRegistrationProvider(_providerRegistrationManager));
-    ModuleController::register_module(PEGASUS_SERVICENAME_CONTROLSERVICE,
+    ModuleController::register_module(PEGASUS_QUEUENAME_CONTROLSERVICE,
                                       PEGASUS_MODULENAME_PROVREGPROVIDER,
                                       provRegProvider,
                                       controlProviderReceiveMessageCallback,

diff --git a/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp b/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
index 8fc648c1783c19e80f46b3a07682257620958fb1..c59e2063def5075063d3adb3ade41673aa85b412 100644 (file)
--- a/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
+++ b/src/Pegasus/Server/HTTPAuthenticatorDelegator.cpp
@@ -45,7 +45,7 @@ PEGASUS_NAMESPACE_BEGIN
 HTTPAuthenticatorDelegator::HTTPAuthenticatorDelegator(
     Uint32 operationMessageQueueId,
     Uint32 exportMessageQueueId)
-   : Base(PEGASUS_SERVICENAME_HTTPAUTHDELEGATOR,
+   : Base(PEGASUS_QUEUENAME_HTTPAUTHDELEGATOR,
           MessageQueue::getNextQueueId()),
     _operationMessageQueueId(operationMessageQueueId),
     _exportMessageQueueId(exportMessageQueueId)
@@ -410,13 +410,4 @@ void HTTPAuthenticatorDelegator::handleHTTPMessage(
     PEG_METHOD_EXIT();
 }
 
-const char* HTTPAuthenticatorDelegator::getQueueName() const
-{
-    PEG_METHOD_ENTER(TRC_HTTP,
-        "HTTPAuthenticatorDelegator::getQueueName");
-
-    PEG_METHOD_EXIT();
-    return PEGASUS_SERVICENAME_HTTPAUTHDELEGATOR;
-}
-
 PEGASUS_NAMESPACE_END

diff --git a/src/Pegasus/Server/HTTPAuthenticatorDelegator.h b/src/Pegasus/Server/HTTPAuthenticatorDelegator.h
index 22aadcb6ec70a08f834fabeea1919d836d7cde7d..8562d80d5e0b3903da9f89c15ee9f5fad4a5ccbb 100644 (file)
--- a/src/Pegasus/Server/HTTPAuthenticatorDelegator.h
+++ b/src/Pegasus/Server/HTTPAuthenticatorDelegator.h
@@ -65,8 +65,6 @@ class PEGASUS_SERVER_LINKAGE HTTPAuthenticatorDelegator : public MessageQueueSer
       virtual void handleEnqueue(Message *);
       virtual void handleEnqueue();
 
-      virtual const char* getQueueName() const;
-
       void handleHTTPMessage(HTTPMessage* httpMessage, Boolean & deleteMessage);
 
    private: