gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: gump/project ws-wsrp4j.xml
Date Wed, 16 Jun 2004 23:05:36 GMT
ajack       2004/06/16 16:05:36

  Modified:    .        Tag: CleanUp gumpy.py
               python/gump/document/xdocs Tag: CleanUp xdoc.py
                        documenter.py
               project  Tag: CleanUp ws-wsrp4j.xml
  Log:
  1) copy buildLog.[html|xml] as we go (running log)
  2) fixed some xhtml in xdocs/vice verse.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.37.2.5  +1 -1      gump/gumpy.py
  
  Index: gumpy.py
  ===================================================================
  RCS file: /home/cvs/gump/gumpy.py,v
  retrieving revision 1.37.2.4
  retrieving revision 1.37.2.5
  diff -u -r1.37.2.4 -r1.37.2.5
  --- gumpy.py	16 Jun 2004 18:33:30 -0000	1.37.2.4
  +++ gumpy.py	16 Jun 2004 23:05:36 -0000	1.37.2.5
  @@ -459,7 +459,7 @@
               catFile(publishedLog, logFile, logTitle)    
               publishedLog.close()
               published=1
  -        except Exception, detauls:
  +        except Exception, details:
               print 'Failed to publish log file. ', str(details)    
               published=0
       else:
  
  
  
  No                   revision
  No                   revision
  1.2.2.5   +12 -6     gump/python/gump/document/xdocs/xdoc.py
  
  Index: xdoc.py
  ===================================================================
  RCS file: /home/cvs/gump/python/gump/document/xdocs/xdoc.py,v
  retrieving revision 1.2.2.4
  retrieving revision 1.2.2.5
  diff -u -r1.2.2.4 -r1.2.2.5
  --- xdoc.py	16 Jun 2004 17:50:40 -0000	1.2.2.4
  +++ xdoc.py	16 Jun 2004 23:05:36 -0000	1.2.2.5
  @@ -567,10 +567,16 @@
               self.createText(text)
           
       def start(self):
  -        self.context.writeLineIndented('<note>')
  +        if self.config.isXhtml():    
  +            self.context.writeLineIndented('<p class="NOTE">')
  +        else:
  +            self.context.writeLineIndented('<note>')
           
       def end(self):
  -        self.context.writeLine('</note>')
  +        if self.config.isXhtml():    
  +            self.context.writeLine('</p>')
  +        else:
  +            self.context.writeLine('</note>')
           
       def createText(self,text=None):
           return self.storePiece(XDocText(self.createSubContext(),self.config,text))    
     
  @@ -597,13 +603,13 @@
               self.createText(text)
           
       def start(self):
  -        if not self.config.isXhtml():    
  +        if self.config.isXhtml():    
               self.context.writeLineIndented('<p class="WARN">')
           else:
               self.context.writeLineIndented('<warning>')    
           
       def end(self):
  -        if not self.config.isXhtml():    
  +        if self.config.isXhtml():    
               self.context.writeLine('</p>')
           else:
               self.context.writeLine('</warning>')
  @@ -628,13 +634,13 @@
               self.createText(text)
           
       def start(self):
  -        if not self.config.isXhtml():    
  +        if self.config.isXhtml():    
               self.context.writeIndented('<pre clas="CODE">')
           else:
               self.context.writeIndented('<source>')
           
       def end(self):
  -        if not self.config.isXhtml():    
  +        if self.config.isXhtml():    
               self.context.writeIndented('</pre>')
           else:
               self.context.writeIndented('</source>')
  
  
  
  1.9.2.9   +29 -14    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.8
  retrieving revision 1.9.2.9
  diff -u -r1.9.2.8 -r1.9.2.9
  --- documenter.py	16 Jun 2004 18:38:20 -0000	1.9.2.8
  +++ documenter.py	16 Jun 2004 23:05:36 -0000	1.9.2.9
  @@ -27,6 +27,8 @@
   from string import lower,replace
   from xml.sax.saxutils import escape
   
  +from shutil import copyfile
  +
   from gump import log
   from gump.core.config import *
   from gump.document.documenter import Documenter
  @@ -106,12 +108,8 @@
           self.documentXRef()
   
           # Synchronize xdocs...
  -        ret=0
  +        return self.syncXDocs()
           
  -        ret=self.syncXDocs()
  -            
  -        return ret
  -
       #####################################################################
       #
       # XDocing...
  @@ -190,19 +188,28 @@
           
           success=True
           try:
  -            #
               # Sync over public pages...
  -            #
               syncDirectories(workContents,logContents)
            
           except:        
  -            log.error('--- Failed to work->log sync and/or clean-up', exc_info=1)
  +            log.error('--- Failed to sync work->log ', exc_info=1)
               success=False
           
  -        if success:
  +        if success: 
  +            logSpec=self.resolver.getFileSpec(self.workspace, 'buildLog')
  +            
               # Current status
  -            buildLog=self.resolver.getFile(self.workspace,'buildLog'),
  -                
  +            logSource=os.path.join(workContents,logSpec.getDocument())
  +            logTarget=os.path.join(logContents,logSpec.getDocument())
  +             
  +            # Do the transfer..
  +            try:
  +                log.debug('Copy %s to %s' % ( logSource, logTarget))    
  +                copyfile(logSource,logTarget)    
  +            except:        
  +                log.error('--- Failed to sync buildLog work->log', exc_info=1)
  +                success=False
  +        
           return success
           
       def syncXDocs(self):
  @@ -697,7 +704,7 @@
           
           document.serialize()
          
  -    def documentBuildLog(self,realTime=0): 
  +    def documentBuildLog(self,realTime=False): 
           #
           # ----------------------------------------------------------------------
           #
  @@ -708,7 +715,16 @@
                   spec.getFile() ,
                   self.config,
                   spec.getRootPath())
  -        
  +                
  +        if realTime: 
  +            document.createWarning('This Gump run is currently in progress...')
  +        else:
  +            document.createNote("""This Gump run is complete. 
  +            It started at %s and ended at %s, both %s.""" 
  +                % ( self.workspace.getStartDateTime(),
  +                    self.workspace.getEndDateTime(),
  +                    self.workspace.timezone) )
  +                    
           self.documentSummary(document, self.workspace.getProjectSummary())            
   
           
           #
  @@ -2377,7 +2393,6 @@
                           #
                           # This is *big* just copy/point to it
                           #
  -                        from shutil import copyfile
                           # Extract name, to make relative to group
                           outputBaseName=os.path.basename(output)
                           (outputName,outputExtn)=os.path.splitext(outputBaseName)
  
  
  
  No                   revision
  No                   revision
  1.19.2.1  +6 -6      gump/project/ws-wsrp4j.xml
  
  Index: ws-wsrp4j.xml
  ===================================================================
  RCS file: /home/cvs/gump/project/ws-wsrp4j.xml,v
  retrieving revision 1.19
  retrieving revision 1.19.2.1
  diff -u -r1.19 -r1.19.2.1
  --- ws-wsrp4j.xml	2 Jun 2004 17:50:05 -0000	1.19
  +++ ws-wsrp4j.xml	16 Jun 2004 23:05:36 -0000	1.19.2.1
  @@ -43,12 +43,12 @@
       <depend project="my-axis"/>
       <depend project="commons-discovery"/>
       <depend project="commons-logging"/>
  -    <depend project="tt-bytecode"/>
  +    <depend project="my-tt-bytecode"/>
       <depend project="wsdl4j"/>
       <depend project="xml-apis"/>
       <depend project="xml-xerces"/>
  -    <depend project="jaxrpc"/>
  -    <depend project="saaj"/>
  +    <depend project="my-jaxrpc"/>
  +    <depend project="my-saaj"/>
   
       <work nested="build/ant/lib/ForeachTask.jar"/>
       <work nested="bin/classes"/>
  @@ -68,16 +68,16 @@
       </nag>
     </project>
     
  -  <project name="tt-bytecode">
  +  <project name="my-tt-bytecode">
     	<jar name="lib/tt-bytecode.jar"/>
     </project>
     <project name="my-axis">
       <jar name="lib/axis.jar"/>
     </project>
  -  <project name="jaxrpc">
  +  <project name="my-jaxrpc">
       <jar name="lib/jaxrpc.jar"/>
     </project>
  -  <project name="saaj">
  +  <project name="my-saaj">
       <jar name="lib/saaj.jar"/>
     </project>
     
  
  
  

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


Mime
View raw message