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 Wed, 11 Feb 2004 22:07:25 GMT
ajack       2004/02/11 14:07:25

  Modified:    python/gump engine.py
               python/gump/model project.py
               python/gump/document forrest.py
  Log:
  Attempt to separate two cats w/ same file name (on two projects)
  
  Revision  Changes    Path
  1.54      +3 -1      jakarta-gump/python/gump/engine.py
  
  Index: engine.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/engine.py,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- engine.py	9 Feb 2004 22:00:55 -0000	1.53
  +++ engine.py	11 Feb 2004 22:07:24 -0000	1.54
  @@ -468,6 +468,7 @@
           #
           #
           # NOTE --------------- NOT TURNED ON YET!!!!!!
  +        # Security concerns...
           #
           #
           if 0 and project.okToPerformWork():        
  @@ -501,7 +502,8 @@
                   project.addInfo('Maven Properties in: ' + propertiesFile)
                   
                   try:
  -                    catFileAsWork(project,propertiesFile)
  +                    catFileAsWork(project,propertiesFile,	\
  +                        project.getName() + ' ' + os.path.basename(propertiesFile))
                   except:
                       log.error('Display Properties [ ' + propertiesFile + '] Failed', exc_info=1)
  
                   
  
  
  
  1.46      +19 -10    jakarta-gump/python/gump/model/project.py
  
  Index: project.py
  ===================================================================
  RCS file: /home/cvs/jakarta-gump/python/gump/model/project.py,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- project.py	10 Feb 2004 22:48:53 -0000	1.45
  +++ project.py	11 Feb 2004 22:07:25 -0000	1.46
  @@ -487,9 +487,10 @@
           #
           if self.hasJars():
               if 1 == self.getJarCount():
  -                if not self.getJarAt(0).hasId():
  -                    self.addInfo('Set <jar identifier to project name')
  -                    self.getJarAt(0).setId(self.getName())    
  +                jar=self.getJarAt(0)
  +                if not jar.hasId():
  +                    self.addInfo('Sole jar [' + jar.getPath() + '] identifier set to project
name')
  +                    jar.setId(self.getName())    
               else:
                   #
                   # :TODO: A work in progress, not sure how
  @@ -498,7 +499,7 @@
                   for jar in self.getJars():
                       if not jar.hasId():
                           basename=os.path.basename(jar.getPath())
  -                        self.addWarning('Set <jar [' + jar.getPath() + '] identifier
to jar basename: [' + basename + ']')    
  +                        self.addWarning('Jar [' + jar.getPath() + '] identifier set to
jar basename: [' + basename + ']')    
                           jar.setId(basename)
           
           # Grab all the work
  @@ -1006,10 +1007,18 @@
           
           props=open(propertiesFile,'w')
           
  -        props.write("""# ------------------------------------------------------------------------
  -# Gump generated properties file
  +        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://jakarta.apache.org/gump
  +#
  +# 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
  
  
  
  1.72      +5 -4      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.71
  retrieving revision 1.72
  diff -u -r1.71 -r1.72
  --- forrest.py	10 Feb 2004 22:48:53 -0000	1.71
  +++ forrest.py	11 Feb 2004 22:07:25 -0000	1.72
  @@ -1280,7 +1280,8 @@
       def documentServerLinks(self,xdocNode,linkable,workspace):
           
           servers=workspace.getServers()
  -        if not servers: return        
  +        if not servers: return    
  +        if len(servers) == 1: return # Assume this one.     
           
           serversSection=xdocNode.createSection('Servers')        
           serversTable=serversSection.createTable()
  
  
  

Mime
View raw message