Author: remi
Date: 2009-04-07 18:06:14 +0200 (Tue, 07 Apr 2009)
New Revision: 4398
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceAttituneManager.py
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceScheduler.py
Log:
* removed configurations from theses resources. The user configuration will be
centralized in one resource
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceAttituneManager.py
===================================================================
---
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceAttituneManager.py
2009-04-07 14:18:51 UTC (rev 4397)
+++
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceAttituneManager.py
2009-04-07 16:06:14 UTC (rev 4398)
@@ -55,11 +55,6 @@
eventsHandler.insert(statusName)
clientsManager.addDefaultExcludedEvent(statusName)
eventsHandler.getEventHandler(ST_NAME_AM_RUN).updateState("False")
- # Default configuration
- self.defaultConfiguration = {
- 'auto-start' : False,
- 'attitunes_path' : "",
- }
# Create a logger
self.logger = SimpleLogger("attitune_manager")
self.logger.resetLog()
@@ -71,7 +66,6 @@
self.logger.logInfo("-----------------------------------------------")
def stop(self):
- self.getConfigurator().store()
self.logger.logInfo("Undeploy the attitunes container")
self.__attitunesContainer.undeploy()
self.__publishEvents(True, ST_NAME_AM_RUN, ["False",])
@@ -297,21 +291,6 @@
self.name = "start"
self.comment = "Start the attitune manager."
- def start(self):
- # Auto start of this service with the resource configuration.
- config = resourceAttituneManager.getConfigurator().load(
- "resourceAttituneManager.conf",
- resourceAttituneManager.defaultConfiguration)
- if config['auto-start']:
- attitunesContainer =
resourceAttituneManager.getAttitunesContainer()
- resourceAttituneManager.logger.logInfo("Add directory in the
container [%s]." %\
- config['attitunes_path'])
- attitunesContainer.addDirectory(config['attitunes_path'])
- resourceAttituneManager.logger.logInfo("Deploy the attitunes
container.")
- attitunesContainer.deploy()
- resourceAttituneManager.logger.logInfo("Attitunes container is
deployed.")
- resourceAttituneManager.publishEvents(True, ST_NAME_AM_RUN,
["True",])
-
def execute(self, id, parameters):
headersStruct = self.getDefaultHeadersStruct()
contentStruct = self.getDefaultContentStruct()
@@ -320,12 +299,6 @@
if not os.path.isdir(parameters['attitunes_path']):
contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
else:
- # Store the configuration
- configurator = resourceAttituneManager.getConfigurator()
- config = configurator.getConfiguration()
- config['attitunes_path'] = parameters['attitunes_path']
- config['auto-start'] = True
- configurator.store()
# Start the attitune manager
attitunesContainer =
resourceAttituneManager.getAttitunesContainer()
resourceAttituneManager.publishEvents(True, ST_NAME_AM_RUN,
["False",])
@@ -337,8 +310,8 @@
directory)
attitunesContainer.removeDirectory(directory)
resourceAttituneManager.logger.logInfo("Add directory in the
container [%s]." %\
- config['attitunes_path'])
- attitunesContainer.addDirectory(config['attitunes_path'])
+ parameters['attitunes_path'])
+ attitunesContainer.addDirectory(parameters['attitunes_path'])
resourceAttituneManager.logger.logInfo("Deploy the attitunes
container.")
attitunesContainer.deploy()
resourceAttituneManager.logger.logInfo("Attitunes container is
deployed.")
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
===================================================================
---
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
2009-04-07 14:18:51 UTC (rev 4397)
+++
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceGadgetFramework.py
2009-04-07 16:06:14 UTC (rev 4398)
@@ -64,23 +64,6 @@
for statusName in SW_NAME_FRAMEWORK:
eventsHandler.insert(statusName)
eventsHandler.getEventHandler(ST_NAME_FW_RUN).updateState("False")
- # Default configuration
- splitedLC = TUXDROID_LANGUAGE.split("_")
- language = splitedLC[0]
- if len(splitedLC) > 1:
- country = splitedLC[1]
- else:
- country = language.upper()
- locutor = TUXDROID_DEFAULT_LOCUTOR
- pitch = 130
- self.defaultConfiguration = {
- 'auto-start' : False,
- 'gadgets_path' : "",
- 'language' : language,
- 'country' : country,
- 'locutor' : locutor,
- 'pitch' : pitch,
- }
# Create a logger
self.logger = SimpleLogger("gadget_framework")
self.logger.resetLog()
@@ -92,7 +75,6 @@
self.logger.logInfo("-----------------------------------------------")
def stop(self):
- self.getConfigurator().store()
self.logger.logInfo("Undeploy the gadgets container")
self.__gadgetsContainer.undeploy()
self.__publishEvents(True, ST_NAME_FW_RUN, ["False",])
@@ -361,26 +343,6 @@
self.name = "start"
self.comment = "Start the gadget framework."
- def start(self):
- # Auto start of this service with the resource configuration.
- config = resourceGadgetFramework.getConfigurator().load(
- "resourceFramework.conf",
- resourceGadgetFramework.defaultConfiguration)
- if config['auto-start']:
- gadgetsContainer = resourceGadgetFramework.getGadgetsContainer()
- resourceGadgetFramework.logger.logInfo("Set locales
[%s:%s:%s:%s]." % (
- config['language'], config['country'],
- config['locutor'], config['pitch']))
- gadgetsContainer.setLocales(config['language'], config['country'],
- config['locutor'], config['pitch'])
- resourceGadgetFramework.logger.logInfo("Add directory in the
container [%s]." %\
- config['gadgets_path'])
- gadgetsContainer.addDirectory(config['gadgets_path'])
- resourceGadgetFramework.logger.logInfo("Deploy the gadgets
container.")
- gadgetsContainer.deploy()
- resourceGadgetFramework.logger.logInfo("Gadgets container is
deployed.")
- resourceGadgetFramework.publishEvents(True, ST_NAME_FW_RUN,
["True",])
-
def execute(self, id, parameters):
headersStruct = self.getDefaultHeadersStruct()
contentStruct = self.getDefaultContentStruct()
@@ -389,16 +351,6 @@
if not os.path.isdir(parameters['gadgets_path']):
contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
else:
- # Store the configuration
- configurator = resourceGadgetFramework.getConfigurator()
- config = configurator.getConfiguration()
- config['language'] = parameters['language']
- config['country'] = parameters['country']
- config['locutor'] = parameters['locutor']
- config['pitch'] = parameters['pitch']
- config['gadgets_path'] = parameters['gadgets_path']
- config['auto-start'] = True
- configurator.store()
# Start the framework
gadgetsContainer = resourceGadgetFramework.getGadgetsContainer()
resourceGadgetFramework.publishEvents(True, ST_NAME_FW_RUN,
@@ -453,15 +405,6 @@
gadgetsContainer = resourceGadgetFramework.getGadgetsContainer()
gadgetsContainer.setLocales(parameters['language'],
parameters['country'], parameters['locutor'], parameters['pitch'])
- # Store the configuration
- configurator = resourceGadgetFramework.getConfigurator()
- config = configurator.getConfiguration()
- config['language'] = parameters['language']
- config['country'] = parameters['country']
- config['locutor'] = parameters['locutor']
- config['pitch'] = parameters['pitch']
- config['gadgets_path'] = parameters['gadgets_path']
- configurator.store()
return headersStruct, contentStruct
# Register the service into the resource
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceScheduler.py
===================================================================
---
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceScheduler.py
2009-04-07 14:18:51 UTC (rev 4397)
+++
software_suite_v2/tuxware/tuxdroidserver/trunk/resources/01_robot_system/resourceScheduler.py
2009-04-07 16:06:14 UTC (rev 4398)
@@ -48,14 +48,8 @@
for statusName in SW_NAME_SCHEDULER_MANAGER:
eventsHandler.insert(statusName)
self.__publishEvents(True, ST_NAME_SCM_RUN, ["False",])
- # Default configuration
- self.defaultConfiguration = {
- 'auto-start' : False,
- 'tasks_path' : "",
- }
def stop(self):
- self.getConfigurator().store()
self.__scheduler.stop()
self.__publishEvents(True, ST_NAME_SCM_RUN, ["False",])
@@ -294,16 +288,6 @@
self.name = "start"
self.comment = "Start the scheduler."
- def start(self):
- # Auto start of this service with the resource configuration.
- config = resourceScheduler.getConfigurator().load(
- "resourceScheduler.conf",
- resourceScheduler.defaultConfiguration)
- if config['auto-start']:
- resourceScheduler.getScheduler().start()
- resourceScheduler.publishEvents(True, ST_NAME_SCM_RUN, ["True",])
- resourceScheduler.getScheduler().loadTasks(config['tasks_path'])
-
def execute(self, id, parameters):
headersStruct = self.getDefaultHeadersStruct()
contentStruct = self.getDefaultContentStruct()
@@ -312,18 +296,12 @@
if not os.path.isdir(parameters['tasks_path']):
contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
else:
- # Store the configuration
- configurator = resourceScheduler.getConfigurator()
- config = configurator.getConfiguration()
- config['tasks_path'] = parameters['tasks_path']
- config['auto-start'] = True
- configurator.store()
# Start the scheduler
resourceScheduler.getScheduler().stop()
resourceScheduler.publishEvents(True, ST_NAME_SCM_RUN, ["False",])
resourceScheduler.getScheduler().start()
resourceScheduler.publishEvents(True, ST_NAME_SCM_RUN, ["True",])
- resourceScheduler.getScheduler().loadTasks(config['tasks_path'])
+
resourceScheduler.getScheduler().loadTasks(parameters['tasks_path'])
return headersStruct, contentStruct
# Register the service into the resource
------------------------------------------------------------------------------
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
