You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@gump.apache.org by aj...@apache.org on 2004/03/17 00:56:42 UTC
cvs commit: gump/python/gump/model loader.py
ajack 2004/03/16 15:56:42
Modified: python/gump/results resulter.py
python/gump/document text.py
python/gump/utils xmlutils.py
python/gump gumprun.py engine.py
python/gump/model loader.py
Log:
Few more tweaks...
Revision Changes Path
1.18 +1 -1 gump/python/gump/results/resulter.py
Index: resulter.py
===================================================================
RCS file: /home/cvs/gump/python/gump/results/resulter.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- resulter.py 15 Mar 2004 22:07:06 -0000 1.17
+++ resulter.py 16 Mar 2004 23:56:41 -0000 1.18
@@ -91,7 +91,7 @@
if server.isPython():
results=self.loadResultsForServer(server)
except Exception, details:
- log.warn('Failed to load results for [' + str(server) + '] : ' \
+ log.debug('Failed to load results for [' + str(server) + '] : ' \
+ str(details), exc_info=1)
if results:
1.13 +7 -4 gump/python/gump/document/text.py
Index: text.py
===================================================================
RCS file: /home/cvs/gump/python/gump/document/text.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- text.py 16 Mar 2004 23:02:50 -0000 1.12
+++ text.py 16 Mar 2004 23:56:41 -0000 1.13
@@ -119,7 +119,8 @@
output.write(indent + "Modules: " + str(len(workspace.getModules())) + "\n")
self.documentAnnotations(indent,workspace)
-
+ self.documentWork(indent,workspace)
+
indent += ' '
for module in sortedModuleList:
if quick:
@@ -130,6 +131,8 @@
output.write(indent + "Module [" + module.getName() + "] State: " + module.getStateDescription() + "\n")
output.write(indent + "Projects: " + str(len(module.getProjects())) + "\n")
+ self.documentWork(indent,module)
+
#
# Document all the annotations
#
1.12 +7 -7 gump/python/gump/utils/xmlutils.py
Index: xmlutils.py
===================================================================
RCS file: /home/cvs/gump/python/gump/utils/xmlutils.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xmlutils.py 16 Mar 2004 19:50:15 -0000 1.11
+++ xmlutils.py 16 Mar 2004 23:56:41 -0000 1.12
@@ -96,17 +96,17 @@
def error(self, exception):
self.addError('XML error : ' + str(exception))
- log.error("Handle a recoverable error." + str(exception), exc_info=1)
+ #log.error("Handle a recoverable error." + str(exception), exc_info=1)
# raise exception
def fatalError(self, exception):
self.addError('XML error : ' + str(exception))
- log.error("Handle a non-recoverable error." + str(exception), exc_info=1)
+ #log.error("Handle a non-recoverable error." + str(exception), exc_info=1)
# raise exception
def warning(self, exception):
self.addWarning('XML warning' + str(exception))
- log.warn("Handle a warning." + str(exception), exc_info=1)
+ #log.warn("Handle a warning." + str(exception), exc_info=1)
###############################################################################
# Base classes for the Gump object model
@@ -234,10 +234,10 @@
#
href=attrs.get('href')
- log.debug('New Named [' + cls.__name__ + '] name=[' + str(name) + '] href=[' + str(href) + ']')
+ #log.debug('New Named [' + cls.__name__ + '] name=[' + str(name) + '] href=[' + str(href) + ']')
if href:
- log.debug('Download metadata from : [' + href + ']')
+ #log.debug('Download metadata from : [' + href + ']')
# Stored by caller...
basedir=attrs.get('@basedir')
@@ -267,12 +267,12 @@
except Exception, detail:
message='Failed to parse XML @ [' + newHref + ']. Details: ' + str(detail)
- log.error(message, exc_info=1)
+ #log.error(message, exc_info=1)
raise RuntimeError, message
else:
# :TODO: Set any object "invalid"?
message='HREF ['+href+'] not loaded'
- log.error(message, exc_info=1)
+ #log.error(message, exc_info=1)
raise RuntimeError, message
#
1.15 +1 -1 gump/python/gump/gumprun.py
Index: gumprun.py
===================================================================
RCS file: /home/cvs/gump/python/gump/gumprun.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- gumprun.py 16 Mar 2004 19:50:14 -0000 1.14
+++ gumprun.py 16 Mar 2004 23:56:41 -0000 1.15
@@ -271,7 +271,7 @@
todo.remove(todoProject)
if not todoProject in result:
result.append(todoProject)
- log.debug('Next Project ['+todoProject.getName()+'] is #' + str(len(result)))
+ #log.debug('Next Project ['+todoProject.getName()+'] is #' + str(len(result)))
#else:
# log.debug('Duplicate Result ['+todoProject.getName()+']')
foundSome=1
1.90 +2 -2 gump/python/gump/engine.py
Index: engine.py
===================================================================
RCS file: /home/cvs/gump/python/gump/engine.py,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -r1.89 -r1.90
--- engine.py 16 Mar 2004 23:19:04 -0000 1.89
+++ engine.py 16 Mar 2004 23:56:41 -0000 1.90
@@ -80,7 +80,7 @@
return self.perform(run, GumpTaskList(['update','build','document','outputs','notify']) )
def performCheck(self,run):
- return self.perform(run, GumpTaskList(['update','check','document']) )
+ return self.perform(run, GumpTaskList(['check','document']) )
###########################################
@@ -103,6 +103,7 @@
def performTasks(self,run,taskList):
for task in taskList:
+ log.info('Perform task [' + task.getName() + ']')
task.invoke(run)
###########################################
@@ -724,7 +725,6 @@
workspace=run.getWorkspace()
log.debug('--- Building work directories with sources')
-
# :TODO: Check the workspace?
1.10 +3 -3 gump/python/gump/model/loader.py
Index: loader.py
===================================================================
RCS file: /home/cvs/gump/python/gump/model/loader.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- loader.py 16 Mar 2004 19:50:15 -0000 1.9
+++ loader.py 16 Mar 2004 23:56:42 -0000 1.10
@@ -38,7 +38,7 @@
def load(self,file,cache=0):
"""Builds a GOM in memory from the xml file. Return the generated GOM."""
- log.info('Start loading metadata...')
+ #log.info('Start loading metadata...')
if not os.path.exists(file):
log.error('Workspace metadata file ['+file+'] not found')
@@ -80,7 +80,7 @@
if not xmlworkspace:
raise IOError, 'Failed to load workspace: ' + file
- log.info('Loaded metadata...')
+ #log.info('Loaded metadata...')
# Construct object around XML.
workspace=Workspace(xmlworkspace)
@@ -95,7 +95,7 @@
XMLModule.map,XMLProject.map, \
XMLServer.map, XMLTracker.map)
- log.info('Processed metadata...')
+ #log.info('Processed metadata...')
finally:
#
---------------------------------------------------------------------
To unsubscribe, e-mail: general-unsubscribe@gump.apache.org
For additional commands, e-mail: general-help@gump.apache.org