Author: remi
Date: 2009-04-08 15:52:39 +0200 (Wed, 08 Apr 2009)
New Revision: 4415
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/TDSClientsManager.py
software_suite_v2/tuxware/tuxdroidserver/trunk/TDSConfiguration.py
software_suite_v2/tuxware/tuxdroidserver/trunk/TDSHTTPServer.py
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/00_server_base/resourceMenu.py
software_suite_v2/tuxware/tuxdroidserver/trunk/tuxhttpserver.py
Log:
* fixed 2 constant names (thanks to Kribleur ;) )
Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/TDSClientsManager.py
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/TDSClientsManager.py
2009-04-08 12:44:39 UTC (rev 4414)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/TDSClientsManager.py
2009-04-08 13:52:39 UTC (rev 4415)
@@ -46,7 +46,7 @@
# Constructor.
#
--------------------------------------------------------------------------
def __init__(self, accessManager, host = TDS_CONF_HOST_ADDRESS,
- port = TDS_CONF_MINOR_PORT_ADDRESS):
+ port = TDS_RAW_DATA_PORT):
"""Constructor.
@accessManager: Access Manager object.
@param host: Host IP to listen.
Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/TDSConfiguration.py
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/TDSConfiguration.py
2009-04-08 12:44:39 UTC (rev 4414)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/TDSConfiguration.py
2009-04-08 13:52:39 UTC (rev 4415)
@@ -37,8 +37,8 @@
TDS_CONF_HOST_ADDRESS = '127.0.0.1'
else:
TDS_CONF_HOST_ADDRESS = ''
-# Major port address (HTTP/REST)
-TDS_CONF_MAJOR_PORT_ADDRESS = 270
+# HTTP server Port
+TDS_HTTP_PORT = 270
# Use 50msec delay in request (CPU optimisation)
TDS_50MSEC_OPTIMISATION = True
# Use asynchronous requests treatment
@@ -50,8 +50,8 @@
#
------------------------------------------------------------------------------
# TCP/IP server configuration
#
------------------------------------------------------------------------------
-# Minor port address (TCP or UDP)
-TDS_CONF_MINOR_PORT_ADDRESS = 271
+# Raw data server port
+TDS_RAW_DATA_PORT = 271
#
------------------------------------------------------------------------------
# Loggers configuration
Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/TDSHTTPServer.py
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/TDSHTTPServer.py
2009-04-08 12:44:39 UTC (rev 4414)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/TDSHTTPServer.py
2009-04-08 13:52:39 UTC (rev 4415)
@@ -71,11 +71,11 @@
try:
if TDS_HTTP_ASYNCHRONOUS_REQUESTS:
self.__server = ThreadedHTTPServer((TDS_CONF_HOST_ADDRESS,
- TDS_CONF_MAJOR_PORT_ADDRESS), TDSHttpRequestHandler)
+ TDS_HTTP_PORT), TDSHttpRequestHandler)
else:
self.__server = HTTPServer((TDS_CONF_HOST_ADDRESS,
- TDS_CONF_MAJOR_PORT_ADDRESS), TDSHttpRequestHandler)
- self.__logger.logInfo("Create an HTTP server on port %d" %
TDS_CONF_MAJOR_PORT_ADDRESS)
+ TDS_HTTP_PORT), TDSHttpRequestHandler)
+ self.__logger.logInfo("Create an HTTP server on port %d" %
TDS_HTTP_PORT)
except:
self.__server = None
self.__logger.logError("(__createServer) Can't create the server")
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/00_server_base/resourceMenu.py
===================================================================
---
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/00_server_base/resourceMenu.py
2009-04-08 12:44:39 UTC (rev 4414)
+++
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/00_server_base/resourceMenu.py
2009-04-08 13:52:39 UTC (rev 4415)
@@ -119,7 +119,7 @@
if address == "":
address = '127.0.0.1'
cmdProt = 'http://%s:%d/<id_client>/%s/%s?%s' % (address,
- TDS_CONF_MAJOR_PORT_ADDRESS, resourceName, service,
+ TDS_HTTP_PORT, resourceName, service,
result['services'][service]['parameters'])
result['services'][service]['commandPrototype'] = cmdProt
return result
Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/tuxhttpserver.py
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/tuxhttpserver.py
2009-04-08 12:44:39 UTC (rev 4414)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/tuxhttpserver.py
2009-04-08 13:52:39 UTC (rev 4415)
@@ -20,7 +20,7 @@
def checkServerRun():
import httplib
- h = httplib.HTTP("127.0.0.1:%d" % TDS_CONF_MAJOR_PORT_ADDRESS)
+ h = httplib.HTTP("127.0.0.1:%d" % TDS_HTTP_PORT)
try:
h.connect()
h.putrequest("GET", "/")
@@ -35,7 +35,7 @@
def killServer():
import httplib
- h = httplib.HTTP("127.0.0.1:%d" % TDS_CONF_MAJOR_PORT_ADDRESS)
+ h = httplib.HTTP("127.0.0.1:%d" % TDS_HTTP_PORT)
try:
h.connect()
except:
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
