Author: remi
Date: 2009-03-18 11:28:15 +0100 (Wed, 18 Mar 2009)
New Revision: 4122
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Framework.py
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Gadget.py
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/GadgetsContainer.py
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/java_framework/tuxdroid-gadget-framework-0.0.3-bridge.jar
Log:
* moved the gadget subprocess killing in the java gadget framework
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Framework.py
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Framework.py
2009-03-18 10:27:12 UTC (rev 4121)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Framework.py
2009-03-18 10:28:15 UTC (rev 4122)
@@ -296,37 +296,6 @@
self.__onGagdetStoppedCallback = funct
#
--------------------------------------------------------------------------
- # Kill sub-process of a gadget.
- # TODO : This functionality must be moved to the java gadget-framework,
- # directly at the method "abort" of the "GadgetInstance.java" source.
- #
--------------------------------------------------------------------------
- def _killSubProcessOfAGadget(self, gadgetUuid):
- """Kill sub-process of a gadget.
- @param gadgetUuid: Gadget uuid.
- """
- if not self.__frameworkBridge.isStarted():
- return
- gadget = self.getGadgetsContainer().getGadgetByUuid(gadgetUuid)
- if gadget == None:
- return
- workingPath = os.path.join(gadget.getDescription().getWorkingPath(),
- "states")
- if not os.path.isdir(workingPath):
- return
- for path in os.listdir(workingPath):
- if path.find(".pid") != -1:
- pidFile = os.path.join(workingPath, path)
- pid = open(pidFile, 'r').read()
- if os.name == 'nt':
- os.popen("TASKKILL /PID %s /F" % pid)
- else:
- os.system("kill -9 " + str(pid))
- try:
- os.remove(pidFile)
- except:
- pass
-
- #
--------------------------------------------------------------------------
#
#
--------------------------------------------------------------------------
def __onFrameworkEvent(self, args):
Modified: software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Gadget.py
===================================================================
--- software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Gadget.py
2009-03-18 10:27:12 UTC (rev 4121)
+++ software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/Gadget.py
2009-03-18 10:28:15 UTC (rev 4122)
@@ -196,8 +196,6 @@
if ret[0] != "SUCCESS":
return False
else:
- # TODO : Will be removed
- framework._killSubProcessOfAGadget(self.getDescription().getUuid())
return True
#
==========================================================================
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/GadgetsContainer.py
===================================================================
---
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/GadgetsContainer.py
2009-03-18 10:27:12 UTC (rev 4121)
+++
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/GadgetsContainer.py
2009-03-18 10:28:15 UTC (rev 4122)
@@ -197,7 +197,4 @@
if ret[0] != "SUCCESS":
return False
else:
- for gadget in self.getGadgets():
- # TODO : Will be removed
-
framework._killSubProcessOfAGadget(gadget.getDescription().getUuid())
return True
Modified:
software_suite_v2/tuxware/tuxdroidserver/trunk/util/gadgets/java_framework/tuxdroid-gadget-framework-0.0.3-bridge.jar
===================================================================
(Binary files differ)
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
