Changeset 4721 for branch/umitweb-ng

Show
Ignore:
Timestamp:
05/01/09 20:49:20 (4 years ago)
Author:
rcarvalho
Message:

Merged revisions 4095-4099 via svnmerge from
http://svn.umitproject.org/svnroot/umit/trunk

........

r4095 | getxsick | 2009-02-17 17:58:22 -0300 (Ter, 17 Fev 2009) | 1 line


test CIA

........

r4096 | getxsick | 2009-02-17 18:17:28 -0300 (Ter, 17 Fev 2009) | 1 line


remove xxx file from tests

........

r4097 | luis | 2009-02-17 18:28:51 -0300 (Ter, 17 Fev 2009) | 1 line


Updated licence copyrights using -> find . -path '*/.svn' -prune -o -type f -print0 | xargs -0 sed -i -e 's/2007 Insecure.Com LLC./2007 Adriano Monteiro Marques/'

........

r4098 | gpolo | 2009-02-17 18:43:12 -0300 (Ter, 17 Fev 2009) | 1 line


float support is deprecated for WaitForSingleObject?

........

r4099 | gpolo | 2009-02-17 18:48:49 -0300 (Ter, 17 Fev 2009) | 1 line


Adjusted umit_scheduler to run as a Windows service under py2exe

........

Location:
branch/umitweb-ng
Files:
53 modified

Legend:

Unmodified
Added
Removed

  • branch/umitweb-ng

    • Property svnmerge-integrated changed from /trunk:1-3190,3263-3267,3269,3271-3278,3285,3307-3308,3366,3379,3383,3567,3628,3678-3679,3705,3720-3729,3735-3738,3742-3748,3765-3766,3771,3788-3789,3792,3794,3797-3804,3849,3858,3876-3877,3879-3880,3927-3930,3932,3936,3939-3940,3946-3948,3953-3954,3965-3966,3968,3972,3993,3995,4000,4006-4007,4010,4012-4013,4015,4017-4019,4021-4025,4027,4029-4031,4033,4035-4038,4040-4042,4044-4045,4049,4054-4064,4073,4087-4092 to /trunk:1-3190,3263-3267,3269,3271-3278,3285,3307-3308,3366,3379,3383,3567,3628,3678-3679,3705,3720-3729,3735-3738,3742-3748,3765-3766,3771,3788-3789,3792,3794,3797-3804,3849,3858,3876-3877,3879-3880,3927-3930,3932,3936,3939-3940,3946-3948,3953-3954,3965-3966,3968,3972,3993,3995,4000,4006-4007,4010,4012-4013,4015,4017-4019,4021-4025,4027,4029-4031,4033,4035-4038,4040-4042,4044-4045,4049,4054-4064,4073,4087-4092,4095-4099

  • branch/umitweb-ng/share/locale/umit.pot

    r4717 r4721  
    99"Project-Id-Version: PACKAGE VERSION\n" 
    1010"Report-Msgid-Bugs-To: \n" 
    11 "POT-Creation-Date: 2009-02-15 19:45+0100\n" 
     11"POT-Creation-Date: 2009-02-15 20:06+0100\n" 
    1212"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" 
    1313"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" 

  • branch/umitweb-ng/umitCore/DataDecay.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitCore/Scheduler.py

    r4720 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Original author: Adriano Monteiro Marques 
    … …  
    614614            if winhndl: 
    615615                stopsignal = win32event.WaitForSingleObject(winhndl, 
    616                         sleep_time * 1000) 
     616                        int(sleep_time * 1000)) 
    617617                if stopsignal == win32event.WAIT_OBJECT_0: 
    618618                    break 

  • branch/umitweb-ng/umitCore/Utils.py

    r4720 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/Connection.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/InventoryChanges.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/Remove.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/Retrieve.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/Search.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/Store.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/Utils.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/XMLStore.py

    r4720 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/__init__.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/_database.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/_sqlite.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/setup/_database.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/setup/_sqlite.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/setup/database_setup.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/sql/sqlite-delete-triggers.sql

    r4683 r4721  
    1 -- Copyright (C) 2007 Insecure.Com LLC. 
     1-- Copyright (C) 2007 Adriano Monteiro Marques 
    22-- 
    33-- Author: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/sql/sqlite-drop-tables.sql

    r4683 r4721  
    1 -- Copyright (C) 2007 Insecure.Com LLC. 
     1-- Copyright (C) 2007 Adriano Monteiro Marques 
    22-- 
    33-- Author: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/sql/sqlite-drop-triggers.sql

    r4683 r4721  
    1 -- Copyright (C) 2007 Insecure.Com LLC. 
     1-- Copyright (C) 2007 Adriano Monteiro Marques 
    22-- 
    33-- Author: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/sql/sqlite-insert-triggers.sql

    r4683 r4721  
    1 -- Copyright (C) 2007 Insecure.Com LLC. 
     1-- Copyright (C) 2007 Adriano Monteiro Marques 
    22-- 
    33-- Author: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitDB/sql/sqlite-schema.sql

    r4683 r4721  
    1 -- Copyright (C) 2007 Insecure.Com LLC. 
     1-- Copyright (C) 2007 Adriano Monteiro Marques 
    22-- 
    33-- Authors: Joao Paulo de Souza Medeiros <ignotus21@gmail.com>, 

  • branch/umitweb-ng/umitDB/sql/sqlite-update-triggers.sql

    r4683 r4721  
    1 -- Copyright (C) 2007 Insecure.Com LLC. 
     1-- Copyright (C) 2007 Adriano Monteiro Marques 
    22-- 
    33-- Author: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/About.py

    r4712 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/Calendar.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/ChangesDiff.py

    r4712 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/ChangesList.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/ColoredToggleButton.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/DataGrabber.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/DataRemoval.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/HostDiscovery.py

    r4720 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/InventoryLoad.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/InventoryTree.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/NewInventory.py

    r4685 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/RefreshDialog.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/SchedulerLog.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/SearchBar.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/SettingsWin.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Author:  Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/StartupSettings.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLBarDisplay.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLBase.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLChangesTree.py

    r4712 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLConnector.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLGraph.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLGraphPreferences.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLGraphToolbar.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/TLToolbar.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/Timeline.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/Viewer.py

    r4717 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umitInventory/__init__.py

    r4683 r4721  
    1 # Copyright (C) 2007 Insecure.Com LLC. 
     1# Copyright (C) 2007 Adriano Monteiro Marques 
    22# 
    33# Authors: Guilherme Polo <ggpolo@gmail.com> 

  • branch/umitweb-ng/umit_scheduler.py

    r4720 r4721  
    4040HOME_CONF = None 
    4141RUNNING_FILE = None 
    42  
     42if hasattr(sys, 'frozen'): 
     43    FROZEN_CFG = os.path.join(os.path.dirname(sys.path[0]), ".scheduserhome") 
     44else: 
     45    FROZEN_CFG = None 
    4346 
    4447class UMITSchedulerWinService(WindowsService): 
    … …  
    4649    _svc_display_name_ = "%s service" % _svc_name_ 
    4750    _svc_description_ = _svc_display_name_ 
    48     _exe_args_ = None # This is defined at bottom 
     51    _exe_args_ = None # This is defined at bottom (when not using py2exe) 
    4952 
    5053    def __init__(self, args): 
    … …  
    5356    def run(self): 
    5457        # _exe_args_ will be our sys.argv when this runs as a Windows service 
    55         Scheduler.main('start', winhndl=self.hndl_waitstop, *sys.argv[1:]) 
     58        # as long as we don't run under py2exe. 
     59        if FROZEN_CFG is not None: 
     60            cfg = open(FROZEN_CFG, 'r') 
     61            home_path = cfg.read() 
     62            cfg.close() 
     63            args = (sys.path[0], home_path) 
     64        else: 
     65            args = sys.argv[1:] 
     66        Scheduler.main('start', winhndl=self.hndl_waitstop, *args) 
    5667 
    5768 
    … …  
    7283    Show help 
    7384    """ 
    74     try: 
    75         program_name = __file__ 
    76     except AttributeError: 
    77         if hasattr(sys, 'frozen'): 
    78             program_name = sys.executable 
    79         else: 
    80             program_name = sys.argv[0] 
    8185    print (_("Usage:") + 
    82             (" %s start|stop|cleanup|running <config_dir>" % program_name)) 
     86            (" %s start|stop|cleanup|running <config_dir>" % __file__)) 
    8387 
    8488 
    … …  
    106110        return 1 
    107111 
    108 if __name__ == "__main__": 
     112 
     113def pre_main(): 
    109114    if len(sys.argv) < 2 or len(sys.argv) > 3: 
    110115        usage() 
    111         sys.exit(0) 
     116        return 0 
    112117 
    113118    if CONFIG_DIR: # forcing especified dir 
    … …  
    119124            setup_homedir(os.path.join(os.path.expanduser("~"), '.umit')) 
    120125 
    121     sys.exit(main(sys.argv[1:])) 
     126    return main(sys.argv[1:]) 
     127 
     128 
     129if FROZEN_CFG is not None: 
     130    def write_frozen_cfg(): 
     131        setup_homedir(os.path.join(os.path.expanduser('~'), '.umit')) 
     132        conf = open(FROZEN_CFG, 'w') 
     133        conf.write(HOME_CONF) 
     134        conf.close() 
     135 
     136    import win32serviceutil 
     137    # HandleCommandLine is used by py2exe when defining a service with 
     138    # cmdline_style as 'custom' 
     139    def HandleCommandLine(): 
     140        # XXX I will need the user home before starting the Scheduler, 
     141        # I wish changing UMITSchedulerWinService._exe_args_ would work 
     142        # here too, but it doesn't. The workaround here is far from 
     143        # ideal. 
     144        if sys.argv[1] == 'install': 
     145            write_frozen_cfg() 
     146        elif sys.argv[1] in ('start', 'debug'): 
     147            if not os.path.isfile(FROZEN_CFG): 
     148                write_frozen_cfg() 
     149 
     150        win32serviceutil.HandleCommandLine(UMITSchedulerWinService) 
     151 
     152if __name__ == "__main__": 
     153    sys.exit(pre_main())