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/test/resources/complete1 download1.xml
Date Fri, 11 Jun 2004 20:46:12 GMT
ajack       2004/06/11 13:46:12

  Modified:    .        Tag: CleanUp gumpy.py
               python/gump/utils Tag: CleanUp launcher.py sync.py
               python/gump Tag: CleanUp update.py debug.py build.py
                        integrate.py check.py preview.py
               python/gump/notify Tag: CleanUp notifier.py notification.py
               python/gump/core Tag: CleanUp config.py gumpenv.py
               python/gump/model Tag: CleanUp module.py project.py
                        __init__.py repository.py
               python/gump/update Tag: CleanUp cvs.py artifact.py
                        updater.py
               python/gump/build Tag: CleanUp maven.py ant.py abstract.py
               python/gump/document/xdocs Tag: CleanUp documenter.py
               python/gump/loader Tag: CleanUp loader.py
               python/gump/stats Tag: CleanUp statistician.py
               python/gump/test Tag: CleanUp resulting.py notifying.py
                        loader_tests.py
               python/gump/test/resources/full1 Tag: CleanUp download1.xml
               python/gump/svg Tag: CleanUp depdiag.py
               python/gump/test/resources/complete1 Tag: CleanUp
                        download1.xml
  Added:       python/gump/integration Tag: CleanUp cvs.py .cvsignore
                        __init__.py depot.py
               python/gump/utils Tag: CleanUp smtp.py
  Removed:     python/gump/net Tag: CleanUp .cvsignore cvs.py smtp.py
                        __init__.py
  Log:
  1) Working w/ Depot
  2) gumpy does a build (not 100% verified)
  3) EOD
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.1.2.1   +99 -0     gump/python/gump/integration/Attic/cvs.py
  
  
  
  
  1.1.2.1   +1 -0      gump/python/gump/integration/Attic/.cvsignore
  
  
  
  
  1.1.2.1   +27 -0     gump/python/gump/integration/Attic/__init__.py
  
  
  
  
  1.1.2.1   +46 -0     gump/python/gump/integration/Attic/depot.py
  
  
  
  
  No                   revision
  No                   revision
  1.37.2.2  +7 -0      gump/gumpy.py
  
  Index: gumpy.py
  ===================================================================
  RCS file: /home/cvs/gump/gumpy.py,v
  retrieving revision 1.37.2.1
  retrieving revision 1.37.2.2
  diff -u -r1.37.2.1 -r1.37.2.2
  --- gumpy.py	9 Jun 2004 19:28:44 -0000	1.37.2.1
  +++ gumpy.py	11 Jun 2004 20:46:09 -0000	1.37.2.2
  @@ -444,6 +444,13 @@
       published=0
       if logdir:
           publishedLogFile=os.path.abspath(os.path.join(logdir,logFileName))
  +        if '--xdocs' in args:
  +            publishedLogFile=os.path.abspath(
  +                                os.path.join(
  +                                    os.path.abspath(
  +                                        os.path.join(logdir,'content'),
  +                                    logFileName)))
  +                                
           try:
               publishedLog=open(publishedLogFile,'w',0) # Unbuffered...
               catFile(publishedLog, logFile, logTitle)    
  
  
  
  No                   revision
  No                   revision
  1.24.2.1  +1 -2      gump/python/gump/utils/launcher.py
  
  Index: launcher.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/utils/launcher.py,v
  retrieving revision 1.24
  retrieving revision 1.24.2.1
  diff -u -r1.24 -r1.24.2.1
  --- launcher.py	25 May 2004 22:46:00 -0000	1.24
  +++ launcher.py	11 Jun 2004 20:46:10 -0000	1.24.2.1
  @@ -488,8 +488,7 @@
         # Restore environment.
         if cmd.cwd: os.chdir(originalCWD)
         for envKey in originalENV.iterkeys():
  -	    value=originalENV[envKey]
  -	    os.environ[envKey]=value
  +	    os.environ[envKey]=originalENV[envKey]
   	  
       return result
       
  
  
  
  1.18.2.1  +19 -12    gump/python/gump/utils/sync.py
  
  Index: sync.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/utils/sync.py,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- sync.py	25 May 2004 22:46:00 -0000	1.18
  +++ sync.py	11 Jun 2004 20:46:10 -0000	1.18.2.1
  @@ -53,7 +53,9 @@
           self.outputStream=None
           
           # Notice that actions occured        
  -        self.actionsOccured=0
  +        self.actionsOccured=False
  +        self.inboundActions=False
  +        self.cleanupActions=False
           
       def execute(self):
           log.debug('Starting %s from [%s]' % (self.actionString,self.sourcedir))
  @@ -106,12 +108,17 @@
                               log.debug('No changes, removed  [' + self.output + ']')
                           except: pass
                   
  -        return self.actionsOccured
  +        return (self.actionsOccured, self.inboundActions, self.cleanupActions)
           
  -    def outputAction(self,type,file,reason=''):
  +    def displayAction(self,inbound,type,file,reason=''):
           
           # Mark something happened..
  -        self.actionsOccured=1
  +        self.actionsOccured=True
  +        
  +        if inbound:
  +            self.inboundActions=True
  +        else:
  +            self.cleanupActions=True
           
           # Log it (if requested)
           if self.outputStream:
  @@ -148,7 +155,7 @@
           # handle case where destinationStat exists but is not a directory    
           #
           if destinationStat and not S_ISDIR(destinationStat[ST_MODE]):
  -            self.outputAction(' -F ', dst, 'Need a directory here, not a file.')        
  +            self.displayAction(True,' -F ', dst, 'Need a directory here, not a file.')        
               os.remove(dst)
               destinationStat = None
            
  @@ -157,7 +164,7 @@
           # a path of directories.)
           #   
           if not destinationStat:     
  -            self.outputAction(' +D ', dst)    
  +            self.displayAction(True,' +D ', dst)    
               os.makedirs(dst)
               
           if destinationStat:
  @@ -207,11 +214,11 @@
                   destinationStat = os.stat(tobedeleted)
                   if S_ISDIR(destinationStat[ST_MODE]):
                       if self.isDebug(): log.debug('Attempting to remove directory [%s]' % (`tobedeleted`))
  -                    self.outputAction(' -D ', tobedeleted)    
  +                    self.displayAction(False,' -D ', tobedeleted)    
                       shutil.rmtree(tobedeleted)
                   else:    
                       if self.isDebug(): log.debug('Attempting to remove file [%s]' % (`tobedeleted`))   
  -                    self.outputAction(' -F ', tobedeleted)    
  +                    self.displayAction(False,' -F ', tobedeleted)    
                       os.remove(tobedeleted)
                       
       def removenonmatching(self, sourcedir, destdir, acceptablefiles, existingfiles):
  @@ -238,13 +245,13 @@
                           log.debug('Removing file [%s] to be replaced by directory' 
                                   %(`fulldestfile`))
                       os.remove(fulldestfile)
  -                    self.outputAction(' -F ', fulldestfile, 'Need a directory.')
  +                    self.displayAction(True,' -F ', fulldestfile, 'Need a directory.')
                       removed.append(afile)
                   elif os.path.isfile(fullsourcefile) and os.path.isdir(fulldestfile):              
                       if self.isDebug(): 
                           log.debug('Removing directory [%s] to be replaced by file' 
                                   %(`fulldestfile`))
  -                    self.outputAction(' -D ', fulldestfile, 'Need a file.')
  +                    self.displayAction(True,' -D ', fulldestfile, 'Need a file.')
                       shutil.rmtree(fulldestfile)
                       removed.append(afile)
                       
  @@ -272,7 +279,7 @@
               performCopy = 1
               reason='Did not exist.'
           elif S_ISDIR(destinationStat[ST_MODE]):
  -            self.outputAction(' -D ', dstname, 'Need a file.')    
  +            self.displayAction(True,' -D ', dstname, 'Need a file.')    
               shutil.rmtree(dstname)
               performCopy = 1
           elif sourceStat[ST_SIZE] != destinationStat[ST_SIZE]:
  @@ -284,7 +291,7 @@
               
           if performCopy:
               if self.isDebug(): log.debug("Attempting copy from [%s] to [%s]" %(`srcname`, `dstname`))    
  -            self.outputAction(' U> ', dstname, reason)    
  +            self.displayAction(True,' U> ', dstname, reason)    
               shutil.copy2(srcname, dstname)    
           #else:
           #    log.debug("Do not copy from [%s:%s] to [%s:%s]" \
  
  
  
  No                   revision
  
  Index: sync.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/utils/sync.py,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- sync.py	25 May 2004 22:46:00 -0000	1.18
  +++ sync.py	11 Jun 2004 20:46:10 -0000	1.18.2.1
  @@ -53,7 +53,9 @@
           self.outputStream=None
           
           # Notice that actions occured        
  -        self.actionsOccured=0
  +        self.actionsOccured=False
  +        self.inboundActions=False
  +        self.cleanupActions=False
           
       def execute(self):
           log.debug('Starting %s from [%s]' % (self.actionString,self.sourcedir))
  @@ -106,12 +108,17 @@
                               log.debug('No changes, removed  [' + self.output + ']')
                           except: pass
                   
  -        return self.actionsOccured
  +        return (self.actionsOccured, self.inboundActions, self.cleanupActions)
           
  -    def outputAction(self,type,file,reason=''):
  +    def displayAction(self,inbound,type,file,reason=''):
           
           # Mark something happened..
  -        self.actionsOccured=1
  +        self.actionsOccured=True
  +        
  +        if inbound:
  +            self.inboundActions=True
  +        else:
  +            self.cleanupActions=True
           
           # Log it (if requested)
           if self.outputStream:
  @@ -148,7 +155,7 @@
           # handle case where destinationStat exists but is not a directory    
           #
           if destinationStat and not S_ISDIR(destinationStat[ST_MODE]):
  -            self.outputAction(' -F ', dst, 'Need a directory here, not a file.')        
  +            self.displayAction(True,' -F ', dst, 'Need a directory here, not a file.')        
               os.remove(dst)
               destinationStat = None
            
  @@ -157,7 +164,7 @@
           # a path of directories.)
           #   
           if not destinationStat:     
  -            self.outputAction(' +D ', dst)    
  +            self.displayAction(True,' +D ', dst)    
               os.makedirs(dst)
               
           if destinationStat:
  @@ -207,11 +214,11 @@
                   destinationStat = os.stat(tobedeleted)
                   if S_ISDIR(destinationStat[ST_MODE]):
                       if self.isDebug(): log.debug('Attempting to remove directory [%s]' % (`tobedeleted`))
  -                    self.outputAction(' -D ', tobedeleted)    
  +                    self.displayAction(False,' -D ', tobedeleted)    
                       shutil.rmtree(tobedeleted)
                   else:    
                       if self.isDebug(): log.debug('Attempting to remove file [%s]' % (`tobedeleted`))   
  -                    self.outputAction(' -F ', tobedeleted)    
  +                    self.displayAction(False,' -F ', tobedeleted)    
                       os.remove(tobedeleted)
                       
       def removenonmatching(self, sourcedir, destdir, acceptablefiles, existingfiles):
  @@ -238,13 +245,13 @@
                           log.debug('Removing file [%s] to be replaced by directory' 
                                   %(`fulldestfile`))
                       os.remove(fulldestfile)
  -                    self.outputAction(' -F ', fulldestfile, 'Need a directory.')
  +                    self.displayAction(True,' -F ', fulldestfile, 'Need a directory.')
                       removed.append(afile)
                   elif os.path.isfile(fullsourcefile) and os.path.isdir(fulldestfile):              
                       if self.isDebug(): 
                           log.debug('Removing directory [%s] to be replaced by file' 
                                   %(`fulldestfile`))
  -                    self.outputAction(' -D ', fulldestfile, 'Need a file.')
  +                    self.displayAction(True,' -D ', fulldestfile, 'Need a file.')
                       shutil.rmtree(fulldestfile)
                       removed.append(afile)
                       
  @@ -272,7 +279,7 @@
               performCopy = 1
               reason='Did not exist.'
           elif S_ISDIR(destinationStat[ST_MODE]):
  -            self.outputAction(' -D ', dstname, 'Need a file.')    
  +            self.displayAction(True,' -D ', dstname, 'Need a file.')    
               shutil.rmtree(dstname)
               performCopy = 1
           elif sourceStat[ST_SIZE] != destinationStat[ST_SIZE]:
  @@ -284,7 +291,7 @@
               
           if performCopy:
               if self.isDebug(): log.debug("Attempting copy from [%s] to [%s]" %(`srcname`, `dstname`))    
  -            self.outputAction(' U> ', dstname, reason)    
  +            self.displayAction(True,' U> ', dstname, reason)    
               shutil.copy2(srcname, dstname)    
           #else:
           #    log.debug("Do not copy from [%s:%s] to [%s:%s]" \
  
  
  
  No                   revision
  
  Index: sync.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/utils/sync.py,v
  retrieving revision 1.18
  retrieving revision 1.18.2.1
  diff -u -r1.18 -r1.18.2.1
  --- sync.py	25 May 2004 22:46:00 -0000	1.18
  +++ sync.py	11 Jun 2004 20:46:10 -0000	1.18.2.1
  @@ -53,7 +53,9 @@
           self.outputStream=None
           
           # Notice that actions occured        
  -        self.actionsOccured=0
  +        self.actionsOccured=False
  +        self.inboundActions=False
  +        self.cleanupActions=False
           
       def execute(self):
           log.debug('Starting %s from [%s]' % (self.actionString,self.sourcedir))
  @@ -106,12 +108,17 @@
                               log.debug('No changes, removed  [' + self.output + ']')
                           except: pass
                   
  -        return self.actionsOccured
  +        return (self.actionsOccured, self.inboundActions, self.cleanupActions)
           
  -    def outputAction(self,type,file,reason=''):
  +    def displayAction(self,inbound,type,file,reason=''):
           
           # Mark something happened..
  -        self.actionsOccured=1
  +        self.actionsOccured=True
  +        
  +        if inbound:
  +            self.inboundActions=True
  +        else:
  +            self.cleanupActions=True
           
           # Log it (if requested)
           if self.outputStream:
  @@ -148,7 +155,7 @@
           # handle case where destinationStat exists but is not a directory    
           #
           if destinationStat and not S_ISDIR(destinationStat[ST_MODE]):
  -            self.outputAction(' -F ', dst, 'Need a directory here, not a file.')        
  +            self.displayAction(True,' -F ', dst, 'Need a directory here, not a file.')        
               os.remove(dst)
               destinationStat = None
            
  @@ -157,7 +164,7 @@
           # a path of directories.)
           #   
           if not destinationStat:     
  -            self.outputAction(' +D ', dst)    
  +            self.displayAction(True,' +D ', dst)    
               os.makedirs(dst)
               
           if destinationStat:
  @@ -207,11 +214,11 @@
                   destinationStat = os.stat(tobedeleted)
                   if S_ISDIR(destinationStat[ST_MODE]):
                       if self.isDebug(): log.debug('Attempting to remove directory [%s]' % (`tobedeleted`))
  -                    self.outputAction(' -D ', tobedeleted)    
  +                    self.displayAction(False,' -D ', tobedeleted)    
                       shutil.rmtree(tobedeleted)
                   else:    
                       if self.isDebug(): log.debug('Attempting to remove file [%s]' % (`tobedeleted`))   
  -                    self.outputAction(' -F ', tobedeleted)    
  +                    self.displayAction(False,' -F ', tobedeleted)    
                       os.remove(tobedeleted)
                       
       def removenonmatching(self, sourcedir, destdir, acceptablefiles, existingfiles):
  @@ -238,13 +245,13 @@
                           log.debug('Removing file [%s] to be replaced by directory' 
                                   %(`fulldestfile`))
                       os.remove(fulldestfile)
  -                    self.outputAction(' -F ', fulldestfile, 'Need a directory.')
  +                    self.displayAction(True,' -F ', fulldestfile, 'Need a directory.')
                       removed.append(afile)
                   elif os.path.isfile(fullsourcefile) and os.path.isdir(fulldestfile):              
                       if self.isDebug(): 
                           log.debug('Removing directory [%s] to be replaced by file' 
                                   %(`fulldestfile`))
  -                    self.outputAction(' -D ', fulldestfile, 'Need a file.')
  +                    self.displayAction(True,' -D ', fulldestfile, 'Need a file.')
                       shutil.rmtree(fulldestfile)
                       removed.append(afile)
                       
  @@ -272,7 +279,7 @@
               performCopy = 1
               reason='Did not exist.'
           elif S_ISDIR(destinationStat[ST_MODE]):
  -            self.outputAction(' -D ', dstname, 'Need a file.')    
  +            self.displayAction(True,' -D ', dstname, 'Need a file.')    
               shutil.rmtree(dstname)
               performCopy = 1
           elif sourceStat[ST_SIZE] != destinationStat[ST_SIZE]:
  @@ -284,7 +291,7 @@
               
           if performCopy:
               if self.isDebug(): log.debug("Attempting copy from [%s] to [%s]" %(`srcname`, `dstname`))    
  -            self.outputAction(' U> ', dstname, reason)    
  +            self.displayAction(True,' U> ', dstname, reason)    
               shutil.copy2(srcname, dstname)    
           #else:
           #    log.debug("Do not copy from [%s:%s] to [%s:%s]" \
  
  
  
  1.1.2.1   +145 -0    gump/python/gump/utils/Attic/smtp.py
  
  
  
  
  No                   revision
  No                   revision
  1.29.2.3  +2 -2      gump/python/gump/update.py
  
  Index: update.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/update.py,v
  retrieving revision 1.29.2.2
  retrieving revision 1.29.2.3
  diff -u -r1.29.2.2 -r1.29.2.3
  --- update.py	11 Jun 2004 17:09:49 -0000	1.29.2.2
  +++ update.py	11 Jun 2004 20:46:10 -0000	1.29.2.3
  @@ -58,7 +58,7 @@
       ps=args[1]
       
       # get parsed workspace definition
  -    workspace=WorkspaceLoader().load(ws, options.isCache()) 
  +    workspace=WorkspaceLoader(options.isCache()).load(ws) 
       
       # Ensure we use text, not forrest...
       options.setText(1)
  
  
  
  1.6.2.3   +1 -1      gump/python/gump/debug.py
  
  Index: debug.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/debug.py,v
  retrieving revision 1.6.2.2
  retrieving revision 1.6.2.3
  diff -u -r1.6.2.2 -r1.6.2.3
  --- debug.py	11 Jun 2004 17:09:50 -0000	1.6.2.2
  +++ debug.py	11 Jun 2004 20:46:10 -0000	1.6.2.3
  @@ -53,7 +53,7 @@
       ps=args[1]
       
       # get parsed workspace definition
  -    workspace=WorkspaceLoader().load(ws, options.isCache()) 
  +    workspace=WorkspaceLoader(options.isCache()).load(ws) 
       
       # Ensure we use text, not forrest...    
       options.setText(1)
  
  
  
  1.48.2.3  +1 -1      gump/python/gump/build.py
  
  Index: build.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build.py,v
  retrieving revision 1.48.2.2
  retrieving revision 1.48.2.3
  diff -u -r1.48.2.2 -r1.48.2.3
  --- build.py	11 Jun 2004 17:09:50 -0000	1.48.2.2
  +++ build.py	11 Jun 2004 20:46:10 -0000	1.48.2.3
  @@ -49,7 +49,7 @@
       ps=args[1]
   
       # get parsed workspace definition
  -    workspace=WorkspaceLoader().load(ws, options.isCache())    
  +    workspace=WorkspaceLoader(options.isCache()).load(ws)    
           
       # Ensure we use text, not forrest...
       options.setText(1)
  
  
  
  1.28.2.3  +2 -2      gump/python/gump/integrate.py
  
  Index: integrate.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/integrate.py,v
  retrieving revision 1.28.2.2
  retrieving revision 1.28.2.3
  diff -u -r1.28.2.2 -r1.28.2.3
  --- integrate.py	11 Jun 2004 17:09:50 -0000	1.28.2.2
  +++ integrate.py	11 Jun 2004 20:46:10 -0000	1.28.2.3
  @@ -61,7 +61,7 @@
       logResourceUtilization('Before load workspace')
           
       # get parsed workspace definition
  -    workspace=WorkspaceLoader().load(ws, 0)
  +    workspace=WorkspaceLoader(False).load(ws)
   
       logResourceUtilization('Before create run')
       
  
  
  
  1.44.2.3  +1 -1      gump/python/gump/check.py
  
  Index: check.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/check.py,v
  retrieving revision 1.44.2.2
  retrieving revision 1.44.2.3
  diff -u -r1.44.2.2 -r1.44.2.3
  --- check.py	11 Jun 2004 17:09:50 -0000	1.44.2.2
  +++ check.py	11 Jun 2004 20:46:10 -0000	1.44.2.3
  @@ -42,7 +42,7 @@
       ps=args[1]
       
       # get parsed workspace definition
  -    workspace=WorkspaceLoader().load(ws, options.isQuick())
  +    workspace=WorkspaceLoader(options.isQuick()).load(ws)
       
       # 
       options.setObjectives(OBJECTIVE_CHECK)    
  
  
  
  1.5.2.1   +4 -4      gump/python/gump/preview.py
  
  Index: preview.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/preview.py,v
  retrieving revision 1.5
  retrieving revision 1.5.2.1
  diff -u -r1.5 -r1.5.2.1
  --- preview.py	3 Jun 2004 19:06:13 -0000	1.5
  +++ preview.py	11 Jun 2004 20:46:10 -0000	1.5.2.1
  @@ -34,7 +34,7 @@
   from gump.core.gumpinit import gumpinit
   from gump.core.gumprun import GumpRun, GumpRunOptions, GumpSet
   from gump.core.commandLine import handleArgv
  -from gump.model.loader import WorkspaceLoader
  +from gump.loader.loader import WorkspaceLoader
   
   from gump.utils.note import Annotatable
   
  @@ -61,7 +61,7 @@
       result=0
       
       # get parsed workspace definition
  -    workspace=WorkspaceLoader().load(ws, options.isCache()) 
  +    workspace=WorkspaceLoader(options.isCache()).load(ws) 
       
       # The Run Details...
       run=GumpRun(workspace,ps,options)    
  @@ -78,10 +78,10 @@
           updater=runner.getUpdater()
           builder=runner.getBuilder()
               
  -    
           for module in run.getGumpSet().getModules():
               print SEPARATOR
               print `module`
  +            module.dump()
               if module.isUpdatable():
                   updater.preview(module)
                          
  
  
  
  No                   revision
  No                   revision
  1.5.2.3   +1 -1      gump/python/gump/notify/notifier.py
  
  Index: notifier.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/notify/notifier.py,v
  retrieving revision 1.5.2.2
  retrieving revision 1.5.2.3
  diff -u -r1.5.2.2 -r1.5.2.3
  --- notifier.py	11 Jun 2004 17:09:50 -0000	1.5.2.2
  +++ notifier.py	11 Jun 2004 20:46:10 -0000	1.5.2.3
  @@ -33,7 +33,7 @@
   from gump.model.module import *
   from gump.model.state import *
   from gump.model.misc import AddressPair
  -from gump.net.smtp import *
  +from gump.utils.smtp import *
   from gump.utils import *
   
   from gump.notify.logic import NotificationLogic
  
  
  
  1.1.2.1   +1 -1      gump/python/gump/notify/notification.py
  
  Index: notification.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/notify/notification.py,v
  retrieving revision 1.1
  retrieving revision 1.1.2.1
  diff -u -r1.1 -r1.1.2.1
  --- notification.py	24 May 2004 16:39:08 -0000	1.1
  +++ notification.py	11 Jun 2004 20:46:10 -0000	1.1.2.1
  @@ -34,7 +34,7 @@
   from gump.model.project import *
   from gump.model.module import *
   from gump.model.state import *
  -from gump.net.smtp import *
  +from gump.utils.smtp import *
   from gump.utils import *
   
   LINE     ='--   --   --   --   --   --   --   --   --   --   --   --   G U M P'
  
  
  
  No                   revision
  No                   revision
  1.5.2.2   +1 -1      gump/python/gump/core/config.py
  
  Index: config.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/config.py,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- config.py	8 Jun 2004 21:36:37 -0000	1.5.2.1
  +++ config.py	11 Jun 2004 20:46:10 -0000	1.5.2.2
  @@ -88,7 +88,7 @@
   class setting:    
       """Configuration of hardcoded settings"""
       
  -    version='2.0.3-alpha-0002'
  +    version='2.1.0-alpha-0001'
       
       ws_version="0.4"
       ws_minimum_version="0.3"
  
  
  
  1.6.2.2   +36 -25    gump/python/gump/core/gumpenv.py
  
  Index: gumpenv.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/core/gumpenv.py,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- gumpenv.py	8 Jun 2004 21:36:37 -0000	1.6.2.1
  +++ gumpenv.py	11 Jun 2004 20:46:10 -0000	1.6.2.2
  @@ -36,6 +36,8 @@
   
   from gump.model.state import *
   from gump.model.propagation import *
  +
  +from gump.integration.depot import *
       
   ###############################################################################
   # Classes
  @@ -58,7 +60,8 @@
       	self.checked=False
       	
       	self.noForrest=False    
  -    	self.noMaven=False    	
  +    	self.noMaven=False    	 
  +    	self.noDepot=False    	
       	self.noUpdate=False    	
       	self.noTimeout=False
       	self.noSvn=False    	
  @@ -68,13 +71,15 @@
           self.noJava=False
           self.noJavac=False
           self.noPGrep=False
  -        self.javaProperties=False
  -    	
  -    	#
  +        
  +        self.javaProperties=None
  +    
       	# JAVACMD can override this, see checkEnvironment
  -    	#
           self.javaCommand = 'java'
           
  +        # DEPOT_HOME
  +        self.depotHome = None
  +        
           #
           # Offset from UTC
           #
  @@ -114,21 +119,28 @@
           #	FORREST_HOME?
       
           if not self.noJavaHome and not self.checkEnvVariable('JAVA_HOME',False):    
  -            self.noJavaHome=1    
  +            self.noJavaHome=True    
               self.addWarning('JAVA_HOME environmental variable not found. Might not be needed.')
                   
           if not self.noClasspath and not self.checkEnvVariable('CLASSPATH',False):
  -            self.noClasspath=1    
  +            self.noClasspath=True    
               self.addWarning('CLASSPATH environmental variable not found. Might not be needed.')
                   
           if not self.noForrest and not self.checkEnvVariable('FORREST_HOME',False): 
  -            self.noForrest=1
  +            self.noForrest=True
               self.addWarning('FORREST_HOME environmental variable not found, no xdoc output.')
                   
           if not self.noMaven and not self.checkEnvVariable('MAVEN_HOME',False): 
  -            self.noMaven=1
  +            self.noMaven=True
               self.addWarning('MAVEN_HOME environmental variable not found, no maven builds.')
               
  +        if not self.noDepot and not self.checkEnvVariable('DEPOT_HOME',False): 
  +            self.noDepot=True
  +            self.addWarning('DEPOT_HOME environmental variable not found, no depot downloads.')
  +        
  +
  +        self.depotHome  = getDepotHome(False)
  +            
           #
           # Check for executables:
           #
  @@ -141,50 +153,49 @@
           self.checkExecutable('env','',False)
   
           if not self.noJava and not self.checkExecutable(self.javaCommand,'-version',exitOnError,1):
  -            self.noJava=1
  -            self.noJavac=1
  +            self.noJava=True
  +            self.noJavac=True
   
           if not self.noJavac and not self.checkExecutable('javac','-help',False):
  -            self.noJavac=1
  +            self.noJavac=True
   
           if not self.noJavac and not self.checkExecutable('java com.sun.tools.javac.Main','-help',False,False,'check_java_compiler'):
  -            self.noJavac=1
  +            self.noJavac=True
   
           if not self.noCvs and not self.checkExecutable('cvs','--version',False):
  -            self.noCvs=1
  +            self.noCvs=True
               self.addWarning('"cvs" command not found, no CVS repository updates')
           
           if not self.noSvn and not self.checkExecutable('svn','--version',False):
  -            self.noSvn=1
  +            self.noSvn=True
               self.addWarning('"svn" command not found, no SVN repository updates')
           
           if not self.noForrest and not self.checkExecutable('forrest','-projecthelp',False): 
  -            self.noForrest=1
  +            self.noForrest=True
               self.addWarning('"forrest" command not found, no xdoc output')
           
           if not self.noTimeout:
               if	not self.checkExecutable('timeout','60 env',False): 
  -                self.noTimeout=1
  +                self.noTimeout=True
                   self.addWarning('"timeout" command not found, no in-line command time outs')
               else:
  -                setting.timeoutCommand=1
  +                setting.timeoutCommand=True
               
           if not self.noUpdate and \
  -            not self.checkExecutable('python update.py','-version',False,False,'check_depot_update'): 
  -            self.noUpdate=1
  +            not self.checkExecutable(getDepotUpdateCmd(),'-version',False,False,'check_depot_update'): 
  +            self.noUpdate=True
               self.addWarning('"update.py" command not found, no package downloads')
           
           if not self.noMaven and \
               not self.checkExecutable('maven','--version',False,False,'check_maven'): 
  -            self.noMaven=1
  +            self.noMaven=True
               self.addWarning('"maven" command not found, no Maven builds')
           
           if not self.noPGrep and not self.checkExecutable('pgrep','-help',False): 
  -            self.noPGrep=1
  +            self.noPGrep=True
               self.addWarning('"pgrep" command not found, no process clean-ups can occur')        
       
  -    
  -        self.checked=1
  +        self.checked=True
           
           self.changeState(STATE_SUCCESS)
       
  @@ -260,7 +271,7 @@
               
           return ok
       
  -    def checkEnvVariable(self,env,mandatory=1):
  +    def checkEnvVariable(self,env,mandatory=True):
           ok=False
           try:
               ok=os.environ.has_key(env)
  
  
  
  No                   revision
  No                   revision
  1.45.2.5  +3 -3      gump/python/gump/model/module.py
  
  Index: module.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/module.py,v
  retrieving revision 1.45.2.4
  retrieving revision 1.45.2.5
  diff -u -r1.45.2.4 -r1.45.2.5
  --- module.py	11 Jun 2004 17:09:50 -0000	1.45.2.4
  +++ module.py	11 Jun 2004 20:46:10 -0000	1.45.2.5
  @@ -338,9 +338,9 @@
                           self.addError('No such repository ['+ str(repoName) +'] in workspace on [' \
                                   + self.getName() + ']')                 
                                                   
  -            elif self.hasDomChild('artifact'):
  -                adom=self.getDomChild('artifact')
  -                repoName=getValue(adom,'repository')
  +            elif self.hasDomChild('artifacts'):
  +                adom=self.getDomChild('artifacts')
  +                repoName=getDomAttributeValue(adom,'repository')
                   if repoName:
                       if workspace.hasRepository(repoName):
                           # It references this repository...
  
  
  
  1.85.2.4  +1 -1      gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/project.py,v
  retrieving revision 1.85.2.3
  retrieving revision 1.85.2.4
  diff -u -r1.85.2.3 -r1.85.2.4
  --- project.py	11 Jun 2004 17:09:50 -0000	1.85.2.3
  +++ project.py	11 Jun 2004 20:46:10 -0000	1.85.2.4
  @@ -167,7 +167,7 @@
           return self.license
           
       def getDeletes(self): return self.deletes
  -    def getMkDirs(self): return self.mkdir
  +    def getMkDirs(self): return self.mkdirs
           
       def hasJars(self):
           return self.jars
  
  
  
  1.5.2.2   +2 -2      gump/python/gump/model/__init__.py
  
  Index: __init__.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/__init__.py,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- __init__.py	11 Jun 2004 17:09:50 -0000	1.5.2.1
  +++ __init__.py	11 Jun 2004 20:46:10 -0000	1.5.2.2
  @@ -40,7 +40,7 @@
   ###############################################################################
   
   # tell Python what modules make up the gump.model package
  -__all__ = ["loader","state", \
  +__all__ = ["misc","state", \
       "object","project","module","workspace","repository", \
  -    "builder"]
  +    "builder","profile",]
   
  
  
  
  1.11.4.4  +5 -5      gump/python/gump/model/repository.py
  
  Index: repository.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/model/repository.py,v
  retrieving revision 1.11.4.3
  retrieving revision 1.11.4.4
  diff -u -r1.11.4.3 -r1.11.4.4
  --- repository.py	11 Jun 2004 17:09:50 -0000	1.11.4.3
  +++ repository.py	11 Jun 2004 20:46:10 -0000	1.11.4.4
  @@ -41,11 +41,11 @@
                           self.getDomChildValue('web')                            
               if self.hasDomChild('root'):
                   root=self.getDomChild('root')
  -                self.method=getDomAttributeValue(root,'method')  
  -                self.user=getDomAttributeValue(root,'user')
  -                self.password=getDomAttributeValue(root,'password')
  -                self.path=getDomAttributeValue(root,'path')
  -                self.hostname=getDomAttributeValue(root,'hostname')
  +                self.method=getDomChildValue(root,'method')  
  +                self.user=getDomChildValue(root,'user')
  +                self.password=getDomChildValue(root,'password')
  +                self.path=getDomChildValue(root,'path')
  +                self.hostname=getDomChildValue(root,'hostname')
               else:
                   raise RuntimeError, 'No XML <root on repository: ' + self.getName()
           elif 'svn'==type:  
  
  
  
  No                   revision
  No                   revision
  1.5.2.2   +3 -5      gump/python/gump/update/cvs.py
  
  Index: cvs.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/update/cvs.py,v
  retrieving revision 1.5.2.1
  retrieving revision 1.5.2.2
  diff -u -r1.5.2.1 -r1.5.2.2
  --- cvs.py	8 Jun 2004 21:36:37 -0000	1.5.2.1
  +++ cvs.py	11 Jun 2004 20:46:11 -0000	1.5.2.2
  @@ -41,7 +41,7 @@
   from gump.model.stats import *
   from gump.model.state import *
   
  -from gump.net.cvs import *
  +from gump.integration.cvs import *
   
   
   ###############################################################################
  @@ -144,8 +144,7 @@
               
               # We run CVS as -q (quiet) so any output means
               # updates occured...
  -            if cmdResult.hasOutput():
  -                module.setModified(1)                        
  +            if cmdResult.hasOutput():                       
                   log.info('Update(s) received via CVS on #[' \
                                   + `module.getPosition()` + \
                                   '] : ' + module.getName())
  @@ -171,8 +170,7 @@
               raise RuntimeException('Not coded for this combo.')            
           
           root=module.cvs.getCvsRoot()
  -      
  -     
  +    
           #
           # Prepare CVS checkout/update command...
           #     
  
  
  
  1.1.2.2   +13 -10    gump/python/gump/update/Attic/artifact.py
  
  Index: artifact.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/update/Attic/artifact.py,v
  retrieving revision 1.1.2.1
  retrieving revision 1.1.2.2
  diff -u -r1.1.2.1 -r1.1.2.2
  --- artifact.py	9 Jun 2004 19:28:45 -0000	1.1.2.1
  +++ artifact.py	11 Jun 2004 20:46:11 -0000	1.1.2.2
  @@ -41,6 +41,8 @@
   from gump.model.stats import *
   from gump.model.state import *
   
  +from gump.integration.depot import *
  +
   ###############################################################################
   # Classes
   ###############################################################################
  @@ -73,7 +75,7 @@
           #
           work=CommandWorkItem(WORK_TYPE_UPDATE,cmd,cmdResult)
           module.performedWork(work)  
  -        repository.performedWork(work.clone())
  +        module.getRepository().performedWork(work.clone())
         
           # Update Context w/ Results  
           if not cmdResult.state==CMD_STATE_SUCCESS:              
  @@ -107,27 +109,28 @@
           url=module.artifacts.getRootUrl()
           group=module.artifacts.getGroup()
         
  -        log.debug("Artifact URL: [" + url + "] on Repository: " + module.repository.getName())
  +        log.debug("Artifact URL/Group: [" + `url` + "," + `group` + "] on Repository: " + module.repository.getName())
        
           #
           # Prepare Artifact checkout/update command...
           # 
  -        cmd=Cmd('update.py',	\
  +        cmd=Cmd(getDepotUpdateCmd(),	\
                   'update_'+module.getName(),	\
                   module.getWorkspace().cvsdir)
  -    
  -        cmd.addParameter(url)
           
  -        cmd.addParameter(group)
  -          
  -        #
           # Be 'quiet' (but not silent) unless requested otherwise.
  -        #
           if 	not module.isDebug() 	\
               and not module.isVerbose() \
               and not module.artifacts.isDebug()	\
               and not module.artifacts.isVerbose():    
               cmd.addParameter('-q')
  -
  +    
  +        # The URL (ought be optional)
  +        if url:
  +            cmd.addParameter(url)
  +    
  +        # Group (mandatory)
  +        cmd.addParameter(group)
  +   
           return cmd
        
  
  
  
  1.3.2.3   +17 -2     gump/python/gump/update/updater.py
  
  Index: updater.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/update/updater.py,v
  retrieving revision 1.3.2.2
  retrieving revision 1.3.2.3
  diff -u -r1.3.2.2 -r1.3.2.3
  --- updater.py	9 Jun 2004 19:28:45 -0000	1.3.2.2
  +++ updater.py	11 Jun 2004 20:46:11 -0000	1.3.2.3
  @@ -159,13 +159,24 @@
                                       'changes_to_'+gumpSafeName(module.getName())+'.txt'))
                       
               # Perform the operation.
  -            modified=syncDirectories(sourcedir,destdir,module,changesFile)
  +            (actions,modified,cleaned)=syncDirectories(sourcedir,destdir,module,changesFile)
                       
               # We are good to go...
               module.changeState(STATE_SUCCESS)
                       
               # Were the contents of the repository modified?                                        
  -            if modified and os.path.exists(changesFile):                               
  +            if modified: 
  +            
  +                #
  +                # Use 'incoming changes' to note that the module
  +                # was modified.
  +                #
  +                module.setModified(True)                                  
  +                log.info('Update(s) received via on #[' \
  +                                + `module.getPosition()` + \
  +                                '] : ' + module.getName())
  +                                
  +                if os.path.exists(changesFile):  
                       catFileToFileHolder(module, changesFile, FILE_TYPE_LOG) 
                           
           except Exception, details:
  @@ -176,7 +187,11 @@
           
   
       def preview(self,module):
  +        """
           
  +            Preview what ought occur for this
  +            
  +        """
           
           if module.hasCvs():
               ok=self.cvs.preview(module)
  
  
  
  No                   revision
  No                   revision
  1.6.2.2   +1 -7      gump/python/gump/build/maven.py
  
  Index: maven.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build/maven.py,v
  retrieving revision 1.6.2.1
  retrieving revision 1.6.2.2
  diff -u -r1.6.2.1 -r1.6.2.2
  --- maven.py	7 Jun 2004 16:22:00 -0000	1.6.2.1
  +++ maven.py	11 Jun 2004 20:46:11 -0000	1.6.2.2
  @@ -120,14 +120,8 @@
           #
           (classpath,bootclasspath)=project.getClasspaths()
       
  -        #
  -        # Get properties
  -        #
  -        #jvmargs=project.getJVMArgs()
  -   
  -        #
  +    
           # Run Maven...
  -        #
           cmd=Cmd('maven','build_'+project.getModule().getName()+'_'+project.getName(),\
               basedir,{'CLASSPATH':classpath})
               
  
  
  
  1.4.2.2   +1 -1      gump/python/gump/build/ant.py
  
  Index: ant.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build/ant.py,v
  retrieving revision 1.4.2.1
  retrieving revision 1.4.2.2
  diff -u -r1.4.2.1 -r1.4.2.2
  --- ant.py	8 Jun 2004 21:36:37 -0000	1.4.2.1
  +++ ant.py	11 Jun 2004 20:46:11 -0000	1.4.2.2
  @@ -124,7 +124,7 @@
           #
           # Get properties
           #
  -        jvmargs=self.getJVMArgs(antxml)
  +        jvmargs=self.getJVMArgs(project)
      
           #
           # Run java on apache Ant...
  
  
  
  1.2.2.1   +5 -5      gump/python/gump/build/abstract.py
  
  Index: abstract.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/build/abstract.py,v
  retrieving revision 1.2
  retrieving revision 1.2.2.1
  diff -u -r1.2 -r1.2.2.1
  --- abstract.py	21 May 2004 23:15:07 -0000	1.2
  +++ abstract.py	11 Jun 2004 20:46:11 -0000	1.2.2.1
  @@ -30,6 +30,7 @@
                               invokeGarbageCollection
   from gump.utils.note import Annotatable
   from gump.utils.work import *
  +from gump.utils.domutils import *
   
   from gump.utils.tools import *
   
  @@ -50,14 +51,13 @@
       def __init__(self,run):
           RunSpecific.__init__(self,run)
   
  -
  -    def getJVMArgs(self,xml):
  +    def getJVMArgs(self,project):
           """Get JVM arguments for a project"""
           args=Parameters()
           
  -        for jvmarg in xml.jvmarg:
  -            if jvmarg.value:
  -                args.addParameter(jvmarg.value)
  +        for jvmarg in project.getDomChildIterator('jvmarg'):
  +            if hasDomAttribute(jvmarg,'value'):                
  +                args.addParameter(getDomAttributeValue(jvmarg,'value'))
               else:
                   log.error('Bogus JVM Argument w/ Value')            
           
  
  
  
  No                   revision
  No                   revision
  1.9.2.3   +11 -10    gump/python/gump/document/xdocs/documenter.py
  
  Index: documenter.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/xdocs/documenter.py,v
  retrieving revision 1.9.2.2
  retrieving revision 1.9.2.3
  diff -u -r1.9.2.2 -r1.9.2.3
  --- documenter.py	11 Jun 2004 17:09:51 -0000	1.9.2.2
  +++ documenter.py	11 Jun 2004 20:46:11 -0000	1.9.2.3
  @@ -1676,7 +1676,9 @@
                                                         
           # Display nag information
           if project.hasNotifys() and project.isVerboseOrDebug():
  -            for (toaddr,fromaddr) in project.getNotifys():
  +            for pair in project.getNotifys():
  +                toaddr=pair.getToAddress()
  +                fromaddr=pair.getFromAddress()
                   detailsList.createEntry('Notify To: ').createFork('mailto:'+toaddr,toaddr)
                   detailsList.createEntry('Notify From: ').createFork('mailto:'+fromaddr,fromaddr)
                       
  @@ -1833,15 +1835,14 @@
                   dependencySection.createNote('This project depends upon no others.')    
                    
           # Not ready for prime time...   
  -        if 'gump.try' == project.getWorkspace().getName():                        
  -            try:
  -                # Generate an SVG for FOG:
  -                (pngFile,pngTitle) = self.diagramDependencies(project)
  -                if pngFile:
  -                    para=dependencySection.createSection('Dependency Diagram').createParagraph()
  -                    para.createFork(pngFile).createIcon(pngFile,pngTitle)
  -            except:
  -                log.error('Failed to diagram dependencies for [' + project.getName() + ']', exc_info=1)
  +        try:
  +            # Generate an SVG for Dependencies Diagram:
  +            (pngFile,pngTitle) = self.diagramDependencies(project)
  +            if pngFile:
  +                para=dependencySection.createSection('Dependency Diagram').createParagraph()
  +                para.createFork(pngFile).createIcon(pngFile,pngTitle)
  +        except:
  +            log.error('Failed to diagram dependencies for [' + project.getName() + ']', exc_info=1)
           
           document.serialize()
           
  
  
  
  No                   revision
  No                   revision
  1.1.2.4   +5 -3      gump/python/gump/loader/Attic/loader.py
  
  Index: loader.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/loader/Attic/loader.py,v
  retrieving revision 1.1.2.3
  retrieving revision 1.1.2.4
  diff -u -r1.1.2.3 -r1.1.2.4
  --- loader.py	11 Jun 2004 17:09:52 -0000	1.1.2.3
  +++ loader.py	11 Jun 2004 20:46:11 -0000	1.1.2.4
  @@ -255,10 +255,12 @@
           
   class WorkspaceLoader(ModelLoader):
       
  -    def load(self,file,cache=True):
  +    def __init__(self,cache):
  +        ModelLoader.__init__(self,cache)
  +    
  +    def load(self,file):
           from gump.model.workspace import Workspace
  -        loader=ModelLoader(cache)
  -        return loader.loadFile(file,Workspace)
  +        return self.loadFile(file,Workspace)
           
   # static void main()
   if __name__=='__main__':
  
  
  
  No                   revision
  No                   revision
  1.3.2.1   +0 -1      gump/python/gump/stats/statistician.py
  
  Index: statistician.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/stats/statistician.py,v
  retrieving revision 1.3
  retrieving revision 1.3.2.1
  diff -u -r1.3 -r1.3.2.1
  --- statistician.py	24 May 2004 16:39:08 -0000	1.3
  +++ statistician.py	11 Jun 2004 20:46:11 -0000	1.3.2.1
  @@ -23,7 +23,6 @@
   
   from gump.core.config import *
   from gump import log
  -from gump.model import *
   from gump.core.gumprun import *
   from gump.core.actor import *
   from gump.stats.statsdb import StatisticsDB
  
  
  
  No                   revision
  No                   revision
  1.8.2.1   +1 -1      gump/python/gump/test/resulting.py
  
  Index: resulting.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/resulting.py,v
  retrieving revision 1.8
  retrieving revision 1.8.2.1
  diff -u -r1.8 -r1.8.2.1
  --- resulting.py	21 May 2004 23:15:00 -0000	1.8
  +++ resulting.py	11 Jun 2004 20:46:11 -0000	1.8.2.1
  @@ -30,7 +30,7 @@
   from gump.results.model import *
   from gump.results.resulter import generateResults,Resulter
   from gump.results.loader import WorkspaceResultLoader
  -from gump.net.smtp import *
  +from gump.utils.smtp import *
   
   class ResultingTestSuite(UnitTestSuite):
       def __init__(self):
  
  
  
  1.3.2.2   +1 -1      gump/python/gump/test/notifying.py
  
  Index: notifying.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/notifying.py,v
  retrieving revision 1.3.2.1
  retrieving revision 1.3.2.2
  diff -u -r1.3.2.1 -r1.3.2.2
  --- notifying.py	11 Jun 2004 17:09:51 -0000	1.3.2.1
  +++ notifying.py	11 Jun 2004 20:46:11 -0000	1.3.2.2
  @@ -31,7 +31,7 @@
   
   from gump.notify.notifier import notify,Notifier
   from gump.notify.notification import PositiveNotification,NegativeNotification
  -from gump.net.smtp import *
  +from gump.utils.smtp import *
   
   class NotificationTestSuite(UnitTestSuite):
       def __init__(self):
  
  
  
  1.6.4.2   +0 -3      gump/python/gump/test/loader_tests.py
  
  Index: loader_tests.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/loader_tests.py,v
  retrieving revision 1.6.4.1
  retrieving revision 1.6.4.2
  diff -u -r1.6.4.1 -r1.6.4.2
  --- loader_tests.py	11 Jun 2004 17:09:51 -0000	1.6.4.1
  +++ loader_tests.py	11 Jun 2004 20:46:11 -0000	1.6.4.2
  @@ -31,9 +31,6 @@
      print "Workspace URL: " + str(url)
      return WorkspaceLoader().load(url)
   
  -def testModule(url,ws):
  -   print "Workspace URL: " + str(url)
  -   return WorkspaceLoader().loadModule(url,ws)
   
   if __name__=='__main__':
   
  
  
  
  No                   revision
  No                   revision
  1.5.4.3   +1 -1      gump/python/gump/test/resources/full1/download1.xml
  
  Index: download1.xml
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/resources/full1/download1.xml,v
  retrieving revision 1.5.4.2
  retrieving revision 1.5.4.3
  diff -u -r1.5.4.2 -r1.5.4.3
  --- download1.xml	9 Jun 2004 19:28:45 -0000	1.5.4.2
  +++ download1.xml	11 Jun 2004 20:46:12 -0000	1.5.4.3
  @@ -5,7 +5,7 @@
       Test of downloading a package
     </description>
   
  -  <artifacts repository="artifact_repository1"/>
  +  <artifacts repository="artifact_repository1" group="test"/>
   
     <project name="download1">
       <package>org.apache.download1</package>
  
  
  
  No                   revision
  No                   revision
  1.9.4.2   +1 -1      gump/python/gump/svg/depdiag.py
  
  Index: depdiag.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/svg/depdiag.py,v
  retrieving revision 1.9.4.1
  retrieving revision 1.9.4.2
  diff -u -r1.9.4.1 -r1.9.4.2
  --- depdiag.py	11 Jun 2004 17:09:52 -0000	1.9.4.1
  +++ depdiag.py	11 Jun 2004 20:46:12 -0000	1.9.4.2
  @@ -308,7 +308,7 @@
       ps=args[1]
   
       # get parsed workspace definition
  -    workspace=WorkspaceLoader().load(ws, options.isCache())    
  +    workspace=WorkspaceLoader(options.isCache()).load(ws)    
           
       # Ensure we use text, not forrest...
       options.setText(1)
  
  
  
  No                   revision
  No                   revision
  1.2.2.3   +1 -1      gump/python/gump/test/resources/complete1/download1.xml
  
  Index: download1.xml
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/test/resources/complete1/download1.xml,v
  retrieving revision 1.2.2.2
  retrieving revision 1.2.2.3
  diff -u -r1.2.2.2 -r1.2.2.3
  --- download1.xml	9 Jun 2004 19:28:45 -0000	1.2.2.2
  +++ download1.xml	11 Jun 2004 20:46:12 -0000	1.2.2.3
  @@ -5,7 +5,7 @@
       Test of downloading a package
     </description>
   
  -  <artifacts repository="artifact_repository1"/>
  +  <artifacts repository="artifact_repository1" group="test"/>
   
     <project name="download1">
       <package>org.apache.download1</package>
  
  
  

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


Mime
View raw message