gump-general mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aj...@apache.org
Subject cvs commit: jakarta-gump/python/gump/document forrest.py
Date Thu, 29 Jan 2004 03:49:58 GMT
ajack       2004/01/28 19:49:58

  Modified:    python/gump/model workspace.py
               python/gump/output xref.py
               python/gump/document forrest.py
  Log:
  1) private workspaces ought keep some details private
  2) working on xref by 'href' where metadata is stored...
  
  Revision  Changes    Path
  1.23      +8 -2      jakarta-gump/python/gump/model/workspace.py
  
  Index: workspace.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model/workspace.py,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- workspace.py	9 Jan 2004 19:57:18 -0000	1.22
  +++ workspace.py	29 Jan 2004 03:49:58 -0000	1.23
  @@ -220,18 +220,24 @@
           else:
               self.logurl = self.xml.logurl
               
  +        # Keep some details private, if requested...
  +        if self.xml.private:
  +            self.private=1
  +        else:
  +            self.private=0
  +            
           # Sending e-mail address
           if not self.xml.email: 
               self.email = default.email
           else:
               self.email = self.xml.email
               
  -        # Sending server
  +        # Gump List...
           if not self.xml.mailinglist: 
               self.mailinglist = default.mailinglist    
           else:
               self.mailinglist = self.xml.mailinglist
  -            
  +                    
           # Mail server
           if not self.xml.mailserver: 
               self.mailserver = default.mailserver
  
  
  
  1.9       +5 -5      jakarta-gump/python/gump/output/xref.py
  
  Index: xref.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/output/xref.py,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- xref.py	28 Jan 2004 22:54:50 -0000	1.8
  +++ xref.py	29 Jan 2004 03:49:58 -0000	1.9
  @@ -167,9 +167,9 @@
       def mapDescriptorLocations(self):
           for module in self.workspace.getModules():            
               for project in module.getProjects():                
  -                metadataLocation=str(project.xml.href)
  +                metadataLocation=str(project.xml.href) or str(module.xml.href)
                   
  -                print project.getName() + ' : ' + metadataLocation + "\n";
  +                # print project.getName() + ' : Metadata Location = ' + metadataLocation
+ "\n";
                   
                   if metadataLocation:          
                       if not self.descriptorLocationToProject.has_key(metadataLocation):
  
  
  
  1.59      +24 -19    jakarta-gump/python/gump/document/forrest.py
  
  Index: forrest.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/document/forrest.py,v
  retrieving revision 1.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- forrest.py	28 Jan 2004 00:13:39 -0000	1.58
  +++ forrest.py	29 Jan 2004 03:49:58 -0000	1.59
  @@ -280,9 +280,11 @@
           textRow.createData('Workspace Documentation')
           textRow.createData().createLink('context.html','Text')
                   
  -        syndRow=definitionTable.createRow()
  -        syndRow.createData('Definition')
  -        syndRow.createData().createLink('workspace.html','XML')
  +                
  +        if not workspace.private:            
  +            syndRow=definitionTable.createRow()
  +            syndRow.createData('Definition')
  +            syndRow.createData().createLink('workspace.html','XML')
                   
           if not gumpSet.isFull():
               note=definitionSection.createNote()
  @@ -320,11 +322,13 @@
           detailsTable.createEntry("Jars Repository : ", workspace.jardir)
           detailsTable.createEntry("CVS Directory : ", workspace.cvsdir)
           detailsTable.createEntry("Package Directory : ", workspace.pkgdir)
  -        detailsTable.createEntry("List Address: ", workspace.mailinglist)
  -        detailsTable.createEntry("E-mail Address: ", workspace.email)
  -        detailsTable.createEntry("E-mail Server: ", workspace.mailserver)
  -        detailsTable.createEntry("Prefix: ", workspace.prefix)
  -        detailsTable.createEntry("Signature: ", workspace.signature)
  +        if not workspace.private:
  +            detailsTable.createEntry("E-mail Server: ", workspace.mailserver)
  +            detailsTable.createEntry("E-mail Port: ", workspace.mailport)
  +            detailsTable.createEntry("List Address: ", workspace.mailinglist)
  +            detailsTable.createEntry("E-mail Address: ", workspace.email)            
  +            detailsTable.createEntry("Prefix: ", workspace.prefix)
  +            detailsTable.createEntry("Signature: ", workspace.signature)
           
           self.documentProperties(detailsSection, workspace, 'Workspace Properties')
           
  @@ -660,14 +664,15 @@
           stream.close()
           document.serialize()
               
  -        # Document the workspace XML    
  -        document=XDocDocument('Definition',self.resolver.getFile(workspace,'workspace.xml'))
  -        stream=StringIO.StringIO() 
  -        xmlize('workspace',workspace.xml,stream)
  -        stream.seek(0)
  -        document.createSource(stream.read())
  -        stream.close()
  -        document.serialize()
  +        if not workspace.private:
  +            # Document the workspace XML    
  +            document=XDocDocument('Definition',self.resolver.getFile(workspace,'workspace.xml'))
  +            stream=StringIO.StringIO() 
  +            xmlize('workspace',workspace.xml,stream)
  +            stream.seek(0)
  +            document.createSource(stream.read())
  +            stream.close()
  +            document.serialize()
         
       def documentRepository(self,repo,workspace,gumpSet):
           
  
  
  

Mime
View raw message