gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: gump/python/gump/build .cvsignore maven.py ant.py __init__.py builder.py script.py abstract.py
Date Mon, 17 May 2004 20:22:05 GMT
ajack       2004/05/17 13:22:05

  Modified:    python/gump/utils Tag: MultiRunner launcher.py
               python/gump Tag: MultiRunner update.py build.py integrate.py
                        check.py debug.py
               python/gump/model Tag: MultiRunner module.py workspace.py
                        object.py project.py state.py
               python/gump/core Tag: MultiRunner __init__.py commandLine.py
                        gumprun.py
               python/gump/test/resources/full1 Tag: MultiRunner
                        repository1.xml
               python/gump/document/forrest Tag: MultiRunner documenter.py
               python/gump/test Tag: MultiRunner model.py resolving.py
                        maven.py pyunit.py
               python/gump/gui Tag: MultiRunner view.py
               template/forrest/content/xdocs Tag: MultiRunner site.xml
  Added:       .        Tag: MultiRunner x.py
               python/gump/test/resources/complete1 Tag: MultiRunner
                        module1.xml svn_repository1.xml server3.xml
                        repository1.xml alias1.xml module5.xml broken2.xml
                        jars_repository1.xml broken1.xml maven1.xml
                        svn_module1.xml tracker1.xml package1.xml
                        module4.xml module3.xml module2.xml .cvsignore
                        server1.xml server2.xml profile.xml workspace.xml
                        download1.xml
               python/gump/output Tag: MultiRunner notify.py
               python/gump/core Tag: MultiRunner demand.py tasks.py
                        runner.py misc.py
               python/gump/test Tag: MultiRunner tasks.py notifying.py
               python/gump/update Tag: MultiRunner __init__.py updater.py
                        cvs.py .cvsignore
               python/gump/build Tag: MultiRunner .cvsignore maven.py
                        ant.py __init__.py builder.py script.py abstract.py
  Removed:     python/gump/output Tag: MultiRunner nag.py
               python/gump/core Tag: MultiRunner engine.py
               python/gump/test Tag: MultiRunner thomas.py nagging.py
               python/gump/document/template Tag: MultiRunner .cvsignore
                        __init__.py documenter.py resolver.py
  Log:
  Work in progress (checking to avoid lightening)
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.22.2.1  +1 -1      gump/python/gump/utils/launcher.py
  
  Index: launcher.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/utils/launcher.py,v
  retrieving revision 1.22
  retrieving revision 1.22.2.1
  diff -u -r1.22 -r1.22.2.1
  --- launcher.py	29 Apr 2004 17:00:42 -0000	1.22
  +++ launcher.py	17 May 2004 20:22:01 -0000	1.22.2.1
  @@ -442,7 +442,7 @@
               result.signal=0
               result.exit_code=systemReturn
               
  -        log.debug('Command -> [' + str(systemReturn)+ '] [Sig:' + str(result.signal) + ' / Exit:' + str(result.exit_code) + '].')
  +        log.debug('Command returned [' + str(systemReturn)+ '] [Sig:' + str(result.signal) + ' / Exit:' + str(result.exit_code) + '].')
           
           #
           # Assume timed out if signal terminated
  
  
  
  No                   revision
  No                   revision
  1.28.2.1  +3 -3      gump/python/gump/update.py
  
  Index: update.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/update.py,v
  retrieving revision 1.28
  retrieving revision 1.28.2.1
  diff -u -r1.28 -r1.28.2.1
  --- update.py	27 Apr 2004 22:12:28 -0000	1.28
  +++ update.py	17 May 2004 20:22:01 -0000	1.28.2.1
  @@ -32,7 +32,7 @@
   
   from gump import log
   from gump.core.gumpinit import gumpinit
  -from gump.core.engine import GumpEngine
  +from gump.core.tasks import SequentialTaskRunner
   from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
   from gump.core.commandLine import handleArgv
   from gump.model.loader import WorkspaceLoader
  @@ -69,7 +69,7 @@
       #
       #    Perform this integration run...
       #
  -    result = GumpEngine().performUpdate(run)
  +    result = SequentialTaskRunner(run).performUpdate()
   
       #
       log.info('Gump Update complete. Exit code:' + str(result))
  
  
  
  1.47.2.1  +2 -2      gump/python/gump/build.py
  
  Index: build.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build.py,v
  retrieving revision 1.47
  retrieving revision 1.47.2.1
  diff -u -r1.47 -r1.47.2.1
  --- build.py	16 Apr 2004 17:28:38 -0000	1.47
  +++ build.py	17 May 2004 20:22:01 -0000	1.47.2.1
  @@ -29,7 +29,7 @@
   
   from gump import log
   from gump.core.gumpinit import gumpinit
  -from gump.core.engine import GumpEngine
  +from gump.core.tasks import SequentialTaskRunner
   from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
   from gump.core.commandLine import handleArgv
   from gump.model.loader import WorkspaceLoader
  @@ -60,7 +60,7 @@
       #
       #    Perform this integration run...
       #
  -    result = GumpEngine().performBuild(run)
  +    result = SequentialTaskRunner(run).performBuild()
       
       #
       log.info('Gump Build complete. Exit code:' + str(result))
  
  
  
  1.27.2.1  +3 -4      gump/python/gump/integrate.py
  
  Index: integrate.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/integrate.py,v
  retrieving revision 1.27
  retrieving revision 1.27.2.1
  diff -u -r1.27 -r1.27.2.1
  --- integrate.py	24 Apr 2004 15:25:18 -0000	1.27
  +++ integrate.py	17 May 2004 20:22:01 -0000	1.27.2.1
  @@ -32,7 +32,7 @@
   
   from gump import log
   from gump.core.gumpinit import gumpinit
  -from gump.core.engine import GumpEngine
  +from gump.core.tasks import SequentialTaskRunner
   from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
   from gump.core.commandLine import handleArgv
   from gump.utils import logResourceUtilization
  @@ -76,7 +76,7 @@
       #
       #    Perform this integration run...
       #
  -    result = GumpEngine().performIntegrate(run)
  +    result = SequentialTaskRunner(run).performIntegrate()
   
       logResourceUtilization('Before exit')
       
  @@ -95,7 +95,6 @@
           signal.signal(signal.SIG_HUP, ignoreHangup)
       except:
           pass
  -    
   
       #print 'Profiling....'
       #import profile
  
  
  
  1.43.2.1  +2 -2      gump/python/gump/check.py
  
  Index: check.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/check.py,v
  retrieving revision 1.43
  retrieving revision 1.43.2.1
  diff -u -r1.43 -r1.43.2.1
  --- check.py	16 Apr 2004 17:28:38 -0000	1.43
  +++ check.py	17 May 2004 20:22:01 -0000	1.43.2.1
  @@ -28,7 +28,7 @@
   
   from gump import log
   from gump.core.gumpinit import gumpinit
  -from gump.core.engine import GumpEngine
  +from gump.core.tasks import SequentialTaskRunner
   from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
   from gump.core.commandLine import handleArgv
   from gump.model.loader import WorkspaceLoader
  @@ -51,7 +51,7 @@
       #
       #    Perform this check run...
       #
  -    result = GumpEngine().performCheck(run)
  +    result = SequentialTaskRunner(run).performCheck()
   
       #
       log.info('Gump Check complete. Exit code:' + str(result))
  
  
  
  1.5.2.1   +2 -2      gump/python/gump/debug.py
  
  Index: debug.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/debug.py,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- debug.py	22 Apr 2004 22:58:15 -0000	1.5
  +++ debug.py	17 May 2004 20:22:01 -0000	1.5.2.1
  @@ -28,7 +28,7 @@
   
   from gump import log
   from gump.core.gumpinit import gumpinit
  -from gump.core.engine import GumpEngine
  +from gump.core.tasks import SequentialTaskRunner
   from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
   from gump.core.commandLine import handleArgv
   from gump.model.loader import WorkspaceLoader
  @@ -64,7 +64,7 @@
       #
       #    Perform this integration run...
       #
  -    result = GumpEngine().performDebug(run)
  +    result = SequentialTaskRunner(run).performDebug()
   
       #
       log.info('Gump Debug complete. Exit code:' + str(result))
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +6 -0      gump/Attic/x.py
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +31 -0     gump/python/gump/test/resources/complete1/Attic/module1.xml
  
  
  
  
  1.1.2.1   +13 -0     gump/python/gump/test/resources/complete1/Attic/svn_repository1.xml
  
  
  
  
  1.1.2.1   +23 -0     gump/python/gump/test/resources/complete1/Attic/server3.xml
  
  
  
  
  1.1.2.1   +16 -0     gump/python/gump/test/resources/complete1/Attic/repository1.xml
  
  
  
  
  1.1.2.1   +14 -0     gump/python/gump/test/resources/complete1/Attic/alias1.xml
  
  
  
  
  1.1.2.1   +27 -0     gump/python/gump/test/resources/complete1/Attic/module5.xml
  
  
  
  
  1.1.2.1   +6 -0      gump/python/gump/test/resources/complete1/Attic/broken2.xml
  
  
  
  
  1.1.2.1   +9 -0      gump/python/gump/test/resources/complete1/Attic/jars_repository1.xml
  
  
  
  
  1.1.2.1   +25 -0     gump/python/gump/test/resources/complete1/Attic/broken1.xml
  
  
  
  
  1.1.2.1   +27 -0     gump/python/gump/test/resources/complete1/Attic/maven1.xml
  
  
  
  
  1.1.2.1   +22 -0     gump/python/gump/test/resources/complete1/Attic/svn_module1.xml
  
  
  
  
  1.1.2.1   +6 -0      gump/python/gump/test/resources/complete1/Attic/tracker1.xml
  
  
  
  
  1.1.2.1   +30 -0     gump/python/gump/test/resources/complete1/Attic/package1.xml
  
  
  
  
  1.1.2.1   +35 -0     gump/python/gump/test/resources/complete1/Attic/module4.xml
  
  
  
  
  1.1.2.1   +38 -0     gump/python/gump/test/resources/complete1/Attic/module3.xml
  
  
  
  
  1.1.2.1   +33 -0     gump/python/gump/test/resources/complete1/Attic/module2.xml
  
  
  
  
  1.1.2.1   +1 -0      gump/python/gump/test/resources/complete1/Attic/.cvsignore
  
  
  
  
  1.1.2.1   +8 -0      gump/python/gump/test/resources/complete1/Attic/server1.xml
  
  
  
  
  1.1.2.1   +6 -0      gump/python/gump/test/resources/complete1/Attic/server2.xml
  
  
  
  
  1.1.2.1   +34 -0     gump/python/gump/test/resources/complete1/Attic/profile.xml
  
  
  
  
  1.1.2.1   +16 -0     gump/python/gump/test/resources/complete1/Attic/workspace.xml
  
  
  
  
  1.1.2.1   +29 -0     gump/python/gump/test/resources/complete1/Attic/download1.xml
  
  
  
  
  No                   revision
  No                   revision
  1.43.2.1  +7 -181    gump/python/gump/model/module.py
  
  Index: module.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/module.py,v
  retrieving revision 1.43
  retrieving revision 1.43.2.1
  diff -u -r1.43 -r1.43.2.1
  --- module.py	30 Apr 2004 18:55:07 -0000	1.43
  +++ module.py	17 May 2004 20:22:02 -0000	1.43.2.1
  @@ -23,7 +23,7 @@
   from gump.model.state import *
   from gump.model.stats import Statable, Statistics
   from gump.model.project import *
  -from gump.model.object import NamedModelObject, Resultable
  +from gump.model.object import NamedModelObject, Resultable, Positioned
   from gump.utils import getIndent
   from gump.utils.note import transferAnnotations, Annotatable
   
  @@ -160,13 +160,14 @@
       unnamedModule.complete(workspace)
       return unnamedModule
           
  -class Module(NamedModelObject, Statable, Resultable):
  +class Module(NamedModelObject, Statable, Resultable, Positioned):
       """Set of Modules (which contain projects)"""
       def __init__(self,xml,workspace):
       	NamedModelObject.__init__(self,xml.getName(),xml,workspace)
               	
       	Statable.__init__(self)
       	Resultable.__init__(self)
  +    	Positioned.__init__(self)
       	
       	self.totalDepends=[]
       	self.totalDependees=[]
  @@ -553,187 +554,12 @@
               return self.cvs.getViewUrl()
           elif self.hasSvn():
               return self.svn.getViewUrl()            
  -        
  -    def getUpdateCommand(self,exists=0):
  -        if self.hasCvs():
  -            return self.getCvsUpdateCommand(exists)
  -        elif self.hasSvn():
  -            return self.getSvnUpdateCommand(exists)
  -        elif self.hasJars():
  -            return self.getJarsUpdateCommand(exists)        
  -           
  -    def getCvsUpdateCommand(self,exists=0):
  -        
  -        log.debug("CVS Update Module " + self.getName() + \
  -                       ", Repository Name: " + str(self.repository.getName()))
  -                                        
  -        root=self.cvs.getCvsRoot()
  -      
  -        log.debug("CVS Root " + root + " on Repository: " + self.repository.getName())
  -     
  -        #
  -        # Prepare CVS checkout/update command...
  -        # 
  -        cmd=Cmd('cvs','update_'+self.getName(),self.getWorkspace().cvsdir)
  -          
  -        #
  -        # Be 'quiet' (but not silent) unless requested otherwise.
  -        #
  -        if 	not self.isDebug() 	\
  -            and not self.isVerbose() \
  -            and not self.cvs.isDebug()	\
  -            and not self.cvs.isVerbose():    
  -            cmd.addParameter('-q')
  -          
  -        #
  -        # Allow trace for debug
  -        #
  -        if self.isDebug():
  -            cmd.addParameter('-t')
  -          
  -        #
  -        # Request compression
  -        #
  -        cmd.addParameter('-z3')
  -          
  -        #
  -        # Set the CVS root
  -        #
  -        cmd.addParameter('-d', root)
  -    
  -        #
  -        # Determine if a tag is set, on <cvs or on <module
  -        #
  -        tag=None
  -        if self.cvs.hasTag():
  -            tag=self.cvs.getTag()
  -        elif self.hasTag():
  -            tag=self.getTag()
  -            
  -        if exists:
  -
  -            # do a cvs update
  -            cmd.addParameter('update')
  -            cmd.addParameter('-P')
  -            cmd.addParameter('-d')
  -            if tag:
  -                cmd.addParameter('-r',tag,' ')
  -            else:
  -                cmd.addParameter('-A')
  -            cmd.addParameter(self.getName())
  -
  -        else:
  -
  -            # do a cvs checkout
  -            cmd.addParameter('checkout')
  -            cmd.addParameter('-P')
  -            if tag:
  -                cmd.addParameter('-r',tag,' ')
  -
  -            if 	not self.cvs.hasModule() or \
  -                not self.cvs.getModule() == self.getName(): 
  -                    cmd.addParameter('-d',self.getName(),' ')
  -                    
  -            if self.cvs.hasModule():
  -                cmd.addParameter(self.cvs.getModule())
  -            else:
  -                cmd.addParameter(self.getName())            
  -        
  -        return (self.repository, root, cmd)
  -     
  -     
  -    def getSvnUpdateCommand(self,exists=0):
  -        
  -        log.debug("SubVersion Update Module " + self.getName() + \
  -                       ", Repository Name: " + str(self.repository.getName()))
  -                                        
  -        url=self.svn.getRootUrl()
  -      
  -        log.debug("SVN URL: [" + url + "] on Repository: " + self.repository.getName())
  -     
  -        #
  -        # Prepare SVN checkout/update command...
  -        # 
  -        cmd=Cmd('svn','update_'+self.getName(),self.getWorkspace().cvsdir)
  -       
  -        #
  -        # Be 'quiet' (but not silent) unless requested otherwise.
  -        #
  -        if 	not self.isDebug() 	\
  -            and not self.isVerbose() \
  -            and not self.svn.isDebug()	\
  -            and not self.svn.isVerbose():    
  -            cmd.addParameter('--quiet')
  -                  
  -        #
  -        # Allow trace for debug
  -        #
  -        #
  -        # SVN complains about -v|--verbose, don't ask me why
  -        #
  -        # if self.isDebug() or  self.svn.isDebug():
  -        #    cmd.addParameter('--verbose')
  -            
  -        if exists:
  -
  -            # do a cvs update
  -            cmd.addParameter('update')
  -
  -        else:
  -
  -            # do a cvs checkout
  -            cmd.addParameter('checkout')
  -            cmd.addParameter(url)
  -       
  -        #
  -        # Request non-interactive
  -        #
  -        cmd.addParameter('--non-interactive')
  -
  -        #
  -        # If module name != SVN directory, tell SVN to put it into
  -        # a directory named after our module
  -        #
  -        if self.svn.hasDir():
  -            if not self.svn.getDir() == self.getName():
  -                cmd.addParameter(self.getName())
  -        
  -
  -        return (self.repository, url, cmd)
  -         
  -     
  -    def getJarsUpdateCommand(self,exists=0):
  -        
  -        log.debug("Jars Update Module " + self.getName() + \
  -                       ", Repository Name: " + str(self.repository.getName()))
  -
  -        url=self.jars.getRootUrl()
  -      
  -        log.debug("Jars URL: [" + url + "] on Repository: " + self.repository.getName())
  -     
  -        #
  -        # Prepare Jars checkout/update command...
  -        # 
  -        cmd=Cmd('ruper',	\
  -                'update_'+self.getName(),	\
  -                self.getWorkspace().cvsdir)
  -    
  -        cmd.addParameter(url)
  -          
  -        #
  -        # Be 'quiet' (but not silent) unless requested otherwise.
  -        #
  -        if 	not self.isDebug() 	\
  -            and not self.isVerbose() \
  -            and not self.jars.isDebug()	\
  -            and not self.jars.isVerbose():    
  -            cmd.addParameter('-q')
  -
  -        return (self.repository, url, cmd)
  -     
  +   
        
   class ModuleStatistics(Statistics):
  -    """Statistics Holder"""
  +    """ 
  +        Module Statistics Holder
  +    """
       def __init__(self,moduleName):
           Statistics.__init__(self,moduleName)    
           self.lastUpdated=-1        
  
  
  
  1.48.2.1  +14 -22    gump/python/gump/model/workspace.py
  
  Index: workspace.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/workspace.py,v
  retrieving revision 1.48
  retrieving revision 1.48.2.1
  diff -u -r1.48 -r1.48.2.1
  --- workspace.py	14 May 2004 22:54:32 -0000	1.48
  +++ workspace.py	17 May 2004 20:22:02 -0000	1.48.2.1
  @@ -399,7 +399,7 @@
               self.listener.handleEvent(ModelEvent())
           
           #
  -        # Check trackers.
  +        # Check Trackers.
           #
           for tracker in self.getTrackers(): 
               tracker.check(self)           
  @@ -424,13 +424,6 @@
               project.complete(self)   
           
               self.listener.handleEvent(ModelEvent())
  -        
  -        # Check they are complete...
  -        for project in self.getProjects():
  -            if not project.isPackaged(): continue
  -            project.checkPackage()          
  -        
  -            self.listener.handleEvent(ModelEvent())         
                                                                
           # Complete the properies
           self.completeProperties()
  @@ -448,7 +441,6 @@
           # Copy over any XML errors/warnings
           transferAnnotations(self.xml, self)  
                   
  -        
           self.listener.handleEvent(ModelEvent())
               
           self.setComplete(1)
  @@ -560,36 +552,36 @@
           for project in self.getProjects():
               project.dump(indent+1,output)
   
  -    def isNag(self):
  +    def isNotify(self):
           return self.xml.nag
           
  -    def hasNagToOverride(self):
  -        return self.isNag() and hasattr(self.xml.nag,'to')
  +    def hasNotifyToOverride(self):
  +        return self.isNotify() and hasattr(self.xml.nag,'to')
           
  -    def getNagToOverride(self):
  +    def getNotifyToOverride(self):
           return getattr(self.xml.nag,'to')
           
  -    def hasNagFromOverride(self):
  +    def hasNotifyFromOverride(self):
           return self.isNag() and hasattr(self.xml.nag,'from')
           
  -    def getNagFromOverride(self):
  +    def getNotifyFromOverride(self):
           return getattr(self.xml.nag,'from')
           
  -    def getNagOverrides(self):
  +    def getNotifyOverrides(self):
             
           #
           # Nag Overrides
           #
  -        wsNagToOverrideAddr=None
  -        wsNagFromOverrideAddr=None
  +        wsNotifyToOverrideAddr=None
  +        wsNotifyFromOverrideAddr=None
           
  -        if self.hasNagToOverride():
  -            wsNagToOverrideAddr=self.getNagToOverride()
  +        if self.hasNotifyToOverride():
  +            wsNotifyToOverrideAddr=self.getNotifyToOverride()
               
           if self.hasNagFromOverride():
  -            wsNagFromOverrideAddr=self.getNagFromOverride()
  +            wsNotifyFromOverrideAddr=self.getNotifyFromOverride()
           
  -        return ( wsNagToOverrideAddr, wsNagFromOverrideAddr)
  +        return ( wsNotifyToOverrideAddr, wsNotifyFromOverrideAddr)
                
       def getVersion(self):
           return self.xml.version
  
  
  
  1.23.2.1  +12 -0     gump/python/gump/model/object.py
  
  Index: object.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/object.py,v
  retrieving revision 1.23
  retrieving revision 1.23.2.1
  diff -u -r1.23 -r1.23.2.1
  --- object.py	29 Mar 2004 19:34:20 -0000	1.23
  +++ object.py	17 May 2004 20:22:02 -0000	1.23.2.1
  @@ -165,6 +165,18 @@
           """ Display the contents of this object """
           output.write(getIndent(indent)+'Name: ' + self.name + '\n')
           ModelObject.dump(self,indent+1,output)
  +
  +          
  +class Positioned:
  +    def __init__(self): 
  +        self.posn=-1
  +        
  +    def setPosition(self,posn):
  +        self.posn=posn
  +
  +    def getPosition(self):
  +        return self.posn
  +
             
   class Resultable:
       def __init__(self): 
  
  
  
  1.82.2.1  +8 -406    gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/project.py,v
  retrieving revision 1.82
  retrieving revision 1.82.2.1
  diff -u -r1.82 -r1.82.2.1
  --- project.py	15 May 2004 18:02:31 -0000	1.82
  +++ project.py	17 May 2004 20:22:02 -0000	1.82.2.1
  @@ -22,7 +22,7 @@
   
   from gump.model.state import *
   from gump.model.object import ModelObject, NamedModelObject, Jar,	\
  -                                Resultable, \
  +                                Resultable, Positioned, \
                                    Mkdir, Delete, JunitReport, Work
   from gump.model.stats import Statable, Statistics
   from gump.model.property import Property
  @@ -136,7 +136,7 @@
           return os.pathsep.join(self.getSimpleClasspathList())
               
   
  -class Project(NamedModelObject, Statable, Resultable, Dependable):
  +class Project(NamedModelObject, Statable, Resultable, Dependable, Positioned):
       """A single project"""
       def __init__(self,xml,workspace):
       	NamedModelObject.__init__(self,xml.getName(),xml,workspace)
  @@ -144,6 +144,7 @@
       	Statable.__init__(self)
       	Resultable.__init__(self)
       	Dependable.__init__(self)
  +    	Positioned.__init__(self)
       	
       	# Navigation
           self.module=None # Module has to claim ownership
  @@ -533,34 +534,6 @@
           # Done, don't redo
           self.setComplete(1)
   
  -    def  checkPackage(self):
  -        if self.okToPerformWork():
  -            #
  -            # Check the package was installed correctly...
  -            #
  -            outputsOk=1
  -            for jar in self.getJars():
  -                jarpath=jar.getPath()
  -                if jarpath:
  -                    if not os.path.exists(jarpath):
  -                        self.changeState(STATE_FAILED,REASON_PACKAGE_BAD)
  -                        outputsOk=0
  -                        self.addError("Missing Packaged Jar: " + str(jarpath))
  -    
  -            if outputsOk:
  -                self.changeState(STATE_COMPLETE,REASON_PACKAGE)
  -            else:
  -                # Just in case it was so bad it thought it had no
  -                # jars to check
  -                self.changeState(STATE_FAILED,REASON_PACKAGE_BAD)
  -                
  -                #
  -                # List them, why not...
  -                #            
  -                from gump.utils.tools import listDirectoryToFileHolder
  -                listDirectoryToFileHolder(self,self.getHomeDirectory(),	\
  -                    FILE_TYPE_PACKAGE, 'list_package_'+self.getName())                                            
  -        
       def importDependencies(self,workspace):        
           badDepends=[]
           # Walk the XML parts converting
  @@ -627,382 +600,7 @@
           hasBuild=0
           # I.e has an <ant or <script element
           if self.xml.ant or self.xml.script or self.xml.maven: hasBuild=1    
  -        return hasBuild
  -
  -    def getBuildCommand(self,javaCommand='java'):
  -
  -        # get the ant element (if it exists)
  -        ant=self.xml.ant
  -
  -        # get the maven element (if it exists)
  -        maven=self.xml.maven
  -
  -        # get the script element (if it exists)
  -        script=self.xml.script
  -
  -        if not (script or ant or maven):
  -          #  log.debug('Not building ' + project.name + ' (no <ant/> or <maven/> or <script/> specified)')
  -          return None
  -
  -        if self.hasScript():
  -            return self.getScriptCommand()
  -        elif self.hasMaven() :
  -            return self.getMavenCommand()
  -        else:
  -            return self.getAntCommand(javaCommand)
  -        
  -    #
  -    # Build an ANT command for this project
  -    #        
  -    def getAntCommand(self,javaCommand='java'):
  -        
  -        ant=self.ant
  -        antxml=self.xml.ant
  -    
  -        # The ant target (or none == ant default target)
  -        target= antxml.target or ''
  -    
  -        # The ant build file (or none == build.xml)
  -        buildfile = antxml.buildfile or ''
  -    
  -        # Optional 'verbose' or 'debug'
  -        verbose=antxml.verbose
  -        debug=antxml.debug
  -    
  -        #
  -        # Where to run this:
  -        #
  -        basedir = ant.getBaseDirectory() or self.getBaseDirectory()
  -    
  -        #
  -        # Build a classpath (based upon dependencies)
  -        #
  -        (classpath,bootclasspath)=self.getClasspaths()
  -    
  -        #
  -        # Get properties
  -        #
  -        properties=self.getAntProperties()
  -   
  -        #
  -        # Get properties
  -        #
  -        sysproperties=self.getAntSysProperties()
  -   
  -        #
  -        # Get properties
  -        #
  -        jvmargs=self.getJVMArgs()
  -   
  -        #
  -        # Run java on apache Ant...
  -        #
  -        cmd=Cmd(javaCommand,'build_'+self.getModule().getName()+'_'+self.getName(),\
  -            basedir,{'CLASSPATH':classpath})
  -            
  -        # These are workspace + project system properties
  -        cmd.addNamedParameters(sysproperties)
  -        
  -        
  -        # :NOTE: Commented out since <sysproperty was implemented.
  -        #
  -        # Set this as a system property. Setting it here helps JDK1.4+
  -        # AWT implementations cope w/o an X11 server running (e.g. on
  -        # Linux)
  -        # cmd.addPrefixedParameter('-D','java.awt.headless','true','=')
  -    
  -    
  -        # :NOTE: Commented out since <sysproperty was implemented.
  -        #
  -        # This helps ant maintain VM information for sub-VMs it launches.
  -        #
  -        # cmd.addPrefixedParameter('-D','build.clonevm','true','=')
  -        
  -        #
  -        # Add BOOTCLASSPATH
  -        #
  -        if bootclasspath:
  -            cmd.addPrefixedParameter('-X','bootclasspath/p',bootclasspath,':')
  -            
  -        if jvmargs:
  -            cmd.addParameters(jvmargs)
  -            
  -        cmd.addParameter('org.apache.tools.ant.Main')  
  -    
  -        #
  -        # Allow ant-level debugging...
  -        #
  -        if self.getWorkspace().isDebug() or self.isDebug() or debug: 
  -            cmd.addParameter('-debug')  
  -        if self.getWorkspace().isVerbose()  or self.isVerbose() or verbose: 
  -            cmd.addParameter('-verbose')  
  -        
  -        #
  -        #	This sets the *defaults*, a workspace could override them.
  -        #        
  -        # :NOTE: Commented out since <property on workspace works.
  -        # cmd.addPrefixedParameter('-D','build.sysclasspath','only','=')
  -    
  -        mergeFile=self.getWorkspace().getMergeFile()
  -        if mergeFile:
  -            cmd.addPrefixedParameter('-D','gump.merge',str(mergeFile),'=')        
  -    
  -        # These are from the project and/or workspace
  -        # These are 'normal' properties.
  -        cmd.addNamedParameters(properties)
  -    
  -        # Pass the buildfile
  -        if buildfile: cmd.addParameter('-f',buildfile)
  -    
  -        # End with the target...
  -        if target: 
  -            for targetParam in target.split():
  -                cmd.addParameter(targetParam)
  -    
  -        return cmd
  -
  -    #
  -    # Build an ANT command for this project
  -    #        
  -    def getMavenCommand(self):
  -        maven=self.maven
  -        mavenxml=self.xml.maven
  -    
  -        # The ant goal (or none == ant default goal)
  -        goal=maven.getGoal()
  -    
  -        # Optional 'verbose' or 'debug'
  -        verbose=mavenxml.verbose
  -        debug=mavenxml.debug
  -    
  -        #
  -        # Where to run this:
  -        #
  -        basedir = maven.getBaseDirectory() or self.getBaseDirectory()
  -    
  -        #
  -        # Build a classpath (based upon dependencies)
  -        #
  -        (classpath,bootclasspath)=self.getClasspaths()
  -    
  -        #
  -        # Get properties
  -        #
  -        #jvmargs=self.getJVMArgs()
  -   
  -        #
  -        # Run Maven...
  -        #
  -        cmd=Cmd('maven','build_'+self.getModule().getName()+'_'+self.getName(),\
  -            basedir,{'CLASSPATH':classpath})
  -            
  -        # Set this as a system property. Setting it here helps JDK1.4+
  -        # AWT implementations cope w/o an X11 server running (e.g. on
  -        # Linux)
  -        # cmd.addPrefixedParameter('-D','java.awt.headless','true','=')
  -    
  -        #
  -        # Add BOOTCLASSPATH
  -        #
  -        #if bootclasspath:
  -        #    cmd.addPrefixedParameter('-X','bootclasspath/p',bootclasspath,':')
  -            
  -        #if jvmargs:
  -        #    cmd.addParameters(jvmargs)
  -            
  -        # cmd.addParameter('org.apache.maven.cli.App')  
  -    
  -        #
  -        # Allow maven-level debugging...
  -        #
  -        if self.getWorkspace().isDebug() or self.isDebug() or debug: 
  -            cmd.addParameter('--debug')  
  -        if self.getWorkspace().isVerbose()  or self.isVerbose() or verbose: 
  -            cmd.addParameter('--exception') 
  -        
  -        #
  -        # Suppress downloads
  -        #          
  -        cmd.addParameter('--offline')  
  -        
  -        #
  -        #	This sets the *defaults*, a workspace could override them.
  -        #
  -        #cmd.addPrefixedParameter('-D','build.sysclasspath','only','=')
  -    
  -        # End with the goal...
  -        cmd.addParameter(goal)
  -    
  -        return cmd
  -  
  -    def getScriptCommand(self):
  -        """ Return the command object for a <script entry """
  -        script=self.script
  -        scriptxml=self.xml.script 
  -           
  -        #
  -        # Where to run this:
  -        #
  -        basedir = script.getBaseDirectory() or self.getBaseDirectory()
  -
  -        # Add .sh  or .bat as appropriate to platform
  -        scriptfullname=scriptxml.name
  -        if not os.name == 'dos' and not os.name == 'nt':
  -            scriptfullname += '.sh'
  -        else:
  -            scriptfullname += '.bat'
  -      
  -        # Optional 'verbose' or 'debug'
  -        # verbose=scriptxml.verbose
  -        # debug=scriptxml.debug
  -       
  -        scriptfile=os.path.abspath(os.path.join(basedir, scriptfullname))
  -        
  -        # Not sure this is relevent...
  -        (classpath,bootclasspath)=self.getClasspaths()
  -
  -        cmd=Cmd(scriptfile,'buildscript_'+self.getModule().getName()+'_'+self.getName(),\
  -            basedir,{'CLASSPATH':classpath})    
  -            
  -        # Set this as a system property. Setting it here helps JDK1.4+
  -        # AWT implementations cope w/o an X11 server running (e.g. on
  -        # Linux)
  -        #    
  -        # Per GUMP-48 scripts do not want this.
  -        # cmd.addPrefixedParameter('-D','java.awt.headless','true','=')
  -    
  -        #
  -        # Add BOOTCLASSPATH
  -        #
  -        # Per GUMP-48 scripts do not want this.
  -        #if bootclasspath:
  -        #    cmd.addPrefixedParameter('-X','bootclasspath/p',bootclasspath,':')
  -                    
  -        #
  -        # Allow script-level debugging...
  -        #
  -        # Per GUMP-48 scripts do not want this.        
  -        #if self.getWorkspace().isDebug() or self.isDebug() or debug:
  -        #    cmd.addParameter('-debug')  
  -        #if self.getWorkspace().isVerbose()  or self.isVerbose() or verbose:
  -        #    cmd.addParameter('-verbose')  
  -        
  -        return cmd
  -    
  -                
  -
  -    def getJVMArgs(self):
  -        """Get JVM arguments for a project"""
  -        args=Parameters()
  -        
  -        if self.hasAnt():
  -            jvmargs=self.getAnt().xml.jvmarg
  -        elif self.hasMaven():
  -            jvmargs=self.getMaven().xml.jvmarg
  -                
  -        for jvmarg in jvmargs:
  -            if jvmarg.value:
  -                args.addParameter(jvmarg.value)
  -            else:
  -                log.error('Bogus JVM Argument w/ Value')            
  -        
  -        return args
  -  
  -    def getAntProperties(self):
  -        """Get properties for a project"""
  -        properties=Parameters()
  -        for property in self.getWorkspace().getProperties()+self.getAnt().getProperties():
  -            properties.addPrefixedNamedParameter('-D',property.name,property.value,'=')
  -        return properties
  -
  -    def getAntSysProperties(self):
  -        """Get sysproperties for a project"""
  -        properties=Parameters()
  -        for property in self.getWorkspace().getSysProperties()+self.getAnt().getSysProperties():
  -            properties.addPrefixedNamedParameter('-D',property.name,property.value,'=')
  -        return properties
  -
  -    # The propertiesFile parameter is primarily for testing.
  -    def generateMavenProperties(self,propertiesFile=None):
  -        """Set properties/overrides for a Maven project"""
  -        
  -        #:TODO: Does Maven have the idea of system properties?
  -        
  -        #
  -        # Where to put this:
  -        #
  -        basedir = self.maven.getBaseDirectory() or self.getBaseDirectory()
  -        if not propertiesFile: 
  -            propertiesFile=os.path.abspath(os.path.join(	\
  -                    basedir,'build.properties'))
  -        
  -        if os.path.exists(propertiesFile):
  -            self.addWarning('Overriding Maven properties: ['+propertiesFile+']')
  -    
  -        
  -        props=open(propertiesFile,'w')
  -        
  -        props.write(("""# ------------------------------------------------------------------------
  -# DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT 
  -#
  -# File Automatically Generated by Gump, see http://gump.apache.org/
  -#
  -# Generated For : %s
  -# Generated At  : %s
  -#
  -#
  -# DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT  DO NOT EDIT
  -# ------------------------------------------------------------------------
  -""")	%	(self.getName(), time.strftime('%Y-%m-%d %H:%M:%S')) )
  -        
  -        #
  -        # Output basic properties
  -        #
  -        for property in self.getWorkspace().getProperties()+self.getMaven().getProperties():
  -            # build.sysclasspath makes Maven sick.
  -            if not 'build.sysclasspath' == property.name:
  -                props.write(('%s=%s\n') % (property.name,property.value))            
  -        
  -        #
  -        # Output classpath properties
  -        #
  -        props.write("""
  -# ------------------------------------------------------------------------
  -# M A V E N  J A R  O V E R R I D E
  -# ------------------------------------------------------------------------
  -maven.jar.override = on
  -
  -# ------------------------------------------------------------------------
  -# Jars set explicity by path.
  -# ------------------------------------------------------------------------
  -""")
  -        
  -        (classpath,bootclasspath)=self.getClasspathObjects()
  -        
  -        # :TODO: write...
  -        for annotatedPath in classpath.getPathParts():
  -            if isinstance(annotatedPath,AnnotatedPath):
  -                props.write(('# Contributor: %s\nmaven.jar.%s=%s\n') % \
  -                    (	annotatedPath.getContributor(),	\
  -                        annotatedPath.getId(),	\
  -                        annotatedPath.getPath()))
  -
  -        return propertiesFile
  -      
  -    def locateMavenLog(self):
  -        """Return Maven log location"""  
  -        basedir = self.maven.getBaseDirectory() or self.getBaseDirectory()
  -        return os.path.abspath(os.path.join(basedir,'maven.log'))
  -      
  -    def locateMavenProjectPropertiesFile(self):
  -        """Return Maven project properties file location""" 
  -        basedir = self.maven.getBaseDirectory() or self.getBaseDirectory()
  -        return os.path.abspath(os.path.join(basedir,'project.properties'))
  -        
  -    def locateMavenProjectFile(self):
  -        """Return Maven project file location"""      
  -        basedir = self.maven.getBaseDirectory() or self.getBaseDirectory()
  -        return os.path.abspath(os.path.join(basedir,'project.xml'))        
  +        return hasBuild      
           
       def dump(self, indent=0, output=sys.stdout):
           """ Display the contents of this object """
  @@ -1013,6 +611,10 @@
                           
           if self.ant:
               self.ant.dump(indent+1,output)
  +        if self.maven:
  +            self.maven.dump(indent+1,output)
  +        if self.script:
  +            self.script.dump(indent+1,output)
               
       #
       # Return a list of the outputs this project generates
  
  
  
  1.13.2.1  +7 -2      gump/python/gump/model/state.py
  
  Index: state.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/state.py,v
  retrieving revision 1.13
  retrieving revision 1.13.2.1
  diff -u -r1.13 -r1.13.2.1
  --- state.py	16 Mar 2004 19:50:14 -0000	1.13
  +++ state.py	17 May 2004 20:22:02 -0000	1.13.2.1
  @@ -26,12 +26,14 @@
   STATE_NONE=1
   STATE_SUCCESS=2
   STATE_FAILED=3
  -STATE_PREREQ_FAILED=4
  -STATE_COMPLETE=5
  +STATE_STALE=4
  +STATE_PREREQ_FAILED=5
  +STATE_COMPLETE=6
   
   stateNames = { STATE_UNSET : "Unset",
              STATE_NONE : "NoWork",
              STATE_SUCCESS : "Success",
  +           STATE_STALE : "Stale",
              STATE_FAILED : "Failed",
              STATE_PREREQ_FAILED : "PrereqFailed",
              STATE_COMPLETE : "Complete" }
  @@ -40,6 +42,7 @@
              STATE_NONE : "No Work Performed",
              STATE_SUCCESS : "Success",
              STATE_FAILED : "Failed",
  +           STATE_STALE : "Stale",
              STATE_PREREQ_FAILED : "Prerequisite Failed",
              STATE_COMPLETE : "Complete" }
   
  @@ -53,6 +56,7 @@
              "NoWork" : STATE_NONE,
               "Success" : STATE_SUCCESS,
               "Failed" : STATE_FAILED,
  +            "Stale" : STATE_STALE,
               "PrereqFailed" : STATE_PREREQ_FAILED,
               "Complete"  : STATE_COMPLETE}
               
  @@ -60,6 +64,7 @@
              "No Work Performed" : STATE_NONE,
               "Success" : STATE_SUCCESS,
               "Failed" : STATE_FAILED,
  +            "Stale" : STATE_STALE,
               "Prerequisite Failed" : STATE_PREREQ_FAILED,
               "Complete"  : STATE_COMPLETE}
              
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +457 -0    gump/python/gump/output/Attic/notify.py
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +4 -2      gump/python/gump/core/__init__.py
  
  Index: __init__.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/__init__.py,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- __init__.py	16 Apr 2004 17:28:41 -0000	1.1
  +++ __init__.py	17 May 2004 20:22:03 -0000	1.1.2.1
  @@ -25,4 +25,6 @@
   """
   
   # tell Python what modules make up the gump.core package
  -__all__ = ["init","commandLine","config","engine","gumpenv","gumprun"]
  +__all__ = ["init","commandLine","config","runner",	\
  +            "misc","builder","updater",	\
  +            "tasks","gumpenv","gumprun"]
  
  
  
  1.6.2.1   +0 -5      gump/python/gump/core/commandLine.py
  
  Index: commandLine.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/commandLine.py,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- commandLine.py	11 May 2004 04:20:01 -0000	1.6
  +++ commandLine.py	17 May 2004 20:22:03 -0000	1.6.2.1
  @@ -68,7 +68,6 @@
                   print "  -O,  --official          Full run, publishing notifications, etc."
                   print "  -D,  --dated             Dated log files."
                   print "  -t,  --text              Use text not Forrest."
  -                print "  -T,  --templates         Use temapltes not Forrest."
                   print "  -X,  --xdocs             Output xdocs, do not run Forrest."
                   
                   print
  @@ -117,10 +116,6 @@
                   removers.append(arg)        
                   self.options.setXDocs(1)
                   log.info('Output xdocs (do not run forrest).')
  -            elif arg in ['-t','--template']:
  -                removers.append(arg)        
  -                self.options.setTemplate(1)
  -                log.info('Use template (not forrest).')
                   
           # Remove 
           for arg in removers:
  
  
  
  1.5.2.1   +8 -9      gump/python/gump/core/gumprun.py
  
  Index: gumprun.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/gumprun.py,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- gumprun.py	11 May 2004 04:20:01 -0000	1.5
  +++ gumprun.py	17 May 2004 20:22:03 -0000	1.5.2.1
  @@ -357,9 +357,7 @@
           
           # Default is Text unless Forrest is in the environment,
           # but can also force text with --text 
  -        self.text=0      
  -        # A new alternative is Template --template
  -        self.template=0      
  +        self.text=0        
           
           # If using Forrest, this say leave xdocs, do NOT run
           # the 'forrest' build inlined.
  @@ -403,12 +401,6 @@
       def setText(self,text):
           self.text=text
           
  -    def isTemplate(self):
  -        return self.template
  -        
  -    def setTemplate(self,template):
  -        self.template=template
  -        
       def isXDocs(self):
           return self.xdocs
           
  @@ -498,5 +490,12 @@
           
           self.gumpSet.dump(indent+1,output)
           
  +class Runnable:
  +    
  +    def __init__(self, run):
  +        self.run	=	run
  +        
  +    def getRun(self):
  +        return self.run
           
           
  
  
  
  No                   revision
  
  Index: gumprun.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/gumprun.py,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- gumprun.py	11 May 2004 04:20:01 -0000	1.5
  +++ gumprun.py	17 May 2004 20:22:03 -0000	1.5.2.1
  @@ -357,9 +357,7 @@
           
           # Default is Text unless Forrest is in the environment,
           # but can also force text with --text 
  -        self.text=0      
  -        # A new alternative is Template --template
  -        self.template=0      
  +        self.text=0        
           
           # If using Forrest, this say leave xdocs, do NOT run
           # the 'forrest' build inlined.
  @@ -403,12 +401,6 @@
       def setText(self,text):
           self.text=text
           
  -    def isTemplate(self):
  -        return self.template
  -        
  -    def setTemplate(self,template):
  -        self.template=template
  -        
       def isXDocs(self):
           return self.xdocs
           
  @@ -498,5 +490,12 @@
           
           self.gumpSet.dump(indent+1,output)
           
  +class Runnable:
  +    
  +    def __init__(self, run):
  +        self.run	=	run
  +        
  +    def getRun(self):
  +        return self.run
           
           
  
  
  
  No                   revision
  
  Index: gumprun.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/gumprun.py,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- gumprun.py	11 May 2004 04:20:01 -0000	1.5
  +++ gumprun.py	17 May 2004 20:22:03 -0000	1.5.2.1
  @@ -357,9 +357,7 @@
           
           # Default is Text unless Forrest is in the environment,
           # but can also force text with --text 
  -        self.text=0      
  -        # A new alternative is Template --template
  -        self.template=0      
  +        self.text=0        
           
           # If using Forrest, this say leave xdocs, do NOT run
           # the 'forrest' build inlined.
  @@ -403,12 +401,6 @@
       def setText(self,text):
           self.text=text
           
  -    def isTemplate(self):
  -        return self.template
  -        
  -    def setTemplate(self,template):
  -        self.template=template
  -        
       def isXDocs(self):
           return self.xdocs
           
  @@ -498,5 +490,12 @@
           
           self.gumpSet.dump(indent+1,output)
           
  +class Runnable:
  +    
  +    def __init__(self, run):
  +        self.run	=	run
  +        
  +    def getRun(self):
  +        return self.run
           
           
  
  
  
  1.1.2.1   +122 -0    gump/python/gump/core/Attic/demand.py
  
  
  
  
  1.1.2.1   +256 -0    gump/python/gump/core/Attic/tasks.py
  
  
  
  
  1.1.2.1   +52 -0     gump/python/gump/core/Attic/runner.py
  
  
  
  
  1.1.2.1   +299 -0    gump/python/gump/core/Attic/misc.py
  
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -1      gump/python/gump/test/resources/full1/repository1.xml
  
  Index: repository1.xml
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/resources/full1/repository1.xml,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- repository1.xml	21 Nov 2003 19:04:10 -0000	1.1
  +++ repository1.xml	17 May 2004 20:22:03 -0000	1.1.2.1
  @@ -2,7 +2,7 @@
   
   <repository name="repository1" type="cvs">
     <title>Repository 1</title>
  -  <home-page>http://jakarta.apache.org/gump</home-page>
  +  <home-page>http://gump.apache.org</home-page>
     <cvsweb>http://cvs.apache.org/viewcvs/</cvsweb>
     <redistributable/>
   
  
  
  
  No                   revision
  No                   revision
  1.36.2.1  +3 -3      gump/python/gump/document/forrest/documenter.py
  
  Index: documenter.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/forrest/documenter.py,v
  retrieving revision 1.36
  retrieving revision 1.36.2.1
  diff -u -r1.36 -r1.36.2.1
  --- documenter.py	15 May 2004 12:08:34 -0000	1.36
  +++ documenter.py	17 May 2004 20:22:03 -0000	1.36.2.1
  @@ -44,7 +44,7 @@
   from gump.model.module import Module
   from gump.model.project import Project
   
  -from gump.output.nag import Nagger
  +from gump.output.notify import Notifier
   from gump.output.statsdb import StatisticsGuru
   from gump.output.xref import XRefGuru
   from gump.core.gumprun import *
  @@ -460,7 +460,7 @@
           self.documentProperties(detailsSection, workspace, 'Workspace Properties')
           
           # Does this workspace send notification (nag) mails?
  -        detailsTable.createEntry("Send Nag E-mails: ", getBooleanString(workspace.isNag()))
  +        detailsTable.createEntry("Send Notification E-mails: ", getBooleanString(workspace.isNotify()))
           
           #document.createRaw('<p><strong>Context Tree:</strong> <link href=\'workspace.html\'>workspace</link></p>')
           # x.write('<p><strong>Workspace Config:</strong> <link href=\'xml.txt\'>XML</link></p>')
  @@ -1813,7 +1813,7 @@
        
               nagSection=document.createSection('Notification')
               nagSection.createParagraph('This is the notification mail that is to be sent')
  -            nagger=Nagger(run)
  +            nagger=Notifier(run)
               content=nagger.getNamedTypedContent(project)            
               nagSection.createSource(content)
                       
  
  
  
  No                   revision
  No                   revision
  1.20.2.1  +4 -4      gump/python/gump/test/model.py
  
  Index: model.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/model.py,v
  retrieving revision 1.20
  retrieving revision 1.20.2.1
  diff -u -r1.20 -r1.20.2.1
  --- model.py	16 Apr 2004 17:28:35 -0000	1.20
  +++ model.py	17 May 2004 20:22:03 -0000	1.20.2.1
  @@ -253,7 +253,7 @@
       def testTrackers(self):
           self.assertNotEmpty('Some trackers ought be found', self.workspace.getTrackers())
                           
  -    def testNagging(self):
  -        self.assertTrue('Ought allow nagging', self.workspace.isNag())
  +    def testNotification(self):
  +        self.assertTrue('Ought allow notify', self.workspace.isNotify())
           
           
  
  
  
  1.6.2.1   +1 -3      gump/python/gump/test/resolving.py
  
  Index: resolving.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/resolving.py,v
  retrieving revision 1.6
  retrieving revision 1.6.2.1
  diff -u -r1.6 -r1.6.2.1
  --- resolving.py	22 Apr 2004 22:58:15 -0000	1.6
  +++ resolving.py	17 May 2004 20:22:04 -0000	1.6.2.1
  @@ -27,7 +27,6 @@
   from gump.test import *
   from gump.document.text.resolver import *
   from gump.document.forrest.resolver import *
  -from gump.document.template.resolver import *
   
   from gump.test.pyunit import UnitTestSuite
   
  @@ -120,8 +119,7 @@
       
       def testResolving(self):
           for resolver in [	TextResolver('./test','http://somewhere/something'),	\
  -                            ForrestResolver('./test','http://somewhere/something'),	\
  -                            TemplateResolver('./test','http://somewhere/something') ] :
  +                            ForrestResolver('./test','http://somewhere/something') ] :
   
   
               #print `resolver`            
  
  
  
  1.7.2.1   +5 -0      gump/python/gump/test/maven.py
  
  Index: maven.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/maven.py,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- maven.py	16 Apr 2004 17:28:35 -0000	1.7
  +++ maven.py	17 May 2004 20:22:04 -0000	1.7.2.1
  @@ -32,6 +32,11 @@
   from gump.test.pyunit import UnitTestSuite
   
   class MavenTestSuite(UnitTestSuite):
  +    """
  +    
  +        Maven Test suite
  +        
  +    """
       def __init__(self):
           UnitTestSuite.__init__(self)
           
  
  
  
  1.30.2.1  +4 -4      gump/python/gump/test/pyunit.py
  
  Index: pyunit.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/pyunit.py,v
  retrieving revision 1.30
  retrieving revision 1.30.2.1
  diff -u -r1.30 -r1.30.2.1
  --- pyunit.py	5 May 2004 15:43:20 -0000	1.30
  +++ pyunit.py	17 May 2004 20:22:04 -0000	1.30.2.1
  @@ -322,8 +322,8 @@
       from gump.test.tools import ToolsTestSuite  
       runner.addSuite(ToolsTestSuite())
       
  -    from gump.test.nagging import NaggingTestSuite  
  -    runner.addSuite(NaggingTestSuite())
  +    from gump.test.notifying import NotificationTestSuite  
  +    runner.addSuite(NotificationTestSuite())
       
       from gump.test.resulting import ResultingTestSuite  
       runner.addSuite(ResultingTestSuite())
  @@ -334,8 +334,8 @@
       from gump.test.unicode import UnicodeTestSuite  
       runner.addSuite(UnicodeTestSuite())
       
  -    from gump.test.thomas import EngineTestSuite  
  -    runner.addSuite(EngineTestSuite())
  +    from gump.test.tasks import TasksTestSuite  
  +    runner.addSuite(TasksTestSuite())
       
       from gump.test.diagram import DiagramTestSuite  
       runner.addSuite(DiagramTestSuite())
  
  
  
  No                   revision
  
  Index: pyunit.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/pyunit.py,v
  retrieving revision 1.30
  retrieving revision 1.30.2.1
  diff -u -r1.30 -r1.30.2.1
  --- pyunit.py	5 May 2004 15:43:20 -0000	1.30
  +++ pyunit.py	17 May 2004 20:22:04 -0000	1.30.2.1
  @@ -322,8 +322,8 @@
       from gump.test.tools import ToolsTestSuite  
       runner.addSuite(ToolsTestSuite())
       
  -    from gump.test.nagging import NaggingTestSuite  
  -    runner.addSuite(NaggingTestSuite())
  +    from gump.test.notifying import NotificationTestSuite  
  +    runner.addSuite(NotificationTestSuite())
       
       from gump.test.resulting import ResultingTestSuite  
       runner.addSuite(ResultingTestSuite())
  @@ -334,8 +334,8 @@
       from gump.test.unicode import UnicodeTestSuite  
       runner.addSuite(UnicodeTestSuite())
       
  -    from gump.test.thomas import EngineTestSuite  
  -    runner.addSuite(EngineTestSuite())
  +    from gump.test.tasks import TasksTestSuite  
  +    runner.addSuite(TasksTestSuite())
       
       from gump.test.diagram import DiagramTestSuite  
       runner.addSuite(DiagramTestSuite())
  
  
  
  No                   revision
  
  Index: pyunit.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/pyunit.py,v
  retrieving revision 1.30
  retrieving revision 1.30.2.1
  diff -u -r1.30 -r1.30.2.1
  --- pyunit.py	5 May 2004 15:43:20 -0000	1.30
  +++ pyunit.py	17 May 2004 20:22:04 -0000	1.30.2.1
  @@ -322,8 +322,8 @@
       from gump.test.tools import ToolsTestSuite  
       runner.addSuite(ToolsTestSuite())
       
  -    from gump.test.nagging import NaggingTestSuite  
  -    runner.addSuite(NaggingTestSuite())
  +    from gump.test.notifying import NotificationTestSuite  
  +    runner.addSuite(NotificationTestSuite())
       
       from gump.test.resulting import ResultingTestSuite  
       runner.addSuite(ResultingTestSuite())
  @@ -334,8 +334,8 @@
       from gump.test.unicode import UnicodeTestSuite  
       runner.addSuite(UnicodeTestSuite())
       
  -    from gump.test.thomas import EngineTestSuite  
  -    runner.addSuite(EngineTestSuite())
  +    from gump.test.tasks import TasksTestSuite  
  +    runner.addSuite(TasksTestSuite())
       
       from gump.test.diagram import DiagramTestSuite  
       runner.addSuite(DiagramTestSuite())
  
  
  
  1.1.2.1   +51 -0     gump/python/gump/test/Attic/tasks.py
  
  
  
  
  1.1.2.1   +110 -0    gump/python/gump/test/Attic/notifying.py
  
  
  
  
  No                   revision
  No                   revision
  1.10.2.1  +4 -4      gump/python/gump/gui/view.py
  
  Index: view.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/gui/view.py,v
  retrieving revision 1.10
  retrieving revision 1.10.2.1
  diff -u -r1.10 -r1.10.2.1
  --- view.py	16 Apr 2004 17:28:42 -0000	1.10
  +++ view.py	17 May 2004 20:22:04 -0000	1.10.2.1
  @@ -82,7 +82,7 @@
   from gump.model.project import Project
   from gump.model.workspace import Workspace
   from gump.model.loader import WorkspaceLoader
  -from gump.core.engine import GumpEngine
  +from gump.core.runner import GumpRunner
   from gump.core.gumprun import GumpSet
   
   ###############################################################################
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +21 -0     gump/python/gump/update/Attic/__init__.py
  
  
  
  
  1.1.2.1   +277 -0    gump/python/gump/update/Attic/updater.py
  
  
  
  
  1.1.2.1   +194 -0    gump/python/gump/update/Attic/cvs.py
  
  
  
  
  1.1.2.1   +1 -0      gump/python/gump/update/Attic/.cvsignore
  
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +1 -1      gump/template/forrest/content/xdocs/site.xml
  
  Index: site.xml
  ===================================================================
  RCS file: /home/cvs/gump/template/forrest/content/xdocs/site.xml,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- site.xml	22 Apr 2004 19:58:08 -0000	1.3
  +++ site.xml	17 May 2004 20:22:04 -0000	1.3.2.1
  @@ -11,7 +11,7 @@
     <work label="Gump">
       <index label="Workspace" href="index.html"/>
       <index label="Environment" href="environment.html"/>
  -    <index label="Options" href="options.html"/>
  +    <index label="Run Options" href="options.html"/>
       <index label="Build Log" href="buildLog.html"/>
       <index label="Notes Log" href="notesLog.html"/>
       <index label="Diffs Log" href="diffsLog.html"/>
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +1 -0      gump/python/gump/build/Attic/.cvsignore
  
  
  
  
  1.1.2.1   +272 -0    gump/python/gump/build/Attic/maven.py
  
  
  
  
  1.1.2.1   +218 -0    gump/python/gump/build/Attic/ant.py
  
  
  
  
  1.1.2.1   +21 -0     gump/python/gump/build/Attic/__init__.py
  
  
  
  
  1.1.2.1   +662 -0    gump/python/gump/build/Attic/builder.py
  
  
  
  
  1.1.2.1   +169 -0    gump/python/gump/build/Attic/script.py
  
  
  
  
  1.1.2.1   +69 -0     gump/python/gump/build/Attic/abstract.py
  
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org


Mime
View raw message