fixed env variable issue for protocol

src/python/dm/common/cli/dmRestCli.py

 #!/usr/bin/env python
 
 from dm.common.cli.dmCli import DmCli
+from dm.common.utility.configurationManager import ConfigurationManager
 
 class DmRestCli(DmCli):
     """ Base dm REST cli class. """
@@ -8,3 +9,6 @@ class DmRestCli(DmCli):
     def __init__(self, validArgCount=0):
         DmCli.__init__(self, validArgCount)
 
+    def getDefaultServiceProtocol(self):
+        return ConfigurationManager.getInstance().getWebServiceProtocol()
+

src/python/dm/common/utility/configurationManager.py

@@ -40,6 +40,7 @@ DEFAULT_DM_SERVICE_PORT = 22236    # 222DM
 DEFAULT_DM_SERVICE_HOST = '0.0.0.0'
 DEFAULT_DM_SERVICE_PROTOCOL = dmServiceConstants.DM_SERVICE_PROTOCOL_HTTP
 
+DEFAULT_DM_WEB_SERVICE_PROTOCOL = DEFAULT_DM_SERVICE_PROTOCOL 
 DEFAULT_DM_DS_WEB_SERVICE_PORT = 22236    # 222DM
 DEFAULT_DM_DS_WEB_SERVICE_HOST = '127.0.0.1'
 DEFAULT_DM_DAQ_WEB_SERVICE_PORT = 33336    # 333DM
@@ -125,6 +126,7 @@ class ConfigurationManager(UserDict.UserDict):
         self['defaultServiceHost'] = DEFAULT_DM_SERVICE_HOST
         self['defaultServiceProtocol'] = DEFAULT_DM_SERVICE_PROTOCOL
 
+        self['defaultWebServiceProtocol'] = DEFAULT_DM_WEB_SERVICE_PROTOCOL
         self['defaultDaqWebServicePort'] = DEFAULT_DM_DAQ_WEB_SERVICE_PORT
         self['defaultDaqWebServiceHost'] = DEFAULT_DM_DAQ_WEB_SERVICE_HOST
         self['defaultDsWebServicePort'] = DEFAULT_DM_DS_WEB_SERVICE_PORT
@@ -158,6 +160,7 @@ class ConfigurationManager(UserDict.UserDict):
         self.__setFromEnvVar('servicePort', 'DM_SERVICE_PORT')
         self.__setFromEnvVar('serviceProtocol', 'DM_SERVICE_PROTOCOL')
 
+        self.__setFromEnvVar('webServiceProtocol', 'DM_WEB_SERVICE_PROTOCOL')
         self.__setFromEnvVar('daqWebServiceHost', 'DM_DAQ_WEB_SERVICE_HOST')
         self.__setFromEnvVar('daqWebServicePort', 'DM_DAQ_WEB_SERVICE_PORT')
         self.__setFromEnvVar('dsWebServiceHost', 'DM_DS_WEB_SERVICE_HOST')
@@ -513,6 +516,18 @@ class ConfigurationManager(UserDict.UserDict):
     def hasServiceHost(self):
         return self.has_key('serviceHost')
 
+    def getDefaultWebServiceProtocol(self):
+        return self['defaultWebServiceProtocol']
+
+    def setWebServiceProtocol(self, webServiceProtocol):
+        self['webServiceProtocol'] = webServiceProtocol
+
+    def getWebServiceProtocol(self, default='__dm_default__'):
+        return self.__getKeyValue('webServiceProtocol', default)
+
+    def hasWebServiceProtocol(self):
+        return self.has_key('webServiceProtocol')
+
     def getDefaultDaqWebServicePort(self):
         return self['defaultDaqWebServicePort']